Redirect build directory to C: on vs2017-win2016 build machine

.ado/templates/build-rnw.yml

@@ -14,7 +14,7 @@ parameters:
   yarnBuildCmd: build
 
   # Visual Studio Installer
-  vsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe'
+  vsInstallerUri: $(VsInstallerUri)
   vsComponents: ''
 
 steps:
@@ -25,7 +25,6 @@ steps:
       vsComponents: ${{ parameters.vsComponents }}
       yarnBuildCmd: ${{ parameters.yarnBuildCmd }}
       debug: ${{ parameters.debug }}
-      forceVSDependencies: false
 
   - task: NuGetCommand@2
     displayName: NuGet restore
@@ -51,6 +50,7 @@ steps:
         /p:PreferredToolArchitecture=${{parameters.preferredToolArchitecture}}
         /p:PlatformToolset=${{parameters.platformToolset}}
         ${{parameters.msbuildArguments}}
+        /p:ReactNativeWindowsBuildDir=$(ReactNativeWindowsBuildDir)
 
   - task: PublishBuildArtifacts@1
     condition:  succeededOrFailed()

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

@@ -1,20 +1,24 @@
 #
 parameters:
   name: ''
-  pool:
   BuildPlatform: x86 # ARM, x86, x64
   UseRNFork: true
-  vsComponents: ''
-  vsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe'
-
+
 jobs:
   - job: ${{ parameters.name }}
     displayName: E2E Test
     dependsOn: Setup
     condition: ne( dependencies.Setup.outputs['checkPayload.shouldSkipPRBuild'], 'True' )
-    pool: ${{ parameters.pool }}
+    pool:
+      vmImage: windows-2019  # E2ETest can only be executed on windows-2019 or above
+    variables: # override vs2017.yml variables because windows-vs-pr is still using vs2017.yml
+      VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141
+      ReactNativeWindowsBuildDir:
+      VmImage: windows-2019
+
     timeoutInMinutes: 60 # how long to run the job before automatically cancelling
     cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
+
     steps:
       - checkout: self
         clean: false
@@ -23,10 +27,8 @@ jobs:
       - template: prepare-env.yml
         parameters:
           useRnFork: ${{ parameters.UseRNFork }}
-          vsComponents: ${{ parameters.vsComponents }}
+          vsComponents: $(VsComponents)
           yarnBuildCmd: build
-          vsInstallerUri: ${{ parameters.vsInstallerUri }}
-          forceVSDependencies: true
 
       - task: CmdLine@2
         displayName: Install react-native-cli
@@ -40,12 +42,6 @@ jobs:
           restoreSolution: packages/E2ETest/windows/ReactUWPTestApp.sln
           verbosityRestore: Detailed # Options: quiet, normal, detailed
 
-      - task: PowerShell@2
-        displayName: Install MUX framework package
-        inputs:
-          targetType: "inline"
-          script:  Add-AppxPackage -path $(Build.SourcesDirectory)/packages/E2ETest/windows/packages/Microsoft.UI.Xaml.2.3.191129002/tools/AppX/${{ parameters.BuildPlatform }}/Release/Microsoft.UI.Xaml.2.3.appx
-
       - task: CmdLine@2
         displayName: Create bundle
         inputs:

.ado/templates/prepare-env.yml

@@ -4,13 +4,25 @@ parameters:
   useRnFork: true
   yarnBuildCmd: build
   debug: false
-  forceVSDependencies: false
 
   # Visual Studio Installer
-  vsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe'
+  vsInstallerUri: $(VsInstallerUri)
   vsComponents: ''
 
 steps:
+  - task: PowerShell@2
+    displayName: Display env
+    inputs:
+      targetType: "inline"
+      script:  gci env:* | sort-object name
+
+  - task: PowerShell@2
+    displayName: Display disksize
+    inputs:
+      targetType: inline # filePath | inline
+      script: |
+        Get-WmiObject Win32_LogicalDisk
+
   - task: UseNode@1
     inputs:
       version: '10.x'
@@ -55,10 +67,10 @@ steps:
         -InstallerUri ${{ parameters.vsInstallerUri }}
         -Components ${{ parameters.vsComponents }}
         -Collect:$${{ parameters.debug }}
-    condition: and(ne('${{parameters.vsComponents}}', ''), or(eq(variables['VmImage'], 'windows-2019'), ${{ parameters.forceVSDependencies }}))
+    condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019'))
 
   - task: PowerShell@2
-    displayName: List disksize by Get-WmiObject Win32_LogicalDisk
+    displayName: List disksize after prepare-env
     inputs:
       targetType: inline # filePath | inline
       script: |

.ado/templates/react-native-init.yml

@@ -5,7 +5,7 @@ parameters:
   platform:
   configuration:
   vsComponents: ''
-  vsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe'
+  vsInstallerUri: $(VsInstallerUri)
 
 steps:
   - checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -91,6 +91,7 @@ steps:
       msbuildArguments:
         /p:PreferredToolArchitecture=$(MSBuildPreferredToolArchitecture)
         /p:PlatformToolset=$(MSBuildPlatformToolset)
