[main] Update dependencies from dotnet/winforms (dotnet#5212)

[main] Update dependencies from dotnet/winforms - Coherency Updates: - System.CodeDom: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Drawing.Common: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Reflection.MetadataLoadContext: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILDAsm: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.ILAsm: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21427.1 to 7.0.0-alpha.1.21453.1 (parent: Microsoft.Private.Winforms) - Merge branch 'main' into darc-main-6135067d-e034-47ce-af6b-28e16f5b1dd6 - Remove Analyzers coming from net6.0 ref pack These require VS 2022 Roslyn v4.0, but the CI machine is still using VS 2019. - Respond to PR feedback from dotnet#5208 (dotnet#5225)
Faithlife · Sep 3, 2021 · b95e8c2 · b95e8c2
1 parent 6733504
commit b95e8c2
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 49 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -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>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -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>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -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>
@@ -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>