Upgrade to VS 2022 (#9916)

*Description* This PR updates RNW to build with (and require) Visual Studio 2022. This includes upgrading the `Microsoft.ReactNative.Managed.CodeGen` project to .NET 6.0 This PR does not change the minimum / target Windows SDK versions for RNW or RNW apps. This PR does not change the language versions of C++ (17) and C# (8.0) used. *Type of Change* - Breaking change (fix or feature that would cause existing functionality to not work as expected) - This change requires a documentation update *Why* Visual Studio 2022 is the currently supported version of Visual Studio and what is available to download without an MSDN subscription to access older versions. As Visual Studio 2019 support is reduced/deprecated, we need to migrate. Closes #8750 Closes #9499 Closes #10130 *What* What's changed: * All VS project files have been updated to require a minimum of VS 2022 (aka version 17.0). * NuGet-based dependencies that are tied to VS version have been upgraded. * The `Microsoft.ReactNative.Managed.CodeGen` project has been updated to .NET 6.0 * The snapshots for the codegen tests have been updated to pass * The E2E Test app has been updated to the latest version of `react-native-xaml` (needed to fix build issues) * Snapshots for E2E tests have been updated to pass *Testing* Builds and tests All tests
microsoft · Oct 31, 2022 · 5885ee4 · 5885ee4
1 parent 10e9788
commit 5885ee4
Show file tree

Hide file tree

Showing 152 changed files with 967 additions and 832 deletions.
diff --git a/.ado/compliance.yml b/.ado/compliance.yml
@@ -6,10 +6,10 @@ parameters:
   default:
     Medium:
       name: rnw-pool-4-microsoft
-      demands: ImageOverride -equals rnw-img-node16
+      demands: ImageOverride -equals rnw-img-vs2022
     Large:
       name: rnw-pool-8-microsoft
-      demands: ImageOverride -equals rnw-img-node16
+      demands: ImageOverride -equals rnw-img-vs2022
 - name: forceCodeQL
   displayName: Force CodeQL to rebuild databases
   type: boolean

diff --git a/.ado/continuous.yml b/.ado/continuous.yml
@@ -13,13 +13,13 @@ parameters:
     default:
       Small:
         name: rnw-pool-2
-        demands: ImageOverride -equals rnw-img-node16
+        demands: ImageOverride -equals rnw-img-vs2022
       Medium:
         name: rnw-pool-4
-        demands: ImageOverride -equals rnw-img-node16
+        demands: ImageOverride -equals rnw-img-vs2022
       Large:
         name: rnw-pool-8
-        demands: ImageOverride -equals rnw-img-node16
+        demands: ImageOverride -equals rnw-img-vs2022
 
 stages:
   - template: stages.yml

diff --git a/.ado/image/rnw-pool.json b/.ado/image/rnw-pool.json
@@ -1,41 +1,71 @@
 {
     "imageType": "Managed",
-    "baseImage": "/MicrosoftWindowsServer/WindowsServer/2019-Datacenter/latest",
+    "baseImage": "/MicrosoftWindowsServer/WindowsServer/2022-Datacenter/latest",
     "artifacts": [
         {
-            "Name": "windows-EnableDeveloperMode"
+            "name": "windows-EnableDeveloperMode"
         },
         {
-            "Name": "windows-enable-long-paths"
+            "name": "windows-enable-long-paths"
         },
         {
-            "Name": "windows-gitinstall"
+            "name": "windows-gitinstall"
         },
         {
-            "Name": "windows-AzPipeline-ImageHelpers"
+            "name": "windows-AzPipeline-ImageHelpers"
         },
         {
-            "Name": "windows-AzPipeline-InitializeVM"
+            "name": "windows-AzPipeline-InitializeVM"
         },
         {
-            "Name": "windows-AzPipeline-Install-VS",
-            "Parameters": {
-                "ToolSetFileName": "2019-default.json"
+            "name": "windows-AzPipeline-powershellCore"
+        },
+        {
+            "name": "windows-AzPipeline-7zip"
+        },
+        {
+            "name": "windows-visualstudio-bootstrapper",
+            "parameters": {
+                "Workloads": "--add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Workload.Universal --add Microsoft.Component.MSBuild --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.ComponentGroup.UWP.Support --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.ComponentGroup.UWP.VC --includeRecommended --includeOptional",
+                "SKU": "Enterprise",
+                "VSBootstrapperURL": "https://aka.ms/vs/17/release/vs_Enterprise.exe"
+            }
+        },
+        {
+            "name": "Windows-NodeJS",
+            "parameters": {
+                "Version": "16.13.0"
             }
         },
         {
-            "Name": "windows-AzPipeline-NodeLts"
+            "name": "windows-npm-global",
+            "parameters": {
+                "packages": "[email protected], [email protected], [email protected]",
+                "addToPath": true
+            }
+        },
+        {
+            "name": "windows-chrome"
         },
         {
-            "Name": "windows-chrome"
+            "name": "windows-AzPipeline-WinAppDriver"
         },
         {
-            "Name": "windows-AzPipeline-WinAppDriver"
+            "name": "windows-dotnetcore-sdk",
+            "parameters": {
+                "DotNetCoreVersion": "2.1.818"
+            }
+        },
+        {
+            "name": "windows-dotnetcore-sdk",
+            "parameters": {
+                "DotNetCoreVersion": "3.1.412"
+            }
         },
         {
-            "Name": "windows-dotnetcore-sdk",
-            "Parameters": {
-                "DotNetCoreVersion": "3.1.401"
+            "name": "windows-dotnetcore-sdk",
+            "parameters": {
+                "DotNetCoreVersion": "6.0.401"
             }
         }
     ],
@@ -47,4 +77,4 @@
             }
         ]
     }
-}
+}
diff --git a/.ado/integrate-rn.yaml b/.ado/integrate-rn.yaml
@@ -14,7 +14,7 @@ variables:
   - group: RNW Secrets
 
 pool:
