Skip to content

Commit 56bf228

Browse files
dotnet-maestro[bot]ryalanms
dotnet-maestro[bot]
and
ryalanms
authored
[release/6.0-preview6] Update dependencies from dotnet/winforms (#4686)
* 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 * Add reference to System.IO.FileSystem.AccessControl for new type forward Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Ryland <41491307+ryalanms@users.noreply.github.com>
1 parent d38b8a2 commit 56bf228

File tree

3 files changed

+58
-57
lines changed

3 files changed

+58
-57
lines changed

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,97 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.6.21315.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.6.21316.3">
55
<Uri>https://github.com/dotnet/winforms</Uri>
6-
<Sha>5d5baee39dd7e2c1639c595b9934e099efe04715</Sha>
6+
<Sha>6a9d2f53a45bb9df68c8ac0d5aa6d7fdf49ae84f</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.6.21315.7">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.6.21316.3">
99
<Uri>https://github.com/dotnet/winforms</Uri>
10-
<Sha>5d5baee39dd7e2c1639c595b9934e099efe04715</Sha>
10+
<Sha>6a9d2f53a45bb9df68c8ac0d5aa6d7fdf49ae84f</Sha>
1111
</Dependency>
1212
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
1414
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
1515
</Dependency>
16-
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
16+
<Dependency Name="System.CodeDom" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
18+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
1919
</Dependency>
20-
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
22+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
2323
</Dependency>
24-
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
26+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
2727
</Dependency>
28-
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
30+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
3131
</Dependency>
32-
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
34+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
3535
</Dependency>
36-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
36+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
38+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
3939
</Dependency>
4040
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
4242
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
4343
</Dependency>
44-
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
44+
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
46-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
46+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
4747
</Dependency>
48-
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
50+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
5151
</Dependency>
5252
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
5454
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
56+
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
58+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
62+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
6363
</Dependency>
6464
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.6.21312.2">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
6666
<Sha>f323cab48022999af07ba408f7cc1c776944cab5</Sha>
6767
</Dependency>
68-
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
68+
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
70-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
70+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
7171
</Dependency>
72-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://github.com/dotnet/runtime</Uri>
74-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
74+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://github.com/dotnet/runtime</Uri>
78-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
78+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
7979
</Dependency>
80-
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://github.com/dotnet/runtime</Uri>
82-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
82+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
84+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://github.com/dotnet/runtime</Uri>
86-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
86+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
88+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
8989
<Uri>https://github.com/dotnet/runtime</Uri>
90-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
90+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
9191
</Dependency>
92-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21314.2" CoherentParentDependency="Microsoft.Private.Winforms">
92+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21315.7" CoherentParentDependency="Microsoft.Private.Winforms">
9393
<Uri>https://github.com/dotnet/runtime</Uri>
94-
<Sha>bc16a7bd2dcca7f1f8ce70e75dc86a3fac3ffcd2</Sha>
94+
<Sha>cf7e7a46f8a4a6225a8f1e059a846ccdebf0454c</Sha>
9595
</Dependency>
9696
</ProductDependencies>
9797
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,41 @@
44
<VersionPrefix>6.0.0</VersionPrefix>
55
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
66
<PreReleaseVersionIteration>6</PreReleaseVersionIteration>
7-
<SystemIOPackagingVersion>6.0.0-preview.6.21314.2</SystemIOPackagingVersion>
8-
<SystemResourcesExtensionsVersion>6.0.0-preview.6.21314.2</SystemResourcesExtensionsVersion>
7+
<SystemIOPackagingVersion>6.0.0-preview.6.21315.7</SystemIOPackagingVersion>
8+
<SystemResourcesExtensionsVersion>6.0.0-preview.6.21315.7</SystemResourcesExtensionsVersion>
99
</PropertyGroup>
1010
<!-- NuGet Package Versions -->
1111
<PropertyGroup>
12-
<MicrosoftPrivateWinformsVersion>6.0.0-preview.6.21315.7</MicrosoftPrivateWinformsVersion>
12+
<MicrosoftPrivateWinformsVersion>6.0.0-preview.6.21316.3</MicrosoftPrivateWinformsVersion>
1313
</PropertyGroup>
1414
<!-- Packages that come from https://github.com/dotnet/coreclr -->
1515
<PropertyGroup>
1616
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
17-
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreILDAsmVersion>
18-
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreILAsmVersion>
17+
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21315.7</MicrosoftNETCoreILDAsmVersion>
18+
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21315.7</MicrosoftNETCoreILAsmVersion>
1919
</PropertyGroup>
2020
<!-- Packages that come from https://github.com/dotnet/core-setup -->
2121
<PropertyGroup>
22-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21314.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
23-
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.6.21314.2</MicrosoftNETCoreAppRefVersion>
24-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.6.21314.2</MicrosoftNETCoreAppRuntimewinx64Version>
25-
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.6.21314.2</MicrosoftNETCorePlatformsVersion>
26-
<SystemDrawingCommonVersion>6.0.0-preview.6.21314.2</SystemDrawingCommonVersion>
27-
<SystemDirectoryServicesVersion>6.0.0-preview.6.21314.2</SystemDirectoryServicesVersion>
28-
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21314.2</SystemReflectionMetadataLoadContextVersion>
22+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21315.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
23+
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.6.21315.7</MicrosoftNETCoreAppRefVersion>
24+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.6.21315.7</MicrosoftNETCoreAppRuntimewinx64Version>
25+
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.6.21315.7</MicrosoftNETCorePlatformsVersion>
26+
<SystemDrawingCommonVersion>6.0.0-preview.6.21315.7</SystemDrawingCommonVersion>
27+
<SystemDirectoryServicesVersion>6.0.0-preview.6.21315.7</SystemDirectoryServicesVersion>
28+
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.6.21315.7</SystemReflectionMetadataLoadContextVersion>
2929
</PropertyGroup>
3030
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
3131
<PropertyGroup>
3232
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.6.21314.2</MicrosoftWin32RegistryPackageVersion>
33-
<SystemCodeDomPackageVersion>6.0.0-preview.6.21314.2</SystemCodeDomPackageVersion>
34-
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.6.21314.2</SystemConfigurationConfigurationManagerPackageVersion>
35-
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.6.21314.2</SystemDiagnosticsEventLogPackageVersion>
33+
<SystemCodeDomPackageVersion>6.0.0-preview.6.21315.7</SystemCodeDomPackageVersion>
34+
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.6.21315.7</SystemConfigurationConfigurationManagerPackageVersion>
35+
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.6.21315.7</SystemDiagnosticsEventLogPackageVersion>
3636
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
3737
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityAccessControlPackageVersion>
38-
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityCryptographyXmlPackageVersion>
39-
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityPermissionsPackageVersion>
38+
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.6.21315.7</SystemSecurityCryptographyXmlPackageVersion>
39+
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.6.21315.7</SystemSecurityPermissionsPackageVersion>
4040
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.6.21314.2</SystemSecurityPrincipalWindowsPackageVersion>
41-
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.6.21314.2</SystemWindowsExtensionsPackageVersion>
41+
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.6.21315.7</SystemWindowsExtensionsPackageVersion>
4242
</PropertyGroup>
4343
<!-- Packages that come from https://github.com/dotnet/arcade -->
4444
<PropertyGroup>

‎src/Microsoft.DotNet.Wpf/src/PresentationUI/PresentationUI.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,18 @@
243243
<NetCoreReference Include="System.Drawing.Primitives" />
244244
<NetCoreReference Include="System.IO" />
245245
<NetCoreReference Include="System.IO.FileSystem" />
246+
<NetCoreReference Include="System.IO.FileSystem.AccessControl" />
246247
<NetCoreReference Include="System.ObjectModel" />
247248
<NetCoreReference Include="System.Resources.ResourceManager" />
248249
<NetCoreReference Include="System.Runtime.Extensions" />
249250
<NetCoreReference Include="System.Runtime.InteropServices" />
251+
<NetCoreReference Include="System.Runtime.Loader" />
250252
<NetCoreReference Include="System.Security.Cryptography.Algorithms" />
251253
<NetCoreReference Include="System.Security.Cryptography.Primitives" />
252254
<NetCoreReference Include="System.Security.Cryptography.X509Certificates" />
253255
<NetCoreReference Include="System.Threading" />
254256
<NetCoreReference Include="System.Threading.Thread" />
255257
<NetCoreReference Include="System.Threading.ThreadPool" />
256-
<NetCoreReference Include="System.Runtime.Loader" />
257258

258259
<MicrosoftPrivateWinFormsReference Include="System.Windows.Forms" />
259260
<MicrosoftPrivateWinFormsReference Include="System.Windows.Forms.Primitives" />

0 commit comments

Comments
 (0)