From 615ee7dcf32cef6e42d6427723cb4c14ca56989a Mon Sep 17 00:00:00 2001 From: Radek Zikmund Date: Wed, 11 Jun 2025 10:19:28 +0200 Subject: [PATCH 01/65] Don't attempt HELO if EnableTls is true. --- .../System.Net.Mail/src/System/Net/Mail/SmtpConnection.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpConnection.cs b/src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpConnection.cs index bc2a2bcbfa0c39..a924cdcd980f60 100644 --- a/src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpConnection.cs +++ b/src/libraries/System.Net.Mail/src/System/Net/Mail/SmtpConnection.cs @@ -628,6 +628,14 @@ private static void SendEHelloCallback(IAsyncResult result) private bool SendHello() { + if (_connection._enableSsl) + { + // We only try HELO command if EHLO was not recognized. Server cannot + // advertise STARTTLS in older HELO command, thus if TLS is required, + // we can fail early. + throw new SmtpException(SR.MailServerDoesNotSupportStartTls); + } + IAsyncResult result = HelloCommand.BeginSend(_connection, _connection._client!._clientDomain, s_sendHelloCallback, this); //if ehello isn't supported, assume basic auth if (result.CompletedSynchronously) From b577c7433426f61bafa73b325a03182f0cdb5f42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Jul 2025 08:36:48 -0700 Subject: [PATCH 02/65] [release/9.0-staging] [Test Only] Fix BuildChainCustomTrustStore test (#117761) * Fix BuildChainCustomTrustStore * Allow partial chains * Try using the extra store * Fix typo * Allow untrusted root --------- Co-authored-by: Kevin Jones --- .../tests/X509Certificates/ChainTests.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Security.Cryptography/tests/X509Certificates/ChainTests.cs b/src/libraries/System.Security.Cryptography/tests/X509Certificates/ChainTests.cs index de1d0b55bf2f62..34ce9021b14b51 100644 --- a/src/libraries/System.Security.Cryptography/tests/X509Certificates/ChainTests.cs +++ b/src/libraries/System.Security.Cryptography/tests/X509Certificates/ChainTests.cs @@ -344,6 +344,8 @@ public static void BuildChainCustomTrustStore( chainTest.ChainPolicy.TrustMode = X509ChainTrustMode.CustomRootTrust; chainTest.ChainPolicy.ExtraStore.Add(issuerCert); + X509ChainStatusFlags allowedFlags = X509ChainStatusFlags.NoError; + switch (testArguments) { case BuildChainCustomTrustStoreTestArguments.TrustedIntermediateUntrustedRoot: @@ -361,6 +363,9 @@ public static void BuildChainCustomTrustStore( chainHolder.DisposeChainElements(); chainTest.ChainPolicy.CustomTrustStore.Remove(rootCert); chainTest.ChainPolicy.TrustMode = X509ChainTrustMode.System; + chainTest.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority; + chainTest.ChainPolicy.ExtraStore.Add(rootCert); + allowedFlags |= X509ChainStatusFlags.UntrustedRoot; break; default: throw new InvalidDataException(); @@ -368,7 +373,11 @@ public static void BuildChainCustomTrustStore( Assert.Equal(chainBuildsSuccessfully, chainTest.Build(endCert)); Assert.Equal(3, chainTest.ChainElements.Count); - Assert.Equal(chainFlags, chainTest.AllStatusFlags()); + + X509ChainStatusFlags actualFlags = chainTest.AllStatusFlags(); + actualFlags &= ~allowedFlags; + + Assert.Equal(chainFlags, actualFlags); } } From 273013bdd37ea0ab976411e8064008a3d9db41be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Jul 2025 11:54:39 +0000 Subject: [PATCH 03/65] Update dependencies from https://github.com/dotnet/emsdk build 20250721.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.8-servicing.25371.3 --- NuGet.config | 3 +-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ac3f710d770bf..9c1b223774e693 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,10 @@ - + - - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + e634c2364c49ed2b86cc25cebf3a95d79abeb294 diff --git a/eng/Versions.props b/eng/Versions.props index f772dc0fc00585..2b09af69097230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.8-servicing.25353.1 + 9.0.8-servicing.25371.3 9.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From 55bb704f556ee323ce87eb7119092e5babbc088b Mon Sep 17 00:00:00 2001 From: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:58:33 -0700 Subject: [PATCH 04/65] Recover the SDK feed in the NuGet.org --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 9c1b223774e693..cddca2426c542b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + + - + - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 0827ec37403702d48974c727c09e579c6aa9748a - + https://github.com/dotnet/arcade - 13b20849f8294593bf150a801cab639397e6c29d + 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f772dc0fc00585..fd53393624ff88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 2.9.0-beta.25325.4 - 9.0.0-beta.25325.4 - 2.9.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 - 9.0.0-beta.25325.4 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 2.9.0-beta.25366.1 + 9.0.0-beta.25366.1 + 2.9.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 + 9.0.0-beta.25366.1 1.4.0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22b49e09d09b58..9b3ad8840fdb28 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index 060c5f7a5532be..fbcea3f120a495 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25325.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From f3614305af6f0233599abd940621c5fc88b86be9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 15:54:37 -0700 Subject: [PATCH 06/65] [release/9.0-staging] Update dependencies from dotnet/xharness (#117872) * Update dependencies from https://github.com/dotnet/xharness build 20250715.5 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25360.3 -> To Version 9.0.0-prerelease.25365.5 * Recover the SDK feed in NuGet.config --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> --- .config/dotnet-tools.json | 2 +- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 00da25c312abbb..929214a7e0f0f8 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.25360.3", + "version": "9.0.0-prerelease.25365.5", "commands": [ "xharness" ] diff --git a/NuGet.config b/NuGet.config index e98fb819f64b47..8e7c6b5cb195b0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f75e5b31b2db1f..42528aa59983ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -320,17 +320,17 @@ https://github.com/dotnet/runtime b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/xharness - 0827ec37403702d48974c727c09e579c6aa9748a + 5c8c4364bdb775c8b787f2c6280c9737cbc06ee1 - + https://github.com/dotnet/xharness - 0827ec37403702d48974c727c09e579c6aa9748a + 5c8c4364bdb775c8b787f2c6280c9737cbc06ee1 - + https://github.com/dotnet/xharness - 0827ec37403702d48974c727c09e579c6aa9748a + 5c8c4364bdb775c8b787f2c6280c9737cbc06ee1 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index fd53393624ff88..fdb5ac829d2c7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,9 +184,9 @@ 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.25360.3 - 9.0.0-prerelease.25360.3 - 9.0.0-prerelease.25360.3 + 9.0.0-prerelease.25365.5 + 9.0.0-prerelease.25365.5 + 9.0.0-prerelease.25365.5 9.0.0-alpha.0.25330.3 3.12.0 4.5.0 From ce56961cca3fa767b494687623c9a9fa711482f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 16:24:56 -0700 Subject: [PATCH 07/65] [release/9.0-staging] Update dependencies from dotnet/sdk (#117873) * Update dependencies from https://github.com/dotnet/sdk build 20250715.26 Microsoft.SourceBuild.Intermediate.sdk , Microsoft.DotNet.ApiCompat.Task From Version 9.0.109-servicing.25360.24 -> To Version 9.0.109-servicing.25365.26 * Update SDK version is versions.prop --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e7c6b5cb195b0..9e4c7a6c73b9c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,8 @@ + - - + https://github.com/dotnet/sdk - 8128984181a05a7dc0de748ad3371e0a7f153f35 + eb8e854575399c14203dada1d2a6d5883fe23a4a diff --git a/eng/Versions.props b/eng/Versions.props index fdb5ac829d2c7e..e51f45e7bb9495 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -263,7 +263,7 @@ 1.0.406601 - 9.0.107 + 9.0.109 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) From 79e2f959fef4c181bac1618194edcdba0d78fdd5 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 24 Jul 2025 12:45:03 -0500 Subject: [PATCH 08/65] Revert "[release/9.0-staging] Update dependencies from dotnet/sdk (#117873)" (#118001) This reverts commit ce56961cca3fa767b494687623c9a9fa711482f3. --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9e4c7a6c73b9c4..8e7c6b5cb195b0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,8 +14,8 @@ - + - + https://github.com/dotnet/sdk - eb8e854575399c14203dada1d2a6d5883fe23a4a + 8128984181a05a7dc0de748ad3371e0a7f153f35 diff --git a/eng/Versions.props b/eng/Versions.props index e51f45e7bb9495..fdb5ac829d2c7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -263,7 +263,7 @@ 1.0.406601 - 9.0.109 + 9.0.107 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) From 0258000d5152402dcd1c56b8be3a59e79a28b9e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:13:14 -0700 Subject: [PATCH 09/65] Update dependencies from https://github.com/dotnet/cecil build 20250720.2 (#117910) Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil From Version 0.11.5-alpha.25329.2 -> To Version 0.11.5-alpha.25370.2 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42528aa59983ec..75c8359299e16a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,14 +54,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 + 788a8a7481c01a7d235110cdea2ca5bfb34210d4 - + https://github.com/dotnet/cecil - 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 + 788a8a7481c01a7d235110cdea2ca5bfb34210d4 diff --git a/eng/Versions.props b/eng/Versions.props index fdb5ac829d2c7e..756362d110625f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,7 +215,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25329.2 + 0.11.5-alpha.25370.2 9.0.0-rtm.24511.16 From 11610697f6fec5fb56386ddfb6a7274edc353328 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 24 Jul 2025 14:25:45 -0700 Subject: [PATCH 10/65] [release/9.0-staging] Update dependencies from dotnet/icu (#117962) * Update dependencies from https://github.com/dotnet/icu build 20250721.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25353.1 -> To Version 9.0.0-rtm.25371.1 * Temporary revert SDK version --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> --- 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 75c8359299e16a..91e803f70ea893 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 50d7c192bf19a9a3d20ea7ca7a30c3f3526c1a7e + 8651fab55b69849f0a4001949df126fea4d4b419 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 756362d110625f..86a8638f8fe209 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25353.1 + 9.0.0-rtm.25371.1 9.0.0-rtm.24466.4 2.4.8 From 8f8f0d16040cc7fd1d8b55841e2b2c4996301f66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:25:47 -0700 Subject: [PATCH 11/65] [release/9.0-staging] Update dependencies from dotnet/roslyn (#118080) * Update dependencies from https://github.com/dotnet/roslyn build 20250724.20 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25329.7 -> To Version 4.12.0-3.25374.20 * Update dependencies from https://github.com/dotnet/roslyn build 20250727.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25329.7 -> To Version 4.12.0-3.25377.4 * Return the SDK feed back to the NuGet.Config --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e7c6b5cb195b0..ce3b78795e70f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + - + https://github.com/dotnet/roslyn - 3f5cf9fbbd91f2047e988801a5142ca1cb6bab45 + 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e diff --git a/eng/Versions.props b/eng/Versions.props index 86a8638f8fe209..48a4c06a836994 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,9 +44,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 - 4.12.0-3.25329.7 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 + 4.12.0-3.25377.4 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.25365.5 - 9.0.0-prerelease.25365.5 - 9.0.0-prerelease.25365.5 + 9.0.0-prerelease.25375.3 + 9.0.0-prerelease.25375.3 + 9.0.0-prerelease.25375.3 9.0.0-alpha.0.25330.3 3.12.0 4.5.0 From 58fba2ee1a22a267f69c947a96ec92d534de5ed2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Aug 2025 23:02:24 +0000 Subject: [PATCH 13/65] Update dependencies from https://github.com/dotnet/emsdk build 20250804.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25404.4 --- NuGet.config | 3 +-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index cddca2426c542b..f8fafbf61782bc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,10 @@ - + - - + https://github.com/dotnet/emsdk - e634c2364c49ed2b86cc25cebf3a95d79abeb294 + 5bc91fcaaa7e0f7ce61b993d7450679b6a545bff diff --git a/eng/Versions.props b/eng/Versions.props index 2b09af69097230..48d94dafd1ca43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,8 +243,8 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.8-servicing.25371.3 - 9.0.8 + 9.0.9-servicing.25404.4 + 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda From df8f6a58e75784f1dd0ab17a31314fc96e695299 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 14:04:50 -0700 Subject: [PATCH 14/65] [release/9.0-staging] Fix broken debugger/debuggee startup handshake protocol on macOS26. (#118212) * Add support for new startup handshake protocol over pipes instead of sempahores. * Remove NonBlocking runtime support. * Renames, logging and simplification. * Improve tracing. * Make open check non blocking. * Fold access into open calls and track ENOENT | ENOACCES * Review feedback. --------- Co-authored-by: lateralusX --- src/coreclr/pal/src/thread/process.cpp | 266 +++++++++++++++++++++++-- 1 file changed, 252 insertions(+), 14 deletions(-) diff --git a/src/coreclr/pal/src/thread/process.cpp b/src/coreclr/pal/src/thread/process.cpp index ec518417ef8386..9504e6995c5506 100644 --- a/src/coreclr/pal/src/thread/process.cpp +++ b/src/coreclr/pal/src/thread/process.cpp @@ -105,6 +105,9 @@ extern "C" } \ } while (false) +// On macOS 26, sem_open fails if debugger and debugee are signed with different team ids. +// Use fifos instead of semaphores to avoid this issue, https://github.com/dotnet/runtime/issues/116545 +#define ENABLE_RUNTIME_EVENTS_OVER_PIPES #endif // __APPLE__ #ifdef __NetBSD__ @@ -1432,21 +1435,217 @@ static uint64_t HashSemaphoreName(uint64_t a, uint64_t b) static const char *const TwoWayNamedPipePrefix = "clr-debug-pipe"; static const char* IpcNameFormat = "%s-%d-%llu-%s"; -/*++ - PAL_NotifyRuntimeStarted +#ifdef ENABLE_RUNTIME_EVENTS_OVER_PIPES +static const char* RuntimeStartupPipeName = "st"; +static const char* RuntimeContinuePipeName = "co"; - Signals the debugger waiting for runtime startup notification to continue and - waits until the debugger signals us to continue. +#define PIPE_OPEN_RETRY_DELAY_NS 500000000 // 500 ms -Parameters: - None +typedef enum +{ + RuntimeEventsOverPipes_Disabled = 0, + RuntimeEventsOverPipes_Succeeded = 1, + RuntimeEventsOverPipes_Failed = 2, +} RuntimeEventsOverPipes; -Return value: - TRUE - successfully launched by debugger, FALSE - not launched or some failure in the handshake ---*/ +typedef enum +{ + RuntimeEvent_Unknown = 0, + RuntimeEvent_Started = 1, + RuntimeEvent_Continue = 2, +} RuntimeEvent; + +static +int +OpenPipe(const char* name, int mode) +{ + int fd = -1; + int flags = mode | O_NONBLOCK; + +#if defined(FD_CLOEXEC) + flags |= O_CLOEXEC; +#endif + + while (fd == -1) + { + fd = open(name, flags); + if (fd == -1) + { + if (mode == O_WRONLY && errno == ENXIO) + { + PAL_nanosleep(PIPE_OPEN_RETRY_DELAY_NS); + continue; + } + else if (errno == EINTR) + { + continue; + } + else + { + break; + } + } + } + + if (fd != -1) + { + flags = fcntl(fd, F_GETFL); + if (flags != -1) + { + flags &= ~O_NONBLOCK; + if (fcntl(fd, F_SETFL, flags) == -1) + { + close(fd); + fd = -1; + } + } + else + { + close(fd); + fd = -1; + } + } + + return fd; +} + +static +void +ClosePipe(int fd) +{ + if (fd != -1) + { + while (close(fd) < 0 && errno == EINTR); + } +} + +static +RuntimeEventsOverPipes +NotifyRuntimeUsingPipes() +{ + RuntimeEventsOverPipes result = RuntimeEventsOverPipes_Disabled; + char startupPipeName[MAX_DEBUGGER_TRANSPORT_PIPE_NAME_LENGTH]; + char continuePipeName[MAX_DEBUGGER_TRANSPORT_PIPE_NAME_LENGTH]; + int startupPipeFd = -1; + int continuePipeFd = -1; + size_t offset = 0; + + LPCSTR applicationGroupId = PAL_GetApplicationGroupId(); + + PAL_GetTransportPipeName(continuePipeName, gPID, applicationGroupId, RuntimeContinuePipeName); + TRACE("NotifyRuntimeUsingPipes: opening continue '%s' pipe\n", continuePipeName); + + continuePipeFd = OpenPipe(continuePipeName, O_RDONLY); + if (continuePipeFd == -1) + { + if (errno == ENOENT || errno == EACCES) + { + TRACE("NotifyRuntimeUsingPipes: pipe %s not found/accessible, runtime events over pipes disabled\n", continuePipeName); + } + else + { + TRACE("NotifyRuntimeUsingPipes: open(%s) failed: %d (%s)\n", continuePipeName, errno, strerror(errno)); + result = RuntimeEventsOverPipes_Failed; + } + + goto exit; + } + + PAL_GetTransportPipeName(startupPipeName, gPID, applicationGroupId, RuntimeStartupPipeName); + TRACE("NotifyRuntimeUsingPipes: opening startup '%s' pipe\n", startupPipeName); + + startupPipeFd = OpenPipe(startupPipeName, O_WRONLY); + if (startupPipeFd == -1) + { + if (errno == ENOENT || errno == EACCES) + { + TRACE("NotifyRuntimeUsingPipes: pipe %s not found/accessible, runtime events over pipes disabled\n", startupPipeName); + } + else + { + TRACE("NotifyRuntimeUsingPipes: open(%s) failed: %d (%s)\n", startupPipeName, errno, strerror(errno)); + result = RuntimeEventsOverPipes_Failed; + } + + goto exit; + } + + TRACE("NotifyRuntimeUsingPipes: sending started event\n"); + + { + unsigned char event = (unsigned char)RuntimeEvent_Started; + unsigned char *buffer = &event; + int bytesToWrite = sizeof(event); + int bytesWritten = 0; + + do + { + bytesWritten = write(startupPipeFd, buffer + offset, bytesToWrite - offset); + if (bytesWritten > 0) + { + offset += bytesWritten; + } + } + while ((bytesWritten > 0 && offset < bytesToWrite) || (bytesWritten == -1 && errno == EINTR)); + + if (offset != bytesToWrite) + { + TRACE("NotifyRuntimeUsingPipes: write(%s) failed: %d (%s)\n", startupPipeName, errno, strerror(errno)); + goto exit; + } + } + + TRACE("NotifyRuntimeUsingPipes: waiting on continue event\n"); + + { + unsigned char event = (unsigned char)RuntimeEvent_Unknown; + unsigned char *buffer = &event; + int bytesToRead = sizeof(event); + int bytesRead = 0; + + offset = 0; + do + { + bytesRead = read(continuePipeFd, buffer + offset, bytesToRead - offset); + if (bytesRead > 0) + { + offset += bytesRead; + } + } + while ((bytesRead > 0 && offset < bytesToRead) || (bytesRead == -1 && errno == EINTR)); + + if (offset == bytesToRead && event == (unsigned char)RuntimeEvent_Continue) + { + TRACE("NotifyRuntimeUsingPipes: received continue event\n"); + } + else + { + TRACE("NotifyRuntimeUsingPipes: received invalid event\n"); + goto exit; + } + } + + result = RuntimeEventsOverPipes_Succeeded; + +exit: + + if (startupPipeFd != -1) + { + ClosePipe(startupPipeFd); + } + + if (continuePipeFd != -1) + { + ClosePipe(continuePipeFd); + } + + return result; +} +#endif // ENABLE_RUNTIME_EVENTS_OVER_PIPES + +static BOOL -PALAPI -PAL_NotifyRuntimeStarted() +NotifyRuntimeUsingSemaphores() { char startupSemName[CLR_SEM_MAX_NAMELEN]; char continueSemName[CLR_SEM_MAX_NAMELEN]; @@ -1467,13 +1666,13 @@ PAL_NotifyRuntimeStarted() CreateSemaphoreName(startupSemName, RuntimeStartupSemaphoreName, unambiguousProcessDescriptor, applicationGroupId); CreateSemaphoreName(continueSemName, RuntimeContinueSemaphoreName, unambiguousProcessDescriptor, applicationGroupId); - TRACE("PAL_NotifyRuntimeStarted opening continue '%s' startup '%s'\n", continueSemName, startupSemName); + TRACE("NotifyRuntimeUsingSemaphores: opening continue '%s' startup '%s'\n", continueSemName, startupSemName); // Open the debugger startup semaphore. If it doesn't exists, then we do nothing and return startupSem = sem_open(startupSemName, 0); if (startupSem == SEM_FAILED) { - TRACE("sem_open(%s) failed: %d (%s)\n", startupSemName, errno, strerror(errno)); + TRACE("NotifyRuntimeUsingSemaphores: sem_open(%s) failed: %d (%s)\n", startupSemName, errno, strerror(errno)); goto exit; } @@ -1496,7 +1695,7 @@ PAL_NotifyRuntimeStarted() { if (EINTR == errno) { - TRACE("sem_wait() failed with EINTR; re-waiting"); + TRACE("NotifyRuntimeUsingSemaphores: sem_wait() failed with EINTR; re-waiting"); continue; } ASSERT("sem_wait(continueSem) failed: errno is %d (%s)\n", errno, strerror(errno)); @@ -1518,6 +1717,45 @@ PAL_NotifyRuntimeStarted() return launched; } +/*++ + PAL_NotifyRuntimeStarted + + Signals the debugger waiting for runtime startup notification to continue and + waits until the debugger signals us to continue. + +Parameters: + None + +Return value: + TRUE - successfully launched by debugger, FALSE - not launched or some failure in the handshake +--*/ +BOOL +PALAPI +PAL_NotifyRuntimeStarted() +{ +#ifdef ENABLE_RUNTIME_EVENTS_OVER_PIPES + // Test pipes as runtime event transport. + RuntimeEventsOverPipes result = NotifyRuntimeUsingPipes(); + switch (result) + { + case RuntimeEventsOverPipes_Disabled: + TRACE("PAL_NotifyRuntimeStarted: pipe handshake disabled, try semaphores\n"); + return NotifyRuntimeUsingSemaphores(); + case RuntimeEventsOverPipes_Failed: + TRACE("PAL_NotifyRuntimeStarted: pipe handshake failed\n"); + return FALSE; + case RuntimeEventsOverPipes_Succeeded: + TRACE("PAL_NotifyRuntimeStarted: pipe handshake succeeded\n"); + return TRUE; + default: + // Unexpected result. + return FALSE; + } +#else + return NotifyRuntimeUsingSemaphores(); +#endif // ENABLE_RUNTIME_EVENTS_OVER_PIPES +} + LPCSTR PALAPI PAL_GetApplicationGroupId() From a4d9f326ac1a4b66bfe6ded0c7d86d4b72eedcb1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 16:06:30 -0700 Subject: [PATCH 15/65] [release/9.0-staging] [NRBF] Allow the users to decode System.Nullable (#118328) * add a failing test that was super hard to extract from the repro * more permissive fix: allow any SystemClass to be represented as ClassWithMembersAndTypes in the payload * a fix that allows for only one particular edge case scenario * Revert "a fix that allows for only one particular edge case scenario" This reverts commit 3636ebe09b0d72df99bb8fea9196a80538852f4d. --------- Co-authored-by: Adam Sitnik --- .../src/System/Formats/Nrbf/MemberTypeInfo.cs | 6 ++- .../tests/EdgeCaseTests.cs | 44 +++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/MemberTypeInfo.cs b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/MemberTypeInfo.cs index 84c1073b0ef67a..c46d13f443e119 100644 --- a/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/MemberTypeInfo.cs +++ b/src/libraries/System.Formats.Nrbf/src/System/Formats/Nrbf/MemberTypeInfo.cs @@ -91,8 +91,10 @@ internal static MemberTypeInfo Decode(BinaryReader reader, int count, PayloadOpt const AllowedRecordTypes SystemClass = Classes | AllowedRecordTypes.SystemClassWithMembersAndTypes // All primitive types can be stored by using one of the interfaces they implement. // Example: `new IEnumerable[1] { "hello" }` or `new IComparable[1] { int.MaxValue }`. - | AllowedRecordTypes.BinaryObjectString | AllowedRecordTypes.MemberPrimitiveTyped; - const AllowedRecordTypes NonSystemClass = Classes | AllowedRecordTypes.ClassWithMembersAndTypes; + | AllowedRecordTypes.BinaryObjectString | AllowedRecordTypes.MemberPrimitiveTyped + // System.Nullable is a special case of SystemClassWithMembersAndTypes + | AllowedRecordTypes.ClassWithMembersAndTypes; + const AllowedRecordTypes NonSystemClass = Classes | AllowedRecordTypes.ClassWithMembersAndTypes; return binaryType switch { diff --git a/src/libraries/System.Formats.Nrbf/tests/EdgeCaseTests.cs b/src/libraries/System.Formats.Nrbf/tests/EdgeCaseTests.cs index f091d47ded8c5f..1d14993a0890c3 100644 --- a/src/libraries/System.Formats.Nrbf/tests/EdgeCaseTests.cs +++ b/src/libraries/System.Formats.Nrbf/tests/EdgeCaseTests.cs @@ -144,4 +144,48 @@ public void CanReadAllKindsOfDateTimes_DateTimeIsMemberOfTheRootRecord(DateTime Assert.Equal(input.Ticks, classRecord.GetDateTime(nameof(ClassWithDateTime.Value)).Ticks); Assert.Equal(input.Kind, classRecord.GetDateTime(nameof(ClassWithDateTime.Value)).Kind); } + + [Fact] + public void CanReadUserClassStoredAsSystemClass() + { + // For the following data, BinaryFormatter serializes the ClassWithNullableStructField class + // as a record with a single field called "NullableField" with BinaryType.SystemClass (!!!) + // and TypeName being System.Nullable`1[[SampleStruct, $AssemblyName]]. + // It most likely does so, because it's System.Nullable<$NonSystemStruct>. + // But later it serializes the SampleStruct as a ClassWithMembersAndTypes record, + // not SystemClassWithMembersAndTypes. + // It does so, only when the payload contains at least one class with the nullable field being null. + + using MemoryStream stream = Serialize( + new ClassWithNullableStructField[] + { + new ClassWithNullableStructField() { NullableField = null }, // having a null here is crucial for the test + new ClassWithNullableStructField() { NullableField = new ClassWithNullableStructField.SampleStruct() { Value = 42 } } + } + ); + + SZArrayRecord arrayRecord = (SZArrayRecord)NrbfDecoder.Decode(stream); + SerializationRecord[] records = arrayRecord.GetArray(); + Assert.Equal(2, arrayRecord.Length); + Assert.All(records, record => Assert.True(record.TypeNameMatches(typeof(ClassWithNullableStructField)))); + Assert.Null(((ClassRecord)records[0]).GetClassRecord(nameof(ClassWithNullableStructField.NullableField))); + + ClassRecord? notNullRecord = ((ClassRecord)records[1]).GetClassRecord(nameof(ClassWithNullableStructField.NullableField)); + Assert.NotNull(notNullRecord); + Assert.Equal(42, notNullRecord.GetInt32(nameof(ClassWithNullableStructField.SampleStruct.Value))); + } + + [Serializable] + public class ClassWithNullableStructField + { +#pragma warning disable IDE0001 // Simplify names + public System.Nullable NullableField; +#pragma warning restore IDE0001 + + [Serializable] + public struct SampleStruct + { + public int Value; + } + } } From dda010aaafd5c30266ec7cc8442c211a849861b1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Aug 2025 20:50:14 +0000 Subject: [PATCH 16/65] Allow two display names for Sydney time zone + disable NoBackwardTimeZones test on Android (#118455) Co-authored-by: Matous Kozak --- .../tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs index 2ff5d459fdb50d..6380157b7b23f1 100644 --- a/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs +++ b/src/libraries/System.Runtime/tests/System.Runtime.Tests/System/TimeZoneInfoTests.cs @@ -89,7 +89,7 @@ public static void Names() // Name abbreviations, if available, are used instead public static IEnumerable Platform_TimeZoneNamesTestData() { - if (PlatformDetection.IsBrowser || (PlatformDetection.IsNotHybridGlobalizationOnApplePlatform && (PlatformDetection.IsMacCatalyst || PlatformDetection.IsiOS || PlatformDetection.IstvOS))) + if (PlatformDetection.IsBrowser) return new TheoryData { { TimeZoneInfo.FindSystemTimeZoneById(s_strPacific), "(UTC-08:00) America/Los_Angeles", null, "PST", "PDT", null }, @@ -100,7 +100,7 @@ public static IEnumerable Platform_TimeZoneNamesTestData() { s_NewfoundlandTz, "(UTC-03:30) America/St_Johns", null, "NST", "NDT", null }, { s_catamarcaTz, "(UTC-03:00) America/Argentina/Catamarca", null, "-03", "-02", null } }; - else if (PlatformDetection.IsHybridGlobalizationOnApplePlatform && (PlatformDetection.IsMacCatalyst || PlatformDetection.IsiOS || PlatformDetection.IstvOS)) + else if (PlatformDetection.IsAppleMobile) return new TheoryData { { TimeZoneInfo.FindSystemTimeZoneById(s_strPacific), "(UTC-08:00) America/Los_Angeles", null, "Pacific Standard Time", "Pacific Daylight Time", "Pacific Summer Time" }, @@ -125,7 +125,7 @@ public static IEnumerable Platform_TimeZoneNamesTestData() return new TheoryData { { TimeZoneInfo.FindSystemTimeZoneById(s_strPacific), "(UTC-08:00) Pacific Time (Los Angeles)", null, "Pacific Standard Time", "Pacific Daylight Time", "Pacific Summer Time" }, - { TimeZoneInfo.FindSystemTimeZoneById(s_strSydney), "(UTC+10:00) Eastern Australia Time (Sydney)", null, "Australian Eastern Standard Time", "Australian Eastern Daylight Time", null }, + { TimeZoneInfo.FindSystemTimeZoneById(s_strSydney), "(UTC+10:00) Eastern Australia Time (Sydney)", "(UTC+10:00) Australian Eastern Time (Sydney)", "Australian Eastern Standard Time", "Australian Eastern Daylight Time", null }, { TimeZoneInfo.FindSystemTimeZoneById(s_strPerth), "(UTC+08:00) Australian Western Standard Time (Perth)", null, "Australian Western Standard Time", "Australian Western Daylight Time", null }, { TimeZoneInfo.FindSystemTimeZoneById(s_strIran), "(UTC+03:30) Iran Time", "(UTC+03:30) Iran Standard Time (Tehran)", "Iran Standard Time", "Iran Daylight Time", "Iran Summer Time" }, { s_NewfoundlandTz, "(UTC-03:30) Newfoundland Time (St. John’s)", null, "Newfoundland Standard Time", "Newfoundland Daylight Time", null }, @@ -3171,6 +3171,7 @@ public static void AdjustmentRuleBaseUtcOffsetDeltaTest() [Fact] [ActiveIssue("https://github.com/dotnet/runtime/issues/64111", TestPlatforms.Linux)] + [ActiveIssue("https://github.com/dotnet/runtime/issues/117731", TestPlatforms.Android)] public static void NoBackwardTimeZones() { if (OperatingSystem.IsAndroid() && !OperatingSystem.IsAndroidVersionAtLeast(26)) From d3c2262a20cee4c7089542dc42cb4366ff71620f Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 7 Aug 2025 08:29:40 -0700 Subject: [PATCH 17/65] Update branding to 9.0.9 (#118349) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f772dc0fc00585..19f38542e56863 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 9.0.8 + 9.0.9 9 0 - 8 + 9 9.0.100 8.0.$([MSBuild]::Add($(PatchVersion),11)) 7.0.20 From 4baf26c256b95a9fdc9ba3c25a0a5d0ebc18d96b Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 7 Aug 2025 09:42:29 -0700 Subject: [PATCH 18/65] Merging internal commits for release/9.0 (#118451) Co-authored-by: Mirroring From 4b82f41389e47357633846b6fbdb0e890fb94bb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Aug 2025 19:09:51 +0000 Subject: [PATCH 19/65] Update dependencies from https://github.com/dotnet/emsdk build 20250811.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25411.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8fafbf61782bc..25250d8e8413a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c67a1899d6c480..0f117f0903b617 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 - + https://github.com/dotnet/emsdk - 5bc91fcaaa7e0f7ce61b993d7450679b6a545bff + 56280cb52722c6acce05584bc9221c98a01e68f6 https://github.com/dotnet/emsdk - 5bc91fcaaa7e0f7ce61b993d7450679b6a545bff + 56280cb52722c6acce05584bc9221c98a01e68f6 - + https://github.com/dotnet/emsdk - 5bc91fcaaa7e0f7ce61b993d7450679b6a545bff + 56280cb52722c6acce05584bc9221c98a01e68f6 diff --git a/eng/Versions.props b/eng/Versions.props index 48d94dafd1ca43..14f4e4319da9ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.9-servicing.25404.4 + 9.0.9-servicing.25411.3 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From 92a4ff60dd59ce16ada723bf1fe2dc74987c7bca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 00:30:05 +0000 Subject: [PATCH 20/65] Update dependencies from https://github.com/dotnet/emsdk build 20250811.5 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25411.5 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25250d8e8413a9..6d001a4d5c5f3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f117f0903b617..554632dcc9605f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 - + https://github.com/dotnet/emsdk - 56280cb52722c6acce05584bc9221c98a01e68f6 + f463f5ffd8417210fa34c746a9c3f33fe6ee461a https://github.com/dotnet/emsdk - 56280cb52722c6acce05584bc9221c98a01e68f6 + f463f5ffd8417210fa34c746a9c3f33fe6ee461a - + https://github.com/dotnet/emsdk - 56280cb52722c6acce05584bc9221c98a01e68f6 + f463f5ffd8417210fa34c746a9c3f33fe6ee461a diff --git a/eng/Versions.props b/eng/Versions.props index 14f4e4319da9ba..4d73bdc1ac10ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.9-servicing.25411.3 + 9.0.9-servicing.25411.5 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From 1cf638449048ada6b14e250e4c9f7ab77f469ad5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 11:03:53 -0700 Subject: [PATCH 21/65] [release/9.0-staging] Revert "Remove custom allocator." (#118279) * Revert "Remove custom allocator." This reverts commit c62bc5b2721673b14e702348a8ccf5f976a2b7a3. * Remove zlib custom allocator for linux. * Remove cookie check from windows custom zlib allocator * Remove zeroing of memory in zlib-allocator * Don't use custom allocator on x86 * Refine allocator condition * Update src/native/libs/System.IO.Compression.Native/CMakeLists.txt --------- Co-authored-by: Eric StJohn Co-authored-by: Jan Kotas --- .../CMakeLists.txt | 4 + .../System.IO.Compression.Native/pal_zlib.c | 8 ++ .../zlib_allocator.h | 8 ++ .../zlib_allocator_win.c | 81 +++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 src/native/libs/System.IO.Compression.Native/zlib_allocator.h create mode 100644 src/native/libs/System.IO.Compression.Native/zlib_allocator_win.c diff --git a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt index c8239e4ee04b4a..8cd64461b55694 100644 --- a/src/native/libs/System.IO.Compression.Native/CMakeLists.txt +++ b/src/native/libs/System.IO.Compression.Native/CMakeLists.txt @@ -14,6 +14,10 @@ set(NATIVECOMPRESSION_SOURCES pal_zlib.c ) +if (CLR_CMAKE_TARGET_WIN32 AND NOT CLR_CMAKE_TARGET_ARCH_I386) + list(APPEND NATIVECOMPRESSION_SOURCES "zlib_allocator_win.c") +endif() + if (NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI) if (CLR_CMAKE_USE_SYSTEM_BROTLI) diff --git a/src/native/libs/System.IO.Compression.Native/pal_zlib.c b/src/native/libs/System.IO.Compression.Native/pal_zlib.c index a04f60aa876a88..8910bab7b6d7cb 100644 --- a/src/native/libs/System.IO.Compression.Native/pal_zlib.c +++ b/src/native/libs/System.IO.Compression.Native/pal_zlib.c @@ -8,6 +8,9 @@ #ifdef _WIN32 #define c_static_assert(e) static_assert((e),"") #include "../Common/pal_utilities.h" + #if _WIN64 + #include + #endif #else #include "pal_utilities.h" #endif @@ -39,6 +42,11 @@ static int32_t Init(PAL_ZStream* stream) { z_stream* zStream = (z_stream*)calloc(1, sizeof(z_stream)); +#ifdef _WIN64 + zStream->zalloc = z_custom_calloc; + zStream->zfree = z_custom_cfree; +#endif + stream->internalState = zStream; if (zStream != NULL) diff --git a/src/native/libs/System.IO.Compression.Native/zlib_allocator.h b/src/native/libs/System.IO.Compression.Native/zlib_allocator.h new file mode 100644 index 00000000000000..cadd00bb5879c5 --- /dev/null +++ b/src/native/libs/System.IO.Compression.Native/zlib_allocator.h @@ -0,0 +1,8 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#include // voidpf + +voidpf z_custom_calloc(voidpf opaque, unsigned items, unsigned size); + +void z_custom_cfree(voidpf opaque, voidpf ptr); diff --git a/src/native/libs/System.IO.Compression.Native/zlib_allocator_win.c b/src/native/libs/System.IO.Compression.Native/zlib_allocator_win.c new file mode 100644 index 00000000000000..239a46e0bfb64b --- /dev/null +++ b/src/native/libs/System.IO.Compression.Native/zlib_allocator_win.c @@ -0,0 +1,81 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#include +#include +#include +#include /* _ASSERTE */ + +#include + +/* A custom allocator for zlib that uses a dedicated heap. + This provides better performance and avoids fragmentation + that can occur on Windows when using the default process heap. + */ + +// Gets the special heap we'll allocate from. +HANDLE GetZlibHeap() +{ + static HANDLE s_hPublishedHeap = NULL; + + // If already initialized, return immediately. + // We don't need a volatile read here since the publish is performed with release semantics. + if (s_hPublishedHeap != NULL) { return s_hPublishedHeap; } + + // Attempt to create a new heap. The heap will be dynamically sized. + HANDLE hNewHeap = HeapCreate(0, 0, 0); + + if (hNewHeap != NULL) + { + // We created a new heap. Attempt to publish it. + if (InterlockedCompareExchangePointer(&s_hPublishedHeap, hNewHeap, NULL) != NULL) + { + HeapDestroy(hNewHeap); // Somebody published before us. Destroy our heap. + hNewHeap = NULL; // Guard against accidental use later in the method. + } + } + else + { + // If we can't create a new heap, fall back to the process default heap. + InterlockedCompareExchangePointer(&s_hPublishedHeap, GetProcessHeap(), NULL); + } + + // Some thread - perhaps us, perhaps somebody else - published the heap. Return it. + // We don't need a volatile read here since the publish is performed with release semantics. + _ASSERTE(s_hPublishedHeap != NULL); + return s_hPublishedHeap; +} + +voidpf z_custom_calloc(opaque, items, size) + voidpf opaque; + unsigned items; + unsigned size; +{ + + SIZE_T cbRequested; + if (sizeof(items) + sizeof(size) <= sizeof(cbRequested)) + { + // multiplication can't overflow; no need for safeint + cbRequested = (SIZE_T)items * (SIZE_T)size; + } + else + { + // multiplication can overflow; go through safeint + if (FAILED(SIZETMult(items, size, &cbRequested))) { return NULL; } + } + + return HeapAlloc(GetZlibHeap(), 0, cbRequested); +} + +void z_custom_cfree(opaque, ptr) + voidpf opaque; + voidpf ptr; +{ + if (ptr == NULL) { return; } // ok to free nullptr + + if (!HeapFree(GetZlibHeap(), 0, ptr)) { goto Fail; } + return; + +Fail: + __fastfail(FAST_FAIL_HEAP_METADATA_CORRUPTION); +} From 4fd6f556ac5214b45036f9221113ffddd38fffe0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Aug 2025 21:55:48 +0000 Subject: [PATCH 22/65] Update dependencies from https://github.com/dotnet/emsdk build 20250814.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25414.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d001a4d5c5f3b..cc5e51c917445f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 554632dcc9605f..191297621bbc72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 - + https://github.com/dotnet/emsdk - f463f5ffd8417210fa34c746a9c3f33fe6ee461a + 387e8d196d58969060b19ee73589e48cbdbe6212 https://github.com/dotnet/emsdk - f463f5ffd8417210fa34c746a9c3f33fe6ee461a + 387e8d196d58969060b19ee73589e48cbdbe6212 - + https://github.com/dotnet/emsdk - f463f5ffd8417210fa34c746a9c3f33fe6ee461a + 387e8d196d58969060b19ee73589e48cbdbe6212 diff --git a/eng/Versions.props b/eng/Versions.props index 4d73bdc1ac10ac..4287807361c164 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.9-servicing.25411.5 + 9.0.9-servicing.25414.2 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From 818b2a0911bd11444cc4055fb361e9023e315323 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Aug 2025 03:06:28 +0000 Subject: [PATCH 23/65] Update dependencies from https://github.com/dotnet/emsdk build 20250815.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25415.4 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 19.1.0-alpha.1.25313.1 -> To Version 19.1.0-alpha.1.25414.3 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport --- NuGet.config | 2 +- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 46 +++++++++---------- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc5e51c917445f..9612ee88893617 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 191297621bbc72..771d8f8cdf7b35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 https://github.com/dotnet/command-line-api @@ -64,18 +64,18 @@ 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 - + https://github.com/dotnet/emsdk - 387e8d196d58969060b19ee73589e48cbdbe6212 + 2d597204c2a7cb5b4603722c979c43dd2d9a6b8a https://github.com/dotnet/emsdk - 387e8d196d58969060b19ee73589e48cbdbe6212 + 2d597204c2a7cb5b4603722c979c43dd2d9a6b8a - + https://github.com/dotnet/emsdk - 387e8d196d58969060b19ee73589e48cbdbe6212 + 2d597204c2a7cb5b4603722c979c43dd2d9a6b8a @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets c77fd5058ea46e9d0b58f5c11b6808d6170e4e32 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4287807361c164..17a2a6cecb3fc6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -225,39 +225,39 @@ 2.4.8 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 - 9.0.9-servicing.25414.2 + 9.0.9-servicing.25415.4 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 3.1.7 1.0.406601 From ff49e217888a1a3f916e0a6a87b2a6c8859b6539 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Aug 2025 13:07:27 +0000 Subject: [PATCH 24/65] Update dependencies from https://github.com/dotnet/emsdk build 20250818.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25418.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9612ee88893617..8fba3c6f1049d8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 771d8f8cdf7b35..75edc5bc43be14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 862b4c8bf05585cc44ceb32dc0fd060ceed06cd2 - + https://github.com/dotnet/emsdk - 2d597204c2a7cb5b4603722c979c43dd2d9a6b8a + dc8e3478c4aa5f6a103329333c2bdbcd07a07741 https://github.com/dotnet/emsdk - 2d597204c2a7cb5b4603722c979c43dd2d9a6b8a + dc8e3478c4aa5f6a103329333c2bdbcd07a07741 - + https://github.com/dotnet/emsdk - 2d597204c2a7cb5b4603722c979c43dd2d9a6b8a + dc8e3478c4aa5f6a103329333c2bdbcd07a07741 diff --git a/eng/Versions.props b/eng/Versions.props index 17a2a6cecb3fc6..5250fe6db08c09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.9-servicing.25415.4 + 9.0.9-servicing.25418.4 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From 1080780923ecf3d3f74486bbb859a9dabcaa4074 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Aug 2025 11:17:39 -0700 Subject: [PATCH 25/65] [release/9.0-staging] Disable release assert on disallowed thread re-initialization for managed C++ (#118842) * IJW workaround --------- Co-authored-by: Jan Kotas Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/coreclr/vm/ceeload.cpp | 9 +++++++++ src/coreclr/vm/ceeload.h | 2 ++ src/coreclr/vm/ceemain.cpp | 12 +++++++++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/coreclr/vm/ceeload.cpp b/src/coreclr/vm/ceeload.cpp index eb3a2d8015ccd5..50b44b6ff6761f 100644 --- a/src/coreclr/vm/ceeload.cpp +++ b/src/coreclr/vm/ceeload.cpp @@ -3746,10 +3746,19 @@ void SaveManagedCommandLine(LPCWSTR pwzAssemblyPath, int argc, LPCWSTR *argv) #endif } +static bool g_fIJWLoaded = false; + void Module::SetIsIJWFixedUp() { LIMITED_METHOD_CONTRACT; InterlockedOr((LONG*)&m_dwTransientFlags, IS_IJW_FIXED_UP); + g_fIJWLoaded = true; +} + +bool Module::HasAnyIJWBeenLoaded() +{ + LIMITED_METHOD_CONTRACT; + return g_fIJWLoaded; } #endif // !DACCESS_COMPILE diff --git a/src/coreclr/vm/ceeload.h b/src/coreclr/vm/ceeload.h index 5fee2e09f4bf79..0f9936e47f864c 100644 --- a/src/coreclr/vm/ceeload.h +++ b/src/coreclr/vm/ceeload.h @@ -1476,6 +1476,8 @@ class Module : public ModuleBase BOOL IsIJWFixedUp() { return m_dwTransientFlags & IS_IJW_FIXED_UP; } void SetIsIJWFixedUp(); + static bool HasAnyIJWBeenLoaded(); + BOOL IsBeingUnloaded() { return m_dwTransientFlags & IS_BEING_UNLOADED; } void SetBeingUnloaded(); void StartUnload(); diff --git a/src/coreclr/vm/ceemain.cpp b/src/coreclr/vm/ceemain.cpp index 3df24664ff2df5..a75353ec28f990 100644 --- a/src/coreclr/vm/ceemain.cpp +++ b/src/coreclr/vm/ceemain.cpp @@ -1815,7 +1815,17 @@ static void OsAttachThread(void* thread) if (t_flsState == FLS_STATE_INVOKED) { - _ASSERTE_ALL_BUILDS(!"Attempt to execute managed code after the .NET runtime thread state has been destroyed."); + // Managed C++ may run managed code in DllMain (e.g. during DLL_PROCESS_DETACH to run global destructors). This is + // not supported and unreliable. Historically, it happened to work most of the time. For backward compatibility, + // suppress this assert in release builds if we have encountered any mixed mode binaries. + if (Module::HasAnyIJWBeenLoaded()) + { + _ASSERTE(!"Attempt to execute managed code after the .NET runtime thread state has been destroyed."); + } + else + { + _ASSERTE_ALL_BUILDS(!"Attempt to execute managed code after the .NET runtime thread state has been destroyed."); + } } t_flsState = FLS_STATE_ARMED; From 76ece90d9ed77bbbd4057015be5a9dd5d4cba0c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 24 Aug 2025 17:37:19 +0200 Subject: [PATCH 26/65] [release/9.0-staging] [wasm][AOT] fix codegen for small structs on stack (#118416) --- src/mono/mono/mini/mini-wasm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mono/mono/mini/mini-wasm.c b/src/mono/mono/mini/mini-wasm.c index a0587570fe2bdf..55d9fceba4cbf2 100644 --- a/src/mono/mono/mini/mini-wasm.c +++ b/src/mono/mono/mini/mini-wasm.c @@ -798,7 +798,7 @@ mini_wasm_is_scalar_vtype (MonoType *type, MonoType **etype) } else if (MONO_TYPE_ISSTRUCT (t)) { if (!mini_wasm_is_scalar_vtype (t, etype)) return FALSE; - } else if (!((MONO_TYPE_IS_PRIMITIVE (t) || MONO_TYPE_IS_REFERENCE (t) || MONO_TYPE_IS_POINTER (t)))) { + } else if (!(MONO_TYPE_IS_PRIMITIVE (t) || MONO_TYPE_IS_REFERENCE (t) || MONO_TYPE_IS_POINTER (t))) { return FALSE; } else { if (etype) @@ -806,10 +806,12 @@ mini_wasm_is_scalar_vtype (MonoType *type, MonoType **etype) } } - if (etype) { - if (!(*etype)) - *etype = mono_get_int32_type (); + // empty struct + if (nfields == 0 && etype) { + *etype = m_class_get_byval_arg (mono_defaults.sbyte_class); } + g_assert (!etype || *etype); + return TRUE; } From 6defb92f2151ea3f6bff4c850dd4f34f25d7f4b0 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 3 Sep 2025 17:55:57 -0700 Subject: [PATCH 27/65] Update branding to 9.0.10 (#119280) * Update branding to 9.0.10 * Updating ImporterTests to account for the longer version string --------- Co-authored-by: Tanner Gooding --- eng/Versions.props | 4 ++-- .../Runtime/Serialization/Schema/Import/ImporterTests.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 64002194d43947..2e232eeeb3e87a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 9.0.9 + 9.0.10 9 0 - 9 + 10 9.0.100 8.0.$([MSBuild]::Add($(PatchVersion),11)) 7.0.20 diff --git a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs index 79d9c1f65078e9..f8a945c3a57c7a 100644 --- a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs +++ b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs @@ -112,13 +112,13 @@ public static IEnumerable Import_MemberData() int newlineSize = Environment.NewLine.Length; // Import(XmlSchemaSet) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas), 5060 + (168 * newlineSize) }; // 168 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas), 5064 + (168 * newlineSize) }; // 168 lines // Import(XmlSchemaSet, ICollection) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, new XmlQualifiedName[] { SchemaUtils.ValidTypeNames[0] }), 1515 + (50 * newlineSize) }; // 50 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, new XmlQualifiedName[] { SchemaUtils.ValidTypeNames[0] }), 1516 + (50 * newlineSize) }; // 50 lines // Import(XmlSchemaSet, XmlQualifiedName) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, SchemaUtils.ValidTypeNames[0]), 1515 + (50 * newlineSize) }; // 50 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, SchemaUtils.ValidTypeNames[0]), 1516 + (50 * newlineSize) }; // 50 lines // Import(XmlSchemaSet, XmlSchemaElement) // TODO From a10b79061845b903555f5b277a0e80568a383424 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 10:56:53 +0000 Subject: [PATCH 28/65] Don't use vfork on android (#118331) When we start the child process, we clear all signal handlers. This operations ends up clearing the signal handlers also for the parent process. Revert to just using fork for simplicity. Co-authored-by: Vlad Brezae --- src/native/libs/System.Native/pal_process.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/native/libs/System.Native/pal_process.c b/src/native/libs/System.Native/pal_process.c index fa5e522c36205e..ca982ebbf48a23 100644 --- a/src/native/libs/System.Native/pal_process.c +++ b/src/native/libs/System.Native/pal_process.c @@ -314,7 +314,11 @@ int32_t SystemNative_ForkAndExecProcess(const char* filename, sigfillset(&signal_set); pthread_sigmask(SIG_SETMASK, &signal_set, &old_signal_set); -#if HAVE_VFORK && !(defined(__APPLE__)) // We don't trust vfork on OS X right now. +// vfork on OS X is deprecated +// On Android, signal handlers between parent and child processes are shared with vfork, so when we reset +// the signal handlers during child startup, we end up incorrectly clearing also the ones for the parent. +#if HAVE_VFORK && !defined(__APPLE__) && !defined(TARGET_ANDROID) + // This platform has vfork(). vfork() is either a synonym for fork or provides shared memory // semantics. For a one gigabyte process, the expected performance gain of using shared memory // vfork() rather than fork() is 99.5% merely due to avoiding page faults as the kernel does not From 58cc46dfeaa14f46dc07b9917ff1b04cf133d14f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 10:57:28 +0000 Subject: [PATCH 29/65] [release/9.0-staging] [mono][debugger] Fix assertion when stepping (#118459) * Fix assertion when stepping * Backport of https://github.com/dotnet/runtime/pull/118542/ --------- Co-authored-by: Thays Grazia --- src/mono/mono/mini/mini-arm64.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mono/mono/mini/mini-arm64.c b/src/mono/mono/mini/mini-arm64.c index c42684ce693527..8410f0939f85c5 100644 --- a/src/mono/mono/mini/mini-arm64.c +++ b/src/mono/mono/mini/mini-arm64.c @@ -4204,7 +4204,7 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb) arm_ldrx (code, ARMREG_IP1, info_var->inst_basereg, GTMREG_TO_INT (info_var->inst_offset)); /* Add the bp_tramp_offset */ - val = ((bp_tramp_offset / 4) * sizeof (target_mgreg_t)) + MONO_STRUCT_OFFSET (SeqPointInfo, bp_addrs); + val = (bp_tramp_offset * sizeof (target_mgreg_t)) + MONO_STRUCT_OFFSET (SeqPointInfo, bp_addrs); /* Load the info->bp_addrs [bp_tramp_offset], which is either 0 or the address of the bp trampoline */ code = emit_ldrx (code, ARMREG_IP1, ARMREG_IP1, val); /* Skip the load if its 0 */ @@ -6873,9 +6873,7 @@ mono_arch_set_breakpoint (MonoJitInfo *ji, guint8 *ip) if (enable_ptrauth) NOT_IMPLEMENTED; - g_assert (native_offset % 4 == 0); - g_assert (info->bp_addrs [native_offset / 4] == 0); - info->bp_addrs [native_offset / 4] = (guint8*)mini_get_breakpoint_trampoline (); + info->bp_addrs [native_offset] = (guint8*)mini_get_breakpoint_trampoline (); } else { /* ip points to an ldrx */ code += 4; @@ -6898,8 +6896,7 @@ mono_arch_clear_breakpoint (MonoJitInfo *ji, guint8 *ip) if (enable_ptrauth) NOT_IMPLEMENTED; - g_assert (native_offset % 4 == 0); - info->bp_addrs [native_offset / 4] = NULL; + info->bp_addrs [native_offset] = NULL; } else { /* ip points to an ldrx */ code += 4; @@ -6967,7 +6964,7 @@ mono_arch_get_seq_point_info (guint8 *code) ji = mini_jit_info_table_find (code); g_assert (ji); - info = g_malloc0 (sizeof (SeqPointInfo) + (ji->code_size / 4) * sizeof(guint8*)); + info = g_malloc0 (sizeof (SeqPointInfo) + (ji->code_size) * sizeof(guint8*)); info->ss_tramp_addr = &ss_trampoline; From 89f3ed10a95a9a94b731a99501e0a54cf2c4dc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 4 Sep 2025 12:59:56 +0200 Subject: [PATCH 30/65] [maccatalyst] Check for -Wno-overriding-option for compatibility with clang in Xcode 16.3+ (#119260) (#119301) https://github.com/llvm/llvm-project/commit/1c66d08b0137cef7761b8220d3b7cb7833f57cdb renamed the option `-Wno-overriding-t-option` to `-Wno-overriding-option`. This caused some configure time checks in CMake to fail because of hitting an unknown compiler option. (cherry picked from commit 4b8a47869b384ccdb4e885d8efcf6a53c3467dd3) --- eng/native/configurecompiler.cmake | 18 +++++++++++++++--- src/mono/CMakeLists.txt | 21 +++++++++++++++++++++ src/mono/mono.proj | 2 -- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index ebb4a427f2896f..109b947e4eb6fb 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -666,9 +666,21 @@ if (CLR_CMAKE_HOST_UNIX) # a value for mmacosx-version-min (blank CMAKE_OSX_DEPLOYMENT_TARGET gets # replaced with a default value, and always gets expanded to an OS version. # https://gitlab.kitware.com/cmake/cmake/-/issues/20132 - # We need to disable the warning that -tagret replaces -mmacosx-version-min - set(DISABLE_OVERRIDING_MIN_VERSION_ERROR -Wno-overriding-t-option) - add_link_options(-Wno-overriding-t-option) + # We need to disable the warning that -target replaces -mmacosx-version-min + # + # With https://github.com/llvm/llvm-project/commit/1c66d08b0137cef7761b8220d3b7cb7833f57cdb clang renamed the option so we need to check for both + check_c_compiler_flag("-Wno-overriding-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + set(DISABLE_OVERRIDING_MIN_VERSION_ERROR -Wno-overriding-option) + else() + check_c_compiler_flag("-Wno-overriding-t-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + set(DISABLE_OVERRIDING_MIN_VERSION_ERROR -Wno-overriding-t-option) + else() + message(FATAL_ERROR "Compiler does not support -Wno-overriding-option or -Wno-overriding-t-option, needed for Mac Catalyst builds.") + endif() + endif() + add_link_options(${DISABLE_OVERRIDING_MIN_VERSION_ERROR}) if(CLR_CMAKE_HOST_ARCH_ARM64) set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "arm64-apple-ios15.0-macabi") add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET}) diff --git a/src/mono/CMakeLists.txt b/src/mono/CMakeLists.txt index fabeafa41e3e79..89597c85659fd8 100644 --- a/src/mono/CMakeLists.txt +++ b/src/mono/CMakeLists.txt @@ -552,6 +552,27 @@ if(GCC) set(WARNINGS "${WARNINGS} -Qunused-arguments -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign -Wno-return-stack-address -Wno-constant-logical-operand -Wno-zero-length-array -Wno-asm-operand-widths") endif() + if (HOST_MACCAT) + # Somewhere between CMake 3.17 and 3.19.4, it became impossible to not pass + # a value for mmacosx-version-min (blank CMAKE_OSX_DEPLOYMENT_TARGET gets + # replaced with a default value, and always gets expanded to an OS version. + # https://gitlab.kitware.com/cmake/cmake/-/issues/20132 + # We need to disable the warning that -target replaces -mmacosx-version-min + # + # With https://github.com/llvm/llvm-project/commit/1c66d08b0137cef7761b8220d3b7cb7833f57cdb clang renamed the option so we need to check for both + check_c_compiler_flag("-Wno-overriding-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_OPTION) + set(WARNINGS "${WARNINGS} -Wno-overriding-option") + else() + check_c_compiler_flag("-Wno-overriding-t-option" COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + if (COMPILER_SUPPORTS_W_NO_OVERRIDING_T_OPTION) + set(WARNINGS "${WARNINGS} -Wno-overriding-t-option") + else() + message(FATAL_ERROR "Compiler does not support -Wno-overriding-option or -Wno-overriding-t-option, needed for Mac Catalyst builds.") + endif() + endif() + endif() + check_c_compiler_flag("-Werror=incompatible-pointer-types" WERROR_INCOMPATIBLE_POINTER_TYPES) if(WERROR_INCOMPATIBLE_POINTER_TYPES) set(WERROR_C "${WERROR_C} -Werror=incompatible-pointer-types") diff --git a/src/mono/mono.proj b/src/mono/mono.proj index 8bfbb710823937..d039812dfe45b0 100644 --- a/src/mono/mono.proj +++ b/src/mono/mono.proj @@ -540,8 +540,6 @@ JS_ENGINES = [NODE_JS] <_MonoCMakeArgs Include="-DCMAKE_SYSTEM_VARIANT=maccatalyst" /> - - <_MonoCPPFLAGS Include="-Wno-overriding-t-option" /> <_MonoCFlags Condition="'$(TargetArchitecture)' == 'arm64'" Include="-target arm64-apple-ios$(MacCatalystVersionMin)-macabi" /> <_MonoCFlags Condition="'$(TargetArchitecture)' == 'x64'" Include="-target x86_64-apple-ios$(MacCatalystVersionMin)-macabi" /> <_MonoCFLAGS Condition="'$(TargetArchitecture)' == 'arm64'" Include="-arch arm64" /> From 981a6107de2b1d1ae04d540b2c5918ac4edc73a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?= <11718369+ManickaP@users.noreply.github.com> Date: Tue, 9 Sep 2025 08:28:40 +0200 Subject: [PATCH 31/65] [release/9.0-staging][HTTP] Stress fix for docker compose (#119455) * [HTTP] Stress fix for docker compose Backport of #119274 to release/10.0 /cc @ManickaP ## Customer Impact - [ ] Customer reported - [x] Found internally Wind down docker compose between individual runs in HTTP stress. ## Regression - [x] Yes - [ ] No Infra update. ## Testing CI stress runs. ## Risk Low. Test only change. * Remove unnecessary docker-compose down commands Removed 'docker-compose down' command from HTTP 1.1 and 2.0 stress test configurations. --- eng/pipelines/libraries/stress/http.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index fdfd004b96eb3e..9beb1e26c2fc2f 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -73,6 +73,7 @@ extends: export SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/2.0" export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 2.0" export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 2.0" + docker-compose down docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 2.0 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) @@ -83,6 +84,7 @@ extends: export SERVER_DUMPS_SHARE="$(Build.ArtifactStagingDirectory)/dumps/server/1.1" export HTTPSTRESS_CLIENT_ARGS="$HTTPSTRESS_CLIENT_ARGS -http 1.1" export HTTPSTRESS_SERVER_ARGS="$HTTPSTRESS_SERVER_ARGS -http 1.1" + docker-compose down docker-compose up --abort-on-container-exit --no-color displayName: Run HttpStress - HTTP 1.1 condition: and(eq(variables['buildRuntime.succeeded'], 'true'), eq(variables['buildStress.succeeded'], 'true')) From df7805bc5811f3dc6c9ecc122d48716c784624dc Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Wed, 10 Sep 2025 12:01:45 -0700 Subject: [PATCH 32/65] Preserve lock id members (#119281) --- .../src/ILLink/ILLink.Descriptors.Shared.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml index a6c2ad4619d923..eb94f795ab2dd6 100644 --- a/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml +++ b/src/libraries/System.Private.CoreLib/src/ILLink/ILLink.Descriptors.Shared.xml @@ -72,6 +72,11 @@ + + + + + From f26e4f18576a9298976df57b14502be46c03db7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Sep 2025 13:27:22 -0700 Subject: [PATCH 33/65] [release/9.0] Update dependencies from dotnet/emsdk (#118940) * Update dependencies from https://github.com/dotnet/emsdk build 20250820.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.9-servicing.25420.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250901.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.9-servicing.25451.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250902.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.10-servicing.25452.4 * Update dependencies from https://github.com/dotnet/emsdk build 20250903.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.10-servicing.25453.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 +---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 52627ab5e8c7a3..2cab12d8cb54e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a07a0e84a695dc..cc6d9f35698e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 788a8a7481c01a7d235110cdea2ca5bfb34210d4 - + https://github.com/dotnet/emsdk - dc8e3478c4aa5f6a103329333c2bdbcd07a07741 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 - + https://github.com/dotnet/emsdk - dc8e3478c4aa5f6a103329333c2bdbcd07a07741 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 - + https://github.com/dotnet/emsdk - dc8e3478c4aa5f6a103329333c2bdbcd07a07741 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 diff --git a/eng/Versions.props b/eng/Versions.props index 2e232eeeb3e87a..685e8901739d87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,8 +243,8 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.9-servicing.25418.4 - 9.0.9 + 9.0.10-servicing.25453.2 + 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda From 97c8123a8689604808537bb5540df2861fec3300 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 15:57:21 +0200 Subject: [PATCH 34/65] [release/9.0-staging] Update dependencies from dotnet/hotreload-utils (#118151) * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250728.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25378.3 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250804.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25404.2 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250811.3 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25411.3 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250818.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25418.2 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250825.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25425.2 * Update dependencies from https://github.com/dotnet/hotreload-utils build 20250901.2 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25330.3 -> To Version 9.0.0-alpha.0.25451.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index ce3b78795e70f2..00cd886597dd2b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,9 @@ - - - - - + https://github.com/dotnet/cecil - 788a8a7481c01a7d235110cdea2ca5bfb34210d4 + fe6e09f8a1f50c772f619a60d0940e0f0a47922a diff --git a/eng/Versions.props b/eng/Versions.props index e067b160f5435b..3d1f2c05806a3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,7 +215,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25370.2 + 0.11.5-alpha.25431.3 9.0.0-rtm.24511.16 From 912f1399c9d570a43f45aa27fd9572144446b070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 16:11:00 +0200 Subject: [PATCH 36/65] [release/9.0-staging] Update dependencies from dotnet/icu (#118423) * Update dependencies from https://github.com/dotnet/icu build 20250804.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25404.1 * Update dependencies from https://github.com/dotnet/icu build 20250808.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25408.2 * Update dependencies from https://github.com/dotnet/icu build 20250811.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25411.1 * Update dependencies from https://github.com/dotnet/icu build 20250814.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25414.1 * Update dependencies from https://github.com/dotnet/icu build 20250816.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25416.1 * Update dependencies from https://github.com/dotnet/icu build 20250818.2 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25418.2 * Update dependencies from https://github.com/dotnet/icu build 20250820.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25420.1 * Update dependencies from https://github.com/dotnet/icu build 20250901.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25451.1 * Update dependencies from https://github.com/dotnet/icu build 20250902.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25452.1 * Update dependencies from https://github.com/dotnet/icu build 20250903.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25371.1 -> To Version 9.0.0-rtm.25453.1 --------- Co-authored-by: dotnet-maestro[bot] --- 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 a1ba96ac7d6538..133b6b03c3f5d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 8651fab55b69849f0a4001949df126fea4d4b419 + 0df8449153b9b92de618c4c3f5b2590aae9d6ff2 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 3d1f2c05806a3c..74dbfccac7dee2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25371.1 + 9.0.0-rtm.25453.1 9.0.0-rtm.24466.4 2.4.8 From 99d8772dd743bb6d32baaa6321d0853952796ab8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Sep 2025 16:12:49 +0200 Subject: [PATCH 37/65] [release/9.0-staging] Update dependencies from dotnet/roslyn (#118193) * Update dependencies from https://github.com/dotnet/roslyn build 20250729.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25379.5 * Update dependencies from https://github.com/dotnet/roslyn build 20250804.5 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25404.5 * Update dependencies from https://github.com/dotnet/roslyn build 20250813.4 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25413.4 * Update dependencies from https://github.com/dotnet/roslyn build 20250824.2 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25424.2 * Update dependencies from https://github.com/dotnet/roslyn build 20250829.9 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25377.4 -> To Version 4.12.0-3.25429.9 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 133b6b03c3f5d2..d5be48b96b95d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -360,17 +360,17 @@ https://github.com/dotnet/runtime-assets c77fd5058ea46e9d0b58f5c11b6808d6170e4e32 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe https://github.com/dotnet/roslyn-analyzers @@ -381,9 +381,9 @@ 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn - 5f78534e8ac55b615a3540e7c1ffedee9ced6e1e + 75273243e5beb19c5e2ae8e58999b21b451c22fe diff --git a/eng/Versions.props b/eng/Versions.props index 74dbfccac7dee2..f6bbfa0b55ab64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,9 +44,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 - 4.12.0-3.25377.4 + 4.12.0-3.25429.9 + 4.12.0-3.25429.9 + 4.12.0-3.25429.9 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 - 9.0.0-beta.25313.1 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 + 9.0.0-beta.25414.2 1.0.0-prerelease.24462.2 1.0.0-prerelease.24462.2 From 95816374ff9a512b2f7e56f906f0ce301c41be31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:34:16 -0700 Subject: [PATCH 39/65] Update dependencies from https://github.com/dotnet/icu build 20250911.2 (#119619) Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25453.1 -> To Version 9.0.0-rtm.25461.2 Co-authored-by: dotnet-maestro[bot] --- 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 496fafc9e7133c..be771a4c4b96a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 0df8449153b9b92de618c4c3f5b2590aae9d6ff2 + 14d2dd6de03ab7cdd95b8ca5dd47feeefa951103 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index f9efaf04487933..59994f388182fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25453.1 + 9.0.0-rtm.25461.2 9.0.0-rtm.24466.4 2.4.8 From 41a48abc04508bb5992cb0c6310ac51a8c9dde3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:34:42 -0700 Subject: [PATCH 40/65] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250902.2 (#119598) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25272.2 -> To Version 9.0.0-alpha.1.25452.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be771a4c4b96a9..e38d38148b9b17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,9 +79,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 9859d82ffce48f49b5e93fa46a38bdddc4ba26be + 745de7d839fdd3b5884d72e953badcfb15493d13 From 76ce7a11f683f1edb4ac3e821d3abcebc5b70ef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 08:37:20 -0700 Subject: [PATCH 41/65] Update dependencies from https://github.com/dotnet/cecil build 20250911.1 (#119620) Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil From Version 0.11.5-alpha.25431.3 -> To Version 0.11.5-alpha.25461.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e38d38148b9b17..d91f7b29b7d626 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,14 +54,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - fe6e09f8a1f50c772f619a60d0940e0f0a47922a + 026a4f32987a274633ed0885ea8b54e790fc94f4 - + https://github.com/dotnet/cecil - fe6e09f8a1f50c772f619a60d0940e0f0a47922a + 026a4f32987a274633ed0885ea8b54e790fc94f4 diff --git a/eng/Versions.props b/eng/Versions.props index 59994f388182fc..04fc9356ccb7a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,7 +215,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25431.3 + 0.11.5-alpha.25461.1 9.0.0-rtm.24511.16 From 735e535d45822c9e32aa70f94fcd25d4955a877e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 12 Sep 2025 10:07:36 -0700 Subject: [PATCH 42/65] [release/9.0-staging] Update dependencies from dotnet/xharness (#119051) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/xharness build 20250817.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25375.3 -> To Version 9.0.0-prerelease.25417.1 * Update dependencies from https://github.com/dotnet/xharness build 20250826.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25375.3 -> To Version 9.0.0-prerelease.25426.1 * Fix merge --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 8 +++++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3bff7a26fb1843..7fcec77f199e6e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "9.0.0-prerelease.25375.3", + "version": "9.0.0-prerelease.25426.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d91f7b29b7d626..0bcf65da517b97 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -320,17 +320,17 @@ https://github.com/dotnet/runtime b030c4dfdfa1bf287f10f96006619a06bc2000ae - + https://github.com/dotnet/xharness - 604c13925074041a51e4533959477c8b6888dcf5 + 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/xharness - 604c13925074041a51e4533959477c8b6888dcf5 + 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/xharness - 604c13925074041a51e4533959477c8b6888dcf5 + 7b6f58237ff2355392960408f4d9fd98dfe58f9b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 04fc9356ccb7a2..a805223ecec0aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -184,9 +184,11 @@ 1.4.0 17.4.0-preview-20220707-01 - 9.0.0-prerelease.25375.3 - 9.0.0-prerelease.25375.3 - 9.0.0-prerelease.25375.3 + + 9.0.0-prerelease.25426.1 + 9.0.0-prerelease.25426.1 + 9.0.0-prerelease.25426.1 + 9.0.0-alpha.0.25451.2 3.12.0 4.5.0 From 11c443c31bc3e70f4edc3602be473f92b5986c27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 13 Sep 2025 10:50:21 -0700 Subject: [PATCH 43/65] [automated] Merge branch 'release/9.0' => 'release/9.0-staging' (#118492) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/emsdk build 20250721.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.8-servicing.25371.3 * Recover the SDK feed in the NuGet.org * Update dependencies from https://github.com/dotnet/emsdk build 20250804.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25404.4 * Update branding to 9.0.9 (#118349) * Merging internal commits for release/9.0 (#118451) Co-authored-by: Mirroring * Update dependencies from https://github.com/dotnet/emsdk build 20250811.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25411.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250811.5 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25411.5 * Update dependencies from https://github.com/dotnet/emsdk build 20250814.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25414.2 * Update dependencies from https://github.com/dotnet/emsdk build 20250815.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25415.4 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 19.1.0-alpha.1.25313.1 -> To Version 19.1.0-alpha.1.25414.3 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport * Update dependencies from https://github.com/dotnet/emsdk build 20250818.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.8-servicing.25353.1 -> To Version 9.0.9-servicing.25418.4 * Update branding to 9.0.10 (#119280) * Update branding to 9.0.10 * Updating ImporterTests to account for the longer version string --------- Co-authored-by: Tanner Gooding * [release/9.0] Update dependencies from dotnet/emsdk (#118940) * Update dependencies from https://github.com/dotnet/emsdk build 20250820.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.9-servicing.25420.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250901.3 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.9-servicing.25451.3 * Update dependencies from https://github.com/dotnet/emsdk build 20250902.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.10-servicing.25452.4 * Update dependencies from https://github.com/dotnet/emsdk build 20250903.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.9-servicing.25418.4 -> To Version 9.0.10-servicing.25453.2 --------- Co-authored-by: dotnet-maestro[bot] --------- Co-authored-by: Mirroring Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tarek Mahmoud Sayed <10833894+tarekgh@users.noreply.github.com> Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Co-authored-by: David Cantú Co-authored-by: Tanner Gooding Co-authored-by: Sean Reeser Co-authored-by: Tanner Gooding Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> --- NuGet.config | 1 + eng/Version.Details.xml | 100 +++++++++--------- eng/Versions.props | 52 ++++----- .../Schema/Import/ImporterTests.cs | 6 +- 4 files changed, 80 insertions(+), 79 deletions(-) diff --git a/NuGet.config b/NuGet.config index 00cd886597dd2b..2cab12d8cb54e5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0bcf65da517b97..6f1b295ec30c0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 https://github.com/dotnet/command-line-api @@ -64,18 +64,18 @@ 026a4f32987a274633ed0885ea8b54e790fc94f4 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets ea395c81a91ed32f9d4573707b326dc0d966d984 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 - + https://github.com/dotnet/llvm-project - abf4d7006526b85c72f91b267f98a40c1bd32314 + 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a805223ecec0aa..ecc51fe7d54c2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 9.0.8 + 9.0.10 9 0 - 8 + 10 9.0.100 8.0.$([MSBuild]::Add($(PatchVersion),11)) 7.0.20 @@ -227,39 +227,39 @@ 2.4.8 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 - 9.0.8-servicing.25353.1 - 9.0.8 + 9.0.10-servicing.25453.2 + 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 - 19.1.0-alpha.1.25313.1 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25414.3 3.1.7 1.0.406601 diff --git a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs index 79d9c1f65078e9..f8a945c3a57c7a 100644 --- a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs +++ b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/Import/ImporterTests.cs @@ -112,13 +112,13 @@ public static IEnumerable Import_MemberData() int newlineSize = Environment.NewLine.Length; // Import(XmlSchemaSet) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas), 5060 + (168 * newlineSize) }; // 168 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas), 5064 + (168 * newlineSize) }; // 168 lines // Import(XmlSchemaSet, ICollection) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, new XmlQualifiedName[] { SchemaUtils.ValidTypeNames[0] }), 1515 + (50 * newlineSize) }; // 50 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, new XmlQualifiedName[] { SchemaUtils.ValidTypeNames[0] }), 1516 + (50 * newlineSize) }; // 50 lines // Import(XmlSchemaSet, XmlQualifiedName) - yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, SchemaUtils.ValidTypeNames[0]), 1515 + (50 * newlineSize) }; // 50 lines + yield return new object[] { (XsdDataContractImporter imp) => imp.Import(SchemaUtils.PositiveSchemas, SchemaUtils.ValidTypeNames[0]), 1516 + (50 * newlineSize) }; // 50 lines // Import(XmlSchemaSet, XmlSchemaElement) // TODO From 8d99e410bcb8dfba0f2f576587743ae6189ad559 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 09:56:54 +0200 Subject: [PATCH 44/65] Do not check status, it's irrelevant whether to asses if H/3 is working. (#119522) Co-authored-by: ManickaP --- .../tests/FunctionalTests/HttpClientHandlerTest.Http3.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs index 358c1a0c7ff287..56a1159483f73d 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/HttpClientHandlerTest.Http3.cs @@ -780,7 +780,6 @@ public async Task Public_Interop_ExactVersion_Success(string uri) }; using HttpResponseMessage response = await client.SendAsync(request).WaitAsync(TimeSpan.FromSeconds(20)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(3, response.Version.Major); } @@ -799,7 +798,6 @@ public async Task Public_Interop_ExactVersion_BufferContent_Success(string uri) }; using HttpResponseMessage response = await client.SendAsync(request, HttpCompletionOption.ResponseContentRead).WaitAsync(TimeSpan.FromSeconds(20)); - Assert.Equal(HttpStatusCode.OK, response.StatusCode); Assert.Equal(3, response.Version.Major); var content = await response.Content.ReadAsStringAsync(); From b96e87d503567005c3c24b15ec1c7dfd0b1164ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 13:51:11 +0000 Subject: [PATCH 45/65] Disable test parallelization in OleDB tests (#119626) Attempts to fix #87783 Co-authored-by: Shay Rojansky --- src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs diff --git a/src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs b/src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs new file mode 100644 index 00000000000000..6349558b2d1c35 --- /dev/null +++ b/src/libraries/System.Data.OleDb/tests/AssemblyInfo.cs @@ -0,0 +1,7 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Xunit; + +// The OleDB tests use the ACE driver, which has issues with concurrency. +[assembly: CollectionBehavior(DisableTestParallelization = true)] From 02031bbe2a1a16801613d97ae2ea65ae80f7f37f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:41:06 -0700 Subject: [PATCH 46/65] Update dependencies from https://github.com/dotnet/icu build 20250912.2 (#119690) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25461.2 -> To Version 9.0.0-rtm.25462.2 Co-authored-by: dotnet-maestro[bot] --- 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 6f1b295ec30c0c..a8c2f92ac49f25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 14d2dd6de03ab7cdd95b8ca5dd47feeefa951103 + fb10ef725c9521c67c21e01e025ce263498f7e0b https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index ecc51fe7d54c2d..417d469d6b4996 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25461.2 + 9.0.0-rtm.25462.2 9.0.0-rtm.24466.4 2.4.8 From a4bcef78b0bcc0923e97dd6f695c1e20adf43e7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:41:20 +0000 Subject: [PATCH 47/65] [release/9.0-staging] Update dependencies from dotnet/arcade (#118224) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/arcade build 20250730.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25380.1 * Update dependencies from https://github.com/dotnet/arcade build 20250806.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25406.1 * Update dependencies from https://github.com/dotnet/arcade build 20250807.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25407.2 * Update dependencies from https://github.com/dotnet/arcade build 20250815.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25415.3 * Update dependencies from https://github.com/dotnet/arcade build 20250828.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25428.3 * Bump SdkVersionForWorkloadTesting * Update dependencies from https://github.com/dotnet/arcade build 20250910.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25460.1 * Bump SdkVersionForWorkloadTesting * Update dependencies from https://github.com/dotnet/arcade build 20250912.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25366.1 -> To Version 9.0.0-beta.25462.4 Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner From Version 2.9.0-beta.25366.1 -> To Version 2.9.0-beta.25462.4 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Alexander Köplinger --- eng/Version.Details.xml | 84 +++++++++---------- eng/Versions.props | 34 ++++---- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 18 ++-- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 19 +++-- .../core-templates/job/source-build.yml | 4 + .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 4 + .../core-templates/jobs/source-build.yml | 5 ++ .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +-- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 ++-- .../core-templates/steps/source-build.yml | 11 ++- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- global.json | 10 +-- 23 files changed, 143 insertions(+), 112 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8c2f92ac49f25..93948128919525 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/arcade - 1a2e280a031aaed0dca606ec8c59c6fe0f9bfc7f + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 417d469d6b4996..1942115c017c3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 2.9.0-beta.25366.1 - 9.0.0-beta.25366.1 - 2.9.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 - 9.0.0-beta.25366.1 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 2.9.0-beta.25462.4 + 9.0.0-beta.25462.4 + 2.9.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 + 9.0.0-beta.25462.4 1.4.0 @@ -265,7 +265,7 @@ 1.0.406601 - 9.0.107 + 9.0.110 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2f3e..792b60b49d424d 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0323ae..facb415ca6ff35 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0e09c9..8da43d3b5837a1 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' @@ -164,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -187,7 +189,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -198,7 +200,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -242,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8ebbc3ab..edefa789d360f3 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e3196727..a58c8a418e8a99 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,10 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -54,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -72,7 +81,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,12 +102,12 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -113,7 +122,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +151,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58fd9a8..5baedac1e03dd4 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b3ee96..662b9fcce154fc 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252cc65c8..4571a7864df6bf 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be4341c62f..bf33cdc2cc7787 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,8 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +119,5 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6de6e..0b408a67bd51cd 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9214e5..2ee8bbfff54553 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe721..a7abd58c4bb609 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3cf1..4085512b690910 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094824f4..7f5b84c4cb827f 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c5231912f..0623ac6e112309 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b7541b..0718e4ba902e8f 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -97,7 +101,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0ba88..4bf4cf41bd7c76 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505aa602..81ea7a261f2d4a 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b3a0..f1311bbb1b33d9 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fcea519..5bdd3dd85fd2be 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index fbcea3f120a495..cdac5c7bdcad75 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.107", + "version": "9.0.110", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.107" + "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25366.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25366.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 81289e992f6d0845343857c9794deb0c413f2428 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:45:15 -0700 Subject: [PATCH 48/65] Update dependencies from https://github.com/dotnet/runtime-assets build 20250912.1 (#119677) On relative base path root Microsoft.DotNet.CilStrip.Sources , System.ComponentModel.TypeConverter.TestData , System.Data.Common.TestData , System.Drawing.Common.TestData , System.Formats.Tar.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.Numerics.TestData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Text.RegularExpressions.TestData , System.Windows.Extensions.TestData From Version 9.0.0-beta.25414.2 -> To Version 9.0.0-beta.25462.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 28 ++++++++++----------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93948128919525..a6d171b992a999 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,57 +174,57 @@ https://github.com/dotnet/arcade e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b https://github.com/dotnet/llvm-project @@ -356,9 +356,9 @@ https://github.com/dotnet/hotreload-utils ecd239d9752aaa9e56878af38b499e0a987a11d1 - + https://github.com/dotnet/runtime-assets - ea395c81a91ed32f9d4573707b326dc0d966d984 + 36490ea19fe9622e76fb3534069a6459ff56353b https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 1942115c017c3e..e2146b7407cbce 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,20 +141,20 @@ 8.0.0 8.0.0 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 - 9.0.0-beta.25414.2 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 + 9.0.0-beta.25462.1 1.0.0-prerelease.24462.2 1.0.0-prerelease.24462.2 From 003505d3b9493cefcb8f32caa4bea46597f4da51 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:48:03 -0700 Subject: [PATCH 49/65] Update dependencies from https://github.com/dotnet/hotreload-utils build 20250912.1 (#119635) On relative base path root Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 9.0.0-alpha.0.25451.2 -> To Version 9.0.0-alpha.0.25462.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tanner Gooding --- 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 a6d171b992a999..f87b3a1ef63268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -352,9 +352,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 9d7532585ce71e30ab55f0364d3cecccaf0775d1 - + https://github.com/dotnet/hotreload-utils - ecd239d9752aaa9e56878af38b499e0a987a11d1 + 0334eb13c37ab4d8d1b405952e838fc8cad195be https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index e2146b7407cbce..3a2e40730936a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,7 +189,7 @@ 9.0.0-prerelease.25426.1 9.0.0-prerelease.25426.1 - 9.0.0-alpha.0.25451.2 + 9.0.0-alpha.0.25462.1 3.12.0 4.5.0 6.0.0 From 1aed58f86a16a65d88c5469ed34ccef6ff143d43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 08:48:55 -0700 Subject: [PATCH 50/65] Update dependencies from https://github.com/dotnet/emsdk build 20250912.3 (#119669) On relative base path root Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.10-servicing.25453.2 -> To Version 9.0.10-servicing.25462.3 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.10 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cab12d8cb54e5..803b50e7acc90d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc6d9f35698e08..55068ae0f39632 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 788a8a7481c01a7d235110cdea2ca5bfb34210d4 - + https://github.com/dotnet/emsdk - 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 + fb8e4a9c44328f916017e4994d5bd24c9115dbbf https://github.com/dotnet/emsdk - 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 + fb8e4a9c44328f916017e4994d5bd24c9115dbbf - + https://github.com/dotnet/emsdk - 1e8a5c863a28d54e6e7f868db4add87c86cc32b6 + fb8e4a9c44328f916017e4994d5bd24c9115dbbf diff --git a/eng/Versions.props b/eng/Versions.props index 685e8901739d87..1f299061e56112 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.10-servicing.25453.2 + 9.0.10-servicing.25462.3 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From e35719215f21756c39d3dd0a7f74c6ae45728beb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 15 Sep 2025 11:50:46 -0700 Subject: [PATCH 51/65] Fix recursion issue found in 109779 (#119128) Co-authored-by: Mike McLaughlin --- src/coreclr/pal/src/thread/process.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/coreclr/pal/src/thread/process.cpp b/src/coreclr/pal/src/thread/process.cpp index 9504e6995c5506..01f67342cc1a54 100644 --- a/src/coreclr/pal/src/thread/process.cpp +++ b/src/coreclr/pal/src/thread/process.cpp @@ -2444,8 +2444,11 @@ PROCCreateCrashDump( size_t previousThreadId = InterlockedCompareExchange(&g_crashingThreadId, currentThreadId, 0); if (previousThreadId != 0) { - // Should never reenter or recurse - _ASSERTE(previousThreadId != currentThreadId); + // Return error if reenter this code + if (previousThreadId == currentThreadId) + { + return false; + } // The first thread generates the crash info and any other threads are blocked while (true) From ac81459d96b1558152b03f5fd70a81d3a7bf4e44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Sep 2025 08:41:59 -0700 Subject: [PATCH 52/65] Update dependencies from https://github.com/dotnet/cecil build 20250914.3 (#119742) On relative base path root Microsoft.SourceBuild.Intermediate.cecil , Microsoft.DotNet.Cecil From Version 0.11.5-alpha.25461.1 -> To Version 0.11.5-alpha.25464.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f87b3a1ef63268..c2a7d325e278b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,14 +54,14 @@ 803d8598f98fb4efd94604b32627ee9407f246db - + https://github.com/dotnet/cecil - 026a4f32987a274633ed0885ea8b54e790fc94f4 + e5381291dd01d040b5b111f3a2ee8508ec990d78 - + https://github.com/dotnet/cecil - 026a4f32987a274633ed0885ea8b54e790fc94f4 + e5381291dd01d040b5b111f3a2ee8508ec990d78 diff --git a/eng/Versions.props b/eng/Versions.props index 3a2e40730936a0..ebf9e1c0d06218 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,7 +217,7 @@ 9.0.0-preview-20241010.1 - 0.11.5-alpha.25461.1 + 0.11.5-alpha.25464.3 9.0.0-rtm.24511.16 From ae38547ca7c94580379b62be534e8acc08c938b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 06:51:25 -0700 Subject: [PATCH 53/65] [release/9.0] Update dependencies from dotnet/emsdk (#119753) * Update dependencies from https://github.com/dotnet/emsdk build 20250915.2 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.10-servicing.25462.3 -> To Version 9.0.10-servicing.25465.2 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.10 * Update dependencies from https://github.com/dotnet/emsdk build 20250916.2 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.10-servicing.25462.3 -> To Version 9.0.10-servicing.25466.2 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.10 Dependency coherency updates On relative base path root runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 19.1.0-alpha.1.25414.3 -> To Version 19.1.0-alpha.1.25462.1 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) * Update dependencies from https://github.com/dotnet/emsdk build 20250916.6 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.10-servicing.25462.3 -> To Version 9.0.10-servicing.25466.6 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.10 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 46 +++++++++---------- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/NuGet.config b/NuGet.config index 803b50e7acc90d..b8b926937be3b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55068ae0f39632..c0049486f34301 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 https://github.com/dotnet/command-line-api @@ -64,18 +64,18 @@ 788a8a7481c01a7d235110cdea2ca5bfb34210d4 - + https://github.com/dotnet/emsdk - fb8e4a9c44328f916017e4994d5bd24c9115dbbf + 2ab31537e6b375f8563a1d67936236797a56e3fa https://github.com/dotnet/emsdk - fb8e4a9c44328f916017e4994d5bd24c9115dbbf + 2ab31537e6b375f8563a1d67936236797a56e3fa - + https://github.com/dotnet/emsdk - fb8e4a9c44328f916017e4994d5bd24c9115dbbf + 2ab31537e6b375f8563a1d67936236797a56e3fa @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets c77fd5058ea46e9d0b58f5c11b6808d6170e4e32 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 - + https://github.com/dotnet/llvm-project - 5ad97991b0fc050c73bc3d49d425b1a0fbb8d8d2 + 165cfbe7ede6c224fccad86059ea5198a97f9297 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1f299061e56112..ca5b49d4540e92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -225,39 +225,39 @@ 2.4.8 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 - 9.0.10-servicing.25462.3 + 9.0.10-servicing.25466.6 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 - 19.1.0-alpha.1.25414.3 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25462.1 3.1.7 1.0.406601 From 1b50e48a3da291ecbc525b3f5443108a4a4ba07f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 12:52:19 -0700 Subject: [PATCH 54/65] Update dependencies from https://github.com/dotnet/icu build 20250916.4 (#119793) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25462.2 -> To Version 9.0.0-rtm.25466.4 Co-authored-by: dotnet-maestro[bot] --- 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 f41de6149d204b..fb75e5c100a749 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - fb10ef725c9521c67c21e01e025ce263498f7e0b + 6616e7baa325ada1cedfac75e4f68e376050e9d0 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 52553c113f9034..aa3e12306bd860 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25462.2 + 9.0.0-rtm.25466.4 9.0.0-rtm.24466.4 2.4.8 From 6d96e28597e7da0d790d495ba834cc4908e442cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 12:59:36 -0700 Subject: [PATCH 55/65] Update dependencies from https://github.com/dotnet/emsdk build 20250917.4 (#119809) On relative base path root Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.10-servicing.25466.6 -> To Version 9.0.10-servicing.25467.4 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.10 Dependency coherency updates On relative base path root runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 19.1.0-alpha.1.25462.1 -> To Version 19.1.0-alpha.1.25466.4 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 46 +++++++++---------- 3 files changed, 73 insertions(+), 73 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8b926937be3b3..2a8e7f05f72fb7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0049486f34301..d26e1a6eedf58b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,37 +12,37 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c https://github.com/dotnet/command-line-api @@ -64,18 +64,18 @@ 788a8a7481c01a7d235110cdea2ca5bfb34210d4 - + https://github.com/dotnet/emsdk - 2ab31537e6b375f8563a1d67936236797a56e3fa + 4f9fa221e638502a58fee696621c1bba2072b23c https://github.com/dotnet/emsdk - 2ab31537e6b375f8563a1d67936236797a56e3fa + 4f9fa221e638502a58fee696621c1bba2072b23c - + https://github.com/dotnet/emsdk - 2ab31537e6b375f8563a1d67936236797a56e3fa + 4f9fa221e638502a58fee696621c1bba2072b23c @@ -226,61 +226,61 @@ https://github.com/dotnet/runtime-assets c77fd5058ea46e9d0b58f5c11b6808d6170e4e32 - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c - + https://github.com/dotnet/llvm-project - 165cfbe7ede6c224fccad86059ea5198a97f9297 + 9ae86175cabaa393cc75bd3e26560a604b2ade7c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ca5b49d4540e92..c054ae31d1e7a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -225,39 +225,39 @@ 2.4.8 9.0.0-alpha.1.24167.3 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 - 9.0.10-servicing.25466.6 + 9.0.10-servicing.25467.4 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 - 19.1.0-alpha.1.25462.1 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 + 19.1.0-alpha.1.25466.4 3.1.7 1.0.406601 From fd6707b0fd95eeaf35ac74214529ee216d5de581 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 06:38:27 -0700 Subject: [PATCH 56/65] Update dependencies from https://github.com/dotnet/icu build 20250916.5 (#119832) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25466.4 -> To Version 9.0.0-rtm.25466.5 Co-authored-by: dotnet-maestro[bot] --- 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 fb75e5c100a749..2ddf04fb3ca756 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 6616e7baa325ada1cedfac75e4f68e376050e9d0 + 068a21dda3860a7055585fc5977c7c615d035360 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index aa3e12306bd860..59300b55d85f5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25466.4 + 9.0.0-rtm.25466.5 9.0.0-rtm.24466.4 2.4.8 From 6347934c15c73d0dee64452c9f286280d359e7fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Sep 2025 11:45:14 -0700 Subject: [PATCH 57/65] Update dependencies from https://github.com/dotnet/roslyn build 20250917.18 (#119830) On relative base path root Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.12.0-3.25429.9 -> To Version 4.12.0-3.25467.18 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ddf04fb3ca756..67360a3d2b76ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -360,17 +360,17 @@ https://github.com/dotnet/runtime-assets 36490ea19fe9622e76fb3534069a6459ff56353b - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 https://github.com/dotnet/roslyn-analyzers @@ -381,9 +381,9 @@ 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn - 75273243e5beb19c5e2ae8e58999b21b451c22fe + dcf9af2b54e4469b94697b1b92d31354ce698f66 diff --git a/eng/Versions.props b/eng/Versions.props index 59300b55d85f5a..0896ee5342e190 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,9 +44,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.12.0-3.25429.9 - 4.12.0-3.25429.9 - 4.12.0-3.25429.9 + 4.12.0-3.25467.18 + 4.12.0-3.25467.18 + 4.12.0-3.25467.18 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 0896ee5342e190..3d1d6a9eb627b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 2.9.0-beta.25462.4 - 9.0.0-beta.25462.4 - 2.9.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 - 9.0.0-beta.25462.4 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 2.9.0-beta.25465.2 + 9.0.0-beta.25465.2 + 2.9.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 + 9.0.0-beta.25465.2 1.4.0 diff --git a/global.json b/global.json index cdac5c7bdcad75..13b3031d87d5cb 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25462.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25465.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From 6c1a72790a79e8293ce969bff08af08675d49bb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:38:53 -0700 Subject: [PATCH 60/65] Update dependencies from https://github.com/dotnet/icu build 20250917.1 (#119872) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25466.5 -> To Version 9.0.0-rtm.25467.1 Co-authored-by: dotnet-maestro[bot] --- 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 ad505278075427..664908235134e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 068a21dda3860a7055585fc5977c7c615d035360 + e98ff8e38ba86538c2a7cd2e2ee32cce4f8e01cb https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index 3d1d6a9eb627b7..c9af8c73172aa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25466.5 + 9.0.0-rtm.25467.1 9.0.0-rtm.24466.4 2.4.8 From 86b870784bc00ba0b06e6b38eb7a34c594d68eaa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 13:30:20 +0200 Subject: [PATCH 61/65] [release/9.0-staging] Disable Multicast SocketOption Test (#119889) Co-authored-by: Ahmet Ibrahim Aksoy --- .../tests/FunctionalTests/SocketOptionNameTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs index 2d7139a05803cb..3cc68756604955 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs @@ -68,6 +68,7 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286 [ActiveIssue("https://github.com/dotnet/runtime/issues/104547", typeof(PlatformDetection), nameof(PlatformDetection.IsQemuLinux))] [ActiveIssue("https://github.com/dotnet/runtime/issues/113827", typeof(PlatformDetection), nameof(PlatformDetection.IsAppleMobile))] + [SkipOnPlatform(TestPlatforms.OSX, "Multicast interface selection fails on macOS 14+ due to changes in how the system handles network interface parameters")] public async Task MulticastInterface_Set_AnyInterface_Succeeds() { // On all platforms, index 0 means "any interface" From ae5e3f887d8b2c0837a796c5cb7a5fd42be70baf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 08:26:20 -0700 Subject: [PATCH 62/65] Update dependencies from https://github.com/dotnet/icu build 20250919.1 (#119932) On relative base path root Microsoft.NETCore.Runtime.ICU.Transport From Version 9.0.0-rtm.25467.1 -> To Version 9.0.0-rtm.25469.1 Co-authored-by: dotnet-maestro[bot] --- 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 664908235134e6..2bdfb23f2ac007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - e98ff8e38ba86538c2a7cd2e2ee32cce4f8e01cb + 4ca307e1d07b3b76d1aa66c15d67de89bcca0cd8 https://github.com/dotnet/msquic diff --git a/eng/Versions.props b/eng/Versions.props index c9af8c73172aa7..a826e5319d2428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -221,7 +221,7 @@ 9.0.0-rtm.24511.16 - 9.0.0-rtm.25467.1 + 9.0.0-rtm.25469.1 9.0.0-rtm.24466.4 2.4.8 From 7501cab0f095539c5c6fe1096db54593f8253776 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 08:28:11 -0700 Subject: [PATCH 63/65] Update dependencies from https://github.com/dotnet/emsdk build 20250919.4 (#119900) On relative base path root Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport From Version 9.0.10-servicing.25467.4 -> To Version 9.0.10-servicing.25469.4 Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.10 -> To Version 9.0.10 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2a8e7f05f72fb7..47a202a7176f21 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d26e1a6eedf58b..691bf00172d3ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,18 +64,18 @@ 788a8a7481c01a7d235110cdea2ca5bfb34210d4 - + https://github.com/dotnet/emsdk - 4f9fa221e638502a58fee696621c1bba2072b23c + f70927a13648c24660c79ff19a6eb2aac100f0ab https://github.com/dotnet/emsdk - 4f9fa221e638502a58fee696621c1bba2072b23c + f70927a13648c24660c79ff19a6eb2aac100f0ab - + https://github.com/dotnet/emsdk - 4f9fa221e638502a58fee696621c1bba2072b23c + f70927a13648c24660c79ff19a6eb2aac100f0ab diff --git a/eng/Versions.props b/eng/Versions.props index c054ae31d1e7a4..37158475ca571d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -243,7 +243,7 @@ Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport --> - 9.0.10-servicing.25467.4 + 9.0.10-servicing.25469.4 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) From 078434b7fd6721b2823be6907a83fa8d9b5a3715 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 07:25:44 -0700 Subject: [PATCH 64/65] Update dependencies from https://github.com/dotnet/arcade build 20250923.2 (#120025) On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25465.2 -> To Version 9.0.0-beta.25473.2 Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner From Version 2.9.0-beta.25465.2 -> To Version 2.9.0-beta.25473.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84f437f11e32f2..b8194d4307f008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 741a0aecd9de1e..c9055b2c6ca245 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 2.9.0-beta.25465.2 - 9.0.0-beta.25465.2 - 2.9.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 - 9.0.0-beta.25465.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 2.9.0-beta.25473.2 + 9.0.0-beta.25473.2 + 2.9.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 + 9.0.0-beta.25473.2 1.4.0 diff --git a/global.json b/global.json index 13b3031d87d5cb..28c4eb97d697b6 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25465.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25473.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16" From fe023f17474aab631c9ee8caeabfae03af46689b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 11:50:45 -0700 Subject: [PATCH 65/65] Update dependencies from https://github.com/dotnet/arcade build 20250925.3 (#120111) On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25473.2 -> To Version 9.0.0-beta.25475.3 Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner From Version 2.9.0-beta.25473.2 -> To Version 2.9.0-beta.25475.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- global.json | 6 +-- 3 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b8194d4307f008..2f49cf7164a235 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 7b6f58237ff2355392960408f4d9fd98dfe58f9b - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index c9055b2c6ca245..68bd7cb1ac5500 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 2.9.0-beta.25473.2 - 9.0.0-beta.25473.2 - 2.9.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 - 9.0.0-beta.25473.2 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 2.9.0-beta.25475.3 + 9.0.0-beta.25475.3 + 2.9.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 + 9.0.0-beta.25475.3 1.4.0 diff --git a/global.json b/global.json index 28c4eb97d697b6..7709b66eebb40a 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25473.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25475.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25475.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"