From de0f8b389841292c9c89315b29a51eb0c9f170ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 May 2021 13:27:25 +0000 Subject: [PATCH 01/24] Update dependencies from https://github.com/dotnet/winforms build 20210529.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21279.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21278.10 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd1a619cb51..077c4133e1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 1320e330434e9912060f2b471561be02492d6021 + f61ebf22d6653395871cac5bd951361df55f1ae1 - + https://github.com/dotnet/winforms - 1320e330434e9912060f2b471561be02492d6021 + f61ebf22d6653395871cac5bd951361df55f1ae1 - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a - + https://github.com/dotnet/runtime - f54a4cd54f73731ac6117fe8c98e24c1792401b4 + 95a4476b91827e6f707744fab6e9d87df870407a diff --git a/eng/Versions.props b/eng/Versions.props index 10e9a5235c4..256d3b3f6b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21279.1 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 - 6.0.0-preview.6.21278.2 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21278.10 From d2f7af732ffa14633992e6c1c9b28f50beb6723a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 May 2021 00:36:21 +0000 Subject: [PATCH 02/24] Update dependencies from https://github.com/dotnet/winforms build 20210530.6 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21280.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21278.10 (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 077c4133e1d..84f9dde83bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - f61ebf22d6653395871cac5bd951361df55f1ae1 + ce705447863f9d65a10c0a4f3dce26928bac1c8b - + https://github.com/dotnet/winforms - f61ebf22d6653395871cac5bd951361df55f1ae1 + ce705447863f9d65a10c0a4f3dce26928bac1c8b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 256d3b3f6b7..0a16b9b298b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21279.1 + 6.0.0-preview.6.21280.6 From 8f68d053e6ffc2801f3cb7f3cf4ce49fd2026e91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 May 2021 01:01:57 +0000 Subject: [PATCH 03/24] Update dependencies from https://github.com/dotnet/winforms build 20210530.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21280.8 --- 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 84f9dde83bd..d7af722e6bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - ce705447863f9d65a10c0a4f3dce26928bac1c8b + 1e28e546fd0e994cd96b09ba13fc265fd3ae653a - + https://github.com/dotnet/winforms - ce705447863f9d65a10c0a4f3dce26928bac1c8b + 1e28e546fd0e994cd96b09ba13fc265fd3ae653a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0a16b9b298b..c60a2c14888 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21280.6 + 6.0.0-preview.6.21280.8 From 4ad0a6e22679ef5302e0467963c051fba0ad5361 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 May 2021 01:02:09 +0000 Subject: [PATCH 04/24] Update dependencies from https://github.com/dotnet/winforms build 20210530.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21280.8 -> To Version 6.0.0-preview.6.21280.7 --- 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 d7af722e6bb..37ab0bd2148 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 1e28e546fd0e994cd96b09ba13fc265fd3ae653a + f205bcd987ccc8c530763de311a2dbc807b4be61 - + https://github.com/dotnet/winforms - 1e28e546fd0e994cd96b09ba13fc265fd3ae653a + f205bcd987ccc8c530763de311a2dbc807b4be61 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c60a2c14888..f14bf7a8e9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21280.8 + 6.0.0-preview.6.21280.7 From 3227f4ce73e30e1570f5e3d2b8695bb79713e50f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 May 2021 01:02:22 +0000 Subject: [PATCH 05/24] Update dependencies from https://github.com/dotnet/winforms build 20210530.11 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21280.7 -> To Version 6.0.0-preview.6.21280.11 --- 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 37ab0bd2148..04bffeb4b9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - f205bcd987ccc8c530763de311a2dbc807b4be61 + f902b3694211e34eb29a275dd4efa5702534ddc2 - + https://github.com/dotnet/winforms - f205bcd987ccc8c530763de311a2dbc807b4be61 + f902b3694211e34eb29a275dd4efa5702534ddc2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f14bf7a8e9c..266f6ca329b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21280.7 + 6.0.0-preview.6.21280.11 From 6425171fb8dfc972e27631e61208c8f1fb8b5503 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 May 2021 01:02:34 +0000 Subject: [PATCH 06/24] Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21279.3 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04bffeb4b9d..85a4c4f748e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,89 +9,89 @@ https://github.com/dotnet/winforms f902b3694211e34eb29a275dd4efa5702534ddc2 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 - + https://github.com/dotnet/runtime - 95a4476b91827e6f707744fab6e9d87df870407a + b5c91e4c29359f160edcf7caf16530e48d9a4fb0 diff --git a/eng/Versions.props b/eng/Versions.props index 266f6ca329b..92eb07cab2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 @@ -14,31 +14,31 @@ 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 - 6.0.0-preview.6.21278.10 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21279.3 From 0248c0c8894e0cc19c3f245f32832912f6cdb43c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 May 2021 03:30:23 +0000 Subject: [PATCH 07/24] Update dependencies from https://github.com/dotnet/winforms build 20210530.14 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21280.14 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21279.3 (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 85a4c4f748e..cef8c84f160 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - f902b3694211e34eb29a275dd4efa5702534ddc2 + 34adf771ca84eb8c56f5183eb60cf23840c8fd47 - + https://github.com/dotnet/winforms - f902b3694211e34eb29a275dd4efa5702534ddc2 + 34adf771ca84eb8c56f5183eb60cf23840c8fd47 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 92eb07cab2d..5f48fac25e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21280.11 + 6.0.0-preview.6.21280.14 From 63430b96366232edfc23d7a1929737501ef2a021 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jun 2021 06:49:29 +0000 Subject: [PATCH 08/24] Update dependencies from https://github.com/dotnet/winforms build 20210531.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21281.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21279.3 (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 cef8c84f160..c6ab42c45e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 34adf771ca84eb8c56f5183eb60cf23840c8fd47 + 791e5bb26dcaeb6b35efea84d8b76c5c88944e4b - + https://github.com/dotnet/winforms - 34adf771ca84eb8c56f5183eb60cf23840c8fd47 + 791e5bb26dcaeb6b35efea84d8b76c5c88944e4b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5f48fac25e2..30585b00406 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21280.14 + 6.0.0-preview.6.21281.1 From aba999d53ae0992f00beace51b2ac2baa48d0b7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jun 2021 07:33:40 +0000 Subject: [PATCH 09/24] Update dependencies from https://github.com/dotnet/winforms build 20210531.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21281.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21281.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6ab42c45e6..8f915d55577 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 791e5bb26dcaeb6b35efea84d8b76c5c88944e4b + cf7c9da0c817977a66ba7437f2e8d6d059807e85 - + https://github.com/dotnet/winforms - 791e5bb26dcaeb6b35efea84d8b76c5c88944e4b + cf7c9da0c817977a66ba7437f2e8d6d059807e85 - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e - + https://github.com/dotnet/runtime - b5c91e4c29359f160edcf7caf16530e48d9a4fb0 + fea7ff2cce79da2df9cf1c50ce215287750f055e diff --git a/eng/Versions.props b/eng/Versions.props index 30585b00406..dd47f30066d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.3 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 - 6.0.0-preview.6.21279.3 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21281.1 From 6b39f9d2f3eff4ff91906089cc1981c18186e8ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jun 2021 19:57:30 +0000 Subject: [PATCH 10/24] Update dependencies from https://github.com/dotnet/winforms build 20210601.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21301.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21281.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 8f915d55577..79a55bb83d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - cf7c9da0c817977a66ba7437f2e8d6d059807e85 + c47d6d2c079ab2fb7161cf483ac52004e85adf39 - + https://github.com/dotnet/winforms - cf7c9da0c817977a66ba7437f2e8d6d059807e85 + c47d6d2c079ab2fb7161cf483ac52004e85adf39 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index dd47f30066d..0fd5720c6d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21281.3 + 6.0.0-preview.6.21301.1 From cca689d2525e038600848125b7f46d010d5c0696 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jun 2021 20:30:00 +0000 Subject: [PATCH 11/24] Update dependencies from https://github.com/dotnet/winforms build 20210601.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21301.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21301.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79a55bb83d0..9c1d1d1bb27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - c47d6d2c079ab2fb7161cf483ac52004e85adf39 + 4966ceee4f3fc3f386f88290b10cb81fbb4f23fa - + https://github.com/dotnet/winforms - c47d6d2c079ab2fb7161cf483ac52004e85adf39 + 4966ceee4f3fc3f386f88290b10cb81fbb4f23fa - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 - + https://github.com/dotnet/runtime - fea7ff2cce79da2df9cf1c50ce215287750f055e + 85fde0536b64c4901056b894f5184103f39cac63 diff --git a/eng/Versions.props b/eng/Versions.props index 0fd5720c6d0..4d2cc23cea8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.2 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 - 6.0.0-preview.6.21281.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21301.1 From 779e258fbcd2036d5a14061fded2e5c57359a24b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jun 2021 20:46:35 +0000 Subject: [PATCH 12/24] Update dependencies from https://github.com/dotnet/winforms build 20210601.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21301.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21301.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 9c1d1d1bb27..c470e7727d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 4966ceee4f3fc3f386f88290b10cb81fbb4f23fa + f9286c4645fcc0db59c118fa8eb5e7b020b4f2f5 - + https://github.com/dotnet/winforms - 4966ceee4f3fc3f386f88290b10cb81fbb4f23fa + f9286c4645fcc0db59c118fa8eb5e7b020b4f2f5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4d2cc23cea8..dd5b07c79ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21301.2 + 6.0.0-preview.6.21301.3 From 7a7de755f0d5145415a26354df5daade006ab190 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 1 Jun 2021 21:05:41 +0000 Subject: [PATCH 13/24] Update dependencies from https://github.com/dotnet/winforms build 20210601.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21301.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21301.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 c470e7727d1..5c2d4ed919b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - f9286c4645fcc0db59c118fa8eb5e7b020b4f2f5 + e4793021e21a63b03aef91fb7eeb6614faa8adb8 - + https://github.com/dotnet/winforms - f9286c4645fcc0db59c118fa8eb5e7b020b4f2f5 + e4793021e21a63b03aef91fb7eeb6614faa8adb8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index dd5b07c79ea..35fff4173ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21301.3 + 6.0.0-preview.6.21301.4 From 47a513784a739d596361c5e9538a5a276bfff49e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Jun 2021 13:25:58 +0000 Subject: [PATCH 14/24] Update dependencies from https://github.com/dotnet/winforms build 20210602.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21302.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21302.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c2d4ed919b..ca183e15f1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - e4793021e21a63b03aef91fb7eeb6614faa8adb8 + c44df149a214583a6edc935e1fe5fbc85c7a8c76 - + https://github.com/dotnet/winforms - e4793021e21a63b03aef91fb7eeb6614faa8adb8 + c44df149a214583a6edc935e1fe5fbc85c7a8c76 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 - + https://github.com/dotnet/runtime - 85fde0536b64c4901056b894f5184103f39cac63 + dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 diff --git a/eng/Versions.props b/eng/Versions.props index 35fff4173ef..717d9e70162 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21301.4 + 6.0.0-preview.6.21302.1 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 - 6.0.0-preview.6.21301.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.1 From 2cfa9bcb8d93f0573b487c128fdad306d9b304fb Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Wed, 2 Jun 2021 15:52:51 -0700 Subject: [PATCH 15/24] Update PresentationBuildTasks to build against .NET Framework 4.72 and .NET Core 3.1 --- .../Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs | 4 ++++ .../Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs | 3 +++ .../src/PresentationBuildTasks/PresentationBuildTasks.csproj | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs index 4561ee6e388..fe5c2ff65d8 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs @@ -1277,7 +1277,11 @@ private void DoMarkupCompilation() { // Better GC behavior in 4.6 and later when wrapped in Task.Run(). // Inside of VisualStudio, when DesignTimeMarkupCompilation happens, it uses MarkupCompilePass1 only (not Pass2). + + // AppDomains are not supported on .NET Core. 'AppDomain.Unload' will always throw `CannotUnloadAppDomainException`. + #pragma warning disable SYSLIB0024 AppDomain.Unload(appDomain); + #pragma warning restore SYSLIB0024 }); } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs index 34aa76d124b..c73dc8f8d48 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs @@ -702,7 +702,10 @@ private void DoLocalReferenceMarkupCompilation(FileUnit localApplicationFile, Fi if (appDomain != null) { + // AppDomains are not supported on .NET Core. 'AppDomain.Unload' will always throw `CannotUnloadAppDomainException`. + #pragma warning disable SYSLIB0024 AppDomain.Unload(appDomain); + #pragma warning restore SYSLIB0024 compilerWrapper = null; } } diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 176313c0d95..d03837424ed 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,6 @@  - net472;netcoreapp2.1 + net472;netcoreapp3.1 false true From c9eaf2663207d46f18f55c4fd863f4f82bff5305 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Jun 2021 01:46:35 +0000 Subject: [PATCH 16/24] Update dependencies from https://github.com/dotnet/winforms build 20210602.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21302.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21302.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 ca183e15f1a..ebab6038495 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - c44df149a214583a6edc935e1fe5fbc85c7a8c76 + de3ddbbc3d26daad5c1508eb3acbb55004f07a1c - + https://github.com/dotnet/winforms - c44df149a214583a6edc935e1fe5fbc85c7a8c76 + de3ddbbc3d26daad5c1508eb3acbb55004f07a1c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 717d9e70162..f4822e375e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21302.5 From ff2f46a4051262d77485cc6f0bb3c8c3514f8974 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Jun 2021 13:14:02 +0000 Subject: [PATCH 17/24] Update dependencies from https://github.com/dotnet/winforms build 20210603.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21303.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21302.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 ebab6038495..3ffd650155a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - de3ddbbc3d26daad5c1508eb3acbb55004f07a1c + 25784b16b61b52e9ba18727cd43a4990dffa9477 - + https://github.com/dotnet/winforms - de3ddbbc3d26daad5c1508eb3acbb55004f07a1c + 25784b16b61b52e9ba18727cd43a4990dffa9477 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f4822e375e1..bdb39a17453 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21302.5 + 6.0.0-preview.6.21303.1 From 8a280476dc8eb7498c648ed69fbf76da95ac3eb3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Jun 2021 18:38:20 +0000 Subject: [PATCH 18/24] Update dependencies from https://github.com/dotnet/winforms build 20210603.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21303.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.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21303.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ffd650155a..e4659e50a7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 25784b16b61b52e9ba18727cd43a4990dffa9477 + f87237bbbdb07b3e19d3f8a3c07a2ca39a4d25fa - + https://github.com/dotnet/winforms - 25784b16b61b52e9ba18727cd43a4990dffa9477 + f87237bbbdb07b3e19d3f8a3c07a2ca39a4d25fa - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 - + https://github.com/dotnet/runtime - dbb05eba3b229df3d4c15ce08de9f84c7febb7b3 + 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 diff --git a/eng/Versions.props b/eng/Versions.props index bdb39a17453..f092a308944 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.2 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 - 6.0.0-preview.6.21302.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21303.1 From 585bca08f9a059f35f1fd5ba49f86b0d9cd99c4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Jun 2021 02:51:19 +0000 Subject: [PATCH 19/24] Update dependencies from https://github.com/dotnet/winforms build 20210603.7 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21303.7 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21303.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 e4659e50a7b..a1825937dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - f87237bbbdb07b3e19d3f8a3c07a2ca39a4d25fa + 5c93ab02ee4e8811dea3df93e312f2d3b83a25a0 - + https://github.com/dotnet/winforms - f87237bbbdb07b3e19d3f8a3c07a2ca39a4d25fa + 5c93ab02ee4e8811dea3df93e312f2d3b83a25a0 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f092a308944..c0e3aa8c504 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21303.2 + 6.0.0-preview.6.21303.7 From 8c51116bafa7c09f6986b7096897b0eebcc83e76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Jun 2021 13:16:54 +0000 Subject: [PATCH 20/24] Update dependencies from https://github.com/dotnet/winforms build 20210604.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21304.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21304.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1825937dc3..4441416e3de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 5c93ab02ee4e8811dea3df93e312f2d3b83a25a0 + 3b711ef30d99a43db6889c75412b234b2f3e6aec - + https://github.com/dotnet/winforms - 5c93ab02ee4e8811dea3df93e312f2d3b83a25a0 + 3b711ef30d99a43db6889c75412b234b2f3e6aec - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 - + https://github.com/dotnet/runtime - 3e1ddb05cd2a1f14729df91c8c429f3047a4b569 + 5a1b8223dab2f7954e7f206095ba937e5d237299 diff --git a/eng/Versions.props b/eng/Versions.props index c0e3aa8c504..bdde6cefd0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21303.7 + 6.0.0-preview.6.21304.1 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 - 6.0.0-preview.6.21303.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21304.1 From bf0807c1c86d66a83382664c4efe268de7f6ace7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Jun 2021 13:06:58 +0000 Subject: [PATCH 21/24] Update dependencies from https://github.com/dotnet/winforms build 20210605.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21305.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21305.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4441416e3de..f30cfe165ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 3b711ef30d99a43db6889c75412b234b2f3e6aec + 4f7a8081ac26db680328ef9e76ba51d0988c4ebe - + https://github.com/dotnet/winforms - 3b711ef30d99a43db6889c75412b234b2f3e6aec + 4f7a8081ac26db680328ef9e76ba51d0988c4ebe - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 - + https://github.com/dotnet/runtime - 5a1b8223dab2f7954e7f206095ba937e5d237299 + 00c4a492a5d34547457936be2a56f894ce5eb241 diff --git a/eng/Versions.props b/eng/Versions.props index bdde6cefd0c..266c1d09365 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21305.1 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 - 6.0.0-preview.6.21304.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21305.1 From 87668175fba98c729476dc356c6543f77837480a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 6 Jun 2021 09:14:33 +0000 Subject: [PATCH 22/24] Update dependencies from https://github.com/dotnet/winforms build 20210606.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21306.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21305.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 f30cfe165ca..88b227a022f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 4f7a8081ac26db680328ef9e76ba51d0988c4ebe + d2b8bc375d88e8853cb7d3d404f14a3edb62ece7 - + https://github.com/dotnet/winforms - 4f7a8081ac26db680328ef9e76ba51d0988c4ebe + d2b8bc375d88e8853cb7d3d404f14a3edb62ece7 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 266c1d09365..b11e5705747 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21306.1 From 444d0024499cbc41d349a521a600f93e7721d768 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Jun 2021 08:26:32 +0000 Subject: [PATCH 23/24] Update dependencies from https://github.com/dotnet/winforms build 20210607.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21278.2 -> To Version 6.0.0-preview.6.21307.1 Dependency coherency updates Microsoft.Win32.Registry,System.CodeDom,System.Configuration.ConfigurationManager,System.Diagnostics.EventLog,System.DirectoryServices,System.Drawing.Common,System.Reflection.MetadataLoadContext,System.Security.AccessControl,System.Security.Cryptography.Xml,System.Security.Permissions,System.Security.Principal.Windows,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.6.21278.2 -> To Version 6.0.0-preview.6.21306.1 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 42 ++++++++++---------- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88b227a022f..0598c60ee7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - d2b8bc375d88e8853cb7d3d404f14a3edb62ece7 + 503c5c458435c7e1cc8fff852e685d94b1f21f9e - + https://github.com/dotnet/winforms - d2b8bc375d88e8853cb7d3d404f14a3edb62ece7 + 503c5c458435c7e1cc8fff852e685d94b1f21f9e - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 1489cb7f8770ad66aef462957016806862709f4b - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 - + https://github.com/dotnet/runtime - 00c4a492a5d34547457936be2a56f894ce5eb241 + 5b8e1780ad7740e632c285bc2af13a8d0b20c5a9 diff --git a/eng/Versions.props b/eng/Versions.props index b11e5705747..0418f711175 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21307.1 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 4.6.0-preview4.19176.11 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 - 6.0.0-preview.6.21305.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 + 6.0.0-preview.6.21306.1 From c52f1df945d968a0e405a795b2f090b25227b69f Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Fri, 4 Jun 2021 11:31:56 -0700 Subject: [PATCH 24/24] Update PBT TFM to 6.0 --- eng/WpfArcadeSdk/tools/Pbt.props | 2 +- .../src/PresentationBuildTasks/Microsoft.WinFX.targets | 2 +- .../src/PresentationBuildTasks/PresentationBuildTasks.csproj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/Pbt.props b/eng/WpfArcadeSdk/tools/Pbt.props index 5b67be1b247..ee6943cf351 100644 --- a/eng/WpfArcadeSdk/tools/Pbt.props +++ b/eng/WpfArcadeSdk/tools/Pbt.props @@ -4,7 +4,7 @@ - netcoreapp2.1 + net6.0 net472 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets index 2280fbfa761..a00d90978e6 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft.WinFX.targets @@ -1,7 +1,7 @@ - <_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' == 'Core'">netcoreapp2.1 + <_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' == 'Core'">net6.0 <_PresentationBuildTasksTfm Condition="'$(MSBuildRuntimeType)' != 'Core'">net472 <_PresentationBuildTasksAssembly Condition="'$(_PresentationBuildTasksAssembly)'==''">$([MSBuild]::Unescape($([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\$(_PresentationBuildTasksTfm)\PresentationBuildTasks.dll')))) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index d03837424ed..eeaf8b37079 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,6 @@  - net472;netcoreapp3.1 + net472;net6.0 false true @@ -60,7 +60,7 @@ - +