Skip to content

Commit fe452cf

Browse files
authored
Add KnownILLinkPack to bundled versions (#15106)
Part of dotnet/linker#3029. With https://github.com/dotnet/sdk/pull/29441/files, this will enable the SDK to use a different version of illink depending on the TFM. The latest 7.0 illink package is used when trimming net7.0 and earlier, which matches the configuration we shipped in the .NET 7 SDK. - The 7.0 version is taken from the latest 7.0 SDK branch: https://github.com/dotnet/sdk/blob/release/7.0.2xx/eng/Versions.props#L89. - The 8.0 version is the latest in the SDK's main branch: https://github.com/dotnet/sdk/blob/main/eng/Versions.props#L88 These versions will quickly get out of date and need to be kept updated. For the latest (8.0) version it would be possible to set up dependency flow from linker -> installer to automate this, but this will not be necessary after the linker move to dotnet/runtime, which will allow us to use $(MicrosoftNETCoreAppRuntimePackageVersion) for the latest illink pack. Unfortunately the 7.0 version will still need manual updates. We might want to consider changing our version numbers to match dotnet/runtime, but AFAIK that will still be a manual process (to update the patch number in the release/7.0 branch of dotnet/linker every SDK servicing release).
2 parents 9d67854 + 094ab5e commit fe452cf

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

src/redist/targets/GenerateBundledVersions.targets

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686

8787
<_NET70RuntimePackVersion>7.0.$(VersionFeature70)</_NET70RuntimePackVersion>
8888
<_NET70TargetingPackVersion>7.0.$(VersionFeature70)</_NET70TargetingPackVersion>
89+
<_NET70ILLinkPackVersion>7.0.100-1.22579.2</_NET70ILLinkPackVersion>
8990
<_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70)</_WindowsDesktop70RuntimePackVersion>
9091
<_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70)</_WindowsDesktop70TargetingPackVersion>
9192
<_AspNet70RuntimePackVersion>7.0.$(VersionFeature70)</_AspNet70RuntimePackVersion>
@@ -408,6 +409,10 @@ Copyright (c) .NET Foundation. All rights reserved.
408409
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
409410
/>
410411
412+
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
413+
TargetFramework="net8.0"
414+
ILLinkPackVersion="8.0.100-1.22619.1" />
415+
411416
<KnownRuntimePack Include="Microsoft.NETCore.App"
412417
TargetFramework="net8.0"
413418
RuntimeFrameworkName="Microsoft.NETCore.App"
@@ -540,6 +545,10 @@ Copyright (c) .NET Foundation. All rights reserved.
540545
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
541546
/>
542547
548+
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
549+
TargetFramework="net7.0"
550+
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
551+
543552
<KnownRuntimePack Include="Microsoft.NETCore.App"
544553
TargetFramework="net7.0"
545554
RuntimeFrameworkName="Microsoft.NETCore.App"
@@ -665,6 +674,10 @@ Copyright (c) .NET Foundation. All rights reserved.
665674
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
666675
/>
667676
677+
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
678+
TargetFramework="net6.0"
679+
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
680+
668681
<KnownRuntimePack Include="Microsoft.NETCore.App"
669682
TargetFramework="net6.0"
670683
RuntimeFrameworkName="Microsoft.NETCore.App"
@@ -789,6 +802,10 @@ Copyright (c) .NET Foundation. All rights reserved.
789802
Crossgen2RuntimeIdentifiers="@(Net50Crossgen2SupportedRids, '%3B')"
790803
/>
791804
805+
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
806+
TargetFramework="net5.0"
807+
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
808+
792809
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
793810
TargetFramework="net5.0"
794811
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
@@ -897,6 +914,10 @@ Copyright (c) .NET Foundation. All rights reserved.
897914
AppHostRuntimeIdentifiers="@(NetCore31RuntimePackRids, '%3B')"
898915
/>
899916
917+
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
918+
TargetFramework="netcoreapp3.1"
919+
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
920+
900921
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
901922
TargetFramework="netcoreapp3.1"
902923
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
@@ -967,6 +988,10 @@ Copyright (c) .NET Foundation. All rights reserved.
967988
AppHostRuntimeIdentifiers="@(NetCore30RuntimePackRids, '%3B')"
968989
/>
969990
991+
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
992+
TargetFramework="netcoreapp3.0"
993+
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
994+
970995
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
971996
TargetFramework="netcoreapp3.0"
972997
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"

0 commit comments

Comments
 (0)