Skip to content

[main] Update dependencies from dotnet/winforms #4767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jul 1, 2021
Merged

[main] Update dependencies from dotnet/winforms #4767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
17faa18
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 29, 2021
b84ac63
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 29, 2021
75abd3e
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 29, 2021
4b3d3e7
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 29, 2021
757907f
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 29, 2021
5620dc5
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 30, 2021
27f135f
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jun 30, 2021
3fb773a
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jul 1, 2021
d8c572d
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jul 1, 2021
f5e7635
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jul 1, 2021
6057eb0
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jul 1, 2021
e22c948
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Jul 1, 2021
6b3e249
Merge branch 'main' into darc-main-fedcc441-679e-4f31-9222-e890437f720c
ryalanms Jul 1, 2021
42fa645
Property 'PrivateKey' is intentionally retrieved the key is null to c…
ryalanms Jul 1, 2021
5cd068d
Remove unused Microsoft.Win32.Registry entry from Version.Details.xml…
ryalanms Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 38 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.7.21328.3">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.7.21351.3">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>41a8948a7ae4217cdd5db682c34ac4a5534e7d76</Sha>
<Sha>48ba88a5f185a4748ded7e291fd94dec3636befa</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.7.21328.3">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.7.21351.3">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>41a8948a7ae4217cdd5db682c34ac4a5534e7d76</Sha>
<Sha>48ba88a5f185a4748ded7e291fd94dec3636befa</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.5.21254.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>65020c946254c9a99497f4fdfa4136131f51f913</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.7.21351.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>f78c13c1e8db4a80f142d1e16db014338d7062c8</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21328.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21351.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>91599fff26619cb8bccb7b39c39590e7cd9a4379</Sha>
<Sha>cf2938f44fc1494ae984c52a1568a03d51e513ca</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,38 @@
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>7</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-preview.7.21328.2</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.7.21328.2</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>6.0.0-preview.7.21351.2</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.7.21351.2</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.7.21328.3</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.7.21351.3</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.7.21328.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.7.21328.2</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.7.21351.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.7.21351.2</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21328.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.7.21328.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.7.21328.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.7.21328.2</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.7.21328.2</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.7.21328.2</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.7.21328.2</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21351.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.7.21351.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.7.21351.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.7.21351.2</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.7.21351.2</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.7.21351.2</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.7.21351.2</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<SystemCodeDomPackageVersion>6.0.0-preview.7.21328.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.7.21328.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.7.21328.2</SystemDiagnosticsEventLogPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.7.21351.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.7.21351.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.7.21351.2</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.7.21328.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.7.21328.2</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.7.21328.2</SystemWindowsExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.7.21351.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.7.21351.2</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.7.21351.2</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions ...Microsoft.DotNet.Wpf/src/PresentationUI/MS/Internal/documents/DocumentSignatureManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions ...osoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

/// <summary>
Expand Down