From 61869f0445e73fe99e0e414061e527c41805a39b Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Fri, 23 Aug 2024 00:09:12 -0700 Subject: [PATCH 1/3] Add net10.0 known framework references --- .../targets/GenerateBundledVersions.targets | 146 ++++++++++++++++-- 1 file changed, 132 insertions(+), 14 deletions(-) diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets index 2f533cb3cb56..6fabaa814a71 100644 --- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets +++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets @@ -85,6 +85,14 @@ <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion) <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion) + + <_NET90RuntimePackVersion>9.0.0-preview.7.24405.7 + <_NET90TargetingPackVersion>9.0.0-preview.7.24405.7 + <_WindowsDesktop90RuntimePackVersion>9.0.0-preview.7.24405.2 + <_WindowsDesktop90TargetingPackVersion>9.0.0-preview.7.24405.2 + <_AspNet90RuntimePackVersion>9.0.0-preview.7.24406.2 + <_AspNet90TargetingPackVersion>9.0.0-preview.7.24406.2 + <_NET80RuntimePackVersion>8.0.$(VersionFeature80) <_NET80TargetingPackVersion>8.0.$(VersionFeature80) <_WindowsDesktop80RuntimePackVersion>8.0.$(VersionFeature80) @@ -532,9 +540,9 @@ Copyright (c) .NET Foundation. All rights reserved. @(ImplicitPackageVariable->'', ' ') - + - + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Fri, 23 Aug 2024 00:20:20 -0700 Subject: [PATCH 2/3] Fix the format --- .../redist-installer/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets index 6fabaa814a71..ed9de8300278 100644 --- a/src/Installer/redist-installer/targets/GenerateBundledVersions.targets +++ b/src/Installer/redist-installer/targets/GenerateBundledVersions.targets @@ -760,7 +760,7 @@ Copyright (c) .NET Foundation. All rights reserved. RuntimePackExcludedRuntimeIdentifiers="android%3Blinux-bionic" /> - + Date: Fri, 23 Aug 2024 18:20:05 +0000 Subject: [PATCH 3/3] Disable PublishSelfContained scenario test --- .../WebScenarioTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs index 06b783468d25..470ea28f88ec 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/WebScenarioTests.cs @@ -37,7 +37,8 @@ private static IEnumerable 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); }