Merge pull request #1395 from xamarin/ci-refresh-20220728

refreshed CI settings
xamarin · Aug 3, 2022 · dda722f · dda722f
2 parents 400ecd8 + acafe9a
commit dda722f
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -20,21 +20,26 @@ resources:
 
 variables:
   DotNet6Version: 6.0.300
-  XamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-1-windows
+  DotNet6Source: https://aka.ms/dotnet6/nuget/index.json
+  NuGetOrgSource: https://api.nuget.org/v3/index.json
+  XamarinDotNetWorkloadSource: workloads.json   # or url (check for recent versions - redth)
+                                                # https://aka.ms/dotnet/maui/6.0.400.json
+  # matching builds
   # NOTE: there wasn't a public release of 16.11 for macOS
-  XamarinAndroidPkg: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/5673868/d17-1/19b97b7614b275a84d9e38096bd1fe0e25a494d4/xamarin.android-12.2.0.4.pkg
+  LegacyXamarinAndroidPkg:  https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/6454390/6.0.4xx/0b8d593a61bb49120fdf817e8dfdbc4b33937772/xamarin.android-12.3.99.117.pkg
+  LegacyXamarinAndroidVsix: https://dl.internalx.com/vsts-devdiv/Xamarin.Android/public/6454390/6.0.4xx/0b8d593a61bb49120fdf817e8dfdbc4b33937772/Xamarin.Android.Sdk-12.3.99.117.vsix
 jobs:
   - template: .ci/build.v1.yml@components
     parameters:
       timeoutInMinutes: 360
       areaPath: 'DevDiv\Xamarin SDK\Android'
-      macosImage: 'macOS-11'                                  # the name of the macOS VM image
-                                                              # BigSur 20211120
+      macosImage: 'macOS-12'                                  # the name of the macOS VM image
+                                                              # Monterey 20220728
       windowsAgentPoolName: AzurePipelines-EO
       windowsImage: ''
       windowsImageOverride: AzurePipelinesWindows2019compliant
 
-      xcode: 13.2.1
+      xcode: 13.3.1
       buildType: 'manifest'
 
       linuxAgentPoolName: AzurePipelines-EO
@@ -77,12 +82,14 @@ jobs:
           condition: eq(variables['System.JobName'], 'windows')
           displayName: install Xamarin.Android
         - pwsh: |
-            dotnet workload install android
+            dotnet workload update --verbosity diag --from-rollback-file $(XamarinDotNetWorkloadSource) --source $(Dotnet6Source) --source $(NuGetOrgSource)
+            dotnet workload install android --verbosity diag --skip-manifest-update --source $(Dotnet6Source) --source $(NuGetOrgSource)
+            dotnet workload install maui --verbosity diag --skip-manifest-update --source $(Dotnet6Source) --source $(NuGetOrgSource)
           displayName: install .NET 6 Android Workload
           condition: ne(variables['System.JobName'], 'linux')
       tools:
         - 'xamarin.androidbinderator.tool': '0.5.4'
-        - 'xamarin.androidx.migration.tool': '1.0.9'
+        - 'xamarin.androidx.migration.tool': '1.0.10'
   - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
     - template: sign-artifacts/jobs/v2.yml@internal-templates
       parameters: