From 58908bc1b2c98fe4906671eddf7517439dbd0a39 Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 6 Dec 2019 11:35:27 -0800 Subject: [PATCH 01/11] reduce build time --- .ado/templates/e2e-test-job.yml | 14 +--------- .ado/templates/install-SDK.yml | 2 +- .ado/windows-vs-pr.yml | 45 ++++++++++++++++++++------------- 3 files changed, 29 insertions(+), 32 deletions(-) diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index 64bbcaeb2e2..e838712605c 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -2,7 +2,7 @@ parameters: name: '' pool: - BuildPlatform: x86 # ARM, x86, x64 + BuildPlatform: x64 # ARM, x86, x64 UseRNFork: true vsComponents: '' vsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe' @@ -90,18 +90,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-AppPackage -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: - script: yarn run bundle - workingDirectory: packages/E2ETest - - task: CmdLine@2 displayName: run-windows inputs: diff --git a/.ado/templates/install-SDK.yml b/.ado/templates/install-SDK.yml index 93f3037ea71..a846aaa900c 100644 --- a/.ado/templates/install-SDK.yml +++ b/.ado/templates/install-SDK.yml @@ -8,4 +8,4 @@ steps: filePath: vnext\Scripts\Install-WindowsSdkISO.ps1 arguments: ${{ parameters.sdkVersion }} displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})' - condition: ne('', '${{ parameters.sdkVersion }}') \ No newline at end of file + condition: and(ne('', '${{ parameters.sdkVersion }}'), ne('18362', '${{ parameters.sdkVersion }}')) # SDK 18362 already exist in build machine \ No newline at end of file diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index f9543164443..eee441c402c 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -31,18 +31,10 @@ jobs: BuildPlatform: x64 UseRNFork: true LayoutHeaders: true - X86Debug: - BuildConfiguration: Debug - BuildPlatform: x86 - UseRNFork: true ArmDebug: BuildConfiguration: Debug BuildPlatform: arm UseRNFork: true - X64Release: - BuildConfiguration: Release - BuildPlatform: x64 - UseRNFork: true X86Release: BuildConfiguration: Release BuildPlatform: x86 @@ -83,17 +75,33 @@ jobs: contents: | ReactUWP\** - - task: DeleteFiles@1 - displayName: Delete vnext/build folder - inputs: - SourceFolder: vnext/build - Contents: '**/*' + - job: RNWUniversalOtherProjectsPR + displayName: Universal Other Projects PR + dependsOn: Setup + condition: ne( dependencies.Setup.outputs['checkPayload.shouldSkipPRBuild'], 'True' ) + strategy: + matrix: + X86Debug: + BuildConfiguration: Debug + BuildPlatform: x86 + UseRNFork: true + X64Release: + BuildConfiguration: Release + BuildPlatform: x64 + UseRNFork: true + pool: + vmImage: $(VmImage) + timeoutInMinutes: 60 + cancelTimeoutInMinutes: 5 - - task: DeleteFiles@1 - displayName: Delete vnext/target folder + steps: + - checkout: self + clean: false + submodules: false + + - task: UseNode@1 inputs: - SourceFolder: vnext/target - Contents: '**/*' + version: '10.x' - task: NuGetCommand@2 displayName: NuGet restore - Playground @@ -158,6 +166,7 @@ jobs: workingDirectory: vnext condition: and(succeeded(), eq(variables['UseRNFork'], 'true')) + - job: RNWDesktopPR displayName: Desktop PR dependsOn: Setup @@ -525,7 +534,7 @@ jobs: parameters: name: E2ETest pool: - vmImage: windows-2019 + vmImage: $(VmImage) BuildPlatform: x64 UseRNFork: true vsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64, Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 From 24da3e1050e267a09b4a6b7c875e70740f44892c Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 6 Dec 2019 12:42:18 -0800 Subject: [PATCH 02/11] changes --- .ado/templates/build-rnw.yml | 56 +++------------------------- .ado/templates/e2e-test-job.yml | 66 ++++----------------------------- .ado/templates/install-SDK.yml | 2 +- .ado/templates/prepare-env.yml | 61 ++++++++++++++++++++++++++++++ .ado/windows-vs-pr.yml | 20 +++------- 5 files changed, 80 insertions(+), 125 deletions(-) create mode 100644 .ado/templates/prepare-env.yml diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 2bbce3c21dc..68308a6a4dc 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -18,57 +18,13 @@ parameters: vsComponents: '' steps: - - task: CmdLine@2 - displayName: Modify package.json to use unforked RN - inputs: - script: node scripts/useUnForkedRN.js - workingDirectory: $(Build.SourcesDirectory)/vnext - condition: and(succeeded(), not('${{parameters.useRnFork}}')) - - - task: CmdLine@2 - displayName: yarn install (Using microsoft/react-native) - inputs: - script: yarn install --frozen-lockfile - condition: and(succeeded(), '${{parameters.useRnFork}}') - - # We can't use a frozen lockfile for both the fork and non-fork, since they install different dependencies - # We don't want to force devs to update/create two lock files on every change, so just don't freeze when - # using the non fork version. - - task: CmdLine@2 - displayName: yarn install (Using facebook/react-native) - inputs: - script: yarn install - condition: and(succeeded(), not('${{parameters.useRnFork}}')) - - - task: CmdLine@2 - displayName: yarn ${{ parameters.yarnBuildCmd }} - inputs: - script: yarn ${{ parameters.yarnBuildCmd }} - - - task: NuGetCommand@2 - displayName: NuGet restore - inputs: - command: restore - restoreSolution: ${{parameters.project }} - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)/vnext/NuGet.config - restoreDirectory: packages/ - verbosityRestore: Detailed # Options: quiet, normal, detailed - - - template: install-SDK.yml + - template: prepare-env.yml parameters: - sdkVersion: $(Win10Version) - - - task: PowerShell@2 - displayName: Install Visual Studio dependencies - inputs: - targetType: filePath - filePath: $(Build.SourcesDirectory)/vnext/Scripts/Tfs/Install-VsFeatures.ps1 - arguments: - -InstallerUri ${{ parameters.vsInstallerUri }} - -Components ${{ parameters.vsComponents }} - -Collect:$${{ parameters.debug }} - condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) + useRnFork: ${{ useRnFork }} + vsInstallerUri: ${{ parameters.vsInstallerUri }} + vsComponents: ${{ parameters.vsComponents }} + yarnBuildCmd: ${{ parameters.yarnBuildCmd }} + debug: ${{ parameters.debug }} - task: MSBuild@1 displayName: MSBuild ${{parameters.project}} diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index e838712605c..1ef4bee646a 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -2,7 +2,7 @@ parameters: name: '' pool: - BuildPlatform: x64 # ARM, x86, x64 + 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' @@ -16,49 +16,12 @@ jobs: 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 # self represents the repo where the initial Pipelines YAML file was found - clean: true # whether to fetch clean each time - # fetchDepth: 2 # the depth of commits to ask Git to fetch - lfs: false # whether to download Git-LFS files - submodules: false # set to 'true' for a single level of submodules or 'recursive' to get submodules of submodules - persistCredentials: false # set to 'true' to leave the OAuth token in the Git config after the initial fetch - - - task: UseNode@1 - inputs: - version: '10.x' - - - task: PowerShell@2 - displayName: "Remove WebDriverIO Workaround" - inputs: - targetType: "inline" - script: '((Get-Content -path packages/E2ETest/package.json -Raw) -replace ".*webdriver.git.*","") | Set-Content -Path packages/E2ETest/package.json' - - - task: CmdLine@2 - displayName: Install react-native-cli - inputs: - script: npm install -g react-native-cli - - - task: CmdLine@2 - displayName: Modify package.json to use unforked RN - inputs: - script: node scripts/useUnForkedRN.js - workingDirectory: vnext - condition: and(succeeded(), eq('${{ parameters.UseRNFork }}', 'false')) - - - task: CmdLine@2 - displayName: yarn install (Using microsoft/react-native) - inputs: - script: yarn install --frozen-lockfile - condition: and(succeeded(), eq('${{ parameters.UseRNFork }}', 'true')) - - # We can't use a frozen lockfile for both the fork and non-fork, since they install different dependencies - # We don't want to force devs to update/create two lock files on every change, so just don't freeze when - # using the non fork version. - - task: CmdLine@2 - displayName: yarn install (Using facebook/react-native) - inputs: - script: yarn install - condition: and(succeeded(), eq('${{ parameters.UseRNFork }}', 'false')) + - template: prepare-env.yml + parameters: + useRnFork: ${{ UseRNFork }} + vsComponents: ${{ vsComponents }} + yarnBuildCmd: buildci + vsInstallerUri: ${{ vsInstallerUri }} - task: PowerShell@2 displayName: "Patch WebDriverIO" @@ -68,21 +31,6 @@ jobs: - template: stop-packagers.yml - - task: CmdLine@2 - displayName: yarn build - inputs: - script: yarn build - - - task: PowerShell@2 - displayName: Install Visual Studio dependencies - inputs: - targetType: filePath - filePath: $(Build.SourcesDirectory)/vnext/Scripts/Tfs/Install-VsFeatures.ps1 - arguments: - -InstallerUri ${{ parameters.vsInstallerUri }} - -Components ${{ parameters.vsComponents }} - condition: ne('${{parameters.vsComponents}}', '') - - task: NuGetCommand@2 displayName: NuGet restore - ReactUWPTestApp inputs: diff --git a/.ado/templates/install-SDK.yml b/.ado/templates/install-SDK.yml index a846aaa900c..93f3037ea71 100644 --- a/.ado/templates/install-SDK.yml +++ b/.ado/templates/install-SDK.yml @@ -8,4 +8,4 @@ steps: filePath: vnext\Scripts\Install-WindowsSdkISO.ps1 arguments: ${{ parameters.sdkVersion }} displayName: 'Install Insider SDK (${{ parameters.sdkVersion }})' - condition: and(ne('', '${{ parameters.sdkVersion }}'), ne('18362', '${{ parameters.sdkVersion }}')) # SDK 18362 already exist in build machine \ No newline at end of file + condition: ne('', '${{ parameters.sdkVersion }}') \ No newline at end of file diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml new file mode 100644 index 00000000000..bbd366cbbb4 --- /dev/null +++ b/.ado/templates/prepare-env.yml @@ -0,0 +1,61 @@ +# Steps to checkout, install node_modules, yarn build, install SDK and install VS dependencies + +parameters: + useRnFork: true + yarnBuildCmd: build + debug: false + + # Visual Studio Installer + vsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe' + vsComponents: '' + +steps: + - checkout: self + clean: false + submodules: false + + - task: UseNode@1 + inputs: + version: '10.x' + + - task: CmdLine@2 + displayName: Modify package.json to use unforked RN + inputs: + script: node scripts/useUnForkedRN.js + workingDirectory: $(Build.SourcesDirectory)/vnext + condition: and(succeeded(), not('${{parameters.useRnFork}}')) + + - task: CmdLine@2 + displayName: yarn install (Using microsoft/react-native) + inputs: + script: yarn install --frozen-lockfile + condition: and(succeeded(), '${{parameters.useRnFork}}') + + # We can't use a frozen lockfile for both the fork and non-fork, since they install different dependencies + # We don't want to force devs to update/create two lock files on every change, so just don't freeze when + # using the non fork version. + - task: CmdLine@2 + displayName: yarn install (Using facebook/react-native) + inputs: + script: yarn install + condition: and(succeeded(), not('${{parameters.useRnFork}}')) + + - task: CmdLine@2 + displayName: yarn ${{ parameters.yarnBuildCmd }} + inputs: + script: yarn ${{ parameters.yarnBuildCmd }} + + - template: install-SDK.yml + parameters: + sdkVersion: $(Win10Version) + + - task: PowerShell@2 + displayName: Install Visual Studio dependencies + inputs: + targetType: filePath + filePath: $(Build.SourcesDirectory)/vnext/Scripts/Tfs/Install-VsFeatures.ps1 + arguments: + -InstallerUri ${{ parameters.vsInstallerUri }} + -Components ${{ parameters.vsComponents }} + -Collect:$${{ parameters.debug }} + condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) \ No newline at end of file diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index eee441c402c..b720e401770 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -53,14 +53,6 @@ jobs: cancelTimeoutInMinutes: 5 steps: - - checkout: self - clean: false - submodules: false - - - task: UseNode@1 - inputs: - version: '10.x' - - template: templates/build-rnw.yml parameters: useRnFork: $(UseRNFork) @@ -95,13 +87,11 @@ jobs: cancelTimeoutInMinutes: 5 steps: - - checkout: self - clean: false - submodules: false - - - task: UseNode@1 - inputs: - version: '10.x' + - template: templates/prepare-env.yml + parameters: + useRnFork: $(UseRNFork) + vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM + yarnBuildCmd: buildci - task: NuGetCommand@2 displayName: NuGet restore - Playground From 4e27310282277e18ad12ca080cd37b9a66000499 Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 6 Dec 2019 13:55:57 -0800 Subject: [PATCH 03/11] fix pipeline failure --- .ado/templates/build-rnw.yml | 12 ++++++++++- .ado/templates/e2e-test-job.yml | 37 ++++++++++++--------------------- .ado/templates/prepare-env.yml | 4 ---- .ado/windows-vs-pr.yml | 12 +++++++---- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 68308a6a4dc..a99bdfbf23e 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -20,12 +20,22 @@ parameters: steps: - template: prepare-env.yml parameters: - useRnFork: ${{ useRnFork }} + useRnFork: ${{ parameters.useRnFork }} vsInstallerUri: ${{ parameters.vsInstallerUri }} vsComponents: ${{ parameters.vsComponents }} yarnBuildCmd: ${{ parameters.yarnBuildCmd }} debug: ${{ parameters.debug }} + - task: NuGetCommand@2 + displayName: NuGet restore + inputs: + command: restore + restoreSolution: ${{parameters.project }} + feedsToUse: config + nugetConfigPath: $(Build.SourcesDirectory)/vnext/NuGet.config + restoreDirectory: packages/ + verbosityRestore: Detailed # Options: quiet, normal, detailed + - task: MSBuild@1 displayName: MSBuild ${{parameters.project}} inputs: diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index 1ef4bee646a..eddd63c7cdb 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -18,18 +18,15 @@ jobs: steps: - template: prepare-env.yml parameters: - useRnFork: ${{ UseRNFork }} - vsComponents: ${{ vsComponents }} - yarnBuildCmd: buildci - vsInstallerUri: ${{ vsInstallerUri }} + useRnFork: ${{ parameters.UseRNFork }} + vsComponents: ${{ parameters.vsComponents }} + yarnBuildCmd: build + vsInstallerUri: ${{ parameters.vsInstallerUri }} - - task: PowerShell@2 - displayName: "Patch WebDriverIO" + - task: CmdLine@2 + displayName: Install react-native-cli inputs: - targetType: "inline" - script: '((Get-Content -path node_modules/webdriver/build/utils.js -Raw) -replace "if \(!body .*","if (!body) {") | Set-Content -Path node_modules/webdriver/build/utils.js' - - - template: stop-packagers.yml + script: npm install -g react-native-cli - task: NuGetCommand@2 displayName: NuGet restore - ReactUWPTestApp @@ -38,6 +35,12 @@ 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-AppPackage -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: run-windows inputs: @@ -78,20 +81,6 @@ jobs: testResultsFiles: "packages/E2ETest/reports/*.log" condition: succeededOrFailed() - - task: PowerShell@2 - displayName: "Show package.json" - inputs: - targetType: "inline" - script: "Get-Content packages/E2ETest/package.json | foreach {Write-Output $_}" - condition: failed() - - - task: PowerShell@2 - displayName: "Show node_modules/webdriver/build/utils.js" - inputs: - targetType: "inline" - script: "Get-Content node_modules/webdriver/build/utils.js | foreach {Write-Output $_}" - condition: failed() - - task: PowerShell@2 displayName: "Show appium log" inputs: diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index bbd366cbbb4..d2f7ba61696 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -10,10 +10,6 @@ parameters: vsComponents: '' steps: - - checkout: self - clean: false - submodules: false - - task: UseNode@1 inputs: version: '10.x' diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index b720e401770..459e3bb9832 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -53,6 +53,10 @@ jobs: cancelTimeoutInMinutes: 5 steps: + - checkout: self + clean: false + submodules: false + - template: templates/build-rnw.yml parameters: useRnFork: $(UseRNFork) @@ -87,6 +91,10 @@ jobs: cancelTimeoutInMinutes: 5 steps: + - checkout: self + clean: false + submodules: false + - template: templates/prepare-env.yml parameters: useRnFork: $(UseRNFork) @@ -189,10 +197,6 @@ jobs: clean: false submodules: false - - task: UseNode@1 - inputs: - version: '10.x' - - task: VisualStudioTestPlatformInstaller@1 inputs: testPlatformVersion: 16.3.0 From 8202caa4cf6357d722b8c45dd95d28f59703447f Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 6 Dec 2019 14:42:32 -0800 Subject: [PATCH 04/11] use Add-AppxPackage --- .ado/templates/e2e-test-job.yml | 2 +- .ado/templates/prepare-env.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index eddd63c7cdb..9d61df84b1b 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -39,7 +39,7 @@ jobs: displayName: Install MUX framework package inputs: targetType: "inline" - script: Add-AppPackage -path $(Build.SourcesDirectory)/packages/E2ETest/windows/packages/Microsoft.UI.Xaml.2.3.191129002/tools/AppX/${{ parameters.BuildPlatform }}/Release/Microsoft.UI.Xaml.2.3.appx + 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: run-windows diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index d2f7ba61696..87b834d59d5 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -54,4 +54,11 @@ steps: -InstallerUri ${{ parameters.vsInstallerUri }} -Components ${{ parameters.vsComponents }} -Collect:$${{ parameters.debug }} - condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) \ No newline at end of file + condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) + + - task: PowerShell@2 + displayName: List disksize by Get-WmiObject Win32_LogicalDisk + inputs: + targetType: inline # filePath | inline + script: | + Get-WmiObject Win32_LogicalDisk \ No newline at end of file From d5f6fcd4a49e046c9e7866fee2af82d3542f5809 Mon Sep 17 00:00:00 2001 From: Canhua Li Date: Fri, 6 Dec 2019 15:01:15 -0800 Subject: [PATCH 05/11] E2E test still use windows-2019 image --- .ado/windows-vs-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 459e3bb9832..034d9a0af1d 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -528,7 +528,7 @@ jobs: parameters: name: E2ETest pool: - vmImage: $(VmImage) + vmImage: windows-2019 BuildPlatform: x64 UseRNFork: true vsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64, Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 From 091153e43cf1739da6402d0f63d2f60d210ab038 Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 6 Dec 2019 15:51:13 -0800 Subject: [PATCH 06/11] force install vs dependencies on vs2019 image for E2E test --- .ado/templates/prepare-env.yml | 3 ++- .ado/windows-vs-pr.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index 87b834d59d5..a85b3a08efe 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -4,6 +4,7 @@ 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' @@ -54,7 +55,7 @@ steps: -InstallerUri ${{ parameters.vsInstallerUri }} -Components ${{ parameters.vsComponents }} -Collect:$${{ parameters.debug }} - condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) + condition: or('${{ forceVSDependencies }}', and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019'))) - task: PowerShell@2 displayName: List disksize by Get-WmiObject Win32_LogicalDisk diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 034d9a0af1d..0f921bed6fc 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -532,6 +532,7 @@ jobs: BuildPlatform: x64 UseRNFork: true vsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64, Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 + forceVSDependencies: true - job: RNWNugetPR displayName: Build and Pack Nuget From c9608084cb0b7e52ba9554bdf1c0caaf3534f26a Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 6 Dec 2019 16:06:57 -0800 Subject: [PATCH 07/11] parameters.forceVSDependencies --- .ado/templates/prepare-env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index a85b3a08efe..6d55c79da60 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -55,7 +55,7 @@ steps: -InstallerUri ${{ parameters.vsInstallerUri }} -Components ${{ parameters.vsComponents }} -Collect:$${{ parameters.debug }} - condition: or('${{ forceVSDependencies }}', and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019'))) + condition: or('${{ parameters.forceVSDependencies }}', and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019'))) - task: PowerShell@2 displayName: List disksize by Get-WmiObject Win32_LogicalDisk From b829251c41431f81bfa9df5d01e4e20f9ef7cecb Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Mon, 9 Dec 2019 11:31:26 -0800 Subject: [PATCH 08/11] add ../../.ado/variables/vs2017.yml --- .ado/variables/vs2017.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ado/variables/vs2017.yml b/.ado/variables/vs2017.yml index 325667fefb1..8334ac5b111 100644 --- a/.ado/variables/vs2017.yml +++ b/.ado/variables/vs2017.yml @@ -1,4 +1,5 @@ variables: VmImage: vs2017-win2016 MSBuildVersion: 15.0 + VsComponents: GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq' From d1f2166413b84e84032a69a4e05660fb2bd3985c Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Mon, 9 Dec 2019 11:47:42 -0800 Subject: [PATCH 09/11] Revert "add ../../.ado/variables/vs2017.yml" This reverts commit b829251c41431f81bfa9df5d01e4e20f9ef7cecb. --- .ado/variables/vs2017.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ado/variables/vs2017.yml b/.ado/variables/vs2017.yml index 8334ac5b111..325667fefb1 100644 --- a/.ado/variables/vs2017.yml +++ b/.ado/variables/vs2017.yml @@ -1,5 +1,4 @@ variables: VmImage: vs2017-win2016 MSBuildVersion: 15.0 - VsComponents: GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq' From 3e38b3a0544d55695368ef88e3cff0679b54bf74 Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Mon, 9 Dec 2019 11:50:12 -0800 Subject: [PATCH 10/11] revert and force --- .ado/templates/build-rnw.yml | 1 + .../windows/ReactUWPTestApp/ReactUWPTestApp.csproj | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index a99bdfbf23e..052ebb81e6c 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -25,6 +25,7 @@ steps: vsComponents: ${{ parameters.vsComponents }} yarnBuildCmd: ${{ parameters.yarnBuildCmd }} debug: ${{ parameters.debug }} + forceVSDependencies: false - task: NuGetCommand@2 displayName: NuGet restore diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj index 940cc0ba392..6b9244428a2 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj +++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj @@ -19,6 +19,13 @@ true 867D41FE5091AED426000143497EA4DFC29A8097 ReactUWPTestApp_TemporaryKey.pfx + False + SHA256 + True + True + Always + x64 + 0 true @@ -89,7 +96,7 @@ true true - + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ @@ -151,7 +158,6 @@ 14.0 - echo WorkingDir %CD% @@ -159,7 +165,6 @@ -