Exclude System.* reference assemblies in ILCompiler.Build.Tasks (#86423)

* Exclude System.* reference assemblies in ILCompiler.Build.Tasks We expect the implementation of these assemblies to come as part of msbuild. Fixes #83695 * Do not include any System.* assemblies as part of the task * Delete custom resolver
dotnet · May 18, 2023 · 29d485c · 29d485c
1 parent b25f2bb
commit 29d485c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 103 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Build.Tasks/ComputeManagedAssembliesToCompileToNative.cs b/src/coreclr/tools/aot/ILCompiler.Build.Tasks/ComputeManagedAssembliesToCompileToNative.cs
@@ -13,7 +13,7 @@
 
 namespace Build.Tasks
 {
-    public class ComputeManagedAssembliesToCompileToNative : DesktopCompatibleTask
+    public class ComputeManagedAssembliesToCompileToNative : Task
     {
         [Required]
         public ITaskItem[] Assemblies

diff --git a/src/coreclr/tools/aot/ILCompiler.Build.Tasks/DesktopCompatibleTask.cs b/src/coreclr/tools/aot/ILCompiler.Build.Tasks/DesktopCompatibleTask.cs
diff --git a/src/coreclr/tools/aot/ILCompiler.Build.Tasks/DumpNativeResources.cs b/src/coreclr/tools/aot/ILCompiler.Build.Tasks/DumpNativeResources.cs
@@ -8,13 +8,14 @@
 using System.Text;
 
 using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
 
 namespace Build.Tasks
 {
     /// <summary>
     /// Dumps native Win32 resources in the given assembly into a specified *.res file.
     /// </summary>
-    public class DumpNativeResources : DesktopCompatibleTask
+    public class DumpNativeResources : Task
     {
         /// <summary>
         /// File name of the assembly with Win32 resources to be dumped.

diff --git a/src/coreclr/tools/aot/ILCompiler.Build.Tasks/ILCompiler.Build.Tasks.csproj b/src/coreclr/tools/aot/ILCompiler.Build.Tasks/ILCompiler.Build.Tasks.csproj
@@ -9,12 +9,11 @@
     <OutputPath>$(RuntimeBinDir)/ilc-published/netstandard</OutputPath>
     <Configurations>Debug;Release;Checked</Configurations>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" PrivateAssets="all" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" PrivateAssets="all" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
     <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
   </ItemGroup>