From 33910a89b98b4afdf4d6af8ea5fc5a18c4c2a438 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 01:21:35 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/winforms build 20210616.5 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21316.4 -> To Version 6.0.0-preview.7.21316.5 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.6.21314.2 -> To Version 6.0.0-preview.7.21316.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 9665c1018ad..f20dbbd78d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 7e1d9ad9e8893fae019b46ee744fdc99a4c12f13 + 30d81450f45b90bc9d7b3b0eb2e7ff0d134e7db2 - + https://github.com/dotnet/winforms - 7e1d9ad9e8893fae019b46ee744fdc99a4c12f13 + 30d81450f45b90bc9d7b3b0eb2e7ff0d134e7db2 https://github.com/dotnet/runtime bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 https://github.com/dotnet/runtime bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 https://github.com/dotnet/runtime bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int c289a53cdd64fc3965ab62fe68935ea24dd365e9 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + 6b015e2e24461313622575ca56fb76d4ad469ab5 diff --git a/eng/Versions.props b/eng/Versions.props index 4ab6053a31c..76face49a33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 7 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 - 6.0.0-preview.7.21316.4 + 6.0.0-preview.7.21316.5 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 4.6.0-preview4.19176.11 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.7.21316.2 From e3fc7885861ff3fa0522992567ae2e2652fd4070 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 04:32:38 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/winforms build 20210616.8 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21316.4 -> To Version 6.0.0-preview.7.21316.8 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.6.21314.2 -> To Version 6.0.0-preview.7.21316.2 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f20dbbd78d8..b7b5e007deb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,11 +1,11 @@ - + https://github.com/dotnet/winforms 30d81450f45b90bc9d7b3b0eb2e7ff0d134e7db2 - + https://github.com/dotnet/winforms 30d81450f45b90bc9d7b3b0eb2e7ff0d134e7db2 diff --git a/eng/Versions.props b/eng/Versions.props index 76face49a33..94397ef0509 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21316.5 + 6.0.0-preview.7.21316.8 From e96edd286541b994f5e01d0ad334bd1150c9527a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 08:46:14 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/winforms build 20210617.1 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21316.4 -> To Version 6.0.0-preview.7.21317.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.6.21314.2 -> To Version 6.0.0-preview.7.21316.2 (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 b7b5e007deb..415f904189d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - 30d81450f45b90bc9d7b3b0eb2e7ff0d134e7db2 + a2a48d7c55e178477609e53e879c6fde03a07d6a - + https://github.com/dotnet/winforms - 30d81450f45b90bc9d7b3b0eb2e7ff0d134e7db2 + a2a48d7c55e178477609e53e879c6fde03a07d6a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 94397ef0509..08a49399b6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21316.8 + 6.0.0-preview.7.21317.1 From 4334d748022d922c8e603ea0ef45a10ab666c8d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 13:01:06 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/winforms build 20210617.2 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.7.21316.4 -> To Version 6.0.0-preview.7.21317.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.6.21314.2 -> To Version 6.0.0-preview.7.21316.2 (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 415f904189d..ab9308421de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/winforms - a2a48d7c55e178477609e53e879c6fde03a07d6a + ded555d7fdf0410731cb68b6febe5e2ed1cffb71 - + https://github.com/dotnet/winforms - a2a48d7c55e178477609e53e879c6fde03a07d6a + ded555d7fdf0410731cb68b6febe5e2ed1cffb71 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 08a49399b6b..2e77851ea80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ - 6.0.0-preview.7.21317.1 + 6.0.0-preview.7.21317.2 From 0808ae17d7cecf52680cc3f06c3663b27f541b48 Mon Sep 17 00:00:00 2001 From: Ryland <41491307+ryalanms@users.noreply.github.com> Date: Wed, 16 Jun 2021 17:25:21 -0700 Subject: [PATCH 5/5] Add reference to System.IO.FileSystem.AccessControl for new type forward --- .../src/PresentationUI/PresentationUI.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj index 63e6c572158..a5fdb337aef 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj @@ -243,17 +243,18 @@ + + -