mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add KnownILLinkPack to bundled versions (#15106)

Browse source 
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).
This commit is contained in:
Sven Boemer 2022-12-20 17:49:46 -08:00 • committed by GitHub
commit fe452cf9cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/redist/targets/GenerateBundledVersions.targets
View file

@ -86,6 +86,7 @@
<_NET70RuntimePackVersion>7.0.$(VersionFeature70)</_NET70RuntimePackVersion>
<_NET70TargetingPackVersion>7.0.$(VersionFeature70)</_NET70TargetingPackVersion>
<_NET70ILLinkPackVersion>7.0.100-1.22579.2</_NET70ILLinkPackVersion>
<_WindowsDesktop70RuntimePackVersion>7.0.$(VersionFeature70)</_WindowsDesktop70RuntimePackVersion>
<_WindowsDesktop70TargetingPackVersion>7.0.$(VersionFeature70)</_WindowsDesktop70TargetingPackVersion>
<_AspNet70RuntimePackVersion>7.0.$(VersionFeature70)</_AspNet70RuntimePackVersion>
@ -408,6 +409,10 @@ Copyright (c) .NET Foundation. All rights reserved.
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net8.0"
ILLinkPackVersion="8.0.100-1.22619.1" />
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
@ -540,6 +545,10 @@ Copyright (c) .NET Foundation. All rights reserved.
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net7.0"
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net7.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
@ -665,6 +674,10 @@ Copyright (c) .NET Foundation. All rights reserved.
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net6.0"
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net6.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
@ -789,6 +802,10 @@ Copyright (c) .NET Foundation. All rights reserved.
Crossgen2RuntimeIdentifiers="@(Net50Crossgen2SupportedRids, '%3B')"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net5.0"
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="net5.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
@ -897,6 +914,10 @@ Copyright (c) .NET Foundation. All rights reserved.
AppHostRuntimeIdentifiers="@(NetCore31RuntimePackRids, '%3B')"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="netcoreapp3.1"
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="netcoreapp3.1"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
@ -967,6 +988,10 @@ Copyright (c) .NET Foundation. All rights reserved.
AppHostRuntimeIdentifiers="@(NetCore30RuntimePackRids, '%3B')"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="netcoreapp3.0"
ILLinkPackVersion="$(_NET70ILLinkPackVersion)" />
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"