Skip to content

Commit 0cfc81d

Browse files
sbomermarek-safarvitek-karas
authored
Clean up dead code in illink targets (#85741)
Removes TFM version checks, and adds a warning when using explicit ILLink package reference. We reference ILLink as a packagereference that versions with the runtime, so the 8.0 linker is only supported when targeting `net8.0`, and we can remove the TFM checks. We don't want to support someone adding a PackageReference to an 8.0 linker, while targeting an older TFM, in an attempt to get newer linker bits but with settings that were closer to what we shipped with that TFM. --------- Co-authored-by: Marek Safar <[email protected]> Co-authored-by: Vitek Karas <[email protected]>
1 parent ddd748e commit 0cfc81d

File tree

4 files changed

+10
-208
lines changed

4 files changed

+10
-208
lines changed

src/coreclr/nativeaot/BuildIntegration/Microsoft.DotNet.ILCompiler.SingleEntry.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Target Name="GenerateILCompilerExplicitPackageReferenceWarning" Condition="'$(SuppressGenerateILCompilerExplicitPackageReferenceWarning)' == '' and '$(ILCompilerTargetsPath)' != ''"
4444
BeforeTargets="ImportRuntimeIlcPackageTarget">
4545
<Warning Condition="'%(PackageReference.Identity)' == 'Microsoft.DotNet.ILCompiler' And '%(PackageReference.IsImplicitlyDefined)' != 'true'"
46-
Text="Delete explicit 'Microsoft.DotNet.ILCompiler' package reference in your project file. Explicit 'Microsoft.DotNet.ILCompiler' package reference can run into version errors." />
46+
Text="Delete explicit 'Microsoft.DotNet.ILCompiler' package reference in your project file to avoid versioning problems." />
4747
</Target>
4848

4949
<!-- Locate the runtime package according to the current target runtime -->

src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
<!-- Note: 'build/Microsoft.NET.ILLink.targets' should not match the package name, because we don't want the targets
2929
to be imported by nuget. The SDK will import them in the right order. -->
3030
<None Include="**\*.props;**\*.targets" Pack="true" PackagePath="%(RecursiveDir)%(Filename)%(Extension)" />
31-
<None Include="build/6.0_suppressions.xml" Pack="true" PackagePath="build/" />
3231
<None Include="..\ILLink.RoslynAnalyzer\Microsoft.NET.ILLink.Analyzers.props" Pack="true" PackagePath="build/" />
3332
</ItemGroup>
3433

src/tools/illink/src/ILLink.Tasks/build/6.0_suppressions.xml

Lines changed: 0 additions & 156 deletions
This file was deleted.

0 commit comments

Comments
 (0)