Update to macOS 11

.config/dotnet-tools.json

@@ -21,7 +21,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.22124.1",
+      "version": "1.0.0-prerelease.22204.2",
       "commands": [
         "xharness"
       ]

cake/UtilsManaged.cake

@@ -308,11 +308,6 @@ async Task DownloadPackageAsync(string id, DirectoryPath outputDirectory)
 
         Information($"Downloading '{currentId}' version '{currentVersion}'...");
 
-        if (currentId == "_nativeassets.maccatalyst") {
-            Warning($"Skipping '{currentId}' because we do not yet have this package working...");
-            return;
-        }
-
         var root = await comparer.ExtractCachedPackageAsync(currentId, currentVersion);
         var toolsDir = $"{root}/tools/";
         if (DirectoryExists(toolsDir)) {

scripts/azure-pipelines-tests.yml

@@ -16,7 +16,7 @@ parameters:
     type: object
     default:
       name: Azure Pipelines
-      vmImage: macOS-10.15
+      vmImage: macos-11
   - name: VM_IMAGE_LINUX
     type: object
     default:
@@ -44,5 +44,8 @@ stages:
       isBuildPipeline: false
       buildExternals: ${{ parameters.buildExternals }}
       VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
+      VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }}
       VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
+      VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC }}
       VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }}
+      VM_IMAGE_LINUX_NATIVE: ${{ parameters.VM_IMAGE_LINUX }}

scripts/azure-pipelines-variables.yml

@@ -10,11 +10,12 @@ variables:
   BUILD_NUMBER: $[counter(format('_{0}_{1}_{2}__', variables['SKIASHARP_VERSION'], variables['Build.SourceBranch'], variables['PREVIEW_LABEL']), 1)]
   TIZEN_LINUX_PACKAGES: libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn
   MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build
-  MONO_VERSION_MACOS: '6_12_7'
+  MONO_VERSION_MACOS: '6_12_13'
   MONO_VERSION_LINUX: ''
-  XCODE_VERSION: 12.4
-  DOTNET_VERSION_PREVIOUS: 3.1.416
-  DOTNET_VERSION: 5.0.405
+  XCODE_VERSION: 13.2.1
+  XCODE_VERSION_NATIVE: 13.2.1
+  DOTNET_VERSION_PREVIOUS: 3.1.417
+  DOTNET_VERSION: 5.0.406
   DOTNET_VERSION_PREVIEW: '6.0.200-rtm.22107.3'
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.14.json'
   CONFIGURATION: 'Release'

scripts/azure-pipelines.yml

@@ -22,7 +22,7 @@ parameters:
     type: object
     default:
       name: Azure Pipelines
-      vmImage: macOS-10.15
+      vmImage: macos-11
   - name: VM_IMAGE_LINUX
     type: object
     default:
@@ -46,5 +46,8 @@ stages:
       isBuildPipeline: true
       buildExternals: ${{ parameters.buildExternals }}
       VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
+      VM_IMAGE_WINDOWS_NATIVE: ${{ parameters.VM_IMAGE_WINDOWS }}
       VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
+      VM_IMAGE_MAC_NATIVE: ${{ parameters.VM_IMAGE_MAC }}
       VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }}
+      VM_IMAGE_LINUX_NATIVE: ${{ parameters.VM_IMAGE_LINUX }}

scripts/azure-templates-build.yml

@@ -54,14 +54,14 @@ jobs:
             sudo apt update
             sudo apt install -y ${{ parameters.packages }}
           displayName: Install additional package dependencies
-          condition: ne('${{ parameters.packages }}', '')
+          condition: and(succeeded(), ne('${{ parameters.packages }}', ''))
 
       # make sure mono/msbuild is the correct version
       - ${{ if and(ne(variables['MONO_VERSION_LINUX'], ''), eq(parameters.docker, ''), endsWith(parameters.name, '_linux')) }}:
         - bash: ./scripts/install-mono.sh $(MONO_VERSION_LINUX)
           displayName: Install Mono and MSBuild
       - ${{ if endsWith(parameters.name, '_macos') }}:
-        - bash: sudo $(Agent.HomeDirectory)/scripts/select-xamarin-sdk.sh $(MONO_VERSION_MACOS)
+        - bash: sudo ./scripts/select-xamarin.sh $(MONO_VERSION_MACOS)
           displayName: Switch to the latest Xamarin SDK
 
       # install extra bits for the native builds
@@ -114,46 +114,58 @@ jobs:
             displayName: Install Android API 31 (v12)
         # install the bits needed for .NET
         - ${{ if eq(parameters.installDotNet, 'true') }}:
+          - ${{ if endsWith(parameters.name, '_macos') }}:
+            - pwsh: Remove-Item "$env:AGENT_TOOLSDIRECTORY/dotnet" -Recurse -Force -ErrorAction SilentlyContinue
+              displayName: Cleanup existing versions of .NET Core
           - task: UseDotNet@2
             inputs:
               packageType: 'sdk'
               version: $(DOTNET_VERSION_PREVIOUS)
-              performMultiLevelLookup: true
             displayName: Install the previous version of .NET Core
           - task: UseDotNet@2
             inputs:
               packageType: 'sdk'
               version: $(DOTNET_VERSION)
-              performMultiLevelLookup: true
             displayName: Install the correct version of .NET Core
           # install the bits needed for .NET 6 builds
           - pwsh: .\scripts\install-dotnet.ps1 -Version $env:DOTNET_VERSION_PREVIEW -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet"
             displayName: Install the preview version of .NET Core
-            condition: ne(variables.DOTNET_VERSION_PREVIEW, '')
+            condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, ''))
+          # display dotnet info
+          - pwsh: dotnet --info
+            displayName: Display all the .NET information
+          # install VS
           - ${{ if endsWith(parameters.name, '_windows') }}:
             - ${{ if eq(parameters.installPreviewVs, 'true') }}:
               - pwsh: .\scripts\install-vs.ps1
                 displayName: Install Visual Studio
+          # install workloads
           - ${{ if not(endsWith(parameters.name, '_linux')) }}:
             - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" -IsPreview $true
-              condition: ne(variables.DOTNET_VERSION_PREVIEW, '')
+              condition: and(succeeded(), ne(variables.DOTNET_VERSION_PREVIEW, ''))
               displayName: Install the preview .NET Core workloads
             - pwsh: .\scripts\install-dotnet-workloads.ps1 -InstallDir "$env:AGENT_TOOLSDIRECTORY/dotnet" -SourceUrl "$env:DOTNET_WORKLOAD_SOURCE" -IsPreview $false
-              condition: eq(variables.DOTNET_VERSION_PREVIEW, '')
+              condition: and(succeeded(), eq(variables.DOTNET_VERSION_PREVIEW, ''))
               displayName: Install the .NET Core workloads
-          # display dotnet info
-          - pwsh: dotnet --info
-            displayName: Display all the .NET information
 
       # select the correct/latest version of Visual Studio
       - ${{ if endsWith(parameters.name, '_windows') }}:
         - pwsh: .\scripts\select-vs.ps1
           displayName: Select Visual Studio
 
+      # install nuget
+      - ${{ if endsWith(parameters.name, '_windows') }}:
+        - pwsh: .\scripts\install-nuget.ps1
+          displayName: Install NuGet
+
       # install the mac tools
       - ${{ if endsWith(parameters.name, '_macos') }}:
-        - bash: echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'/Applications/Xcode_$(XCODE_VERSION).app;sudo xcode-select --switch /Applications/Xcode_$(XCODE_VERSION).app/Contents/Developer
-          displayName: Switch to the latest Xcode
+        - ${{ if startsWith(parameters.name, 'native_') }}:
+          - bash: sudo ./scripts/select-xcode.sh $(XCODE_VERSION_NATIVE)
+            displayName: Switch to the latest Xcode
+        - ${{ if not(startsWith(parameters.name, 'native_')) }}:
+          - bash: sudo ./scripts/select-xcode.sh $(XCODE_VERSION)
+            displayName: Switch to the latest Xcode
 
       # install the linux tools
       - ${{ if and(eq(parameters.installEmsdk, 'true'), endsWith(parameters.name, '_linux')) }}:
@@ -179,10 +191,6 @@ jobs:
         - pwsh: dotnet tool install -g ${{ tool }}
           displayName: Install ${{ tool }}
 
-      # install nuget
-      - pwsh: .\scripts\install-nuget.ps1
-        displayName: Install NuGet
-
       # download artifacts
       - template: azure-templates-download-artifacts.yml
         parameters:

scripts/azure-templates-github-status.yml

@@ -26,7 +26,7 @@ steps:
       curl -v `
         -X POST `
         -H "Accept: application/vnd.github.v3+json" `
-        -H "Authorization: token $(Github.Token)" `
+        -H "Authorization: token $(Github.Token.Status)" `
         https://api.github.com/repos/$env:BUILD_REPOSITORY_ID/statuses/$env:SYSTEM_PULLREQUEST_SOURCECOMMITID `
         -d @temp-test.json
     displayName: ${{ parameters.displayName }}