From b15645365a7c526b86c81badff3494668b437c73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Jun 2021 16:46:10 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/winforms build 20210616.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms From Version 6.0.0-preview.6.21315.7 -> To Version 6.0.0-preview.6.21316.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.6.21314.2 -> To Version 6.0.0-preview.6.21315.7 (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 a4f89bdb46b..7e4cf4269d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,97 +1,97 @@ - + https://github.com/dotnet/winforms - 5d5baee39dd7e2c1639c595b9934e099efe04715 + 6a9d2f53a45bb9df68c8ac0d5aa6d7fdf49ae84f - + https://github.com/dotnet/winforms - 5d5baee39dd7e2c1639c595b9934e099efe04715 + 6a9d2f53a45bb9df68c8ac0d5aa6d7fdf49ae84f https://github.com/dotnet/runtime bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c https://github.com/dotnet/runtime bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c https://github.com/dotnet/runtime bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int f323cab48022999af07ba408f7cc1c776944cab5 - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c - + https://github.com/dotnet/runtime - bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2 + cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c diff --git a/eng/Versions.props b/eng/Versions.props index 0dcce3f49f4..e3352840914 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,41 +4,41 @@ 6.0.0 preview 6 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 - 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21316.3 5.0.0-alpha1.19562.1 - 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 - 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.6.21315.7 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 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.21315.7 + 6.0.0-preview.6.21315.7 + 6.0.0-preview.6.21315.7 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.6.21315.7 + 6.0.0-preview.6.21315.7 6.0.0-preview.6.21314.2 - 6.0.0-preview.6.21314.2 + 6.0.0-preview.6.21315.7 From 195094ced31a9dbbca0c810fe1a59f9ee322edfc 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 2/2] 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 @@ + + -