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

Add net 9 known framework references into a stable codeflow PR (#17432)

Browse source
This commit is contained in:
Marc Paine 2023-09-27 11:59:29 -07:00 committed by GitHub
commit b9dfebb58a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 193 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eng/Versions.props
View file

@ -30,6 +30,7 @@
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
<_NET80ILLinkPackVersion>8.0.100-1.23067.1</_NET80ILLinkPackVersion>
</PropertyGroup>
<!-- Restore feeds -->
<PropertyGroup Label="Restore feeds">

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

@ -94,6 +94,15 @@
<_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</_NETCoreAppPackageVersion>
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
<!-- TODO: Once .NET 8.0.X has released, update these version numbers to 8.0.$(VersionFeature80) -->
<_NET80RuntimePackVersion>8.0.0-preview.7.23375.6</_NET80RuntimePackVersion>
<_NET80TargetingPackVersion>8.0.0-preview.7.23375.6</_NET80TargetingPackVersion>
<_NET80WebAssemblyPackVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</_NET80WebAssemblyPackVersion>
<_WindowsDesktop80RuntimePackVersion>8.0.0-preview.7.23376.1</_WindowsDesktop80RuntimePackVersion>
<_WindowsDesktop80TargetingPackVersion>8.0.0-preview.7.23376.1</_WindowsDesktop80TargetingPackVersion>
<_AspNet80RuntimePackVersion>8.0.0-preview.7.23375.9</_AspNet80RuntimePackVersion>
<_AspNet80TargetingPackVersion>8.0.0-preview.7.23375.9</_AspNet80TargetingPackVersion>
<_NET70RuntimePackVersion>7.0.$(VersionFeature70)</_NET70RuntimePackVersion>
<_NET70TargetingPackVersion>7.0.$(VersionFeature70)</_NET70TargetingPackVersion>
@ -196,6 +205,10 @@
linux-ppc64le;
"/>
<Net80AppHostRids Include="
@(Net70AppHostRids);
" />
<Net70RuntimePackRids Include="
@(Net60RuntimePackRids);
linux-bionic-arm;
@ -205,14 +218,18 @@
linux-ppc64le;
" />
<Net80RuntimePackRids Include="
@(Net70RuntimePackRids);
" />
<NetCoreAppHostRids Include="
@(Net70AppHostRids);
@(Net80AppHostRids);
" />
<NetCoreAppHostRids Remove="win-arm" />
<NetCoreRuntimePackRids Include="
@(Net70RuntimePackRids);
@(Net80RuntimePackRids);
" />
<NetCoreRuntimePackRids Remove="win-arm" />
@ -263,10 +280,14 @@
@(Net60MonoRuntimePackRids);
" />
<MonoRuntimePackRids Include="
<Net80MonoRuntimePackRids Include="
@(Net70MonoRuntimePackRids);
" />
<MonoRuntimePackRids Include="
@(Net80MonoRuntimePackRids);
" />
<MonoRuntimePackRids Remove="win-arm" />
<AspNetCore30RuntimePackRids Include="
@ -298,7 +319,9 @@
<Net70Crossgen2SupportedRids Include="@(Net60Crossgen2SupportedRids)" />
<Crossgen2SupportedRids Include="@(Net70Crossgen2SupportedRids)" />
<Net80Crossgen2SupportedRids Include="@(Net70Crossgen2SupportedRids)" />
<Crossgen2SupportedRids Include="@(Net80Crossgen2SupportedRids)" />
<Crossgen2SupportedRids Remove="win-arm" />
@ -311,10 +334,12 @@
win-x64;
" />
<Net80ILCompilerSupportedRids Include="@(Net70ILCompilerSupportedRids)" />
<!-- The subset of ILCompiler target RIDs that are officially supported. Should be a subset of
https://github.com/dotnet/runtime/blob/main/src/installer/pkg/projects/Microsoft.DotNet.ILCompiler/ILCompilerRIDs.props -->
<ILCompilerSupportedRids Include="
@(Net70ILCompilerSupportedRids);
@(Net80ILCompilerSupportedRids);
osx-x64;
osx-arm64;
" />
@ -449,9 +474,9 @@ Copyright (c) .NET Foundation. All rights reserved.
@(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)"/>', '
')
<!-- .NET 8.0 -->
<!-- .NET 9.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
@ -462,7 +487,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
TargetFramework="net9.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NETCoreAppPackageVersion)"
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')"
@ -470,21 +495,21 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
TargetFramework="net8.0"
TargetFramework="net9.0"
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
/>
<KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
TargetFramework="net8.0"
TargetFramework="net9.0"
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
/>
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
@ -493,15 +518,15 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net8.0"
TargetFramework="net9.0"
ILLinkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
<KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
TargetFramework="net8.0"
TargetFramework="net9.0"
WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
@ -510,7 +535,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
@ -522,7 +547,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
@ -535,7 +560,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
@ -548,7 +573,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="net8.0"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
@ -559,6 +584,155 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimePackExcludedRuntimeIdentifiers="android%3Blinux-bionic"
/>
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
TargetFramework="net9.0-windows10.0.17763.0"
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
RuntimePackAlwaysCopyLocal="true"
RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
RuntimePackRuntimeIdentifiers="any"
IsWindowsOnly="true"
/>
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
TargetFramework="net9.0-windows10.0.18362.0"
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
RuntimePackAlwaysCopyLocal="true"
RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
RuntimePackRuntimeIdentifiers="any"
IsWindowsOnly="true"
/>
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
TargetFramework="net9.0-windows10.0.19041.0"
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
RuntimePackAlwaysCopyLocal="true"
RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
RuntimePackRuntimeIdentifiers="any"
IsWindowsOnly="true"
/>
<!-- .NET 8.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(_NET80RuntimePackVersion)"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(_NET80TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(Net80RuntimePackRids, '%3B')"
/>
<KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NET80RuntimePackVersion)"
AppHostRuntimeIdentifiers="@(Net80AppHostRids, '%3B')"
ExcludedRuntimeIdentifiers="android"
/>
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
TargetFramework="net8.0"
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
Crossgen2PackVersion="$(_NET80RuntimePackVersion)"
Crossgen2RuntimeIdentifiers="@(Net80Crossgen2SupportedRids, '%3B')"
/>
<KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
TargetFramework="net8.0"
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
ILCompilerPackVersion="$(_NET80RuntimePackVersion)"
ILCompilerRuntimeIdentifiers="@(Net80ILCompilerSupportedRids, '%3B')"
/>
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_NET80RuntimePackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
RuntimePackRuntimeIdentifiers="@(NativeAOTRuntimePackRids, '%3B')"
RuntimePackLabels="NativeAOT"
/>
<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net8.0"
ILLinkPackVersion="$(_NET80ILLinkPackVersion)" />
<KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
TargetFramework="net8.0"
WebAssemblySdkPackVersion="$(_NET80WebAssemblyPackVersion)" />
<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_NET80RuntimePackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="@(Net80MonoRuntimePackRids, '%3B')"
RuntimePackLabels="Mono"
/>
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="8.0.0"
LatestRuntimeFrameworkVersion="$(_WindowsDesktop80RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_WindowsDesktop80TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true"
/>
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="8.0.0"
LatestRuntimeFrameworkVersion="$(_WindowsDesktop80RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_WindowsDesktop80TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true"
Profile="WPF"
/>
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="8.0.0"
LatestRuntimeFrameworkVersion="$(_WindowsDesktop80RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_WindowsDesktop80TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true"
Profile="WindowsForms"
/>
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="net8.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="8.0.0"
LatestRuntimeFrameworkVersion="$(_AspNet80RuntimePackVersion)"
TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(_AspNet80TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(AspNetCore80RuntimePackRids, '%3B')"
RuntimePackExcludedRuntimeIdentifiers="android%3Blinux-bionic"
/>
<!-- .NET 7.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net7.0"