[Housekeeping] Add provisionating xcode to net6 (#836)

* Add provisionating xcode to net6 * Fix essentials device tests * try again # Conflicts: # eng/pipelines/handlers.yml
dotnet · Apr 27, 2021 · 05be6b3 · 05be6b3
1 parent 105b3cd
commit 05be6b3
Showing 1 changed file with 39 additions and 7 deletions.
diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml
@@ -145,10 +145,7 @@ stages:
           vmImage: $(macOSXVmImage)
           demands:
             - sh
-        variables:
-          provisionator.xcode : '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
-          provisionator.path : '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
-          provisionator.extraArguments : '--v'
+            - Xamarin.iOS
         steps:
           - template: common/controlgallery-ios.yml
 
@@ -167,9 +164,6 @@ stages:
         variables:
           renderers: 'FAST'
           outputfolder: 'newRenderers'
-          provisionator.xcode : '$(System.DefaultWorkingDirectory)/eng/provisioning/xcode.csx'
-          provisionator.path : '$(System.DefaultWorkingDirectory)/eng/provisioning/provisioning.csx'
-          provisionator.extraArguments : '--v'
         steps:
           - template: common/controlgallery-android.yml
 
@@ -188,6 +182,25 @@ stages:
             vmImage: ${{ BuildPlatform.vmImage }}
           steps:
             - ${{ if eq(BuildPlatform.name, 'macos') }}:
+              - task: xamops.azdevex.provisionator-task.provisionator@1
+                displayName: 'Provision Xcode'
+                condition: ne(variables['REQUIRED_XCODE'], '')
+                inputs:
+                  provisioning_script: $(provisionator.xcode)
+
+              - task: xamops.azdevex.provisionator-task.provisionator@1
+                displayName: 'Provisionator'
+                condition: eq(variables['provisioning'], 'true')
+                inputs:
+                  provisioning_script: $(provisionator.xcode)
+                  provisioning_extra_args: $(provisionator.extraArguments)
+
+              - script: |
+                  echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
+                  echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
+                displayName: 'Setup SDK Paths'
+                condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
+
               - bash: |
                   set -x
                   mkdir -p ~/Library/Preferences/Xamarin
@@ -238,6 +251,25 @@ stages:
               vmImage: ${{ BuildPlatform.vmImage }}
             steps:
               - ${{ if eq(BuildPlatform.name, 'macos') }}:
+                - task: xamops.azdevex.provisionator-task.provisionator@1
+                  displayName: 'Provision Xcode'
+                  condition: ne(variables['REQUIRED_XCODE'], '')
+                  inputs:
+                    provisioning_script: $(provisionator.xcode)
+
+                - task: xamops.azdevex.provisionator-task.provisionator@1
+                  displayName: 'Provisionator'
+                  condition: eq(variables['provisioning'], 'true')
+                  inputs:
+                    provisioning_script: $(provisionator.xcode)
+                    provisioning_extra_args: $(provisionator.extraArguments)
+
+                - script: |
+                    echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"
+                    echo "##vso[task.prependpath]~/Library/Developer/Xamarin/android-sdk-macosx"
+                  displayName: 'Setup SDK Paths'
+                  condition: ne(variables['osx2019VmPool'], 'Azure Pipelines')
+                
                 - bash: |
                     set -x
                     mkdir -p ~/Library/Preferences/Xamarin