From 131977c69b92506db0c88646cda4c66be0b785af Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 8 Apr 2025 15:51:02 -0700 Subject: [PATCH 1/8] Update the sign check to remove the exclusions but only check on signed builds --- .../redist-installer/targets/BundledManifests.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Installer/redist-installer/targets/BundledManifests.targets b/src/Installer/redist-installer/targets/BundledManifests.targets index 849b5e788da9..af8029113f0d 100644 --- a/src/Installer/redist-installer/targets/BundledManifests.targets +++ b/src/Installer/redist-installer/targets/BundledManifests.targets @@ -50,7 +50,7 @@ + Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' and '$(Sign)' == 'true' "> $(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe $(ArtifactsLogDir)\workloadmanifestsigncheck.log @@ -60,7 +60,7 @@ + Exclude="Microsoft.NET.Sdk.Aspire"> $([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi')))) From 6be82afde3166545e013da8ec230a53a57796fab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Apr 2025 05:02:19 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/arcade build 20250408.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3a5ce05222..d9f235ea17d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - faa1471063676aca349da6b48c56dd0fc95aa869 + c7a36e53f91e41943746f97a8c183549364c5092 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d94724ec0c05..ad08ca939dc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25204.7 + 8.0.0-beta.25208.7 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 570ed21c0599..1918bc6863ac 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.114", + "dotnet": "8.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25204.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" } } From 48364dab39c4b123ee73f0f6403dc0d5f1c526a0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 9 Apr 2025 15:01:36 -0700 Subject: [PATCH 3/8] Switch to using the source branch that's set in our builds. --- .../redist-installer/targets/BundledManifests.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Installer/redist-installer/targets/BundledManifests.targets b/src/Installer/redist-installer/targets/BundledManifests.targets index af8029113f0d..9fe8246ec949 100644 --- a/src/Installer/redist-installer/targets/BundledManifests.targets +++ b/src/Installer/redist-installer/targets/BundledManifests.targets @@ -50,7 +50,10 @@ + Condition=" '$(OS)' == 'Windows_NT' and + '$(Architecture)' != 'arm' and + $(BUILD_SOURCEBRANCH) != '' and + $(BUILD_SOURCEBRANCH.Contains('release')) "> $(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe $(ArtifactsLogDir)\workloadmanifestsigncheck.log From 9d590119da60ef15c7ad7bf9af592a1c0c0704fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Apr 2025 05:02:23 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/msbuild build 20250410.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.11.26-servicing-25111-04 -> To Version 17.11.30-servicing-25210-03 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3f763004357..bc4189edd688 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3a5ce05222..e3d6c4fb9065 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk ec84e775d21d3b7a6698ec30f7b2a5a9e3acd314 - + https://github.com/dotnet/msbuild - 2b19be476c8b86077deb82788563d7f7cc53468b + e8f3d27217ec7f7b9296955b74077e0c4f6328c3 - + https://github.com/dotnet/msbuild - 2b19be476c8b86077deb82788563d7f7cc53468b + e8f3d27217ec7f7b9296955b74077e0c4f6328c3 - + https://github.com/dotnet/msbuild - 2b19be476c8b86077deb82788563d7f7cc53468b + e8f3d27217ec7f7b9296955b74077e0c4f6328c3 diff --git a/eng/Versions.props b/eng/Versions.props index d94724ec0c05..32b8ab444d79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.11.26 + 17.11.30 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3a5ce05222..b83995bdfeba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - a8f24d5519fcff94cd145f3c19c745d53fba8290 + 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 - + https://github.com/dotnet/templating - a8f24d5519fcff94cd145f3c19c745d53fba8290 + 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 - + https://github.com/dotnet/templating - a8f24d5519fcff94cd145f3c19c745d53fba8290 + 731d4697ceb43ca5ab88a4994b5a226e0cbf16c4 diff --git a/eng/Versions.props b/eng/Versions.props index d94724ec0c05..b3f7387abd11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.409-servicing.25207.2 + 8.0.409-servicing.25209.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8c6ee8e01632a321227c48baf5cc37399b097402 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 10 Apr 2025 01:57:47 -0700 Subject: [PATCH 6/8] Disable Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works --- .../WasmPublishIntegrationTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs index 20caa31b5962..7075611f8963 100644 --- a/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs @@ -1081,7 +1081,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works() AssertRIDPublishOuput(publishCommand, testInstance, hosted: true); } - [ConditionalFact()] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/44179")] public void Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_Works() { // Arrange From 135d2cd688deff920864470ce6e2760fb31529dc Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Fri, 11 Apr 2025 06:06:56 -0700 Subject: [PATCH 7/8] Merging internal commits for release/9.0.1xx (#48266) Co-authored-by: DotNet-Bot Co-authored-by: ProductConstructionServiceProd Co-authored-by: Mirroring Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> Co-authored-by: Jason Zhai --- NuGet.config | 8 ++ eng/Version.Details.xml | 256 ++++++++++++++++++++-------------------- eng/Versions.props | 112 +++++++++--------- 3 files changed, 192 insertions(+), 184 deletions(-) diff --git a/NuGet.config b/NuGet.config index d0b714fe2897..969c8bf1feb0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,10 @@ + + @@ -33,11 +35,14 @@ + + + @@ -64,10 +69,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0adb8e32a992..b116e9f586f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 35eb08d048d4f4667db94b07f0e838ccd5fb5169 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - dad5528e5bdf92a05a5a404c5f7939523390b96d + 78be8cdf4f0bfd93018fd7a87f8282a41d041298 - + https://github.com/dotnet/emsdk - dad5528e5bdf92a05a5a404c5f7939523390b96d + 78be8cdf4f0bfd93018fd7a87f8282a41d041298 - + https://github.com/dotnet/emsdk - dad5528e5bdf92a05a5a404c5f7939523390b96d + 78be8cdf4f0bfd93018fd7a87f8282a41d041298 @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://github.com/nuget/nuget.client @@ -230,99 +230,99 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + ef0ddf89991072267608f432ca2163ac54fdecab - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + ef0ddf89991072267608f432ca2163ac54fdecab - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + ef0ddf89991072267608f432ca2163ac54fdecab - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1c33258cdd6220239735d6a7a18ef6adc082038c + ef0ddf89991072267608f432ca2163ac54fdecab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 33f5371cc258de0a72569adf1e9fbcbf04256a17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 @@ -343,21 +343,21 @@ 44568f7817cd7c6daf90c9340c64c3b69277b7f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 https://github.com/dotnet/test-templates @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5bf1bff0e58e41f748a8a6d7c666ed28e033e318 + ca42d9e58480ab4ebb845027c44c6b4f10e0539d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f58f709bc102a0d15aa6ffe4d9a7435bebd3079e + 33f5371cc258de0a72569adf1e9fbcbf04256a17 https://github.com/dotnet/xdt @@ -503,89 +503,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b96167fbfe8bd45d94e4dcda42c7d09eb5745459 + d5dc8a13cc618b9cbdc1e5744b4806c594d49553 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 @@ -619,9 +619,9 @@ aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 340af2e00701..a8a4f5256eb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.3-servicing.25112.2 + 9.0.4-servicing.25163.12 @@ -86,54 +86,54 @@ - 9.0.3 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4-servicing.25163.5 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25163.5 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 8.0.0-rc.1.23414.4 - 9.0.3-servicing.25111.13 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4-servicing.25163.5 + 9.0.4-servicing.25163.5 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 2.1.0 - 9.0.3 + 9.0.4 8.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 8.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 8.0.4 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 - 9.0.3-servicing.25113.2 - 9.0.3-servicing.25113.2 - 9.0.3 - 9.0.3 + 9.0.4-servicing.25164.6 + 9.0.4-servicing.25164.6 + 9.0.4 + 9.0.4 @@ -215,19 +215,19 @@ - 9.0.3 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 - 9.0.3-servicing.25112.20 + 9.0.4 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 + 9.0.4-servicing.25164.3 @@ -237,8 +237,8 @@ - 9.0.3-rtm.25113.4 - 9.0.3-rtm.25113.4 + 9.0.4-rtm.25164.2 + 9.0.4-rtm.25164.2 @@ -317,8 +317,8 @@ 15.0.9617 18.0.9617 - 9.0.3-servicing.25105.2 - 9.0.3 + 9.0.4-servicing.25157.2 + 9.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 4bbdf7693b0a9aeec43988ae7e6a6c8a11dbebc4 Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 11 Apr 2025 16:07:14 -0500 Subject: [PATCH 8/8] .NET Source-Build 9.0.105 April 2025 Updates (#48274) Co-authored-by: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Co-authored-by: Matt Thalman --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 298215c970c3..afa91a48031d 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5da211e1c42254cb35e7ef3d5a8428fb24853169 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index cd703a42d3f1..ec033700d78b 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.104 - 9.0.104-servicing.25113.1 + 9.0.105 + 9.0.105-servicing.25165.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index a156964e7a3d..28b3d0048c19 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.104" + "dotnet": "9.0.105" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5" } }