Merge pull request #14150 from dotnet/marcpopMSFT-streamlineprmatrix

Simplify our PR builds.

.vsts-ci.yml

@@ -71,34 +71,26 @@ stages:
         matrix:
           # Public-only builds
           ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
-            Build_Debug_x86:
+            Build_Release_x64:
               _BuildConfig: Debug
-              _BuildArchitecture: x86
+              _BuildArchitecture: x64
               _DOTNET_CLI_UI_LANGUAGE: ''
-              _AdditionalBuildParameters: ''
+              _AdditionalBuildParameters: '/p:PublishInternalAsset=true'
               _TestArg: $(_WindowsTestArg)
           # Internal-only builds
           ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-            Build_Release_x86:
-              _BuildConfig: Release
-              _BuildArchitecture: x86
-              _DOTNET_CLI_UI_LANGUAGE: ''
-              _AdditionalBuildParameters: ''
-              _TestArg: $(_WindowsTestArg)
-          # Always run builds
             Build_Release_x64:
               _BuildConfig: Release
               _BuildArchitecture: x64
               _DOTNET_CLI_UI_LANGUAGE: ''
               _AdditionalBuildParameters: '/p:PublishInternalAsset=true'
               _TestArg: $(_WindowsTestArg)
-          Build_Release_arm:
+            Build_Release_x86:
               _BuildConfig: Release
-            _BuildArchitecture: arm
+              _BuildArchitecture: x86
               _DOTNET_CLI_UI_LANGUAGE: ''
               _AdditionalBuildParameters: ''
-            # Never run tests on arm64
+              _TestArg: $(_WindowsTestArg)
-            _TestArg: ''
             Build_Release_arm64:
               _BuildConfig: Release
               _BuildArchitecture: arm64
@@ -107,20 +99,17 @@ stages:
               # Never run tests on arm64
               _TestArg: ''
 
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/build.yml
       parameters:
         agentOs: Windows_NT
         pool:
-        ${{ if eq(variables['System.TeamProject'], 'public') }}:
-          name: NetCore1ESPool-Public
-          demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:
             name: NetCore1ESPool-Internal
             demands: ImageOverride -equals build.windows.10.amd64.vs2019
         timeoutInMinutes: 180
         strategy:
           matrix:
-          # Always run builds
             Build_Release_x64:
               _BuildConfig: Release
               _BuildArchitecture: x64
@@ -186,30 +175,6 @@ stages:
               _BuildArchitecture: 'x64'
               _AdditionalBuildParameters: '/p:BuildSdkDeb=true'
               _TestArg: $(_NonWindowsTestArg)
-            Build_Rhel_7_2_Release_x64:
-              _BuildConfig: Release
-              _DockerParameter: '--docker centos'
-              _LinuxPortable: ''
-              _RuntimeIdentifier: ''
-              _BuildArchitecture: 'x64'
-              _TestArg: $(_NonWindowsTestArg)
-            Build_Rhel_7_2_Release_Arm64:
-              _BuildConfig: Release
-              _DockerParameter: '--docker centos'
-              _LinuxPortable: ''
-              _RuntimeIdentifier: '--runtime-id linux-arm64'
-              _BuildArchitecture: 'arm64'
-              # Never run tests on arm
-              _TestArg: ''
-              _AdditionalBuildParameters: '/p:CLIBUILD_SKIP_TESTS=true'
-            Build_Arm_Debug:
-              _BuildConfig: Debug
-              _DockerParameter: ''
-              _LinuxPortable: '--linux-portable'
-              _RuntimeIdentifier: '--runtime-id linux-arm'
-              _BuildArchitecture: 'arm'
-              # Never run tests on arm
-              _TestArg: ''
             Build_Arm64_Debug:
               _BuildConfig: Debug
               _DockerParameter: ''
@@ -218,25 +183,6 @@ stages:
               _BuildArchitecture: 'arm64'
               # Never run tests on arm64
               _TestArg: ''
-            Build_Linux_musl_Debug_arm:
-              _BuildConfig: Debug
-              # linux-musl-arm cross gen depends on glibc 2.27 (this OS has it)
-              _DockerParameter: '--docker ubuntu.18.04'
-              _LinuxPortable: ''
-              _RuntimeIdentifier: '--runtime-id linux-musl-arm'
-              _BuildArchitecture: 'arm'
-              _AdditionalBuildParameters: '/p:OSName="linux-musl"'
-              # Never run tests on arm
-              _TestArg: ''
-            Build_Linux_musl_Debug_arm64:
-              _BuildConfig: Debug
-              _DockerParameter: ''
-              _LinuxPortable: ''
-              _RuntimeIdentifier: '--runtime-id linux-musl-arm64'
-              _BuildArchitecture: 'arm64'
-              _AdditionalBuildParameters: '/p:OSName="linux-musl"'
-              # Never run tests on arm64
-              _TestArg: ''
             Build_Linux_musl_Debug_x64:
               _BuildConfig: Debug
               _DockerParameter: '--docker alpine.3.15'
@@ -329,20 +275,17 @@ stages:
             _BuildArchitecture: 'x64'
             _TestArg: $(_NonWindowsTestArg)
 
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/build.yml
       parameters:
         agentOs: Linux
         pool:
-        ${{ if eq(variables['System.TeamProject'], 'public') }}:
-          name: NetCore1ESPool-Public
-          demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
           ${{ if eq(variables['System.TeamProject'], 'internal') }}:
             name: NetCore1ESPool-Internal
             demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
         timeoutInMinutes: 180
         strategy:
           matrix:
-          # Always run builds
             Build_LinuxPortable_Release_x64:
               _BuildConfig: Release
               _DockerParameter: ''
@@ -372,6 +315,7 @@ stages:
             _RuntimeIdentifier: ''
             _BuildArchitecture: 'x64'
             _TestArg: $(_NonWindowsTestArg)
+          ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
             Build_Release_arm64:
               _BuildConfig: Release
               _RuntimeIdentifier: '--runtime-id osx-arm64'