Merge remote-tracking branch 'dotnet/master' into dev/zadanz/coverage

dotnet · Mar 13, 2019 · 7d1c155 · 7d1c155
2 parents 97b0364 + 671d130
commit 7d1c155
Show file tree

Hide file tree

Showing 102 changed files with 4,859 additions and 26,069 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -154,13 +154,19 @@ indent_size = 2
 indent_size = 2
 
 # Xml files
-[*.{xml,stylecop,resx,ruleset}]
+[*.{xml,stylecop,ruleset}]
 indent_size = 2
 
 # Xml config files
 [*.{props,targets,config,nuspec}]
 indent_size = 2
 
+# resx Files
+[*.{resx,xlf}]
+indent_size = 2
+charset = utf-8-bom
+insert_final_newline = true
+
 # Shell scripts
 [*.sh]
 end_of_line = lf

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -5,8 +5,7 @@
   </PropertyGroup>
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-  <Import Project="$(RepositoryEngineeringDir)CodeStyle.props" />
-  <Import Project="eng\ReferenceAssemblies.props" />
+  <Import Project="$(RepositoryEngineeringDir)CodeStyle.props" />  
   <Import Project="eng\FacadeAssemblies.props" />
 
   <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -2,6 +2,7 @@
 <Project>
   <Import Project="$(RepositoryEngineeringDir)CodeStyle.targets" />
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+  <Import Project="$(RepositoryEngineeringDir)packageContent.targets" />
   <Import Project="$(RepositoryEngineeringDir)versioning.targets" />
   <!-- to prevent using MS.NC.Platforms from SDK, which is lagging behind the version that WinForms gets from the CoreFx packages -->
   <ItemGroup>

diff --git a/Documentation/porting-guidelines.md b/Documentation/porting-guidelines.md
@@ -7,6 +7,8 @@
 The migration process includes two steps: **preparing your project for porting** to
 .NET Core and **porting** itself.
 
+For additional information and assistance, we recommend checking out [this article on the dotnet blog][dotnet-blog-port-guide] as well as the [accompanying video tutorial][dotnet-blog-port-video].
+
 ## Prepare your project for porting
 
 1. **Run [.NET Portability Analyzer][api-port]** first to determine if there are
@@ -108,6 +110,8 @@ System.PlatformNotSupportedException: 'Configuration files are not supported.'
 
 [comment]: <> (URI Links)
 
+[dotnet-blog-port-guide]: https://devblogs.microsoft.com/dotnet/how-to-port-desktop-applications-to-net-core-3-0/
+[dotnet-blog-port-video]: https://www.youtube.com/watch?v=upVQEUc_KwU
 [api-port]: https://blogs.msdn.microsoft.com/dotnet/2018/08/08/are-your-windows-forms-and-wpf-applications-ready-for-net-core-3-0/
 [pkg-config]: https://docs.microsoft.com/en-us/nuget/reference/migrate-packages-config-to-package-reference
 [sdk-tool]:https://github.com/hvanbakel/CsprojToVs2017