+        /p:ReactNativeWindowsBuildDir=$(ReactNativeWindowsBuildDir)
 
   - task: PublishBuildArtifacts@1
     condition:  succeededOrFailed()

.ado/variables/msbuild.yml

@@ -4,3 +4,4 @@ variables:
   MSBuildPlatformToolset: v141
   TargetPlatformVersion: 10.0.18362.0
   Win10Version: 18362
+  VsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe'

.ado/variables/vs2017.yml

@@ -2,3 +2,4 @@ variables:
   VmImage: vs2017-win2016
   MSBuildVersion: 15.0
   GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq'
+  ReactNativeWindowsBuildDir: $(Agent.HomeDirectory)\RNW

.ado/variables/vs2019.yml

@@ -3,3 +3,4 @@ variables:
   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'
+  ReactNativeWindowsBuildDir: 

.ado/windows-vs-pr.yml

@@ -127,6 +127,7 @@ jobs:
           msbuildArguments:
             /p:PreferredToolArchitecture=$(MSBuildPreferredToolArchitecture)
             /p:PlatformToolset=$(MSBuildPlatformToolset)
+            /p:ReactNativeWindowsBuildDir=$(ReactNativeWindowsBuildDir)
           clean: true # Optional
         condition: and(succeeded(), eq(variables['UseRNFork'], 'true'))
 
@@ -155,6 +156,7 @@ jobs:
           msbuildArguments:
             /p:PreferredToolArchitecture=$(MSBuildPreferredToolArchitecture)
             /p:PlatformToolset=$(MSBuildPlatformToolset)
+            /p:ReactNativeWindowsBuildDir=$(ReactNativeWindowsBuildDir)
           clean: true # Optional
         condition: and(succeeded(), eq(variables['UseRNFork'], 'true'), False) # Disabled, out of space issues on CI machines
 
@@ -494,6 +496,8 @@ jobs:
             /p:PlatformToolset=$(MSBuildPlatformToolset)
             /p:TargetPlatformVersion=$(TargetPlatformVersion)
             /p:WindowsTargetPlatformVersion=$(TargetPlatformVersion)
+            /p:ReactNativeWindowsBuildDir=$(ReactNativeWindowsBuildDir)
+
           #clean: true # Optional
           #maximumCpuCount: false # Optional
           #restoreNugetPackages: false # Optional
@@ -535,11 +539,8 @@ jobs:
   - template: templates/e2e-test-job.yml # Template reference
     parameters:
       name: E2ETest
-      pool:
-        vmImage: windows-2019
       BuildPlatform: x64
       UseRNFork: true
-      vsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64, Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141
 
   - job: RNWNugetPR
     displayName: Build and Pack Nuget

change/react-native-windows-2019-12-11-13-44-04-OneFolder.json

@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "redirect to C on build machine",
+  "packageName": "react-native-windows",
+  "email": "[email protected]",
+  "commit": "7f3bb66b87d8b38f74129d778b4fe3d7245d4a45",
+  "date": "2019-12-11T21:44:04.212Z"
+}

vnext/Directory.Build.props

@@ -17,10 +17,10 @@
 
   <PropertyGroup Label="Configuration">
     <ProjectName Condition="'$(ProjectName)'==''">$(MSBuildProjectName)</ProjectName>
-
+    <ReactNativeWindowsBuildDir Condition="'$(ReactNativeWindowsBuildDir)'==''">$(ReactNativeWindowsDir)build</ReactNativeWindowsBuildDir>
     <!-- Visual Studio forces using 'Win32' for the 'x86' platform. -->
-    <BaseIntDir Condition="'$(Platform)' != 'Win32'">$(ReactNativeWindowsDir)build\$(Platform)\$(Configuration)</BaseIntDir>
-    <BaseIntDir Condition="'$(Platform)' == 'Win32'">$(ReactNativeWindowsDir)build\x86\$(Configuration)</BaseIntDir>
+    <BaseIntDir Condition="'$(Platform)' != 'Win32'">$(ReactNativeWindowsBuildDir)\$(Platform)\$(Configuration)</BaseIntDir>
+    <BaseIntDir Condition="'$(Platform)' == 'Win32'">$(ReactNativeWindowsBuildDir)\x86\$(Configuration)</BaseIntDir>
     <BaseOutDir Condition="'$(Platform)' != 'Win32'">$(ReactNativeWindowsDir)target\$(Platform)\$(Configuration)</BaseOutDir>
     <BaseOutDir Condition="'$(Platform)' == 'Win32'">$(ReactNativeWindowsDir)target\x86\$(Configuration)</BaseOutDir>
 

vnext/Directory.Build.targets

@@ -10,6 +10,7 @@
     <Message Text="=> PlatformTarget          [$(PlatformTarget)]" />
     <Message Text="=> PlatformName            [$(PlatformName)]" />
     <Message Text="=> DefaultPlatformToolset  [$(DefaultPlatformToolset)]" />
+    <Message Text="=> ReactNativeWindowsBuildDir  [$(ReactNativeWindowsBuildDir)]" />    
     <Message Text="=> BaseIntDir              [$(BaseIntDir)]" />
     <Message Text="=> BaseOutDir              [$(BaseOutDir)]" />
     <Message Text="=> IntDir                  [$(IntDir)]" />