AOT compatible: set IsAOTcompatible (#7152)

Nigusu-Allehu · web-flow · commit 8deb76a20811 · 2026-03-05T18:25:44.000-08:00
diff --git a/src/NuGet.Core/Directory.Build.targets b/src/NuGet.Core/Directory.Build.targets
@@ -0,0 +1,6 @@
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+  <PropertyGroup Condition="'$(IsAotCompatible)' == '' And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
+    <IsAotCompatible>true</IsAotCompatible>
+  </PropertyGroup>
+</Project>
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj b/src/NuGet.Core/NuGet.Build.Tasks/NuGet.Build.Tasks.csproj
@@ -9,6 +9,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <XPLATProject>true</XPLATProject>
     <UsePublicApiAnalyzer>false</UsePublicApiAnalyzer>
+    <IsAotCompatible>false</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
@@ -7,6 +7,7 @@
     <Shipping>true</Shipping>
     <PackProject>true</PackProject>
     <XPLATProject>true</XPLATProject>
+    <IsAotCompatible>false</IsAotCompatible>
     <UseMSBuildLocator Condition=" '$(UseMSBuildLocator)' == '' And '$(Configuration)' == 'Debug' and '$(CI)' != 'true' ">true</UseMSBuildLocator>
     <!-- Microsoft.Extensions.CommandLineUtils.Sources causes nullability warnings, so we have to disable it for the project and enable in each file until we can remove the package  -->
     <Nullable>disable</Nullable>
diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/LockFileUtils.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/Utility/LockFileUtils.cs
@@ -822,7 +822,7 @@ private static List<SelectionCriteria> CreateCriteria(
         /// Clears a lock file group and replaces the first item with _._ if
         /// the group has items. Empty groups are left alone.
         /// </summary>
-        private static void ClearIfExists<T>(IList<T> group) where T : LockFileItem
+        private static void ClearIfExists<T>(IList<T> group, Func<string, T> factory) where T : LockFileItem
         {
             if (GroupHasNonEmptyItems(group))
             {
@@ -846,7 +846,7 @@ private static void ClearIfExists<T>(IList<T> group) where T : LockFileItem
                 group.Clear();
 
                 // Create a new item with the _._ path
-                var emptyItem = (T)Activator.CreateInstance(typeof(T), new[] { emptyDir });
+                var emptyItem = factory(emptyDir);
 
                 // Copy over the properties from the first
                 foreach (var pair in firstItem.Properties)
@@ -949,7 +949,7 @@ private static List<LockFileRuntimeTarget> GetRuntimeTargetLockFileItems(
 
             if ((dependencyType & groupType) == LibraryIncludeFlags.None)
             {
-                ClearIfExists<LockFileRuntimeTarget>(items);
+                ClearIfExists(items, static path => new LockFileRuntimeTarget(path));
             }
 
             return items;
@@ -1023,20 +1023,20 @@ public static void ExcludeItems(LockFileTargetLibrary lockFileLib, LibraryInclud
         {
             if ((dependencyType & LibraryIncludeFlags.Runtime) == LibraryIncludeFlags.None)
             {
-                ClearIfExists(lockFileLib.RuntimeAssemblies);
+                ClearIfExists(lockFileLib.RuntimeAssemblies, static path => new LockFileItem(path));
                 lockFileLib.FrameworkAssemblies.Clear();
                 lockFileLib.ResourceAssemblies.Clear();
             }
 
             if ((dependencyType & LibraryIncludeFlags.Compile) == LibraryIncludeFlags.None)
             {
-                ClearIfExists(lockFileLib.CompileTimeAssemblies);
-                ClearIfExists(lockFileLib.EmbedAssemblies);
+                ClearIfExists(lockFileLib.CompileTimeAssemblies, static path => new LockFileItem(path));
+                ClearIfExists(lockFileLib.EmbedAssemblies, static path => new LockFileItem(path));
             }
 
             if ((dependencyType & LibraryIncludeFlags.Native) == LibraryIncludeFlags.None)
             {
-                ClearIfExists(lockFileLib.NativeLibraries);
+                ClearIfExists(lockFileLib.NativeLibraries, static path => new LockFileItem(path));
             }
 
             if ((dependencyType & LibraryIncludeFlags.ContentFiles) == LibraryIncludeFlags.None
@@ -1051,16 +1051,16 @@ public static void ExcludeItems(LockFileTargetLibrary lockFileLib, LibraryInclud
                 (dependencyType & LibraryIncludeFlags.Build) == LibraryIncludeFlags.None)
             {
                 // If BuildTransitive is excluded then all build assets are cleared.
-                ClearIfExists(lockFileLib.Build);
-                ClearIfExists(lockFileLib.BuildMultiTargeting);
+                ClearIfExists(lockFileLib.Build, static path => new LockFileItem(path));
+                ClearIfExists(lockFileLib.BuildMultiTargeting, static path => new LockFileItem(path));
             }
             else if ((dependencyType & LibraryIncludeFlags.Build) == LibraryIncludeFlags.None)
             {
                 if (!lockFileLib.Build.Any(item => item.Path.StartsWith("buildTransitive/", StringComparison.OrdinalIgnoreCase)))
                 {
                     // all build assets are from /build folder so just clear them all.
-                    ClearIfExists(lockFileLib.Build);
-                    ClearIfExists(lockFileLib.BuildMultiTargeting);
+                    ClearIfExists(lockFileLib.Build, static path => new LockFileItem(path));
+                    ClearIfExists(lockFileLib.BuildMultiTargeting, static path => new LockFileItem(path));
                 }
                 else
                 {
diff --git a/src/NuGet.Core/NuGet.Credentials/NuGet.Credentials.csproj b/src/NuGet.Core/NuGet.Credentials/NuGet.Credentials.csproj
@@ -9,7 +9,6 @@
     <XPLATProject>true</XPLATProject>
     <UsePublicApiAnalyzer>perTfm</UsePublicApiAnalyzer>
     <NoWarn>$(NoWarn);RS0041</NoWarn>
-    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IsVsixBuild)' == 'true' ">
diff --git a/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj b/src/NuGet.Core/NuGet.DependencyResolver.Core/NuGet.DependencyResolver.Core.csproj
@@ -8,7 +8,6 @@
     <RootNamespace>NuGet.DependencyResolver</RootNamespace>
     <IncludeInVSIX>true</IncludeInVSIX>
     <XPLATProject>true</XPLATProject>
-    <IsAotCompatible>true</IsAotCompatible>
     <Description>NuGet's PackageReference dependency resolver implementation.</Description>
   </PropertyGroup>
 
diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj
@@ -7,7 +7,6 @@
     <Shipping>true</Shipping>
     <IncludeInVSIX>true</IncludeInVSIX>
     <XPLATProject>true</XPLATProject>
-    <IsAotCompatible>true</IsAotCompatible>
     <Description>NuGet's types and interfaces for understanding dependencies.</Description>
   </PropertyGroup>
 
diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj
@@ -8,7 +8,6 @@
     <Shipping>true</Shipping>
     <IncludeInVSIX>true</IncludeInVSIX>
     <XPLATProject>true</XPLATProject>
-    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IsVsixBuild)' == 'true' ">
diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj
@@ -10,6 +10,7 @@
     <IncludeInVSIX>true</IncludeInVSIX>
     <XPLATProject>true</XPLATProject>
     <UsePublicApiAnalyzer>perTfm</UsePublicApiAnalyzer>
+    <IsAotCompatible>false</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IsVsixBuild)' == 'true' ">
diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
@@ -7,6 +7,7 @@
     <Shipping>true</Shipping>
     <IncludeInVSIX>true</IncludeInVSIX>
     <XPLATProject>true</XPLATProject>
+    <IsAotCompatible>false</IsAotCompatible>
     <Description>NuGet's core types and interfaces for PackageReference-based restore, such as lock files, assets file and internal restore models.</Description>
   </PropertyGroup>
 
@@ -19,8 +20,9 @@
     <ProjectReference Include="..\NuGet.DependencyResolver.Core\NuGet.DependencyResolver.Core.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
+  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
+    <PackageReference Include="System.Collections.Immutable" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -53,8 +55,4 @@
   <ItemGroup>
     <InternalsVisibleTo Include="NuGet.ProjectModel.Test" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Text.Json" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" />
-  </ItemGroup>
 </Project>
diff --git a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
@@ -10,6 +10,7 @@
     <XPLATProject>true</XPLATProject>
     <Description>NuGet's implementation for interacting with feeds. Contains functionality for all feed types.</Description>
     <UsePublicApiAnalyzer>perTfm</UsePublicApiAnalyzer>
+    <IsAotCompatible>false</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(IsVsixBuild)' == 'true' ">
diff --git a/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj b/src/NuGet.Core/NuGet.Resolver/NuGet.Resolver.csproj
@@ -7,7 +7,6 @@
     <PackProject>true</PackProject>
     <Shipping>true</Shipping>
     <IncludeInVSIX>true</IncludeInVSIX>
-    <IsAotCompatible>true</IsAotCompatible>
     <XPLATProject>true</XPLATProject>
   </PropertyGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ private static List<SelectionCriteria> CreateCriteria(`
`822`	`822`	`/// Clears a lock file group and replaces the first item with _._ if`
`823`	`823`	`/// the group has items. Empty groups are left alone.`
`824`	`824`	`/// </summary>`
`825`		`- private static void ClearIfExists<T>(IList<T> group) where T : LockFileItem`
	`825`	`+ private static void ClearIfExists<T>(IList<T> group, Func<string, T> factory) where T : LockFileItem`
`826`	`826`	`{`
`827`	`827`	`if (GroupHasNonEmptyItems(group))`
`828`	`828`	`{`
`@@ -846,7 +846,7 @@ private static void ClearIfExists<T>(IList<T> group) where T : LockFileItem`
`846`	`846`	`group.Clear();`
`847`	`847`
`848`	`848`	`// Create a new item with the _._ path`
`849`		`- var emptyItem = (T)Activator.CreateInstance(typeof(T), new[] { emptyDir });`
	`849`	`+ var emptyItem = factory(emptyDir);`
`850`	`850`
`851`	`851`	`// Copy over the properties from the first`
`852`	`852`	`foreach (var pair in firstItem.Properties)`
`@@ -949,7 +949,7 @@ private static List<LockFileRuntimeTarget> GetRuntimeTargetLockFileItems(`
`949`	`949`
`950`	`950`	`if ((dependencyType & groupType) == LibraryIncludeFlags.None)`
`951`	`951`	`{`
`952`		`- ClearIfExists<LockFileRuntimeTarget>(items);`
	`952`	`+ ClearIfExists(items, static path => new LockFileRuntimeTarget(path));`
`953`	`953`	`}`
`954`	`954`
`955`	`955`	`return items;`
`@@ -1023,20 +1023,20 @@ public static void ExcludeItems(LockFileTargetLibrary lockFileLib, LibraryInclud`
`1023`	`1023`	`{`
`1024`	`1024`	`if ((dependencyType & LibraryIncludeFlags.Runtime) == LibraryIncludeFlags.None)`
`1025`	`1025`	`{`
`1026`		`- ClearIfExists(lockFileLib.RuntimeAssemblies);`
	`1026`	`+ ClearIfExists(lockFileLib.RuntimeAssemblies, static path => new LockFileItem(path));`
`1027`	`1027`	`lockFileLib.FrameworkAssemblies.Clear();`
`1028`	`1028`	`lockFileLib.ResourceAssemblies.Clear();`
`1029`	`1029`	`}`
`1030`	`1030`
`1031`	`1031`	`if ((dependencyType & LibraryIncludeFlags.Compile) == LibraryIncludeFlags.None)`
`1032`	`1032`	`{`
`1033`		`- ClearIfExists(lockFileLib.CompileTimeAssemblies);`
`1034`		`- ClearIfExists(lockFileLib.EmbedAssemblies);`
	`1033`	`+ ClearIfExists(lockFileLib.CompileTimeAssemblies, static path => new LockFileItem(path));`
	`1034`	`+ ClearIfExists(lockFileLib.EmbedAssemblies, static path => new LockFileItem(path));`
`1035`	`1035`	`}`
`1036`	`1036`
`1037`	`1037`	`if ((dependencyType & LibraryIncludeFlags.Native) == LibraryIncludeFlags.None)`
`1038`	`1038`	`{`
`1039`		`- ClearIfExists(lockFileLib.NativeLibraries);`
	`1039`	`+ ClearIfExists(lockFileLib.NativeLibraries, static path => new LockFileItem(path));`
`1040`	`1040`	`}`
`1041`	`1041`
`1042`	`1042`	`if ((dependencyType & LibraryIncludeFlags.ContentFiles) == LibraryIncludeFlags.None`
`@@ -1051,16 +1051,16 @@ public static void ExcludeItems(LockFileTargetLibrary lockFileLib, LibraryInclud`
`1051`	`1051`	`(dependencyType & LibraryIncludeFlags.Build) == LibraryIncludeFlags.None)`
`1052`	`1052`	`{`
`1053`	`1053`	`// If BuildTransitive is excluded then all build assets are cleared.`
`1054`		`- ClearIfExists(lockFileLib.Build);`
`1055`		`- ClearIfExists(lockFileLib.BuildMultiTargeting);`
	`1054`	`+ ClearIfExists(lockFileLib.Build, static path => new LockFileItem(path));`
	`1055`	`+ ClearIfExists(lockFileLib.BuildMultiTargeting, static path => new LockFileItem(path));`
`1056`	`1056`	`}`
`1057`	`1057`	`else if ((dependencyType & LibraryIncludeFlags.Build) == LibraryIncludeFlags.None)`
`1058`	`1058`	`{`
`1059`	`1059`	`if (!lockFileLib.Build.Any(item => item.Path.StartsWith("buildTransitive/", StringComparison.OrdinalIgnoreCase)))`
`1060`	`1060`	`{`
`1061`	`1061`	`// all build assets are from /build folder so just clear them all.`
`1062`		`- ClearIfExists(lockFileLib.Build);`
`1063`		`- ClearIfExists(lockFileLib.BuildMultiTargeting);`
	`1062`	`+ ClearIfExists(lockFileLib.Build, static path => new LockFileItem(path));`
	`1063`	`+ ClearIfExists(lockFileLib.BuildMultiTargeting, static path => new LockFileItem(path));`
`1064`	`1064`	`}`
`1065`	`1065`	`else`
`1066`	`1066`	`{`