Skip to content

Add net10.0 known framework references #42969

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

Merged
merged 3 commits into from
Aug 28, 2024
Merged

Add net10.0 known framework references #42969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61869f0
Add net10.0 known framework references
Aug 23, 2024
53b58a4
Fix the format
Aug 23, 2024
14773e4
Disable PublishSelfContained scenario test
ellahathaway Aug 23, 2024
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
144 changes: 131 additions & 13 deletions src/Installer/redist-installer/targets/GenerateBundledVersions.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>

<!-- TODO: Once .NET 9.0.X has released, update these version numbers to 9.0.$(VersionFeature80) -->
<_NET90RuntimePackVersion>9.0.0-preview.7.24405.7</_NET90RuntimePackVersion>
<_NET90TargetingPackVersion>9.0.0-preview.7.24405.7</_NET90TargetingPackVersion>
<_WindowsDesktop90RuntimePackVersion>9.0.0-preview.7.24405.2</_WindowsDesktop90RuntimePackVersion>
<_WindowsDesktop90TargetingPackVersion>9.0.0-preview.7.24405.2</_WindowsDesktop90TargetingPackVersion>
<_AspNet90RuntimePackVersion>9.0.0-preview.7.24406.2</_AspNet90RuntimePackVersion>
<_AspNet90TargetingPackVersion>9.0.0-preview.7.24406.2</_AspNet90TargetingPackVersion>

<_NET80RuntimePackVersion>8.0.$(VersionFeature80)</_NET80RuntimePackVersion>
<_NET80TargetingPackVersion>8.0.$(VersionFeature80)</_NET80TargetingPackVersion>
<_WindowsDesktop80RuntimePackVersion>8.0.$(VersionFeature80)</_WindowsDesktop80RuntimePackVersion>
Expand Down Expand Up @@ -532,9 +540,9 @@ Copyright (c) .NET Foundation. All rights reserved.
@(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)" />', '
')

<!-- .NET 9.0 -->
<!-- .NET 10.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
Expand All @@ -545,29 +553,29 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
TargetFramework="net10.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NETCoreAppPackageVersion)"
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')"
ExcludedRuntimeIdentifiers="android"
/>

<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
TargetFramework="net9.0"
TargetFramework="net10.0"
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
/>

<KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
TargetFramework="net9.0"
TargetFramework="net10.0"
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
ILCompilerPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
ILCompilerRuntimeIdentifiers="@(ILCompilerSupportedRids, '%3B')"
/>

<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
Expand All @@ -576,15 +584,15 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net9.0"
TargetFramework="net10.0"
ILLinkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />

<KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
TargetFramework="net9.0"
TargetFramework="net10.0"
WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />

<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
Expand All @@ -593,7 +601,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
Expand All @@ -605,7 +613,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
Expand All @@ -618,7 +626,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
Expand All @@ -631,7 +639,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/>

<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="net9.0"
TargetFramework="net10.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppDefaultRuntimeFrameworkVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
Expand All @@ -642,6 +650,116 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimePackExcludedRuntimeIdentifiers="android%3Blinux-bionic"
/>

<!-- .NET 9.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="$(_NET90RuntimePackVersion)"
LatestRuntimeFrameworkVersion="$(_NET90RuntimePackVersion)"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(_NET90TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(Net90RuntimePackRids, '%3B')"
/>

<KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NET90RuntimePackVersion)"
AppHostRuntimeIdentifiers="@(Net90AppHostRids, '%3B')"
ExcludedRuntimeIdentifiers="android"
/>

<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
TargetFramework="net9.0"
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
Crossgen2PackVersion="$(_NET90RuntimePackVersion)"
Crossgen2RuntimeIdentifiers="@(Net90Crossgen2SupportedRids, '%3B')"
/>

<KnownILCompilerPack Include="Microsoft.DotNet.ILCompiler"
TargetFramework="net9.0"
ILCompilerPackNamePattern="runtime.**RID**.Microsoft.DotNet.ILCompiler"
ILCompilerPackVersion="$(_NET90RuntimePackVersion)"
ILCompilerRuntimeIdentifiers="@(Net90ILCompilerSupportedRids, '%3B')"
/>

<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_NET90RuntimePackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.NativeAOT.**RID**"
RuntimePackRuntimeIdentifiers="@(Net90NativeAOTRuntimePackRids, '%3B')"
RuntimePackLabels="NativeAOT"
/>

<KnownILLinkPack Include="Microsoft.NET.ILLink.Tasks"
TargetFramework="net9.0"
ILLinkPackVersion="$(_NET90RuntimePackVersion)" />

<KnownWebAssemblySdkPack Include="Microsoft.NET.Sdk.WebAssembly.Pack"
TargetFramework="net9.0"
WebAssemblySdkPackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)" />

<KnownRuntimePack Include="Microsoft.NETCore.App"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.NETCore.App"
LatestRuntimeFrameworkVersion="$(_NET90RuntimePackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="@(Net90MonoRuntimePackRids, '%3B')"
RuntimePackLabels="Mono"
/>

<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(_WindowsDesktop90RuntimePackVersion)"
LatestRuntimeFrameworkVersion="$(_WindowsDesktop90RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_WindowsDesktop90TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true"
/>

<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(_WindowsDesktop90RuntimePackVersion)"
LatestRuntimeFrameworkVersion="$(_WindowsDesktop90RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_WindowsDesktop90TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true"
Profile="WPF"
/>

<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(_WindowsDesktop90RuntimePackVersion)"
LatestRuntimeFrameworkVersion="$(_WindowsDesktop90RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_WindowsDesktop90TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true"
Profile="WindowsForms"
/>

<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="net9.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(_AspNet90RuntimePackVersion)"
LatestRuntimeFrameworkVersion="$(_AspNet90RuntimePackVersion)"
TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(_AspNet90TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(AspNetCore90RuntimePackRids, '%3B')"
RuntimePackExcludedRuntimeIdentifiers="android%3Blinux-bionic"
/>

<!-- .NET 8.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App"
TargetFramework="net8.0"
Expand Down
3 changes: 2 additions & 1 deletion src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ private static IEnumerable<TestScenario> GetScenarios()

yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Razor, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.BlazorWasm, DotNetActions.Build | DotNetActions.Run | DotNetActions.Publish);
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.WebApp, DotNetActions.PublishSelfContained, VerifyRuntimePacksForSelfContained);
// Disabled due to .NET 10.0 transition. See https://github.com/dotnet/sdk/pull/42969
// yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.WebApp, DotNetActions.PublishSelfContained, VerifyRuntimePacksForSelfContained);
yield return new(nameof(WebScenarioTests), DotNetLanguage.CSharp, DotNetTemplate.Worker);
}

Expand Down