diff --git a/Winforms.sln b/Winforms.sln
@@ -1,20 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28016.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28627.84
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinformsControlsTest", "src\System.Windows.Forms\tests\IntegrationTests\WinformsControlsTest\WinformsControlsTest.csproj", "{657472B8-FDA3-49DF-B8BE-0246046A4348}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms", "src\System.Windows.Forms\src\System.Windows.Forms.csproj", "{0D23A41B-2626-4703-9E4A-87C07F69B0B2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Ref", "src\System.Windows.Forms\ref\System.Windows.Forms.Ref.csproj", "{334C343B-9D39-498E-89D8-B6526028FD5C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Tests", "src\System.Windows.Forms\tests\UnitTests\System.Windows.Forms.Tests.csproj", "{AB38E262-F206-4820-8F29-23C5F72A4A16}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Private.Winforms", "pkg\Microsoft.Private.Winforms.csproj", "{F133342A-3040-4005-A2F0-7685AA7CB82D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors.Ref", "src\System.Windows.Forms.Design.Editors\ref\System.Windows.Forms.Design.Editors.Ref.csproj", "{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors", "src\System.Windows.Forms.Design.Editors\src\System.Windows.Forms.Design.Editors.csproj", "{B50AC96F-2655-4687-A404-16DF51882CBC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Editors.Tests", "src\System.Windows.Forms.Design.Editors\tests\UnitTests\System.Windows.Forms.Design.Editors.Tests.csproj", "{27F24D0C-5F0A-472E-AE12-98B386A13D50}"
@@ -23,16 +19,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design", "src\System.Windows.Forms.Design\src\System.Windows.Forms.Design.csproj", "{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Windows.Forms.Design.Ref", "src\System.Windows.Forms.Design\ref\System.Windows.Forms.Design.Ref.csproj", "{351EA462-BCB8-42E7-8595-A4FE55E3B25D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Design.Facade", "src\System.Drawing.Design\src\System.Drawing.Design.Facade.csproj", "{A2B1148A-1747-47BD-8048-416C2C2AF14C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Design.Facade", "src\System.Design\src\System.Design.Facade.csproj", "{9BEC2806-D8E0-443B-8B58-9D344E0C2D24}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{989F376E-AE19-43B0-A3E6-96A7E22B4E80}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{D5951C9D-146A-4F80-9451-B7AED28254F1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{DF68A171-D27B-4E6A-8A7E-63A651622355}"
@@ -55,30 +47,22 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D23A41B-2626-4703-9E4A-87C07F69B0B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{334C343B-9D39-498E-89D8-B6526028FD5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{334C343B-9D39-498E-89D8-B6526028FD5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{334C343B-9D39-498E-89D8-B6526028FD5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{334C343B-9D39-498E-89D8-B6526028FD5C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB38E262-F206-4820-8F29-23C5F72A4A16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB38E262-F206-4820-8F29-23C5F72A4A16}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB38E262-F206-4820-8F29-23C5F72A4A16}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB38E262-F206-4820-8F29-23C5F72A4A16}.Release|Any CPU.Build.0 = Release|Any CPU
-		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{657472B8-FDA3-49DF-B8BE-0246046A4348}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F133342A-3040-4005-A2F0-7685AA7CB82D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F133342A-3040-4005-A2F0-7685AA7CB82D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F133342A-3040-4005-A2F0-7685AA7CB82D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F133342A-3040-4005-A2F0-7685AA7CB82D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5A619DC4-854A-450E-8F9A-AC72D2F5B59A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B50AC96F-2655-4687-A404-16DF51882CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B50AC96F-2655-4687-A404-16DF51882CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B50AC96F-2655-4687-A404-16DF51882CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -95,10 +79,6 @@ Global
 		{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{351EA462-BCB8-42E7-8595-A4FE55E3B25D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A2B1148A-1747-47BD-8048-416C2C2AF14C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -124,17 +104,14 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{657472B8-FDA3-49DF-B8BE-0246046A4348} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
 		{0D23A41B-2626-4703-9E4A-87C07F69B0B2} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
-		{334C343B-9D39-498E-89D8-B6526028FD5C} = {D5951C9D-146A-4F80-9451-B7AED28254F1}
 		{AB38E262-F206-4820-8F29-23C5F72A4A16} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
-		{657472B8-FDA3-49DF-B8BE-0246046A4348} = {680FB14C-7B0C-4D63-9F1A-18ACCDB0F52A}
 		{F133342A-3040-4005-A2F0-7685AA7CB82D} = {989F376E-AE19-43B0-A3E6-96A7E22B4E80}
-		{5A619DC4-854A-450E-8F9A-AC72D2F5B59A} = {D5951C9D-146A-4F80-9451-B7AED28254F1}
 		{B50AC96F-2655-4687-A404-16DF51882CBC} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
 		{27F24D0C-5F0A-472E-AE12-98B386A13D50} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{F977CA8C-FBF9-4D82-80BA-FE5B2F33486E} = {583F1292-AE8D-4511-B8D8-A81FE4642DDC}
 		{61D06BBD-B0CF-4CE1-9139-1CC4B82F0F9B} = {77FEDB47-F7F6-490D-AF7C-ABB4A9E0B9D7}
-		{351EA462-BCB8-42E7-8595-A4FE55E3B25D} = {D5951C9D-146A-4F80-9451-B7AED28254F1}
 		{A2B1148A-1747-47BD-8048-416C2C2AF14C} = {434C00C3-E498-4BA7-9764-9F0FC8CFE457}
 		{9BEC2806-D8E0-443B-8B58-9D344E0C2D24} = {434C00C3-E498-4BA7-9764-9F0FC8CFE457}
 		{583F1292-AE8D-4511-B8D8-A81FE4642DDC} = {DF68A171-D27B-4E6A-8A7E-63A651622355}

diff --git a/eng/ReferenceAssemblies.props b/eng/ReferenceAssemblies.props
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -7,55 +7,59 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="Microsoft.Win32.Registry" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="System.Configuration.ConfigurationManager" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="System.Drawing.Common" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="System.Security.Cryptography.Cng" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="System.CodeDom" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="System.Security.Permissions" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview4.19154.9">
+    <Dependency Name="System.Windows.Extensions" Version="4.6.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview4.19154.9">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview4.19161.10">
       <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>8a730a6ecd96fef04d74e1807c8b1d193e0a5f16</Sha>
+      <Sha>a7098b8893a0ebf53a881d43b333dcda5b2c8716</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19156.20">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19161.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d2edb248bc2dc37fa0669053b0c88f3bffffb26</Sha>
+      <Sha>2ca74c76adc84f0459b4a0352034db463d0b910f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19156.20">
+    <Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19161.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d2edb248bc2dc37fa0669053b0c88f3bffffb26</Sha>
+      <Sha>2ca74c76adc84f0459b4a0352034db463d0b910f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19156.20">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19161.14">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>1d2edb248bc2dc37fa0669053b0c88f3bffffb26</Sha>
+      <Sha>2ca74c76adc84f0459b4a0352034db463d0b910f</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19161.14">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>2ca74c76adc84f0459b4a0352034db463d0b910f</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -9,25 +9,33 @@
   </PropertyGroup>
   <!-- Corefx-updated dependencies -->
   <PropertyGroup>
-    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview4.19154.9</MicrosoftWin32RegistryPackageVersion>
-    <SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview4.19154.9</SystemConfigurationConfigurationManagerPackageVersion>
-    <SystemDrawingCommonPackageVersion>4.6.0-preview4.19154.9</SystemDrawingCommonPackageVersion>
-    <MicrosoftWin32SystemEventsPackageVersion>4.6.0-preview4.19154.9</MicrosoftWin32SystemEventsPackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview4.19154.9</SystemSecurityCryptographyCngPackageVersion>
-    <SystemCodeDomPackageVersion>4.6.0-preview4.19154.9</SystemCodeDomPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>4.6.0-preview4.19154.9</SystemSecurityPermissionsPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>4.6.0-preview4.19154.9</SystemWindowsExtensionsPackageVersion>
-    <MicrosoftNETCorePlatformsVersion>3.0.0-preview4.19154.9</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftWin32RegistryPackageVersion>4.6.0-preview4.19161.10</MicrosoftWin32RegistryPackageVersion>
+    <SystemConfigurationConfigurationManagerPackageVersion>4.6.0-preview4.19161.10</SystemConfigurationConfigurationManagerPackageVersion>
+    <SystemDrawingCommonPackageVersion>4.6.0-preview4.19161.10</SystemDrawingCommonPackageVersion>
+    <MicrosoftWin32SystemEventsPackageVersion>4.6.0-preview4.19161.10</MicrosoftWin32SystemEventsPackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>4.6.0-preview4.19161.10</SystemSecurityCryptographyCngPackageVersion>
+    <SystemCodeDomPackageVersion>4.6.0-preview4.19161.10</SystemCodeDomPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>4.6.0-preview4.19161.10</SystemSecurityPermissionsPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>4.6.0-preview4.19161.10</SystemWindowsExtensionsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview4.19161.10</MicrosoftNETCorePlatformsPackageVersion>
   </PropertyGroup>
   <!-- Arcade-updated dependencies -->
   <PropertyGroup>
-    <MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19156.20</MicrosoftDotNetGenFacadesPackageVersion>
-    <MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19156.20</MicrosoftDotNetXUnitExtensionsPackageVersion>
+    <MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19161.14</MicrosoftDotNetGenFacadesPackageVersion>
+    <MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19161.14</MicrosoftDotNetXUnitExtensionsPackageVersion>
   </PropertyGroup>
-  <!-- Additional dependencies -->
+  <!-- XUnit-related unchanging dependencies -->
   <PropertyGroup>
-    <AccessibilityPackageVersion>4.6.0-alpha-27122-5</AccessibilityPackageVersion>
+    <XUnitVersion>2.4.1-pre.build.4059</XUnitVersion>
+    <XUnitAssertVersion>$(XUnitVersion)</XUnitAssertVersion>
+    <XUnitRunnerConsoleVersion>$(XUnitVersion)</XUnitRunnerConsoleVersion>
+    <XUnitRunnerVisualStudioVersion>$(XUnitVersion)</XUnitRunnerVisualStudioVersion>
+    <XUnitExtensibilityExecutionVersion>$(XUnitVersion)</XUnitExtensibilityExecutionVersion>
     <XUnitStaFactPackageVersion>0.3.5</XUnitStaFactPackageVersion>
+  </PropertyGroup>
+  <!-- Additional unchanging dependencies -->
+  <PropertyGroup>
+    <AccessibilityPackageVersion>4.6.0-alpha-27122-5</AccessibilityPackageVersion>
     <MoqPackageVersion>4.10.0</MoqPackageVersion>
     <MicrosoftTargetingPackNETFrameworkv472PackageVersion>1.0.0</MicrosoftTargetingPackNETFrameworkv472PackageVersion>
     <CoverletMSBuildPackageVersion>2.6.0</CoverletMSBuildPackageVersion>