Twopanedemo

.ado/VSComponentList.ps1

@@ -0,0 +1,24 @@
+$dir = $env:temp
+if ($env:Agent_TempDirectory -ne $null)
+{
+    $dir = $env:Agent_TempDirectory
+}
+
+$installerPath = 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\'
+$installationPath = . $installerPath\vswhere.exe -latest -property installationPath
+$vsconfig = "$dir\vsconfig"
+Write-Host "VSConfig will be at $vsconfig"
+
+Invoke-WebRequest -Uri 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe' -OutFile $dir\vs_enterprise.exe
+$p = Start-Process -PassThru $dir\vs_enterprise.exe -RedirectStandardError $dir\err -RedirectStandardOutput $dir\out -ArgumentList "export --installpath `"$installationPath`" --quiet --config $vsconfig" 
+$p.WaitForExit()
+$x = [Datetime]::Now.AddSeconds(60)
+while (!(Test-Path $vsconfig) -and ([datetime]::Now -lt $x))
+{
+    Sleep 5
+    Write-Host "Waiting for vsconfig file..."
+}
+
+Get-Content $dir\err
+Get-Content $dir\out
+Get-Content $vsconfig

.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

.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
@@ -77,7 +78,17 @@ steps:
       msbuildArchitecture: ${{parameters.msBuildArchitecture}}
       platform: $(BuildPlatform)
       configuration: $(BuildConfiguration)
+      createLogFile: true
+      logFileVerbosity: detailed
       msbuildArguments:
         /p:PreferredToolArchitecture=${{parameters.preferredToolArchitecture}}
         /p:PlatformToolset=${{parameters.platformToolset}}
         ${{parameters.msbuildArguments}}
+
+  - task: PublishBuildArtifacts@1
+    condition:  succeededOrFailed()
+    timeoutInMinutes: 10
+    inputs:
+      pathtoPublish: $(Build.SourcesDirectory)/${{parameters.project}}.log
+      artifactName: Detailed Logs for ${{parameters.project}} $(BuildConfiguration) $(BuildPlatform)
+      publishLocation: 'Container'

.ado/templates/e2e-test-job.yml

@@ -95,9 +95,17 @@ jobs:
       - task: CmdLine@2
         displayName: run-windows
         inputs:
-          script: react-native run-windows --no-packager --arch ${{ parameters.BuildPlatform }} --release --bundle --logging --force
+          script: react-native run-windows --no-packager --arch ${{ parameters.BuildPlatform }} --release --bundle --logging
           workingDirectory: packages/E2ETest
 
+      - task: PublishBuildArtifacts@1
+        condition:  succeededOrFailed()
+        timeoutInMinutes: 10
+        inputs:    
+          pathtoPublish: packages/E2ETest/msbuild.binlog 
+          artifactName: 'ReactUWPTestApp build log' 
+          publishLocation: 'Container'
+
       # Wait for app to launch. A workaround to avoid WinAppDriver error: Failed to locate opened application window with appId
       - task: PowerShell@2
         displayName: Wait for app to launch

.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 }}')

.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)

.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
@@ -81,16 +83,22 @@ steps:
     inputs:
       solution: $(Agent.BuildDirectory)\testcli\windows\testcli.sln
       msbuildVersion: $(MSBuildVersion) # Optional. Options: latest, 16.0, 15.0, 14.0, 12.0, 4.0
-      msbuildArchitecture: x86 # Optional. Options: x86, x64
+      msbuildArchitecture: $(MSBuildArchitecture) # Optional. Options: x86, x64
       platform: ${{ parameters.platform }} # Optional
       configuration: ${{ parameters.configuration }} # Optional
-      restoreNugetPackages: true
+      createLogFile: true
+      logFileVerbosity: detailed
       msbuildArguments:
         /p:PreferredToolArchitecture=$(MSBuildPreferredToolArchitecture)
         /p:PlatformToolset=$(MSBuildPlatformToolset)
-#        /p:VCTargetsPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\MSBuild\Microsoft\VC\v150"
 
-      clean: true # Optional
+  - task: PublishBuildArtifacts@1
+    condition:  succeededOrFailed()
+    timeoutInMinutes: 10
+    inputs:
+      pathtoPublish: $(Agent.BuildDirectory)/testcli/windows/testcli.sln.log
+      artifactName: Detailed Logs for testcli.sln ${{ parameters.platform }} ${{ parameters.configuration }}
+      publishLocation: 'Container'
 
   - task: CmdLine@2
     displayName: Create bundle testcli

.ado/variables/msbuild.yml

@@ -0,0 +1,6 @@
+variables:
+  MSBuildArchitecture: x64
+  MSBuildPreferredToolArchitecture: x64
+  MSBuildPlatformToolset: v141
+  TargetPlatformVersion: 10.0.18362.0
+  Win10Version: 18362

.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'

.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'