Skip to content

Commit

Permalink
[release/6.0-preview2] Update dependencies from dotnet/winforms (#4212)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/winforms build 20210222.6

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 6.0.0-preview.3.21123.1 -> To Version 6.0.0-preview.2.21122.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.3.21123.2 -> To Version 6.0.0-preview.2.21120.6 (parent: Microsoft.Private.Winforms

* Update triggers

* Update dependencies from https://github.com/dotnet/winforms build 20210223.2

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 6.0.0-preview.3.21123.1 -> To Version 6.0.0-preview.2.21123.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.3.21123.2 -> To Version 6.0.0-preview.2.21123.7 (parent: Microsoft.Private.Winforms

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
  • Loading branch information
3 people authored Feb 24, 2021
1 parent 7a945a3 commit c4e26b5
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 65 deletions.
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ trigger:
- master
- release/3.*
- release/5.*
- release/6.*
- internal/release/5.*
- internal/release/6.*
- experimental/*
paths:
exclude:
Expand All @@ -53,6 +55,7 @@ pr:
- release/3.*
- internal/release/3.*
- release/5.*
- release/6.*
- experimental/*
paths:
exclude:
Expand Down
88 changes: 44 additions & 44 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,101 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.3.21123.1">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-preview.2.21123.2">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>7b6d43368dbfd7a40fd0d3e336e46418f780ee59</Sha>
<Sha>cec40d967da26139b8a622a9d6a18b52e6794e1b</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.3.21123.1">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.2.21123.2">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>7b6d43368dbfd7a40fd0d3e336e46418f780ee59</Sha>
<Sha>cec40d967da26139b8a622a9d6a18b52e6794e1b</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Win32.Registry" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Reflection.Emit" Version="5.0.0-alpha.1.19563.6">
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.AccessControl" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Principal.Windows" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-preview.2.21116.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>55bb4fd101e83575b545f27105d575c1895a6b8a</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.2.21123.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>ec21beea1763aa539e1084e595a86a58d444036e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
42 changes: 21 additions & 21 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,42 @@
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-preview.3.21123.2</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.3.21123.2</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>6.0.0-preview.2.21123.7</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.2.21123.7</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.3.21123.1</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-preview.2.21123.2</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.2.21123.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.2.21123.7</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21123.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21123.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.3.21123.2</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.3.21123.2</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.3.21123.2</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.3.21123.2</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.2.21123.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.2.21123.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.2.21123.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.2.21123.7</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.2.21123.7</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-preview.2.21123.7</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-preview.2.21123.7</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.3.21123.2</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.3.21123.2</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.3.21123.2</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.3.21123.2</SystemDiagnosticsEventLogPackageVersion>
<MicrosoftWin32RegistryPackageVersion>6.0.0-preview.2.21123.7</MicrosoftWin32RegistryPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-preview.2.21123.7</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-preview.2.21123.7</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-preview.2.21123.7</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionEmitPackageVersion>5.0.0-alpha.1.19563.6</SystemReflectionEmitPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.3.21123.2</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.3.21123.2</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.3.21123.2</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.3.21123.2</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.3.21123.2</SystemWindowsExtensionsPackageVersion>
<SystemSecurityAccessControlPackageVersion>6.0.0-preview.2.21123.7</SystemSecurityAccessControlPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-preview.2.21123.7</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-preview.2.21123.7</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>6.0.0-preview.2.21123.7</SystemSecurityPrincipalWindowsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-preview.2.21123.7</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down

0 comments on commit c4e26b5

Please sign in to comment.