-  vmImage: windows-2019
+  vmImage: windows-2022
 
 jobs:
   - job: IntegrateRN

diff --git a/.ado/jobs/desktop.yml b/.ado/jobs/desktop.yml
@@ -59,15 +59,15 @@ jobs:
               value: false
 
             #5059 - Disable failing or intermittent tests (IntegrationTestHarness,AsyncStorage,WebSocket,Logging).
-            #5265 - WebSocketModuleIntegrationTest::WebSocketModule_Ping fails for Release
+            #10732 -  WebSocketIntegrationTest::SendReceiveSsl fails on Windows Server 2022.
             - name: Desktop.IntegrationTests.Filter
               value: >
                 (FullyQualifiedName!=RNTesterIntegrationTests::AsyncStorage)&
                 (FullyQualifiedName!=RNTesterIntegrationTests::Blob)&
                 (FullyQualifiedName!=RNTesterIntegrationTests::IntegrationTestHarness)&
                 (FullyQualifiedName!=WebSocketResourcePerformanceTest::ProcessThreadsPerResource)&
+                (FullyQualifiedName!=WebSocketIntegrationTest::SendReceiveSsl)&
                 (FullyQualifiedName!=Microsoft::React::Test::HttpOriginPolicyIntegrationTest)
-
             #6799 -
             #       HostFunctionTest              - Crashes under JSI/V8
             #       HostObjectProtoTest           - Crashes under JSI/V8

diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -18,10 +18,10 @@ parameters:
   default:
     Medium:
       name: rnw-pool-4-microsoft
-      demands: ImageOverride -equals rnw-img-node16
+      demands: ImageOverride -equals rnw-img-vs2022
     Large:
       name: rnw-pool-8-microsoft
-      demands: ImageOverride -equals rnw-img-node16
+      demands: ImageOverride -equals rnw-img-vs2022
 
 variables:
   - template: variables/windows.yml

diff --git a/.ado/templates/discover-google-test-adapter.yml b/.ado/templates/discover-google-test-adapter.yml
@@ -1,7 +1,7 @@
 steps:
 
   - powershell: |
-      $vsExtensionPath="${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\";
+      $vsExtensionPath="${env:ProgramFiles}\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\Extensions\";
       $GoogleTestAdapterPath=(Get-ChildItem $vsExtensionPath -Directory | Where-Object -FilterScript {Test-Path  (Join-Path -Path $_.FullName -ChildPath "GoogleTestAdapter.Core.dll")}).FullName
 
       # Test the path to the google test adapter

