Skip to content

[release/6.0-rc1] Update dependencies from dotnet/winforms #5208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 30, 2021
Merged

[release/6.0-rc1] Update dependencies from dotnet/winforms #5208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
142caea
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 28, 2021
fcd16ea
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 30, 2021
7acd67d
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 30, 2021
f9c78fd
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 30, 2021
280cdc6
Remove Analyzers coming from net6.0 ref pack
eerhardt Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,12 @@
<Import Sdk="Microsoft.DotNet.Arcade.Wpf.Sdk"
Project="Sdk.targets"
Condition="!Exists('$(WpfArcadeSdkProps)') Or !Exists('$(WpfArcadeSdkTargets)')"/>

<!-- Temporarily remove analyzers from framework references until we can update to VS 2022 which handles them correctly
https://github.com/dotnet/wpf/issues/5224 -->
<Target Name="_RemoveFrameworkReferenceAnalyzers" AfterTargets="ResolveTargetingPackAssets">
<ItemGroup>
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').IndexOf('analyzers', StringComparison.OrdinalIgnoreCase)) > 0" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != '' and $([System.String]::Copy('%(Directory)').IndexOf('analyzers', StringComparison.OrdinalIgnoreCase)) > 0" />
<Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.FrameworkReferenceName)' != ''" />

You can remove the later part of this condition. That was present when I needed to distingush analyzers from refs (WPF was previously using an SDK which raised them as references).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Waiting for CI to validate the current changes and then will commit this suggestion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or not, I guess

</ItemGroup>
</Target>
</Project>
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,85 +1,85 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-rc.1.21426.8">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.0-rc.1.21430.13">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ef62cf01879337b5fa4f710a347bc9cab9fb897b</Sha>
<Sha>bab479fa2de8644d36533ef8c35022ff4d6e0c13</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rc.1.21426.8">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rc.1.21430.13">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>ef62cf01879337b5fa4f710a347bc9cab9fb897b</Sha>
<Sha>bab479fa2de8644d36533ef8c35022ff4d6e0c13</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rc.1.21419.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>4bc1c55c0abcb0ff62bdb534168a51be2224fe3f</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21426.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rc.1.21430.11" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4ebbb8ed88ae2656d2072940d3aaf17a2e5cefd6</Sha>
<Sha>0ab2741bdcf5c05c6c4f986d6c4eb0df573bc549</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
36 changes: 18 additions & 18 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,38 +4,38 @@
<VersionPrefix>6.0.0</VersionPrefix>
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<SystemIOPackagingVersion>6.0.0-rc.1.21426.17</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21426.17</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>6.0.0-rc.1.21430.11</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21430.11</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.0-rc.1.21426.8</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.0-rc.1.21430.13</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-rc.1.21426.17</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-rc.1.21426.17</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-rc.1.21430.11</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.0-rc.1.21430.11</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21426.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21426.17</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21426.17</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21426.17</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.1.21426.17</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-rc.1.21426.17</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.1.21426.17</SystemReflectionMetadataLoadContextVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21430.11</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21430.11</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21430.11</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21430.11</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.1.21430.11</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>6.0.0-rc.1.21430.11</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.1.21430.11</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<SystemCodeDomPackageVersion>6.0.0-rc.1.21426.17</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-rc.1.21426.17</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-rc.1.21426.17</SystemDiagnosticsEventLogPackageVersion>
<SystemCodeDomPackageVersion>6.0.0-rc.1.21430.11</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>6.0.0-rc.1.21430.11</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>6.0.0-rc.1.21430.11</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-rc.1.21426.17</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-rc.1.21426.17</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-rc.1.21426.17</SystemWindowsExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.0-rc.1.21430.11</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>6.0.0-rc.1.21430.11</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>6.0.0-rc.1.21430.11</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down