From 17faa18d5285627ba225cfe0a4cc42d8e3ad584e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 01:18:18 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/winforms build 20210628.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21328.4 --- 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 2361ae86575..4432ad1394f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 41a8948a7ae4217cdd5db682c34ac4a5534e7d76 + a98fd12e749d6258936eaaba266345bc8c972da8 - + https://github.com/dotnet/winforms - 41a8948a7ae4217cdd5db682c34ac4a5534e7d76 + a98fd12e749d6258936eaaba266345bc8c972da8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 34fc81e9ecc..84db0f62950 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21328.3 + 6.0.0-preview.7.21328.4 From b84ac63c831126f16151dc732390124d0779becf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 11:22:31 +0000 Subject: [PATCH 02/14] Update dependencies from https://github.com/dotnet/winforms build 20210628.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21328.5 --- 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 4432ad1394f..6db331789dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - a98fd12e749d6258936eaaba266345bc8c972da8 + 6eb56903ff492b6a3a318b8a92a56dc27f7104e5 - + https://github.com/dotnet/winforms - a98fd12e749d6258936eaaba266345bc8c972da8 + 6eb56903ff492b6a3a318b8a92a56dc27f7104e5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 84db0f62950..3862a7efb68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21328.4 + 6.0.0-preview.7.21328.5 From 75abd3e8493ecb00208272fdc3cecc641df0b17c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 15:19:32 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/winforms build 20210629.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21329.1 Dependency coherency updates System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.7.21328.2 -> To Version 6.0.0-preview.7.21329.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6db331789dd..74fedf5a2b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,89 +1,89 @@ - + https://github.com/dotnet/winforms - 6eb56903ff492b6a3a318b8a92a56dc27f7104e5 + 33e6661074e60a55be9e39405b5d91afda2525a4 - + https://github.com/dotnet/winforms - 6eb56903ff492b6a3a318b8a92a56dc27f7104e5 + 33e6661074e60a55be9e39405b5d91afda2525a4 https://github.com/dotnet/runtime 65020c946254c9a99497f4fdfa4136131f51f913 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 5d23d767dda75bf7a6dd4eed0fcd871bc44eda1f - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 - + https://github.com/dotnet/runtime - 91599fff26619cb8bccb7b39c39590e7cd9a4379 + 969840ecd1964656d5686fa861110d905cd0d6c9 diff --git a/eng/Versions.props b/eng/Versions.props index 3862a7efb68..4297ff2cc93 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.21329.1 + 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21328.5 + 6.0.0-preview.7.21329.1 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.21329.1 + 6.0.0-preview.7.21329.1 - 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.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 - 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.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 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.21329.1 + 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.1 From 4b3d3e7921e0697f156c694d6fd19b9c910d572d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 21:13:50 +0000 Subject: [PATCH 04/14] Update dependencies from https://github.com/dotnet/winforms build 20210629.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21329.2 Dependency coherency updates System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.7.21328.2 -> To Version 6.0.0-preview.7.21329.1 (parent: Microsoft.Private.Winforms --- 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 74fedf5a2b9..15c7968087b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 33e6661074e60a55be9e39405b5d91afda2525a4 + dc9b46d4fb153130db8721c33b568eb9aa876b90 - + https://github.com/dotnet/winforms - 33e6661074e60a55be9e39405b5d91afda2525a4 + dc9b46d4fb153130db8721c33b568eb9aa876b90 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4297ff2cc93..c793cd82e39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21329.2 From 757907f82b9c6f29bda0737cd76155b95e4a50ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Jun 2021 22:45:09 +0000 Subject: [PATCH 05/14] Update dependencies from https://github.com/dotnet/winforms build 20210629.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21329.3 Dependency coherency updates System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.7.21328.2 -> To Version 6.0.0-preview.7.21329.1 (parent: Microsoft.Private.Winforms --- 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 15c7968087b..601fdb8fe8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - dc9b46d4fb153130db8721c33b568eb9aa876b90 + 41f0a6dc646101990567843728ccba083685ecf4 - + https://github.com/dotnet/winforms - dc9b46d4fb153130db8721c33b568eb9aa876b90 + 41f0a6dc646101990567843728ccba083685ecf4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c793cd82e39..2d3d5496e96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21329.2 + 6.0.0-preview.7.21329.3 From 5620dc5dfde636e844fc4542c86b468447a718d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Jun 2021 13:25:11 +0000 Subject: [PATCH 06/14] Update dependencies from https://github.com/dotnet/winforms build 20210630.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21330.1 Dependency coherency updates System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.7.21328.2 -> To Version 6.0.0-preview.7.21330.2 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 601fdb8fe8c..97a6f7c6b2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,89 +1,89 @@ - + https://github.com/dotnet/winforms - 41f0a6dc646101990567843728ccba083685ecf4 + 549c0e3c6d3bed3facfa07d61b7418d2839c83ec - + https://github.com/dotnet/winforms - 41f0a6dc646101990567843728ccba083685ecf4 + 549c0e3c6d3bed3facfa07d61b7418d2839c83ec https://github.com/dotnet/runtime 65020c946254c9a99497f4fdfa4136131f51f913 - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 5d23d767dda75bf7a6dd4eed0fcd871bc44eda1f - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c - + https://github.com/dotnet/runtime - 969840ecd1964656d5686fa861110d905cd0d6c9 + ff88d1d3a022021a54fbe05949a27db29c690f0c diff --git a/eng/Versions.props b/eng/Versions.props index 2d3d5496e96..815f0fb8742 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 preview 7 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21329.3 + 6.0.0-preview.7.21330.1 5.0.0-alpha1.19562.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 4.6.0-preview4.19176.11 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 - 6.0.0-preview.7.21329.1 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.2 From 27f135fc3aabed9976032054e17d6490d8d2439a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 30 Jun 2021 15:54:44 +0000 Subject: [PATCH 07/14] Update dependencies from https://github.com/dotnet/winforms build 20210630.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21330.2 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.5.21254.12 -> To Version 5.0.0-preview.4.20202.18 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97a6f7c6b2f..78bfa3daab2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/winforms - 549c0e3c6d3bed3facfa07d61b7418d2839c83ec + 5f7a198aa4121d66eac6824e64530374c09029f4 - + https://github.com/dotnet/winforms - 549c0e3c6d3bed3facfa07d61b7418d2839c83ec + 5f7a198aa4121d66eac6824e64530374c09029f4 - + https://github.com/dotnet/runtime - 65020c946254c9a99497f4fdfa4136131f51f913 + 0375524a91a47ca4db3ee1be548f74bab7e26e76 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 815f0fb8742..4759a2d444d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21330.1 + 6.0.0-preview.7.21330.2 From 3fb773a4bab7166ed3ccca513594976470296207 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Jul 2021 03:02:46 +0000 Subject: [PATCH 08/14] Update dependencies from https://github.com/dotnet/winforms build 20210630.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21330.4 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.5.21254.12 -> To Version 5.0.0-preview.4.20202.18 (parent: Microsoft.Private.Winforms --- 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 78bfa3daab2..7fbf1ab7850 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 5f7a198aa4121d66eac6824e64530374c09029f4 + abe058b24abe17e48123829e96a23a33bb9fa6ef - + https://github.com/dotnet/winforms - 5f7a198aa4121d66eac6824e64530374c09029f4 + abe058b24abe17e48123829e96a23a33bb9fa6ef https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4759a2d444d..b8a375e8df6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21330.4 From d8c572d429349e6012fbdc6873043bfa383ebd30 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Jul 2021 03:26:09 +0000 Subject: [PATCH 09/14] Update dependencies from https://github.com/dotnet/winforms build 20210630.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21330.5 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.5.21254.12 -> To Version 5.0.0-preview.4.20202.18 (parent: Microsoft.Private.Winforms --- 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 7fbf1ab7850..8fe60707adf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - abe058b24abe17e48123829e96a23a33bb9fa6ef + 1c0e7fedf75b5a63b042e5386b6cec79a5a70912 - + https://github.com/dotnet/winforms - abe058b24abe17e48123829e96a23a33bb9fa6ef + 1c0e7fedf75b5a63b042e5386b6cec79a5a70912 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b8a375e8df6..55b6ebff275 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21330.4 + 6.0.0-preview.7.21330.5 From f5e7635f44e7a9208745cb952f36ae0e86a7fb72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Jul 2021 06:48:29 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/winforms build 20210630.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21330.6 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.5.21254.12 -> To Version 5.0.0-preview.4.20202.18 (parent: Microsoft.Private.Winforms --- 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 8fe60707adf..58a46e6a1d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 1c0e7fedf75b5a63b042e5386b6cec79a5a70912 + a0d99dd0f11d810ed7eafa2d37cb9be2e99de33b - + https://github.com/dotnet/winforms - 1c0e7fedf75b5a63b042e5386b6cec79a5a70912 + a0d99dd0f11d810ed7eafa2d37cb9be2e99de33b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 55b6ebff275..46dcecfa076 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21330.5 + 6.0.0-preview.7.21330.6 From 6057eb0b7fdc4caf4e019e890189856faa7e860e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Jul 2021 13:12:20 +0000 Subject: [PATCH 11/14] Update dependencies from https://github.com/dotnet/winforms build 20210701.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21351.2 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.5.21254.12 -> To Version 5.0.0-preview.4.20202.18 (parent: Microsoft.Private.Winforms --- 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 58a46e6a1d5..6ea5a52ad61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - a0d99dd0f11d810ed7eafa2d37cb9be2e99de33b + 95aa486ed8f2d70a20817aba82635d0409096362 - + https://github.com/dotnet/winforms - a0d99dd0f11d810ed7eafa2d37cb9be2e99de33b + 95aa486ed8f2d70a20817aba82635d0409096362 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 46dcecfa076..b262fb08c37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21330.6 + 6.0.0-preview.7.21351.2 From e22c94830a2d4b6e0f7618b27596988cfd35daed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Jul 2021 13:24:58 +0000 Subject: [PATCH 12/14] Update dependencies from https://github.com/dotnet/winforms build 20210701.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21328.3 -> To Version 6.0.0-preview.7.21351.3 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.Cryptography.Xml,System.Security.Permissions,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.IO.Packaging,Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.0-preview.5.21254.12 -> To Version 5.0.0-preview.4.20202.18 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++---------- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ea5a52ad61..039cbcbdfff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,89 +1,89 @@ - + https://github.com/dotnet/winforms - 95aa486ed8f2d70a20817aba82635d0409096362 + 48ba88a5f185a4748ded7e291fd94dec3636befa - + https://github.com/dotnet/winforms - 95aa486ed8f2d70a20817aba82635d0409096362 + 48ba88a5f185a4748ded7e291fd94dec3636befa https://github.com/dotnet/runtime 0375524a91a47ca4db3ee1be548f74bab7e26e76 - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 5d23d767dda75bf7a6dd4eed0fcd871bc44eda1f - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca - + https://github.com/dotnet/runtime - ff88d1d3a022021a54fbe05949a27db29c690f0c + cf2938f44fc1494ae984c52a1568a03d51e513ca diff --git a/eng/Versions.props b/eng/Versions.props index b262fb08c37..37cf527f030 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,38 +4,38 @@ 6.0.0 preview 7 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.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.3 5.0.0-alpha1.19562.1 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.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.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.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.21330.2 - 6.0.0-preview.7.21330.2 - 6.0.0-preview.7.21330.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 + 6.0.0-preview.7.21351.2 From 42fa6453ae8bdcfeff2bc6ae4b5ff9505fbca6fd Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Thu, 1 Jul 2021 12:53:46 -0700 Subject: [PATCH 13/14] Property 'PrivateKey' is intentionally retrieved the key is null to cause an exception; the value of 'PrivateKey' is never actually returned. Disable new deprecated API warning. --- .../MS/Internal/documents/DocumentSignatureManager.cs | 2 ++ .../MS/Internal/IO/Packaging/XmlDigitalSignatureProcessor.cs | 2 ++ 2 files changed, 4 insertions(+) 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 } /// From 5cd068d5370a2f9fddd7037ea1f372b9ad29ed69 Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Thu, 1 Jul 2021 15:27:46 -0700 Subject: [PATCH 14/14] Remove unused Microsoft.Win32.Registry entry from Version.Details.xml. This is now included in the Microsoft.NETCore.App.Ref targeting pack and has already been removed from Versions.props. --- eng/Version.Details.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb3a32fbc17..cc88f1a03f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,10 +9,6 @@ https://github.com/dotnet/winforms 48ba88a5f185a4748ded7e291fd94dec3636befa - - https://github.com/dotnet/runtime - 0375524a91a47ca4db3ee1be548f74bab7e26e76 - https://github.com/dotnet/runtime cf2938f44fc1494ae984c52a1568a03d51e513ca