From 9486b6cba00d32d5b4af29c13343cccf9f978773 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 17:14:14 -0800 Subject: [PATCH 1/3] Update implicit versions Update to 9.0.0 release version --- NuGet.config | 52 +++++++++ eng/Version.Details.xml | 252 ++++++++++++++++++++-------------------- eng/Versions.props | 114 +++++++++--------- 3 files changed, 235 insertions(+), 183 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99713c19bd90..74d4d0a82718 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,17 +6,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43,10 +69,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 252e05f4c2f9..d7c734cd7c14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 44a0b49cb0ae4d3c5400360b5124d451a9c5362e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df + 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/emsdk - 0b30e0253a0d7c47a99cecd51b0d5ff5c83ad1df + 763d10a1a251be35337ee736832bfde3f9200672 @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn c0b2f366d0fb54cf49040a82f0d044bb959a9e73 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/nuget/nuget.client @@ -226,99 +226,99 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4c2c5a0efe35521e7637d228bfba823f6b63dd74 + 308dc7955704be60afc72ec00902cc18e028c3c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 49ab7e335401671d3909153f2ca0dddc6030628d + a04736acb8edb533756131d3d5fc55f15cd03d6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b @@ -339,21 +339,21 @@ f6384a995a7032f50f4e3d07fad1c87e2cd8a560 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b https://github.com/dotnet/test-templates @@ -386,13 +386,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d30c019e3116e813215903d7330ea18e620f8d16 + 62ebdb4b0d5cc7e163b8dc9331dc196e576bf162 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 49ab7e335401671d3909153f2ca0dddc6030628d + a04736acb8edb533756131d3d5fc55f15cd03d6a https://github.com/dotnet/xdt @@ -499,89 +499,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c70204ae3c91d2b48fa6d9b92b62265f368421b4 + af22effae4069a5dfb9b0735859de48820104f5b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 @@ -615,9 +615,9 @@ 3c393bbd85ae16ddddba20d0b75035b0c6f1a52d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 990ebf52fc408ca45929fd176d2740675a67fab8 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 56f80e57bf67..e3a17d8e507c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,9 +32,9 @@ 30 32 17 - 35 + 36 20 - 10 + 11 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -92,7 +92,7 @@ - 9.0.0-rc.2.24474.1 + 9.0.0-rtm.24529.1 @@ -103,54 +103,54 @@ - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0-rtm.24528.9 + 9.0.0 + 9.0.0 + 9.0.0-rtm.24528.9 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.0-rc.1.23414.4 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0-rtm.24528.9 + 9.0.0-rtm.24528.9 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 2.1.0 - 9.0.0-rc.2.24473.5 + 9.0.0 8.0.0 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.0 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + 9.0.0 8.0.4 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 9.0.0 + 9.0.0 - 9.0.0-rc.2.24474.4 - 9.0.0-rc.2.24474.4 - 9.0.0-rc.2.24474.4 - 9.0.0-rc.2.24474.4 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 + 9.0.0 + 9.0.0 @@ -232,19 +232,19 @@ - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 + 9.0.0 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0 + 9.0.0 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 + 9.0.0-rtm.24529.3 @@ -254,8 +254,8 @@ - 9.0.0-rc.2.24474.3 - 9.0.0-rc.2.24474.3 + 9.0.0-rtm.24529.2 + 9.0.0-rtm.24529.2 @@ -334,7 +334,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rc.2.24468.8 + 9.0.0-rtm.24528.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 642d6de424b030433ddb1209b66cedae9ba3bf3e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 12 Nov 2024 17:34:46 -0800 Subject: [PATCH 2/3] Switch to emsdk stable package version --- NuGet.config | 15 +++++++++++++++ eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 74d4d0a82718..47cf47c74848 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,21 @@ + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7c734cd7c14..30dbbc939a93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -59,7 +59,7 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk 763d10a1a251be35337ee736832bfde3f9200672 diff --git a/eng/Versions.props b/eng/Versions.props index e3a17d8e507c..39b122332bb5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -334,7 +334,7 @@ 15.0.9600-net9-rc2 18.0.9600-net9-rc2 - 9.0.0-rtm.24528.2 + 9.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From d9cfa04ed8b4ec9e3627ac7ecb44b7d3085d91bb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Nov 2024 15:00:54 -0800 Subject: [PATCH 3/3] Update the version package property for emscripten --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 39b122332bb5..f05a6c6bd803 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -335,7 +335,7 @@ 18.0.9600-net9-rc2 9.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`))