Skip to content

[main] Update dependencies from dotnet/winforms #5212

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 24 commits into from
Sep 3, 2021
Merged

[main] Update dependencies from dotnet/winforms #5212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
558d5c6
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 28, 2021
4d162e7
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 29, 2021
ef91882
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 30, 2021
1627b74
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 30, 2021
82c6c5d
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 30, 2021
9d21162
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Aug 31, 2021
bc0c5e8
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
0c8b1ce
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
bfe6ae7
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
aee583e
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
77e63e7
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
ef22730
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
36fb2fa
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 1, 2021
c00a67b
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 2, 2021
eaf8343
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 2, 2021
8fc8edc
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 2, 2021
0421fe3
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 2, 2021
500dcf2
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 3, 2021
50625ef
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 3, 2021
fafcfa2
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 3, 2021
2b45e61
Update dependencies from https://github.com/dotnet/winforms build 202…
dotnet-maestro[bot] Sep 3, 2021
788a6c1
Merge branch 'main' into darc-main-6135067d-e034-47ce-af6b-28e16f5b1dd6
eerhardt Sep 3, 2021
af777f4
Remove Analyzers coming from net6.0 ref pack
eerhardt Aug 30, 2021
70cfe53
Respond to PR feedback from https://github.com/dotnet/wpf/pull/5208 (…
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)' != ''" />
</ItemGroup>
</Target>
</Project>
68 changes: 34 additions & 34 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.0-alpha.1.21427.15">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.0-alpha.1.21453.8">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>3f7166098be6bc3f97318f9202258ef8095ee543</Sha>
<Sha>30891a7c73e146a38f82f5c7c5500423c0ffc04f</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-alpha.1.21427.15">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-alpha.1.21453.8">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>3f7166098be6bc3f97318f9202258ef8095ee543</Sha>
<Sha>30891a7c73e146a38f82f5c7c5500423c0ffc04f</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.CodeDom" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Cryptography.Xml" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rc.1.21417.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>552adb9a860d3e46354669315bbf72aa421ccdc1</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.IO.Packaging" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Resources.Extensions" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21427.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21453.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3cd4e393d9cb69bcb6f53db80998b6c45693e117</Sha>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<VersionPrefix>7.0.0</VersionPrefix>
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
<SystemIOPackagingVersion>7.0.0-alpha.1.21427.1</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>7.0.0-alpha.1.21427.1</SystemResourcesExtensionsVersion>
<SystemIOPackagingVersion>7.0.0-alpha.1.21453.1</SystemIOPackagingVersion>
<SystemResourcesExtensionsVersion>7.0.0-alpha.1.21453.1</SystemResourcesExtensionsVersion>
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>7.0.0-alpha.1.21427.15</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.0-alpha.1.21453.8</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
Expand All @@ -18,22 +18,22 @@
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21406.5</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.0-alpha.1.21427.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-alpha.1.21427.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21427.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>7.0.0-alpha.1.21427.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>7.0.0-alpha.1.21427.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-alpha.1.21427.1</SystemReflectionMetadataLoadContextVersion>
<MicrosoftNETCoreAppRefVersion>7.0.0-alpha.1.21453.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-alpha.1.21453.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21453.1</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>7.0.0-alpha.1.21453.1</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>7.0.0-alpha.1.21453.1</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>7.0.0-alpha.1.21453.1</SystemReflectionMetadataLoadContextVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefx via core-setup coherency parent dependency -->
<PropertyGroup>
<SystemCodeDomPackageVersion>7.0.0-alpha.1.21427.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0-alpha.1.21427.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>7.0.0-alpha.1.21427.1</SystemDiagnosticsEventLogPackageVersion>
<SystemCodeDomPackageVersion>7.0.0-alpha.1.21453.1</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0-alpha.1.21453.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>7.0.0-alpha.1.21453.1</SystemDiagnosticsEventLogPackageVersion>
<SystemReflectionTypeExtensionsPackageVersion>4.6.0-preview4.19176.11</SystemReflectionTypeExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>7.0.0-alpha.1.21427.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>7.0.0-alpha.1.21427.1</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>7.0.0-alpha.1.21427.1</SystemWindowsExtensionsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>7.0.0-alpha.1.21453.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>7.0.0-alpha.1.21453.1</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>7.0.0-alpha.1.21453.1</SystemWindowsExtensionsPackageVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
Expand Down