microsoft · acoates-ms · Oct 30, 2019 · Oct 28, 2019 · Oct 28, 2019 · Oct 28, 2019
diff --git a/.ado/publish.yml b/.ado/publish.yml
@@ -1,9 +1,8 @@
 name: 0.0.$(Date:yyMM.d)$(Rev:rrr)
 
 variables:
-  VmImage: vs2017-win2016
-  VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64
-  # VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\VC\v150'
+  - template: variables/msbuild.yml
+  - template: variables/vs2017.yml
 
 trigger:
   batch: true
@@ -59,12 +58,12 @@ jobs:
         inputs:
           script: node ./.ado/setVersionEnvVars.js
         env:
-          RUNNER_TEMP: $(Build.ArtifactStagingDirectory)
+          RUNNER_TEMP: $(Build.StagingDirectory)
 
       - task: PublishBuildArtifacts@1
         displayName: Publish VersionEnvVars
         inputs:
-          PathtoPublish: $(Build.ArtifactStagingDirectory)/versionEnvVars
+          PathtoPublish: $(Build.StagingDirectory)/versionEnvVars
           ArtifactName: VersionEnvVars
 
   - job: RnwNativeBuildDesktop
@@ -92,21 +91,18 @@ jobs:
         displayName: Download VersionEnvVars
         inputs:
           artifactName: VersionEnvVars
-          downloadPath: $(Build.ArtifactStagingDirectory)
+          downloadPath: $(Build.StagingDirectory)
 
       - task: CmdLine@2
         inputs:
-          script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js
+          script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js
 
       - template: templates/build-rnw.yml
         parameters:
           project: vnext/ReactWindows-Desktop.sln
-          platformToolset: v141
-          vsComponents: $(VsComponents)
           msbuildArguments:
             /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)"
             /p:RNW_PKG_VERSION="$(RNW_PKG_VERSION)"
-#            /p:VCTargetsPath="$(VCTargetsPath)"
 
       - template: templates/publish-build-artifacts-for-nuget.yml
         parameters:
@@ -147,18 +143,16 @@ jobs:
         displayName: Download VersionEnvVars
         inputs:
           artifactName: VersionEnvVars
-          downloadPath: $(Build.ArtifactStagingDirectory)
+          downloadPath: $(Build.StagingDirectory)
 
       - task: CmdLine@2
         inputs:
-          script: node $(Build.ArtifactStagingDirectory)/versionEnvVars/versionEnvVars.js
+          script: node $(Build.StagingDirectory)/versionEnvVars/versionEnvVars.js
 
       - template: templates/build-rnw.yml
         parameters:
           project: vnext/ReactWindows-Universal.sln
           vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM
-          msbuildArguments:
-#            /p:VCTargetsPath="$(VCTargetsPath)"
 
       - template: templates/publish-build-artifacts-for-nuget.yml
         parameters:
@@ -189,11 +183,11 @@ jobs:
         displayName: Download VersionEnvVars
         inputs:
           artifactName: VersionEnvVars
-          downloadPath: $(Build.ArtifactStagingDirectory)
+          downloadPath: $(Build.StagingDirectory)
 
       - task: CmdLine@2
         inputs:
-          script: node $(Build.ArtifactStagingDirectory)/VersionEnvVars/versionEnvVars.js
+          script: node $(Build.StagingDirectory)/VersionEnvVars/versionEnvVars.js
 
       # The commit tag in the nuspec requires that we use at least nuget 4.6
       - task: NuGetToolInstaller@0

diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml
@@ -6,11 +6,10 @@ parameters:
 
   # NuGet & MSBuild
   project:
-  msbuildVersion: 16.0
-  msBuildArchitecture: x64
-  preferredToolArchitecture: x64
-  platformToolset: v141
-  targetPlatformVersion: 10.0.18362.0
+  msbuildVersion: $(MSBuildVersion)
+  msBuildArchitecture: $(MSBuildArchitecture)
+  preferredToolArchitecture: $(MSBuildPreferredToolArchitecture)
+  platformToolset: $(MSBuildPlatformToolset)
   msbuildArguments: ''
   yarnBuildCmd: build
 
@@ -57,6 +56,8 @@ steps:
       verbosityRestore: Detailed # Options: quiet, normal, detailed
 
   - template: install-SDK.yml
+    parameters:
+      sdkVersion: $(Win10Version)
 
   - task: PowerShell@2
     displayName: Install Visual Studio dependencies
@@ -87,8 +88,7 @@ steps:
   - task: PublishBuildArtifacts@1
     condition:  succeededOrFailed()
     timeoutInMinutes: 10
-    inputs:    
-      pathtoPublish: $(Build.SourcesDirectory)/${{parameters.project}}.log 
+    inputs:
+      pathtoPublish: $(Build.SourcesDirectory)/${{parameters.project}}.log
       artifactName: Detailed Logs for ${{parameters.project}} $(BuildConfiguration) $(BuildPlatform)
       publishLocation: 'Container'
-
diff --git a/.ado/templates/install-SDK.yml b/.ado/templates/install-SDK.yml
@@ -1,10 +1,11 @@
 parameters:
-  sdkVersion: 18362
+  sdkVersion: ''
 
 steps:
   - task: powershell@2
     inputs:
       targetType: filePath
       filePath: vnext\Scripts\Install-WindowsSdkISO.ps1
       arguments: ${{ parameters.sdkVersion }}
-    displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})'
+    displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})'
+    condition: ne('', '${{ parameters.sdkVersion }}')
diff --git a/.ado/templates/publish-build-artifacts-for-nuget.yml b/.ado/templates/publish-build-artifacts-for-nuget.yml
@@ -9,18 +9,18 @@ steps:
     displayName: Copy NuGet header files
     inputs:
       filePath: vnext/Scripts/Tfs/Layout-Headers.ps1