diff --git a/.ado/templates/msbuild-sln.yml b/.ado/templates/msbuild-sln.yml
@@ -6,10 +6,10 @@ parameters:
   # NuGet & MSBuild
   solutionDir:
   solutionName:
-  msbuildVersion: 16.0
+  msbuildVersion: 17.0
   msBuildArchitecture: x64
   preferredToolArchitecture: x64
-  platformToolset: v142
+  platformToolset: v143
   buildPlatform: x64
   buildConfiguration: Debug
   msbuildArguments: ''

diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
@@ -16,13 +16,13 @@ parameters:
     default:
       Small:
         name: rnw-pool-2
-        demands: ImageOverride -equals rnw-img-node16
+        demands: ImageOverride -equals rnw-img-vs2022
       Medium:
         name: rnw-pool-4
-        demands: ImageOverride -equals rnw-img-node16
+        demands: ImageOverride -equals rnw-img-vs2022
       Large:
         name: rnw-pool-8
-        demands: ImageOverride -equals rnw-img-node16
+        demands: ImageOverride -equals rnw-img-vs2022
 
 stages:
   - template: stages.yml

diff --git a/change/@react-native-windows-automation-channel-00041bab-d2c7-42ef-8abd-05b58b54138f.json b/change/@react-native-windows-automation-channel-00041bab-d2c7-42ef-8abd-05b58b54138f.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Upgrade to VS 2022",
+  "packageName": "@react-native-windows/automation-channel",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-automation-fc29def0-23e2-4730-b7a1-59a4a62f7c68.json b/change/@react-native-windows-automation-fc29def0-23e2-4730-b7a1-59a4a62f7c68.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Upgrade to VS 2022",
+  "packageName": "@react-native-windows/automation",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-cli-194a5a46-f531-4507-b2db-d3a733b34a7a.json b/change/@react-native-windows-cli-194a5a46-f531-4507-b2db-d3a733b34a7a.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Upgrade to VS 2022",
+  "packageName": "@react-native-windows/cli",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/@react-native-windows-telemetry-ad25992d-2d3b-4f16-82dd-e1639d3091c0.json b/change/@react-native-windows-telemetry-ad25992d-2d3b-4f16-82dd-e1639d3091c0.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Upgrade to VS 2022",
+  "packageName": "@react-native-windows/telemetry",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/change/react-native-windows-467ff3e1-7e84-4df3-9df0-cec9b92426b9.json b/change/react-native-windows-467ff3e1-7e84-4df3-9df0-cec9b92426b9.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Upgrade to VS 2022",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/docs/testing.md b/docs/testing.md
@@ -4,7 +4,7 @@ When contributing to this project, unit and integration tests should be run to h
 
 ## Windows Desktop
 Tests should be run with a VSTest-compatible client
