Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70c60d1
Exclude System.* reference assemblies in ILCompiler.Build.Tasks
jkotas May 18, 2023
42b0e70
Do not include any System.* assemblies as part of the task
jkotas May 18, 2023
7a471da
Delete custom resolver
jkotas May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/tools/aot/ILCompiler.Build.Tasks/ComputeManagedAssembliesToCompileToNative.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace Build.Tasks
{
public class ComputeManagedAssembliesToCompileToNative : DesktopCompatibleTask
public class ComputeManagedAssembliesToCompileToNative : Task
{
[Required]
public ITaskItem[] Assemblies
Expand Down
98 changes: 0 additions & 98 deletions src/coreclr/tools/aot/ILCompiler.Build.Tasks/DesktopCompatibleTask.cs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Build.Tasks/DumpNativeResources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 2 additions & 3 deletions src/coreclr/tools/aot/ILCompiler.Build.Tasks/ILCompiler.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Copy link
Member

@agocke agocke May 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, SRM should be in the SDK as well. Can we add PrivateAssets here as well?

Copy link
Member Author

@jkotas jkotas May 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Delete CopyLocalLockFileAssemblies property instead.

</ItemGroup>

Expand Down