From 5a7e1f2374b7142026bed1ca420db682926b5263 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 30 Aug 2023 12:51:30 -0500 Subject: [PATCH 01/29] [main] Update dotnet/runtime --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++++----------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6fba1fb7a29..a3695810027a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,9 +6,9 @@ 9dfddc30a1e9101f7e44dcda57d95902073e444c - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 https://github.com/dotnet/runtime @@ -19,33 +19,33 @@ https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/emsdk - abfa03c97f4175d4d209435cd0e71f558e36c3fd + b3b412d49a538d6c4d42c76570266ee267c5f305 @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest cbf9d3f64b5d90b47763c2a0fa557a65d571a6d0 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 2a2a5c0a3546..e73b1adebd06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23428.2 7.0.0-preview.22423.2 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23422.1 @@ -48,18 +48,18 @@ - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23430.1 @@ -207,13 +207,13 @@ - 8.0.0-rc.1.23411.2 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) + 9.0.0-alpha.1.23427.1 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From ac96fe8bc62443f1c887115b1db53b3fcae2d641 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 30 Aug 2023 13:15:53 -0500 Subject: [PATCH 02/29] Fix SharedFramework too --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3695810027a..e776f0a50199 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,9 +10,9 @@ https://github.com/dotnet/runtime 03d25cd9f3868c92554e27048a57c49a39ce07c9 - + https://github.com/dotnet/runtime - f8c110b8003d68cc635add4ca791d6cf2e645561 + 03d25cd9f3868c92554e27048a57c49a39ce07c9 diff --git a/eng/Versions.props b/eng/Versions.props index e73b1adebd06..2a9f21dc3d4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ 9.0.0-alpha.1.23430.1 - 8.0.0-rc.1.23421.3 + 9.0.0-alpha.1.23430.1 9.0.0-alpha.1.23430.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 9.0.0-alpha.1.23430.1 From 09e65470a3325939154031ee53fea5ff6e688ea7 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 30 Aug 2023 15:46:42 -0500 Subject: [PATCH 03/29] Update the variable used in global.json too --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index a79a3d2bf648..4e7afcf551f8 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "8.0.100-preview.7.23376.3", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" + "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" ], "aspnetcore": [ "$(MicrosoftAspNetCoreAppRefPackageVersion)" From 8bed3cf499e87daf6ca0d5414a424e0f741fc08d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 31 Aug 2023 01:34:48 -0700 Subject: [PATCH 04/29] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 4e7afcf551f8..74597db673d6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.2.23430.1", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" From 98927b24d16458367da5c46760fd59c025885e5d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 31 Aug 2023 03:24:46 -0700 Subject: [PATCH 05/29] Update blazor web tag --- ...asicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt | 2 +- ...stTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 43863371c11c..6ae36b31c376 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -14,7 +14,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 78e5e556da33..5a6f4cdfc0d2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -10,7 +10,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library From ab874759dac3ce9dd2dbaebbe74f63ae66c9b742 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 31 Aug 2023 20:14:39 -0700 Subject: [PATCH 06/29] Update blazor web tag for osx and linux --- ....BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt | 2 +- ...ts.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt | 2 +- ...ListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt | 2 +- ...ewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index de300f22e68f..645f01c9faa4 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -14,7 +14,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index de300f22e68f..645f01c9faa4 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -14,7 +14,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index dbfe3c1db2b7..c94749ef3499 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -10,7 +10,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index dbfe3c1db2b7..c94749ef3499 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -10,7 +10,7 @@ ASP.NET Core Web API (native AOT) webapiaot [C#] ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty Class Library classlib [C#],F#,VB Common/Library From ef8f565dceeb0d7c6da4b68d019d370dd7bde42a Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 1 Sep 2023 16:48:26 -0500 Subject: [PATCH 07/29] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 74597db673d6..6b5dd1a0d4df 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rc.2.23430.1", + "dotnet": "9.0.100-alpha.1.23421.9", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" From f8f8fc295b753bfcb52eb5323aae8f4efd605510 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 1 Sep 2023 20:53:57 -0500 Subject: [PATCH 08/29] Bump runtime dependencies --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++--------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e776f0a50199..d68982c1752a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,42 +6,42 @@ 9dfddc30a1e9101f7e44dcda57d95902073e444c - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 https://github.com/dotnet/emsdk @@ -189,25 +189,25 @@ https://github.com/microsoft/vstest cbf9d3f64b5d90b47763c2a0fa557a65d571a6d0 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 https://github.com/dotnet/windowsdesktop @@ -382,19 +382,19 @@ - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/runtime - 03d25cd9f3868c92554e27048a57c49a39ce07c9 + 9b2f5336162e854465794dca6632b271642db0a2 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 2a9f21dc3d4d..2853194a157f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23428.2 7.0.0-preview.22423.2 - 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23451.10 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23451.10 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23422.1 @@ -48,18 +48,18 @@ - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 $(MicrosoftExtensionsDependencyModelPackageVersion) - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 - 9.0.0-alpha.1.23430.1 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23451.10 From 4e46d4af136e1c3f93709bd061098f67ca998e4b Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Tue, 5 Sep 2023 10:10:24 -0700 Subject: [PATCH 09/29] Bump tools packages to net8 --- Directory.Build.props | 4 ++-- .../Microsoft.DotNet.ApiCompat.Task.csproj | 2 +- .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 +- .../Microsoft.DotNet.ApiCompatibility.csproj | 2 +- .../Microsoft.DotNet.PackageValidation.csproj | 2 +- .../Microsoft.DotNet.GenAPI.Task.csproj | 2 +- .../Microsoft.DotNet.GenAPI.Tool.csproj | 2 +- .../Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj | 2 +- .../Microsoft.DotNet.ApiSymbolExtensions.csproj | 2 +- src/Tests/HelixTasks/HelixTasks.csproj | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 557a6be1c73d..520f0fa0034f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -13,10 +13,10 @@ false net8.0 $(SdkTargetFramework) - + - net7.0 + net8.0 $(SdkTargetFramework) diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj index 89afcc229f59..789ca53bff4e 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 enable Open diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj index 908d5a3eb6e1..40639765aecf 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 net8.0 Exe enable diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj index d0ede2c2d59a..0ca3e9db6ff8 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 Open enable diff --git a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj index f18ddd4c76d0..6b1910a1e9b6 100644 --- a/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj +++ b/src/ApiCompat/Microsoft.DotNet.PackageValidation/Microsoft.DotNet.PackageValidation.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 Open enable diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj index 9f3aa8eff7a5..1aef7c5aa918 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/Microsoft.DotNet.GenAPI.Task.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 Open enable diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj index abc87d57ecc5..58f870a72151 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 net8.0 Exe enable diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj index f48404dfb2b0..cdb417f2ed9d 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 net8.0;net472 enable Open diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj b/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj index a6294b1150fd..903d570cac0c 100644 --- a/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj +++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj @@ -1,7 +1,7 @@  - net6.0;net472 + net8.0;net472 enable net8.0;net472 Open diff --git a/src/Tests/HelixTasks/HelixTasks.csproj b/src/Tests/HelixTasks/HelixTasks.csproj index 1d539eb4199e..3156bf81dad3 100644 --- a/src/Tests/HelixTasks/HelixTasks.csproj +++ b/src/Tests/HelixTasks/HelixTasks.csproj @@ -1,7 +1,7 @@  - net6.0;net472 - net6.0 + net8.0;net472 + net8.0 true Microsoft.DotNet.SDK.Build.Helix From c6361e188eb3ffff4c624b175287df25d9e60f02 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Tue, 5 Sep 2023 10:16:48 -0700 Subject: [PATCH 10/29] Suppress TFM build warnings temporarily --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 520f0fa0034f..3a20a15a9c05 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -12,6 +12,8 @@ true false net8.0 + + true $(SdkTargetFramework) - + https://github.com/dotnet/runtime - 9b2f5336162e854465794dca6632b271642db0a2 + 90042669ef7e2d829aa605cb3751760b6161d12a - + https://github.com/dotnet/runtime - 9b2f5336162e854465794dca6632b271642db0a2 + 90042669ef7e2d829aa605cb3751760b6161d12a - + https://github.com/dotnet/runtime - 9b2f5336162e854465794dca6632b271642db0a2 + 90042669ef7e2d829aa605cb3751760b6161d12a @@ -415,9 +415,9 @@ https://github.com/dotnet/arcade 3d92d0bfd8c9006f5fe1687e465dc4f8aa068b00 - + https://github.com/dotnet/runtime - 9b2f5336162e854465794dca6632b271642db0a2 + 90042669ef7e2d829aa605cb3751760b6161d12a https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 2853194a157f..7af92097c91a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23428.2 7.0.0-preview.22423.2 - 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23455.1 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23455.1 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23422.1 @@ -48,18 +48,18 @@ - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 $(MicrosoftExtensionsDependencyModelPackageVersion) - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 - 9.0.0-alpha.1.23451.10 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23455.1 @@ -207,7 +207,7 @@ - 9.0.0-alpha.1.23427.1 + 9.0.0-alpha.1.23429.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 3cc46c9e7091b95a561944e30f81684256a5644a Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 5 Sep 2023 17:47:02 -0500 Subject: [PATCH 12/29] Update Directory.Build.props --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3a20a15a9c05..8fc6904ef31e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ true false - net8.0 + net9.0 true $(SdkTargetFramework) From 4593590d5a8547d2bdaed176451e9ec495e290c3 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 6 Sep 2023 10:10:55 -0500 Subject: [PATCH 13/29] revert net9.0 target --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8fc6904ef31e..3a20a15a9c05 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -11,7 +11,7 @@ true false - net9.0 + net8.0 true $(SdkTargetFramework) From 54e2592e0967846e4810f80abec83aba68e0b020 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Wed, 6 Sep 2023 10:27:03 -0700 Subject: [PATCH 14/29] Bump XUnitRunner TFM The task target framework is grossly hardcoded So when the helix project TFM was bumped the xunitrunner couldn't find it. Hopefully this fixes some of the problems. --- src/Tests/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/xunit-runner/XUnitRunner.targets b/src/Tests/xunit-runner/XUnitRunner.targets index 516d03aac63d..d608714527ba 100644 --- a/src/Tests/xunit-runner/XUnitRunner.targets +++ b/src/Tests/xunit-runner/XUnitRunner.targets @@ -9,7 +9,7 @@ -nocolor - net6.0 + net8.0 net472 $(ArtifactsDir)\bin\HelixTasks\$(Configuration)\$(TaskTargetFramework)\HelixTasks.dll From bb4134f0a231e7cfdd38819dada6cde0ce7dbc16 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 7 Sep 2023 16:17:19 -0700 Subject: [PATCH 15/29] Disable transitive pinning as there are conflicts in SRM which we can't update yet. This should be temporary to unblock the build. --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3a20a15a9c05..f1a51db5eeec 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -37,7 +37,7 @@ $(DefineConstants);DOT_NET_BUILD_FROM_SOURCE true - true + false From 38e3276652da98537e8241a75c3753adda905103 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 8 Sep 2023 16:56:42 -0700 Subject: [PATCH 16/29] Reenable transitive pinning and apply a fix to the package that was causing prior errors --- Directory.Build.props | 2 +- .../Microsoft.NET.Build.Tasks.UnitTests.csproj | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index f1a51db5eeec..3a20a15a9c05 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -37,7 +37,7 @@ $(DefineConstants);DOT_NET_BUILD_FROM_SOURCE true - false + true diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj index 09ee2a7255f8..f674def40a04 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj @@ -20,9 +20,13 @@ + + + + + - From 71cc4223c581a6a83f29bfc7274f41bfd13b19ab Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 8 Sep 2023 16:59:47 -0700 Subject: [PATCH 17/29] Switch a test to be self-contained. Not sure why this particular test was failing otherwise as it seemed to be trying to roll-forward across major. --- src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs index 32104c34eb9b..2bb52f6193ea 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishWpfApp.cs @@ -44,7 +44,7 @@ public void It_publishes_and_runs_self_contained_wpf_app() var publishCommand = new PublishCommand(Log, testDir.Path); - publishCommand.Execute($"/p:RuntimeIdentifier={rid}") + publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true") .Should() .Pass(); From 90ee7e07ab33d63d9b8587c04203dab9e12f5202 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 8 Sep 2023 17:01:18 -0700 Subject: [PATCH 18/29] Ran update-test-baselines.ps1 --- .../Publish60Hosted_Works.Publish.files.json | 6 -- ...0Hosted_Works.Publish.staticwebassets.json | 57 ------------------- 2 files changed, 63 deletions(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json index 880b88263875..3155d5c64201 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.files.json @@ -101,9 +101,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", @@ -217,9 +214,6 @@ "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.br", "${OutputPath}\\wwwroot\\_framework\\dotnet.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.br", - "${OutputPath}\\wwwroot\\_framework\\icudt.dat.gz", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.br", "${OutputPath}\\wwwroot\\_framework\\icudt_CJK.dat.gz", diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json index eb73b57a8fa7..7adab319a55e 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish60Hosted_Works.Publish.staticwebassets.json @@ -104,25 +104,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\dotnet.wasm" }, - { - "Identity": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "SourceId": "BlazorWasmHosted60.Client", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "native", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat" - }, { "Identity": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt_CJK.dat", "SourceId": "BlazorWasmHosted60.Client", @@ -1491,44 +1472,6 @@ "CopyToPublishDirectory": "PreserveNewest", "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\dotnet.wasm.br" }, - { - "Identity": "${ProjectPath}\\Client\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.br", - "SourceId": "BlazorWasmHosted60.Client", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.br" - }, - { - "Identity": "${ProjectPath}\\Client\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt.dat.gz", - "SourceId": "BlazorWasmHosted60.Client", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/icudt.dat.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\icudt.dat", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\Client\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\icudt.dat.gz" - }, { "Identity": "${ProjectPath}\\Client\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\icudt_CJK.dat.br", "SourceId": "BlazorWasmHosted60.Client", From 3cd48fd80f26c5a23cc2f0c69cba738764b149c0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Sep 2023 11:09:46 -0700 Subject: [PATCH 19/29] Target a test to be self-contained hardcode system text json to the 8.0 RC1 version for the task assembly --- .../Microsoft.NET.Build.Tasks.csproj | 5 +++-- src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index f346fa737e93..18c0ac4d2445 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -49,8 +49,9 @@ - - + + + diff --git a/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs index 4ea32a9f347c..b66eb8f8bc6b 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/PublishWebApp.cs @@ -36,7 +36,7 @@ public void It_publishes_and_runs_self_contained_web_app() var publishCommand = new PublishCommand(testAsset); - publishCommand.Execute() + publishCommand.Execute("-p:SelfContained=True") .Should() .Pass(); From 42f534aa990b91e041cf0d85505e5865b1cbf13f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 13 Sep 2023 13:16:51 -0500 Subject: [PATCH 20/29] don't overwrite bundledversions unless the SemVer major values match --- ...ndCreateBundledNETCoreAppPackageVersion.cs | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs index f97c5c7ec050..5c64420d60c8 100644 --- a/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs +++ b/src/Layout/toolset-tasks/OverrideAndCreateBundledNETCoreAppPackageVersion.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using Microsoft.Build.Framework; +using NuGet.Versioning; namespace Microsoft.DotNet.Build.Tasks { @@ -56,9 +57,24 @@ public static string ExecuteInternal( propertyGroup.Element(ns + "NETCoreSdkVersion").Value = newSDKVersion; - var originalBundledNETCoreAppPackageVersion = - propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value; - propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value = microsoftNETCoreAppRefPackageVersion; + + var originalBundledNETCoreAppPackageVersion = propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value; + var parsedOriginalBundledPackageVersion = SemanticVersion.Parse(originalBundledNETCoreAppPackageVersion); + var parsedMicrosoftNETCoreAppRefPackageVersion = + SemanticVersion.Parse(microsoftNETCoreAppRefPackageVersion); + + // In the case where we have a new major version, it'll come in first through the dotnet/runtime flow of the + // SDK's own package references. The Stage0 SDK's bundled version props file will still be on the older major version + // (and the older TFM that goes along with that). If we just replaced the bundled version with the new major version, + // apps that target the 'older' TFM would fail to build. So we need to keep the bundled version from the existing + // bundledversions.props in this one specific case. + + var newBundledPackageVersion = + parsedOriginalBundledPackageVersion.Major == parsedMicrosoftNETCoreAppRefPackageVersion.Major + ? microsoftNETCoreAppRefPackageVersion + : originalBundledNETCoreAppPackageVersion; + + propertyGroup.Element(ns + "BundledNETCoreAppPackageVersion").Value = newBundledPackageVersion; void CheckAndReplaceElement(XElement element) { @@ -69,7 +85,7 @@ void CheckAndReplaceElement(XElement element) element.ToString(), element.Value, originalBundledNETCoreAppPackageVersion)); } - element.Value = microsoftNETCoreAppRefPackageVersion; + element.Value = newBundledPackageVersion; } void CheckAndReplaceAttribute(XAttribute attribute) @@ -82,7 +98,7 @@ void CheckAndReplaceAttribute(XAttribute attribute) originalBundledNETCoreAppPackageVersion)); } - attribute.Value = microsoftNETCoreAppRefPackageVersion; + attribute.Value = newBundledPackageVersion; } if (!isSDKServicing) From f8ef959c46cc66d24f6ac895a24f2986af4a9d51 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Sep 2023 15:09:56 -0700 Subject: [PATCH 21/29] Add an additional dependency that's flagged in the tests. --- .../Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 18c0ac4d2445..7bf0d259a51b 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -52,6 +52,7 @@ + From a1ee049aceb574fef6c6f437f2e4174367645e29 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Sep 2023 15:15:27 -0700 Subject: [PATCH 22/29] Remove the cryptography reference per PR feedback --- .../Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj | 1 - .../Microsoft.NET.Build.Tasks.UnitTests.csproj | 1 - .../Microsoft.NET.TestFramework.csproj | 1 - src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj | 1 - src/Tests/trustedroots.Tests/trustedroots.Tests.csproj | 1 - 5 files changed, 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj index f482f27163fe..9fbe6990e2ff 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj @@ -22,7 +22,6 @@ - diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj index f674def40a04..c6e5b535ebba 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj @@ -20,7 +20,6 @@ - diff --git a/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj b/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj index aa0505d0761a..61a7215350c6 100644 --- a/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj +++ b/src/Tests/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj @@ -32,7 +32,6 @@ - diff --git a/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj b/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj index 2de4810afdaa..19e71d799f6a 100644 --- a/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj +++ b/src/Tests/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj @@ -21,7 +21,6 @@ - diff --git a/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj b/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj index 16e6e8a904b3..006f89978e91 100644 --- a/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj +++ b/src/Tests/trustedroots.Tests/trustedroots.Tests.csproj @@ -10,7 +10,6 @@ - From 4ecccd146ac19546deaba5b6fa285ef87801cc4c Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Fri, 15 Sep 2023 10:54:16 -0500 Subject: [PATCH 23/29] Bump runtime build --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++--------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27af691c2736..612d2eb73a33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating 9dfddc30a1e9101f7e44dcda57d95902073e444c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/runtime f8c110b8003d68cc635add4ca791d6cf2e645561 - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/runtime 90042669ef7e2d829aa605cb3751760b6161d12a - + https://github.com/dotnet/emsdk - 2f0c62011e53861b6233181b1add815453087ebd + 7da45c33d57a762de5756f2c090e84327dae143f @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest bb99e3ea07aaecd62d5c59568524133317d081b4 - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/windowsdesktop @@ -386,19 +386,19 @@ - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c @@ -419,9 +419,9 @@ https://github.com/dotnet/arcade 4a908c64757841121e67fda7adaf776c93893163 - + https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a + a6c64c3c26417f579022e20cbcee992b4814ed2c https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 7d8e89182c87..1097af005dc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 7.0.0 8.0.0-beta.23461.2 7.0.0-preview.22423.2 - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 4.6.0 2.0.0-beta4.23307.1 1.0.0-preview.6.23430.3 @@ -48,18 +48,18 @@ - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 $(MicrosoftExtensionsDependencyModelPackageVersion) - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -88,9 +88,9 @@ - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 - 9.0.0-alpha.1.23455.1 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 + 9.0.0-alpha.1.23464.19 @@ -207,7 +207,7 @@ - 9.0.0-alpha.1.23429.3 + 9.0.0-alpha.1.23457.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 882db45f390f91c921c014231b9ec67b6b94f69f Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Fri, 15 Sep 2023 16:09:32 -0400 Subject: [PATCH 24/29] Fix blazor tests built with workloads The tests fail with: ``` emcc : error : /private/tmp/helix/working/A19408C3/w/B54A09BA/e/testExecutionDirectory/.nuget/packages/microsoft.netcore.app.runtime.mono.browser-wasm/8.0.0-rc.1.23414.4/runtimes/browser-wasm/native/libmono-wasm-simd.a: No such file or directory ``` .. because the build is using 9.0 targets, but 8.0 runtime pack. This commit works around that issue by overriding the runtime pack path to point to the correct one. `WasmOverridePacks.targets` is taken from `Wasm.Build.Tests` in `dotnet/runtime`. This workaround can be removed once we have a proper 9.0 workload. --- src/Assets/WasmOverride/Directory.Build.props | 1 + .../WasmOverride/Directory.Build.targets | 3 + .../WasmOverride/WasmOverridePacks.targets | 65 +++++++++++++++++++ .../AspNetSdkTest.cs | 4 ++ 4 files changed, 73 insertions(+) create mode 100644 src/Assets/WasmOverride/Directory.Build.props create mode 100644 src/Assets/WasmOverride/Directory.Build.targets create mode 100644 src/Assets/WasmOverride/WasmOverridePacks.targets diff --git a/src/Assets/WasmOverride/Directory.Build.props b/src/Assets/WasmOverride/Directory.Build.props new file mode 100644 index 000000000000..058246e40862 --- /dev/null +++ b/src/Assets/WasmOverride/Directory.Build.props @@ -0,0 +1 @@ + diff --git a/src/Assets/WasmOverride/Directory.Build.targets b/src/Assets/WasmOverride/Directory.Build.targets new file mode 100644 index 000000000000..62eae55eb3ef --- /dev/null +++ b/src/Assets/WasmOverride/Directory.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/WasmOverride/WasmOverridePacks.targets b/src/Assets/WasmOverride/WasmOverridePacks.targets new file mode 100644 index 000000000000..a5bfb06a3375 --- /dev/null +++ b/src/Assets/WasmOverride/WasmOverridePacks.targets @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_targetingPackReferenceExclusion Include="$(TargetName)" /> + <_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" /> + <_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" /> + + + + <_targetingPackReferenceWithExclusion Include="@(Reference)"> + %(_targetingPackReferenceExclusion.Identity) + + + + + + + + + diff --git a/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs b/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs index c64725eb59ae..6cdc76a1db1e 100644 --- a/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs +++ b/src/Tests/Microsoft.NET.TestFramework/AspNetSdkTest.cs @@ -44,6 +44,10 @@ public TestAsset CreateAspNetSdkTestAsset( targetFrameworks.Value = targetFrameworks.Value.Replace("$(AspNetTestTfm)", overrideTfm ?? DefaultTfm); } }); + + foreach (string assetPath in Directory.EnumerateFiles(Path.Combine(_testAssetsManager.TestAssetsRoot, "WasmOverride"))) + File.Copy(assetPath, Path.Combine(projectDirectory.Path, Path.GetFileName(assetPath))); + return projectDirectory; } From ef678de591feafca04c3ebae469c38ef45963eb7 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Fri, 15 Sep 2023 17:48:24 -0400 Subject: [PATCH 25/29] Use WasmOverride.targets only for net8.0 wasm projects --- src/Assets/WasmOverride/Directory.Build.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Assets/WasmOverride/Directory.Build.targets b/src/Assets/WasmOverride/Directory.Build.targets index 62eae55eb3ef..40fe60d0bdbd 100644 --- a/src/Assets/WasmOverride/Directory.Build.targets +++ b/src/Assets/WasmOverride/Directory.Build.targets @@ -1,3 +1,4 @@ - + + From ce306be00cba57b0fd83d03ca636741b1496c7af Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Mon, 18 Sep 2023 16:14:52 -0700 Subject: [PATCH 26/29] Fix native aot lib test scenario --- .../GivenThatWeWantToPublishAnAotApp.cs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index e943643335ac..6a78ee147610 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -755,10 +755,8 @@ public void NativeAotStaticLib_only_runs_when_switch_is_enabled(string targetFra [Theory] [InlineData("Static")] [InlineData("Shared")] - public void NativeAotLib_errors_out_when_eventpipe_is_enabled(string libType) + public void NativeAotLib_warns_when_eventpipe_is_enabled(string libType) { - // Revisit once the issue is fixed - // https://github.com/dotnet/runtime/issues/89346 var projectName = "AotStaticLibraryPublishWithEventPipe"; var rid = EnvironmentInfo.GetCompatibleRid(ToolsetInfo.CurrentTargetFramework); @@ -771,10 +769,13 @@ public void NativeAotLib_errors_out_when_eventpipe_is_enabled(string libType) var testAsset = _testAssetsManager.CreateTestProject(testProject); var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); + // Revisit once the issue is fixed + // https://github.com/dotnet/runtime/issues/89346 publishCommand .Execute() - .Should().Fail() - .And.HaveStdOutContaining("EventSource is not supported"); + .Should().Pass(); + // Comment in the following code when https://github.com/dotnet/sdk/issues/34839 gets fixed + // .And.HaveStdOutContaining("EventSource is not supported or recommended when compiling to a native library"); } [RequiresMSBuildVersionTheory("17.0.0.32901")] From d1f1784b5e25ee9cb00cc5accf9d4e766f085f91 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 19 Sep 2023 08:41:50 -0500 Subject: [PATCH 27/29] Update versions to official RC1 --- .../Microsoft.NET.Build.Tasks.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 563b737c4ba7..01ce0e70fa82 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -52,10 +52,10 @@ - - - - + + + + From ca8ddf9836029e3faad3dd1dbe441d0b82517c60 Mon Sep 17 00:00:00 2001 From: Elinor Fung Date: Tue, 19 Sep 2023 09:25:45 -0700 Subject: [PATCH 28/29] Remove Microsoft.NETCore.DotNetHostResolver dependency --- eng/Version.Details.xml | 4 ---- eng/Versions.props | 1 - .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 13 ++++++++----- .../Microsoft.DotNet.SdkResolver.csproj | 10 ++++++---- ...Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj | 5 +---- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb34334ebb0d..50830e755431 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,10 +47,6 @@ https://github.com/dotnet/runtime a6c64c3c26417f579022e20cbcee992b4814ed2c - - https://github.com/dotnet/runtime - 90042669ef7e2d829aa605cb3751760b6161d12a - https://github.com/dotnet/emsdk 7da45c33d57a762de5756f2c090e84327dae143f diff --git a/eng/Versions.props b/eng/Versions.props index 84222cbafcaf..89b6ead7ceb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,7 +53,6 @@ 9.0.0-alpha.1.23464.19 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 9.0.0-alpha.1.23464.19 - 9.0.0-alpha.1.23455.1 9.0.0-alpha.1.23464.19 9.0.0-alpha.1.23464.19 $(MicrosoftExtensionsDependencyModelPackageVersion) diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 3a4e5841b010..273d42047bfe 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -64,7 +64,6 @@ - @@ -92,6 +91,10 @@ + + + + @@ -102,17 +105,17 @@ - + - + x86/hostfxr.dll PreserveNewest - + x64/hostfxr.dll PreserveNewest - + arm64/hostfxr.dll PreserveNewest diff --git a/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj index 50f97c79f7de..b5a3bfd041eb 100644 --- a/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.SdkResolver/Microsoft.DotNet.SdkResolver.csproj @@ -17,7 +17,6 @@ - @@ -26,15 +25,18 @@ + + + - + - + x86/hostfxr.dll PreserveNewest - + x64/hostfxr.dll PreserveNewest diff --git a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj index 32d81ee49653..e10f99519e9c 100644 --- a/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj +++ b/src/Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests/Microsoft.DotNet.MSBuildSdkResolver.Tests.csproj @@ -30,7 +30,7 @@ nativeWrapper - + @@ -38,9 +38,6 @@ - - - From 26162bdbe300291ba44c2089ba1195f5dcdeb799 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 19 Sep 2023 15:03:30 -0700 Subject: [PATCH 29/29] Update SourceBuildPrebuiltBaseline.xml for 8.0 msbuild dependencies --- eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 123bd07493ff..0066356a4f84 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -32,5 +32,10 @@ + + + + +