Merge pull request #592 from xamarin/workloads-rollback-files

Using latest Workloads

Author: moljac

azure-pipelines.yml

@@ -10,11 +10,14 @@ variables:
   AndroidXMigrationVersion: 1.0.10
   BootsVersion: 1.1.0.712-preview2
   DotNetVersion: 6.0.300
+  XcodeVersion: 13.3.1
   DotNet6Source: https://aka.ms/dotnet6/nuget/index.json
   NuGetOrgSource: https://api.nuget.org/v3/index.json
-  XamarinDotNetWorkloadSource: https://aka.ms/dotnet/maui/rc.3.json
-  LegacyXamarinAndroidPkg: https://aka.ms/xamarin-android-commercial-d17-2-macos
-  LegacyXamarinAndroidVsix: https://aka.ms/xamarin-android-commercial-d17-2-windows
+  XamarinDotNetWorkloadSource: workloads.json   # or url (check for recent versions - redth)
+                                                # https://aka.ms/dotnet/maui/6.0.400.json
+  # matching builds
+  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
   BUILD_NUMBER: $(Build.BuildNumber)
   BUILD_COMMIT: $(Build.SourceVersion)
   PRE_RESTORE_PROJECTS: true  # Windows is having an issue on CI right now
@@ -40,9 +43,9 @@ jobs:
       areaPath: 'DevDiv\VS Client - Runtime SDKs\Android'
       macosImage: macOS-12                                    # the name of the macOS VM image (BigSur)
       windowsAgentPoolName: android-win-2022
-      xcode: 13.3.1
-      dotnet: '6.0.300'                                       # the version of .NET Core to use
-      dotnetStable: '6.0.300'                                 # the stable version of .NET Core to use
+      xcode: $(XcodeVersion)
+      dotnet: $(DotNetVersion)                                # the version of .NET Core to use
+      dotnetStable: $(DotNetVersion)                          # the stable version of .NET Core to use
       initSteps:
         - task: UseDotNet@2
           displayName: install .NET $(DotNetVersion)
@@ -64,7 +67,7 @@ jobs:
             dotnet tool update --global Cake.Tool
             dotnet tool update --global boots --version $(BootsVersion)
             boots $(LegacyXamarinAndroidPkg)
-            sudo xcode-select -s "/Applications/Xcode_13.3.1.app"
+            sudo xcode-select -s "/Applications/Xcode_$(XcodeVersion).app"
             sudo xcode-select -p
           condition: eq(variables['System.JobName'], 'macos')
         - pwsh: |

workloads.json

@@ -0,0 +1,10 @@
+{
+  "microsoft.net.sdk.android": "32.0.447/6.0.400",
+  "microsoft.net.sdk.ios": "15.4.442/6.0.400",
+  "microsoft.net.sdk.maccatalyst": "15.4.442/6.0.400",
+  "microsoft.net.sdk.macos": "12.3.442/6.0.400",
+  "microsoft.net.sdk.maui": "6.0.424/6.0.400",
+  "microsoft.net.sdk.tvos": "15.4.442/6.0.400",
+  "microsoft.net.workload.mono.toolchain": "6.0.7/6.0.300",
+  "microsoft.net.workload.emscripten": "6.0.4/6.0.300"
+}