-      arguments: -TargetRoot $(Build.ArtifactStagingDirectory)
+      arguments: -TargetRoot $(Build.StagingDirectory)
     condition: ${{ parameters.layoutHeaders }}
 
   - task: CopyFiles@2
     displayName: Copy NuGet artifacts
     inputs:
       sourceFolder: $(Build.SourcesDirectory)/vnext/target/$(BuildPlatform)/$(BuildConfiguration)
-      targetFolder: $(Build.ArtifactStagingDirectory)/$(BuildPlatform)/$(BuildConfiguration)
+      targetFolder: $(Build.StagingDirectory)/$(BuildPlatform)/$(BuildConfiguration)
       contents: ${{parameters.contents}}
 
   - task: PublishBuildArtifacts@1
     displayName: "Publish Artifact: ${{parameters.artifactName}}"
     inputs:
       artifactName: ${{parameters.artifactName}}
-      pathtoPublish: $(Build.ArtifactStagingDirectory)
+      pathtoPublish: $(Build.StagingDirectory)
diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml
@@ -65,6 +65,8 @@ steps:
       restoreSolution: $(Agent.BuildDirectory)\testcli\windows\testcli.sln
 
   - template: install-SDK.yml
+    parameters:
+      sdkVersion: $(Win10Version)
 
   - task: PowerShell@2
     displayName: Install Visual Studio dependencies
@@ -93,7 +95,7 @@ steps:
   - task: PublishBuildArtifacts@1
     condition:  succeededOrFailed()
     timeoutInMinutes: 10
-    inputs:    
+    inputs:
       pathtoPublish: $(Agent.BuildDirectory)/testcli/windows/testcli.sln.log
       artifactName: Detailed Logs for testcli.sln ${{ parameters.platform }} ${{ parameters.configuration }}
       publishLocation: 'Container'

diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml
@@ -0,0 +1,6 @@
+variables:
+  MSBuildArchitecture: x64
+  MSBuildPreferredToolArchitecture: x64
+  MSBuildPlatformToolset: v141
+  TargetPlatformVersion: 10.0.18362.0
+  Win10Version: 18362
diff --git a/.ado/variables/vs2017.yml b/.ado/variables/vs2017.yml
@@ -0,0 +1,4 @@
+variables:
+  VmImage: vs2017-win2016
+  MSBuildVersion: 15.0
+  GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq'
diff --git a/.ado/variables/vs2019.yml b/.ado/variables/vs2019.yml
@@ -0,0 +1,5 @@
+variables:
+  VmImage: windows-2019
+  VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141
+  MSBuildVersion: 16.0
+  GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\pemwd5jw.szc'
diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml
@@ -7,14 +7,8 @@ pr:
   - master
 
 variables:
-  # General / Default
-  VmImage: vs2017-win2016
-  MSBuildVersion: 16.0
-  MSBuildArchitecture: x64
-  MSBuildPreferredToolArchitecture: x64
-  MSBuildPlatformToolset: v141
-  TargetPlatformVersion: 10.0.18362.0
-  VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64
+  - template: variables/msbuild.yml
+  - template: variables/vs2017.yml
 
 jobs:
   - job: Setup
@@ -71,17 +65,12 @@ jobs:
         clean: false
         submodules: false
 
-      # #TODO: Remove
-      # - powershell: |
-      #     ls 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\' -Name -Recurse -Include '*GoogleTest*'
-
       - template: templates/build-rnw.yml
         parameters:
           useRnFork: $(UseRNFork)
           yarnBuildCmd: buildci
           project: vnext/ReactWindows-Universal.sln
           vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM
-          msbuildArguments:
 
       - template: templates/publish-build-artifacts-for-nuget.yml
         parameters:
@@ -178,9 +167,7 @@ jobs:
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
 
     variables:
-      Desktop.IntegrationTests.Filter: (FullyQualifiedName!~WebSocketJSExecutorIntegrationTest)&(FullyQualifiedName!=RNTesterIntegrationTests::WebSocket)&(FullyQualifiedName!~WebSocket)
-      GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq'
-      # VCTargetsPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\VC\v150'
+      Desktop.IntegrationTests.Filter: (FullyQualifiedName!~WebSocketJSExecutorIntegrationTest)&(FullyQualifiedName!~WebSocket)
 
     steps:
       - checkout: self
@@ -195,8 +182,6 @@ jobs:
         parameters:
           yarnBuildCmd: buildci
           project: vnext/ReactWindows-Desktop.sln
-          platformToolset: v141
-          vsComponents: $(VsComponents)
           msbuildArguments:
             /p:RNW_PKG_VERSION_STR="Private Build"
             /p:RNW_PKG_VERSION="1000,0,0,0"
@@ -442,6 +427,8 @@ jobs:
           workingDirectory: current
 
       - template: templates\install-SDK.yml
+        parameters:
+          sdkVersion: $(Win10Version)
 
       - task: PowerShell@2
         displayName: Install Visual Studio dependencies

diff --git a/change/react-native-windows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json b/change/react-native-windows-2019-10-28-21-56-35-DevOps-varsfromtemplate.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Rename back to Build.ArtifactStagingDirectory.",
+  "packageName": "react-native-windows",
+  "email": "julio.rocha@microsoft.com",
+  "commit": "71aa1961c0c19d6b1bd6aade54011f5d9224a9d4",
+  "date": "2019-10-29T04:56:35.311Z"
+}
diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln
@@ -100,12 +100,12 @@ Global
 		Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
+		Debug|ARM = Debug|ARM
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		Release|ARM = Release|ARM
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM