Skip to content
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

Jump to bottom

Clean up dead code in illink targets #85741

Merged
merged 7 commits into from
May 16, 2023
Merged

Clean up dead code in illink targets #85741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b062f97
Clean up dead code in illink targets
sbomer May 3, 2023
174e5e0
Remove 6.0 suppressions xml
sbomer May 3, 2023
0c73186
Add warning about unsupported TFM
sbomer May 4, 2023
5633e40
Warn on explicit package reference
sbomer May 10, 2023
9d936de
Update src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.t…
sbomer May 11, 2023
c085303
Update ILCompiler warning to match
sbomer May 11, 2023
0903e71
Update src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.t…
sbomer May 16, 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/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<Target Name="GenerateILCompilerExplicitPackageReferenceWarning" Condition="'$(SuppressGenerateILCompilerExplicitPackageReferenceWarning)' == '' and '$(AotRuntimePackageLoadedViaSDK)' != 'true' and '$(ILCompilerTargetsPath)' != ''"
BeforeTargets="ImportRuntimeIlcPackageTarget">
<Warning Condition="'%(PackageReference.Identity)' == 'Microsoft.DotNet.ILCompiler' And '%(PackageReference.IsImplicitlyDefined)' != 'true'"
Text="Delete explicit 'Microsoft.DotNet.ILCompiler' package reference in your project file. Explicit 'Microsoft.DotNet.ILCompiler' package reference can run into version errors." />
Text="Delete explicit 'Microsoft.DotNet.ILCompiler' package reference in your project file to avoid versioning problems." />
</Target>

<!-- Locate the runtime package according to the current target runtime -->
Expand Down
1 change: 0 additions & 1 deletion src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<!-- Note: 'build/Microsoft.NET.ILLink.targets' should not match the package name, because we don't want the targets
to be imported by nuget. The SDK will import them in the right order. -->
<None Include="**\*.props;**\*.targets" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="build/6.0_suppressions.xml" Pack="true" PackagePath="build/" />
<None Include="..\ILLink.RoslynAnalyzer\Microsoft.NET.ILLink.Analyzers.props" Pack="true" PackagePath="build/" />
</ItemGroup>

Expand Down
156 changes: 0 additions & 156 deletions src/tools/illink/src/ILLink.Tasks/build/6.0_suppressions.xml
View file
Open in desktop

This file was deleted.

Loading