From 061174c394ffe3e38888611d75e59c53913ce980 Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 13 Dec 2019 13:25:41 -0800 Subject: [PATCH 1/4] reduce build flavours --- .ado/windows-vs-pr.yml | 54 ++++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index de5704d3f9e..27198ccdf79 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -26,23 +26,23 @@ jobs: condition: ne( dependencies.Setup.outputs['checkPayload.shouldSkipPRBuild'], 'True' ) strategy: matrix: - X64Debug: - BuildConfiguration: Debug - BuildPlatform: x64 - UseRNFork: true - LayoutHeaders: true - X64Release: - BuildConfiguration: Release - BuildPlatform: x64 - UseRNFork: true - ArmDebug: - BuildConfiguration: Debug - BuildPlatform: arm - UseRNFork: true - X86Debug: - BuildConfiguration: Debug - BuildPlatform: x86 - UseRNFork: true + #X64Debug: + # BuildConfiguration: Debug + # BuildPlatform: x64 + # UseRNFork: true + # LayoutHeaders: true + #X64Release: + # BuildConfiguration: Release + # BuildPlatform: x64 + # UseRNFork: true + #ArmDebug: + # BuildConfiguration: Debug + # BuildPlatform: arm + # UseRNFork: true + #X86Debug: + # BuildConfiguration: Debug + # BuildPlatform: x86 + # UseRNFork: true X86Release: BuildConfiguration: Release BuildPlatform: x86 @@ -182,12 +182,12 @@ jobs: X64Debug: BuildConfiguration: Debug BuildPlatform: x64 - X86Debug: - BuildConfiguration: Debug - BuildPlatform: x86 - X64Release: - BuildConfiguration: Release - BuildPlatform: x64 + #X86Debug: + # BuildConfiguration: Debug + # BuildPlatform: x86 + #X64Release: + # BuildConfiguration: Release + # BuildPlatform: x64 X86Release: BuildConfiguration: Release BuildPlatform: x86 @@ -561,4 +561,12 @@ jobs: inputs: versionSpec: ">=4.6.0" + # Exclude ReactUWP from nuget because we didn't build all the flavours. + - task: PowerShell@2 + displayName: Download Winium + inputs: + targetType: inline # filePath | inline + script: | + ((Get-Content -path vnext\Scripts\ReactUwp.nuspec -Raw) -replace ".*ReactUWP\React.UWP.*","") | Set-Content -Path vnext\Scripts\ReactUwp.nuspec + - template: templates/prep-and-pack-nuget.yml From 71585cef277f4cd09e6b1b6497a6ae1ef00dd5bd Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 13 Dec 2019 13:30:53 -0800 Subject: [PATCH 2/4] reenable DesktopPR --- .ado/windows-vs-pr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 27198ccdf79..83fd3d2ff8c 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -182,12 +182,12 @@ jobs: X64Debug: BuildConfiguration: Debug BuildPlatform: x64 - #X86Debug: - # BuildConfiguration: Debug - # BuildPlatform: x86 - #X64Release: - # BuildConfiguration: Release - # BuildPlatform: x64 + X86Debug: + BuildConfiguration: Debug + BuildPlatform: x86 + X64Release: + BuildConfiguration: Release + BuildPlatform: x64 X86Release: BuildConfiguration: Release BuildPlatform: x86 From 4ce943b08a8b31a58e386beb09737d5b718ca7c9 Mon Sep 17 00:00:00 2001 From: CanHua Li Date: Fri, 13 Dec 2019 14:22:56 -0800 Subject: [PATCH 3/4] \\ --- .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 83fd3d2ff8c..8fa3c4eb01b 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -567,6 +567,6 @@ jobs: inputs: targetType: inline # filePath | inline script: | - ((Get-Content -path vnext\Scripts\ReactUwp.nuspec -Raw) -replace ".*ReactUWP\React.UWP.*","") | Set-Content -Path vnext\Scripts\ReactUwp.nuspec + ((Get-Content -path vnext\Scripts\ReactUwp.nuspec -Raw) -replace ".*ReactUWP\\React.UWP.*","") | Set-Content -Path vnext\Scripts\ReactUwp.nuspec - template: templates/prep-and-pack-nuget.yml From c68bd1d2ba55d7de88e0d984785a90f7f5bbd875 Mon Sep 17 00:00:00 2001 From: Canhua Li Date: Thu, 19 Dec 2019 11:53:37 -0800 Subject: [PATCH 4/4] Update .ado/windows-vs-pr.yml --- .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 8fa3c4eb01b..15661b5bcbb 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -563,7 +563,7 @@ jobs: # Exclude ReactUWP from nuget because we didn't build all the flavours. - task: PowerShell@2 - displayName: Download Winium + displayName: Exclude ReactUWP from ReactUwp.nuspec inputs: targetType: inline # filePath | inline script: |