finish merging yaml files

azure-pipelines.yml

@@ -63,40 +63,135 @@ stages:
   - stage: windows
     displayName: Build Windows
     jobs:
-    - template: build/steps/build-windows.yml
-      parameters:
-        name: win
+      - job: win_hosted
+        condition: eq(variables['vs2019VmPool'], 'Azure Pipelines')
+        workspace:
+          clean: all
         displayName: Build Windows Phase
+        timeoutInMinutes: 120
+        pool:
+          name: $(vs2019VmPool)
           vmImage: $(vs2019VmImage)
-        vmPool: $(vs2019VmPool)
-        provisionatorPath : 'build/provisioning/provisioning.csx'
-
+          demands: 
+            msbuild
+        strategy:
+          matrix:
+            debug:
+              BuildConfiguration:  'Debug'
+            release:
+              BuildConfiguration:  'Release'
+        steps:
           - template: build/steps/build-windows.yml
             parameters:
-        name: pages
+              provisionatorPath : 'build/provisioning/provisioning.csx'
+      - job: pages_hosted
+        condition: eq(variables['vs2019VmPool'], 'Azure Pipelines')
+        workspace:
+          clean: all
         displayName: Build Pages Phase
+        timeoutInMinutes: 120
+        pool:
+          name: $(vs2019VmPool)
           vmImage: $(vs2019VmImage)
-        vmPool: $(vs2019VmPool)
+          demands: 
+            msbuild
+        strategy:
+          matrix:
+            debug:
+              BuildConfiguration:  'Debug'
+            release:
+              BuildConfiguration:  'Release'
+        steps:
+          - template: build/steps/build-windows.yml
+            parameters:
               slnPath: build/Xamarin.Forms.Pages.sln
               includeUwp: false
               includeAndroid: false
               includeNonUwpAndNonAndroid: false
               includePages: true
-  
-    - job: nuget_pack
+      - job: nuget_pack_hosted
         workspace:
           clean: all
-      dependsOn:
-        - win
         displayName: Nuget Phase
+        dependsOn:
+        - win_hosted
         condition: succeeded()
         pool:
           name: $(vs2019VmPool)
           vmImage: $(vs2019VmImage)
+          demands: 
+            msbuild
         variables:
           FormsIdAppend: ''
           buildConfiguration: $(DefaultBuildConfiguration)
-        nugetPackageVersion : $[ dependencies.win.outputs['debug.winbuild.xamarinformspackageversion'] ]
+          nugetPackageVersion : $[ dependencies.win_hosted.outputs['debug.winbuild.xamarinformspackageversion'] ]
+        steps:
+          - template: build/steps/build-nuget.yml
+      - job: win_bots
+        condition: ne(variables['vs2019VmPool'], 'Azure Pipelines')
+        workspace:
+          clean: all
+        displayName: Build Windows Phase
+        timeoutInMinutes: 120
+        pool:
+          name: $(vs2019VmPool)
+          vmImage: $(vs2019VmImage)
+          demands: 
+            - Agent.OS -equals Windows_NT
+            - msbuild
+        strategy:
+          matrix:
+            debug:
+              BuildConfiguration:  'Debug'
+            release:
+              BuildConfiguration:  'Release'
+        steps:
+          - template: build/steps/build-windows.yml
+            parameters:
+              provisionatorPath : 'build/provisioning/provisioning.csx'
+      - job: pages_bots
+        condition: ne(variables['vs2019VmPool'], 'Azure Pipelines')
+        workspace:
+          clean: all
+        displayName: Build Pages Phase
+        timeoutInMinutes: 120
+        pool:
+          name: $(vs2019VmPool)
+          vmImage: $(vs2019VmImage)
+          demands: 
+            - Agent.OS -equals Windows_NT
+            - msbuild
+        strategy:
+          matrix:
+            debug:
+              BuildConfiguration:  'Debug'
+            release:
+              BuildConfiguration:  'Release'
+        steps:
+          - template: build/steps/build-windows.yml
+            parameters:
+              slnPath: build/Xamarin.Forms.Pages.sln
+              includeUwp: false
+              includeAndroid: false
+              includeNonUwpAndNonAndroid: false
+              includePages: true
+      - job: nuget_pack_bots
+        workspace:
+          clean: all
+        displayName: Nuget Phase
+        dependsOn:
+        - win_bots
+        condition: succeeded()
+        pool:
+          name: $(vs2019VmPool)
+          vmImage: $(vs2019VmImage)
+          demands: 
+            - Agent.OS -equals Windows_NT
+            - msbuild
+        variables:
+          FormsIdAppend: ''
+          buildConfiguration: $(DefaultBuildConfiguration)
+          nugetPackageVersion : $[ dependencies.win_bots.outputs['debug.winbuild.xamarinformspackageversion'] ]
         steps:
           - template: build/steps/build-nuget.yml
 
@@ -124,10 +219,10 @@ stages:
           clean: all
         displayName: OSX Phase
         pool:
+          name:  $(osx2019VmPool)
           vmImage: $(macOSXVmImage)
           demands:
             - sh
-            - msbuild
             - Xamarin.iOS
         variables:
           provisionator.osxPath : 'build/provisioning/provisioning.csx'
@@ -150,10 +245,10 @@ stages:
           clean: all
         displayName: OSX Phase
         pool:
+          name:  $(osx2017VmPool)
           vmImage: 'macOS-10.14'
           demands:
             - sh
-            - msbuild
             - Xamarin.iOS
         variables:
           provisionator.osxPath : 'build/provisioning/provisioning.csx'
@@ -174,6 +269,8 @@ stages:
           displayName: Sign Phase
           pool:
             name: $(signVmImage)
+            demands: 
+              msbuild
           steps:
             - template: build/steps/build-sign.yml
           condition: and(succeeded(), or(eq(variables['Sign'], 'true'), or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'],'refs/tags/'))))

build/steps/build-windows.yml

@@ -1,40 +1,15 @@
 parameters:
-  name: ''            # in the form type_platform_host
-  displayName: ''     # the human name
-  vmImage: ''         # the VM image
-  vmPool: ''         # the VM pool
-  targetFolder: ''    # the bootstrapper target
-  dependsOn: []       # the dependiencies
-  preBuildSteps: []   # any steps to run before the build
-  postBuildSteps: []  # any additional steps to run after the build
   slnPath : 'Xamarin.Forms.sln'
-  csprojPath : 'Xamarin.Forms.Platform.UAP\Xamarin.Forms.Platform.UAP.csproj'
   msbuildExtraArguments : ''
   artifactsTargetFolder: '$(build.artifactstagingdirectory)'
   artifactsName: 'win_build'
-  nunitTestAdapterFolder: 'packages/NUnitTestAdapter.AnyVersion/build/'
   nunitTestFolder: '$(build.sourcesdirectory)'
   includeUwp: 'true'
   includeAndroid: 'true'
   includeNonUwpAndNonAndroid: 'true'
   includePages: 'false'
 
-jobs:
-  - job: ${{ parameters.name }}
-    workspace:
-      clean: all
-    displayName: ${{ parameters.displayName }}
-    timeoutInMinutes: 120
-    pool:
-      name: ${{ parameters.vmPool }}
-      vmImage: ${{ parameters.vmImage }}
-    dependsOn: ${{ parameters.dependsOn }}
-    strategy:
-      matrix:
-        debug:
-          BuildConfiguration:  'Debug'
-        release:
-          BuildConfiguration:  'Release'
+
 steps:
   - checkout: self
     clean: true