diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a7d05085962..cc88f1a03f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,89 +1,85 @@ - + https://github.com/dotnet/winforms - 41a8948a7ae4217cdd5db682c34ac4a5534e7d76 + 48ba88a5f185a4748ded7e291fd94dec3636befa - + https://github.com/dotnet/winforms - 41a8948a7ae4217cdd5db682c34ac4a5534e7d76 + 48ba88a5f185a4748ded7e291fd94dec3636befa - + https://github.com/dotnet/runtime - 65020c946254c9a99497f4fdfa4136131f51f913 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 - - - https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f78c13c1e8db4a80f142d1e16db014338d7062c8 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + cf2938f44fc1494ae984c52a1568a03d51e513ca diff --git a/eng/Versions.props b/eng/Versions.props index fbae38ba40a..0f6ace6a93a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 preview 7 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 - 6.0.0-preview.7.21328.3 + 6.0.0-preview.7.21351.3 5.0.0-alpha1.19562.1 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 4.6.0-preview4.19176.11 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 - 6.0.0-preview.7.21328.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs b/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs index 8c8e0ffad0e..b29edc11c1a 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs @@ -506,7 +506,9 @@ internal void ShowSigningDialog( // Get[Algorithm]PrivateKey methods would always have returned the private key if the PrivateKey property would // But Get[Algorithm]PrivateKey methods never throw but returns null in case of error during cryptographic operations // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can redisplay the certificate picker + #pragma warning disable SYSLIB0028 AsymmetricAlgorithm testKey = x509Certificate2.PrivateKey; + #pragma warning restore SYSLIB0028 } } } diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs index 5a48b5455ae..39a5a32e85b 100644 --- a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs +++ b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs @@ -874,7 +874,9 @@ private static AsymmetricAlgorithm GetPrivateKey(X509Certificate2 cert) // Get[Algorithm]PrivateKey methods would always have returned the private key if the PrivateKey property would // But Get[Algorithm]PrivateKey methods never throw but returns null in case of error during cryptographic operations // But we want exception to be thrown when an error occurs during a cryptographic operation so that we can revert the changes + #pragma warning disable SYSLIB0028 return cert.PrivateKey; + #pragma warning restore SYSLIB0028 } ///