-(i.e. [VSTest.Console.exe](https://docs.microsoft.com/en-us/visualstudio/test/vstest-console-options?view=vs-2019),
+(i.e. [VSTest.Console.exe](https://docs.microsoft.com/en-us/visualstudio/test/vstest-console-options?view=vs-2022),
 [Visual Studio Test task](https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/test/vstest?view=azure-devops)).
 This project includes convenience scripts to set up and run the test artifacts.
 

diff --git a/packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln b/packages/@react-native-windows/automation-channel/windows/AutomationChannel.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32929.385
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutomationChannel", "AutomationChannel\AutomationChannel.vcxproj", "{C0A69310-6119-46DC-A6D6-0BAB7826DC92}"
 	ProjectSection(ProjectDependencies) = postProject

diff --git a/...act-native-windows/automation-channel/windows/AutomationChannel/AutomationChannel.vcxproj b/...act-native-windows/automation-channel/windows/AutomationChannel/AutomationChannel.vcxproj
@@ -9,7 +9,7 @@
     <ProjectName>AutomationChannel</ProjectName>
     <RootNamespace>AutomationChannel</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
@@ -139,7 +139,7 @@
     <None Include="PropertySheet.props" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" />
+    <PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ReactNativeWindowsTargets">

diff --git a/packages/@react-native-windows/automation/src/AutomationClient.ts b/packages/@react-native-windows/automation/src/AutomationClient.ts
@@ -52,23 +52,23 @@ export const app = {
   /**
    * Find an element by Automation ID
    *
-   * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.automationid?view=net-5.0
+   * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.automationid?view=net-6.0
    */
   findElementByAutomationID: (id: string): Promise<AutomationElement> =>
     $(`~${id}`),
 
   /**
    * Finds an element by the name of its class name (e.g. ListViewItem)
    *
-   * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.classname?view=net-5.0
+   * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.automationelement.automationelementinformation.classname?view=net-6.0
    */
   findElementByClassName: (className: string): Promise<AutomationElement> =>
     $(className),
 
   /**
    * Find element by ControlType (e.g. Button, CheckBox)
    *
-   * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.controltype?view=net-5.0
+   * https://docs.microsoft.com/en-us/dotnet/api/system.windows.automation.controltype?view=net-6.0
    */
   findElementByControlType: (controlType: string): Promise<AutomationElement> =>
     $(`<${controlType} />`),

diff --git a/packages/@react-native-windows/cli/src/generator-windows/index.ts b/packages/@react-native-windows/cli/src/generator-windows/index.ts
@@ -39,6 +39,7 @@ const bundleDir = 'Bundle';
 interface NugetPackage {
   id: string;
   version: string;
+  privateAssets: boolean;
 }
 
 function pascalCase(str: string) {
@@ -175,6 +176,7 @@ export async function copyProjectTemplateAndReplace(
     {
       id: 'Microsoft.Windows.CppWinRT',
       version: '2.0.211028.7',
+      privateAssets: true,
     },
   ];
 
@@ -463,6 +465,7 @@ function getUwpCsPackages(): NugetPackage[] {
     {
       id: 'Microsoft.NETCore.UniversalWindowsPlatform',
       version: '6.2.9',
+      privateAssets: false,
     },
   ];
 }
@@ -541,11 +544,13 @@ function getWinAppSDKPackages(nugetVersion: string): NugetPackage[] {
   winAppSDKPackages.push({
     id: 'Microsoft.ReactNative.WindowsAppSDK',
     version: nugetVersion,
+    privateAssets: false,
   });
 
   winAppSDKPackages.push({
     id: 'Microsoft.WindowsAppSDK',
-    version: '1.1.4',
+    version: '1.1.5',
+    privateAssets: false,
   });
 
   return winAppSDKPackages;

diff --git a/packages/@react-native-windows/cli/src/runWindows/utils/msbuildtools.ts b/packages/@react-native-windows/cli/src/runWindows/utils/msbuildtools.ts
@@ -28,9 +28,9 @@ import {CodedError} from '@react-native-windows/telemetry';
 
 export default class MSBuildTools {
   /**
-   * @param version is something like 16.0 for 2019
+   * @param version is something like 17.0 for 2022
    * @param installationPath  Path to installation root
-   * @param installationVersion is the full version e.g. 16.3.29411.108
+   * @param installationVersion is the full version e.g. 17.3.32929.385
    */
   constructor(
     public readonly version: string,
@@ -200,7 +200,7 @@ export default class MSBuildTools {
       'Microsoft.Component.MSBuild',
       getVCToolsByArch(buildArch),
     ];
-    const minVersion = process.env.VisualStudioVersion || '16.7';
+    const minVersion = process.env.VisualStudioVersion || '17.0';
     const vsInstallation = findLatestVsInstall({
       requires,
       minVersion,

diff --git a/...tive-windows/telemetry/src/test/projects/UsesPackageReference/UsesPackageReference.csproj b/...tive-windows/telemetry/src/test/projects/UsesPackageReference/UsesPackageReference.csproj
@@ -17,7 +17,7 @@
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.19041.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
@@ -136,8 +136,8 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '16.0' ">
-    <VisualStudioVersion>16.0</VisualStudioVersion>
+  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '17.0' ">
+    <VisualStudioVersion>17.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <ImportGroup Label="ReactNativeWindowsPropertySheets">

diff --git a/...-native-windows/telemetry/src/test/projects/UsesPackagesConfig/UsesPackagesConfig.vcxproj b/...-native-windows/telemetry/src/test/projects/UsesPackagesConfig/UsesPackagesConfig.vcxproj
@@ -10,7 +10,7 @@
     <ProjectName>UsesPackagesConfig</ProjectName>
     <RootNamespace>UsesPackagesConfig</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>