From c13dccec4d6acd61a74d5c51ff772d6664b3b33f Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Thu, 22 Jan 2026 13:15:03 -0800 Subject: [PATCH 1/6] Update MicrosoftCodeAnalysisVersion_LatestVS To match what is referenced in the 10.0.1xx SDK: https://github.com/dotnet/sdk/blob/0b3258423a96e6b0e0582a31f09e10ce4478fc06/eng/Version.Details.xml#L95 --- eng/Versions.props | 2 +- .../src/System/Reflection/Metadata/TypeNameParser.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d005181c3b1628..195953bc1ddd0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ Source-build builds the product with the most recent previously source-built release. Thankfully, these two requirements line up nicely such that any version that satisfies the VS version requirement will also satisfy the .NET SDK version requirement because of how we ship. --> - 4.14.0 + 5.0.0-2.26070.104 3.3.5-beta1.23270.2 diff --git a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeNameParser.cs b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeNameParser.cs index 448cc85ff1003e..ee89603972b7d3 100644 --- a/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeNameParser.cs +++ b/src/libraries/System.Reflection.Metadata/src/System/Reflection/Metadata/TypeNameParser.cs @@ -61,7 +61,9 @@ private TypeNameParser(ReadOnlySpan name, bool throwOnError, TypeNameParse return null; } +#pragma warning disable IDE0071 Debug.Assert(parsedName.GetNodeCount() == recursiveDepth, $"Node count mismatch for '{typeName.ToString()}'"); +#pragma warning restore IDE0071 return parsedName; } From 6ab6ed5ebb8b0a9492b4cdb1b2e3c854f15f1b53 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Thu, 22 Jan 2026 14:33:17 -0800 Subject: [PATCH 2/6] Remove redundant ToString() in string interpolation --- .../Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs | 2 +- .../System/Security/Cryptography/MLDsaImplementation.Windows.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs b/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs index dee5e6b7c7db3a..a42093af7aee7d 100644 --- a/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs +++ b/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs @@ -451,7 +451,7 @@ private void ExportKey( { Debug.Fail( $"{nameof(blobType)}: {blobType}, " + - $"{nameof(parameterSet)}: {parameterSet.ToString()}, " + + $"{nameof(parameterSet)}: {parameterSet}, " + $"{nameof(keyBytes)}.Length: {keyBytes.Length} / {expectedKeySize}"); throw new CryptographicException(); diff --git a/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs b/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs index dcbd34ed8a2015..ee0ef81ff4a335 100644 --- a/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs +++ b/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs @@ -238,7 +238,7 @@ private void ExportKey(string keyBlobType, int expectedKeySize, Span desti { Debug.Fail( $"{nameof(blobType)}: {blobType}, " + - $"{nameof(parameterSet)}: {parameterSet.ToString()}, " + + $"{nameof(parameterSet)}: {parameterSet}, " + $"{nameof(keyBytes)}.Length: {keyBytes.Length} / {expectedKeySize}"); throw new CryptographicException(); From 8a9a6370e385143218ae3b0b7e295ce8a655ffb4 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Thu, 22 Jan 2026 15:50:56 -0800 Subject: [PATCH 3/6] Fix ReadOnlySpan interpolation for netstandard targets --- .../src/System/Security/Cryptography/MLDsaCng.Windows.cs | 4 +++- .../Security/Cryptography/MLDsaImplementation.Windows.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs b/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs index a42093af7aee7d..cdb5849f9700b7 100644 --- a/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs +++ b/src/libraries/Common/src/System/Security/Cryptography/MLDsaCng.Windows.cs @@ -449,10 +449,12 @@ private void ExportKey( keyBytes.Length != expectedKeySize || !parameterSet.SequenceEqual(expectedParameterSet)) { +#pragma warning disable IDE0071 Debug.Fail( $"{nameof(blobType)}: {blobType}, " + - $"{nameof(parameterSet)}: {parameterSet}, " + + $"{nameof(parameterSet)}: {parameterSet.ToString()}, " + $"{nameof(keyBytes)}.Length: {keyBytes.Length} / {expectedKeySize}"); +#pragma warning restore IDE0071 throw new CryptographicException(); } diff --git a/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs b/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs index ee0ef81ff4a335..f3abbff0614333 100644 --- a/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs +++ b/src/libraries/Common/src/System/Security/Cryptography/MLDsaImplementation.Windows.cs @@ -236,10 +236,12 @@ private void ExportKey(string keyBlobType, int expectedKeySize, Span desti keyBytes.Length != expectedKeySize || !parameterSet.SequenceEqual(expectedParameterSet)) { +#pragma warning disable IDE0071 Debug.Fail( $"{nameof(blobType)}: {blobType}, " + - $"{nameof(parameterSet)}: {parameterSet}, " + + $"{nameof(parameterSet)}: {parameterSet.ToString()}, " + $"{nameof(keyBytes)}.Length: {keyBytes.Length} / {expectedKeySize}"); +#pragma warning restore IDE0071 throw new CryptographicException(); } From 2f810884ee0ad3c208d5497c5aed91ab3e9b5561 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 23 Jan 2026 10:07:31 -0800 Subject: [PATCH 4/6] Use 10.0.100 SDK version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 195953bc1ddd0d..3cc866263744d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ Source-build builds the product with the most recent previously source-built release. Thankfully, these two requirements line up nicely such that any version that satisfies the VS version requirement will also satisfy the .NET SDK version requirement because of how we ship. --> - 5.0.0-2.26070.104 + 5.0.0-2.25523.111 3.3.5-beta1.23270.2 From 62d509c96eadfd8a82d10f2afa8760edb2797c38 Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Fri, 23 Jan 2026 12:00:21 -0800 Subject: [PATCH 5/6] Use 10.0.102 SDK version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3cc866263744d9..ed3b79d338b60e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ Source-build builds the product with the most recent previously source-built release. Thankfully, these two requirements line up nicely such that any version that satisfies the VS version requirement will also satisfy the .NET SDK version requirement because of how we ship. --> - 5.0.0-2.25523.111 + 5.0.0-2.25612.105 3.3.5-beta1.23270.2 From 696c98ccce5d009ee815df18a1cc285c431b764c Mon Sep 17 00:00:00 2001 From: Sven Boemer Date: Wed, 28 Jan 2026 10:14:39 -0800 Subject: [PATCH 6/6] Use 5.0.0 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ed3b79d338b60e..f96d17e649f31d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ Source-build builds the product with the most recent previously source-built release. Thankfully, these two requirements line up nicely such that any version that satisfies the VS version requirement will also satisfy the .NET SDK version requirement because of how we ship. --> - 5.0.0-2.25612.105 + 5.0.0 3.3.5-beta1.23270.2