From 122e785fd51bbddb9485c6c8175810c5ab602279 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 01:12:59 +0700
Subject: [PATCH 01/30] Try use the new OS

---
 scripts/azure-pipelines.yml | 39 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 3f9343d2322..6ffb49e43b2 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -36,7 +36,6 @@ variables:
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
   VM_IMAGE_WINDOWS: windows-2022
-  VM_IMAGE_WINDOWS_PREVIOUS: windows-2019
   VM_IMAGE_MAC: macOS-10.15
   VM_IMAGE_LINUX: ubuntu-18.04
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
@@ -77,7 +76,7 @@ stages:
           name: native_android_x86_windows
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=x86
           installWindowsSdk: false
@@ -87,7 +86,7 @@ stages:
           name: native_android_x64_windows
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=x64
           installWindowsSdk: false
@@ -97,7 +96,7 @@ stages:
           name: native_android_arm_windows
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=arm
           installWindowsSdk: false
@@ -107,7 +106,7 @@ stages:
           name: native_android_arm64_windows
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=arm64
           installWindowsSdk: false
@@ -117,7 +116,7 @@ stages:
           name: native_tizen_windows
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-tizen
           installWindowsSdk: false
           artifactName: native
@@ -126,7 +125,7 @@ stages:
           name: native_uwp_angle_x86_windows
           displayName: ANGLE x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x86
           artifactName: native
@@ -135,7 +134,7 @@ stages:
           name: native_uwp_angle_x64_windows
           displayName: ANGLE x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x64
           artifactName: native
@@ -144,7 +143,7 @@ stages:
           name: native_uwp_angle_arm_windows
           displayName: ANGLE arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm
           artifactName: native
@@ -153,7 +152,7 @@ stages:
           name: native_uwp_angle_arm64_windows
           displayName: ANGLE arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm64
           artifactName: native
@@ -162,7 +161,7 @@ stages:
           name: native_uwp_x86_windows
           displayName: UWP x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=x86 --skipAngle=true
           artifactName: native
@@ -171,7 +170,7 @@ stages:
           name: native_uwp_x64_windows
           displayName: UWP x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=x64 --skipAngle=true
           artifactName: native
@@ -180,7 +179,7 @@ stages:
           name: native_uwp_arm_windows
           displayName: UWP arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=arm --skipAngle=true
           artifactName: native
@@ -189,7 +188,7 @@ stages:
           name: native_uwp_arm64_windows
           displayName: UWP arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=arm64 --skipAngle=true
           artifactName: native
@@ -198,7 +197,7 @@ stages:
           name: native_win32_x86_windows
           displayName: Win32 x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
           additionalArgs: --buildarch=x86
           artifactName: native
@@ -207,7 +206,7 @@ stages:
           name: native_win32_x64_windows
           displayName: Win32 x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -216,7 +215,7 @@ stages:
           name: native_win32_arm64_windows
           displayName: Win32 arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
           additionalArgs: --buildarch=arm64
           artifactName: native
@@ -225,7 +224,7 @@ stages:
           name: native_win32_x64_nanoserver_windows
           displayName: Nano Server x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-nanoserver
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -471,7 +470,7 @@ stages:
         parameters:
           name: api_diff_windows
           displayName: API Diff
-          vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: docs-api-diff
           additionalArgs: --nugetDiffPrerelease=$(NUGET_DIFF_PRERELEASE)
           shouldPublish: false
@@ -824,7 +823,7 @@ stages:
             name: native_checks_windows
             displayName: Run Code Checks
             condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/'))
-            vmImage: $(VM_IMAGE_WINDOWS_PREVIOUS)
+            vmImage: $(VM_IMAGE_WINDOWS)
             target: git-sync-deps
             installWindowsSdk: false
             installDotNet: false

From 123d041fc64d5ba5bf5b1f3dae296945413d62eb Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 01:23:15 +0700
Subject: [PATCH 02/30] Use python 3 on the new agents

---
 scripts/azure-templates-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index e2a91234a37..5a8a248c420 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -71,11 +71,11 @@ jobs:
 
       # install extra bits for the native builds
       - ${{ if startsWith(parameters.name, 'native_') }}:
-        # switch to Python 2.7
+        # switch to Python 3.x
         - task: UsePythonVersion@0
-          displayName: Switch to Python to 2.7
+          displayName: Switch to Python to 3.x
           inputs:
-            versionSpec: '2.7'
+            versionSpec: '3.x'
             architecture: 'x64'
         - ${{ if not(contains(parameters.name, '_checks_')) }}:
           # install android ndk

From e3c5b71fadad801d8988a6745b18ed11130b746c Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 01:46:00 +0700
Subject: [PATCH 03/30] use pools

---
 scripts/azure-pipelines.yml       | 6 +++---
 scripts/azure-templates-build.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 6ffb49e43b2..921f63760ee 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -35,9 +35,9 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: windows-2022
-  VM_IMAGE_MAC: macOS-10.15
-  VM_IMAGE_LINUX: ubuntu-18.04
+  VM_IMAGE_WINDOWS: 'Hosted VS2019'
+  VM_IMAGE_MAC: 'Hosted macOS'
+  VM_IMAGE_LINUX: 'Hosted Ubuntu 1804'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 5a8a248c420..51a96ef5fb2 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -34,7 +34,7 @@ jobs:
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 180
     pool:
-      vmImage: ${{ parameters.vmImage }}
+      pool: ${{ parameters.vmImage }}
       demands: ${{ parameters.demands }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}

From ce6d2fea5b3a7c6dd281fc7dd58679b659750801 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 01:56:04 +0700
Subject: [PATCH 04/30] name

---
 scripts/azure-templates-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 51a96ef5fb2..be8b6106177 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -34,7 +34,7 @@ jobs:
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 180
     pool:
-      pool: ${{ parameters.vmImage }}
+      name: ${{ parameters.vmImage }}
       demands: ${{ parameters.demands }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}

From e89124919ea51fe810d41af26e87356746196276 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 01:56:44 +0700
Subject: [PATCH 05/30] name

---
 scripts/azure-templates-download.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index 5891bceaf05..9a73f20a320 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,7 +11,7 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      vmImage: ${{ parameters.vmImage }}
+      name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:
       - checkout: none

From be5d7844365fee939cf42251d68961e5595ad341 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:02:24 +0700
Subject: [PATCH 06/30] try this

---
 scripts/azure-pipelines.yml          | 6 +++---
 scripts/azure-templates-build.yml    | 5 ++++-
 scripts/azure-templates-download.yml | 5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 921f63760ee..c3b5cbde2d3 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -35,9 +35,9 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: 'Hosted VS2019'
-  VM_IMAGE_MAC: 'Hosted macOS'
-  VM_IMAGE_LINUX: 'Hosted Ubuntu 1804'
+  VM_IMAGE_WINDOWS: 'Azure Pipelines windows-2022'
+  VM_IMAGE_MAC: 'Azure Pipelines macOS-10.15'
+  VM_IMAGE_LINUX: 'Azure Pipelines ubuntu-18.04'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index be8b6106177..13ace714c95 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -34,8 +34,11 @@ jobs:
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 180
     pool:
-      name: ${{ parameters.vmImage }}
       demands: ${{ parameters.demands }}
+      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
+        name: ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index 9a73f20a320..cfc885a0fe9 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,7 +11,10 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      name: ${{ parameters.vmImage }}
+      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
+        name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:
       - checkout: none

From f8c701923d0d64fa99f2b26862142a21a858c93c Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:12:14 +0700
Subject: [PATCH 07/30] asdf

---
 scripts/azure-templates-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 13ace714c95..6eb309b2c9a 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,9 +36,9 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }}
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }} SW startsWith(parameters.vmImage, 'Azure Pipelines')
       ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
-        name: ${{ parameters.vmImage }}
+        name: ${{ parameters.vmImage }} NSW not(startsWith(parameters.vmImage, 'Azure Pipelines'))
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}

From 3632d7e776fba3dd9c3d04af07c943577c13291f Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:15:07 +0700
Subject: [PATCH 08/30] try this now

---
 scripts/azure-pipelines.yml          | 8 ++++----
 scripts/azure-templates-build.yml    | 5 +----
 scripts/azure-templates-download.yml | 5 +----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index c3b5cbde2d3..5a2be7f4fe3 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -35,9 +35,9 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: 'Azure Pipelines windows-2022'
-  VM_IMAGE_MAC: 'Azure Pipelines macOS-10.15'
-  VM_IMAGE_LINUX: 'Azure Pipelines ubuntu-18.04'
+  VM_IMAGE_WINDOWS: 'Hosted VS2019'
+  VM_IMAGE_MAC: 'Hosted macOS'
+  VM_IMAGE_LINUX: 'Hosted Ubuntu 1804'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -60,7 +60,7 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          vmImage: $(VM_IMAGE_LINUX)
+          name: $(VM_IMAGE_LINUX)
         steps:
           - checkout: none
           - template: azure-templates-variables.yml
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 6eb309b2c9a..be8b6106177 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -34,11 +34,8 @@ jobs:
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 180
     pool:
+      name: ${{ parameters.vmImage }}
       demands: ${{ parameters.demands }}
-      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }} SW startsWith(parameters.vmImage, 'Azure Pipelines')
-      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
-        name: ${{ parameters.vmImage }} NSW not(startsWith(parameters.vmImage, 'Azure Pipelines'))
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index cfc885a0fe9..9a73f20a320 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,10 +11,7 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }}
-      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
-        name: ${{ parameters.vmImage }}
+      name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:
       - checkout: none

From a0e692fba3a602df8929da677200ca7c1dfd1709 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:25:04 +0700
Subject: [PATCH 09/30] Revert "try this now"

This reverts commit 3632d7e776fba3dd9c3d04af07c943577c13291f.
---
 scripts/azure-pipelines.yml          | 8 ++++----
 scripts/azure-templates-build.yml    | 5 ++++-
 scripts/azure-templates-download.yml | 5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 5a2be7f4fe3..c3b5cbde2d3 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -35,9 +35,9 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: 'Hosted VS2019'
-  VM_IMAGE_MAC: 'Hosted macOS'
-  VM_IMAGE_LINUX: 'Hosted Ubuntu 1804'
+  VM_IMAGE_WINDOWS: 'Azure Pipelines windows-2022'
+  VM_IMAGE_MAC: 'Azure Pipelines macOS-10.15'
+  VM_IMAGE_LINUX: 'Azure Pipelines ubuntu-18.04'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -60,7 +60,7 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          name: $(VM_IMAGE_LINUX)
+          vmImage: $(VM_IMAGE_LINUX)
         steps:
           - checkout: none
           - template: azure-templates-variables.yml
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index be8b6106177..6eb309b2c9a 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -34,8 +34,11 @@ jobs:
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 180
     pool:
-      name: ${{ parameters.vmImage }}
       demands: ${{ parameters.demands }}
+      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }} SW startsWith(parameters.vmImage, 'Azure Pipelines')
+      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
+        name: ${{ parameters.vmImage }} NSW not(startsWith(parameters.vmImage, 'Azure Pipelines'))
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index 9a73f20a320..cfc885a0fe9 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,7 +11,10 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      name: ${{ parameters.vmImage }}
+      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
+        name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:
       - checkout: none

From 81854ac15ad1238abb8938d1596709213d8b8822 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:26:10 +0700
Subject: [PATCH 10/30] this

---
 scripts/azure-pipelines.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index c3b5cbde2d3..097e1641418 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -60,7 +60,10 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          vmImage: $(VM_IMAGE_LINUX)
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure Pipelines', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines')) }}:
+            name: ${{ variables.VM_IMAGE_LINUX }}
         steps:
           - checkout: none
           - template: azure-templates-variables.yml

From 67958d4d355de8b5e6c68386613e3b9b569efee6 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:30:05 +0700
Subject: [PATCH 11/30] ws scares the machines

---
 scripts/azure-pipelines.yml          | 7 ++++---
 scripts/azure-templates-build.yml    | 8 ++++----
 scripts/azure-templates-download.yml | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 097e1641418..382efcc3aca 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -38,6 +38,7 @@ variables:
   VM_IMAGE_WINDOWS: 'Azure Pipelines windows-2022'
   VM_IMAGE_MAC: 'Azure Pipelines macOS-10.15'
   VM_IMAGE_LINUX: 'Azure Pipelines ubuntu-18.04'
+  VM_IMAGE_AZURE_PREFIX: 'Azure Pipelines '
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -60,9 +61,9 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure Pipelines', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines')) }}:
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, variables.VM_IMAGE_AZURE_PREFIX) }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, variables.VM_IMAGE_AZURE_PREFIX, '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, variables.VM_IMAGE_AZURE_PREFIX)) }}:
             name: ${{ variables.VM_IMAGE_LINUX }}
         steps:
           - checkout: none
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 6eb309b2c9a..15e8edf7b3a 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -35,10 +35,10 @@ jobs:
     timeoutInMinutes: 180
     pool:
       demands: ${{ parameters.demands }}
-      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }} SW startsWith(parameters.vmImage, 'Azure Pipelines')
-      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
-        name: ${{ parameters.vmImage }} NSW not(startsWith(parameters.vmImage, 'Azure Pipelines'))
+      ${{ if startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX) }}:
+        vmImage: ${{ replace(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX, '') }} SW startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)
+      ${{ if not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)) }}:
+        name: ${{ parameters.vmImage }} NSW not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX))
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index cfc885a0fe9..fe4deaf40eb 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,9 +11,9 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines', '') }}
-      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines')) }}:
+      ${{ if startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX) }}:
+        vmImage: ${{ replace(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX, '') }}
+      ${{ if not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)) }}:
         name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:

From ac2f9547d7c005848464d960c3bc1c89fae257dc Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:35:13 +0700
Subject: [PATCH 12/30] yay!

---
 scripts/azure-templates-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 15e8edf7b3a..0e277b50896 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,9 +36,9 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX) }}:
-        vmImage: ${{ replace(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX, '') }} SW startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)
+        vmImage: ${{ replace(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX, '') }}
       ${{ if not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)) }}:
-        name: ${{ parameters.vmImage }} NSW not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX))
+        name: ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}

From 0b1eb9f0391cda023f942161c1aa0b8d05da0805 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:44:41 +0700
Subject: [PATCH 13/30] mental

---
 scripts/azure-pipelines.yml          | 7 +++----
 scripts/azure-templates-build.yml    | 6 +++---
 scripts/azure-templates-download.yml | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 382efcc3aca..8eda307b78a 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -38,7 +38,6 @@ variables:
   VM_IMAGE_WINDOWS: 'Azure Pipelines windows-2022'
   VM_IMAGE_MAC: 'Azure Pipelines macOS-10.15'
   VM_IMAGE_LINUX: 'Azure Pipelines ubuntu-18.04'
-  VM_IMAGE_AZURE_PREFIX: 'Azure Pipelines '
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -61,9 +60,9 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, variables.VM_IMAGE_AZURE_PREFIX) }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, variables.VM_IMAGE_AZURE_PREFIX, '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, variables.VM_IMAGE_AZURE_PREFIX)) }}:
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure Pipelines ', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ')) }}:
             name: ${{ variables.VM_IMAGE_LINUX }}
         steps:
           - checkout: none
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 0e277b50896..ed2bfb81f02 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -35,9 +35,9 @@ jobs:
     timeoutInMinutes: 180
     pool:
       demands: ${{ parameters.demands }}
-      ${{ if startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX) }}:
-        vmImage: ${{ replace(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX, '') }}
-      ${{ if not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)) }}:
+      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
         name: ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index fe4deaf40eb..a4c43faca16 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,9 +11,9 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      ${{ if startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX) }}:
-        vmImage: ${{ replace(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX, '') }}
-      ${{ if not(startsWith(parameters.vmImage, variables.VM_IMAGE_AZURE_PREFIX)) }}:
+      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
+        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
         name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:

From 5c3983d24fd0335732c454fd9455bc0e76ef3f07 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:53:53 +0700
Subject: [PATCH 14/30] Use docker thingy

---
 scripts/azure-templates-build.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index ed2bfb81f02..969e9a62fb7 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -220,9 +220,13 @@ jobs:
               JavaSdkDirectory: $(JAVA_HOME)
             displayName: Run the bootstrapper for ${{ parameters.target }}
       - ${{ if ne(parameters.docker, '') }}:
-        - bash: docker build --tag skiasharp ${{ parameters.dockerArgs }} .
-          workingDirectory: ${{ parameters.docker }}
+        - task: Docker@2
           displayName: Build the Docker image for ${{ parameters.docker }}
+          inputs:
+            command: build
+            arguments: ${{ parameters.dockerArgs }}
+            tags: skiasharp
+            dockerfile: ${{ parameters.docker }}/Dockerfile
         - bash: |
             echo dotnet tool restore > cmd.sh
             echo dotnet cake --target=${{ parameters.target }} --verbosity=${{ parameters.verbosity }} --configuration=${{ coalesce(parameters.configuration, 'Release') }} ${{ parameters.additionalArgs }} >> cmd.sh

From 28da35a6eda4e4ca31c91b875e836cf88cbc41d1 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 02:57:02 +0700
Subject: [PATCH 15/30] this

---
 scripts/azure-pipelines.yml       | 5 ++++-
 scripts/azure-templates-build.yml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 8eda307b78a..88a9f7debf8 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -744,7 +744,10 @@ stages:
       - job: coverage_reports                      # Coverage Reports
         displayName: Coverage Reports
         pool:
-          vmImage: $(VM_IMAGE_LINUX)
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure Pipelines ', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ')) }}:
+            name: ${{ variables.VM_IMAGE_LINUX }}
         dependsOn:
           - tests_netcore_windows
           - tests_netcore_macos
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 969e9a62fb7..b4eca4dc253 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,9 +36,9 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
+        vmImage: '${{ parameters.vmImage }}'  ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}}  ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
       ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
-        name: ${{ parameters.vmImage }}
+        name: '${{ parameters.vmImage }}' ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}

From 2100384cc157bea500dd7aee120366368c90ae84 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:04:29 +0700
Subject: [PATCH 16/30] be explicit

---
 scripts/azure-templates-build.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index b4eca4dc253..9c2249bddfb 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,9 +36,9 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
-        vmImage: '${{ parameters.vmImage }}'  ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}}  ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
+        vmImage: '${{ parameters.vmImage }}' ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
       ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
-        name: '${{ parameters.vmImage }}' ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ parameters.vmImage }}
+        name: '${{ parameters.vmImage }}' ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}
@@ -227,6 +227,7 @@ jobs:
             arguments: ${{ parameters.dockerArgs }}
             tags: skiasharp
             dockerfile: ${{ parameters.docker }}/Dockerfile
+            buildContext: ${{ parameters.docker }}
         - bash: |
             echo dotnet tool restore > cmd.sh
             echo dotnet cake --target=${{ parameters.target }} --verbosity=${{ parameters.verbosity }} --configuration=${{ coalesce(parameters.configuration, 'Release') }} ${{ parameters.additionalArgs }} >> cmd.sh

From c97bddb6fa452b5868193f4ac4109b8cf3ea2435 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:06:17 +0700
Subject: [PATCH 17/30] sigh

---
 scripts/azure-templates-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 9c2249bddfb..f04e82fbeff 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,9 +36,9 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
-        vmImage: '${{ parameters.vmImage }}' ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
+        vmImage: '${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}'
       ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
-        name: '${{ parameters.vmImage }}' ${{ parameters.vmImage }}
+        name: '${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ parameters.vmImage }}'
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}

From b1b2db208083f45c00c21e1c289663718d42b0d5 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:20:17 +0700
Subject: [PATCH 18/30] :scream:

---
 scripts/azure-templates-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index f04e82fbeff..b9d1734fc68 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,9 +36,9 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
-        vmImage: '${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}'
+        vmImage: ${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
       ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
-        name: '${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ parameters.vmImage }}'
+        name: ${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}

From 53fce37bf42145b65e41ae331d24448f14aae1bb Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:25:56 +0700
Subject: [PATCH 19/30] Azure-Pipelines-

---
 scripts/azure-pipelines.yml          | 18 +++++++++---------
 scripts/azure-templates-build.yml    |  8 ++++----
 scripts/azure-templates-download.yml |  6 +++---
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 88a9f7debf8..f5903f06add 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -35,9 +35,9 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: 'Azure Pipelines windows-2022'
-  VM_IMAGE_MAC: 'Azure Pipelines macOS-10.15'
-  VM_IMAGE_LINUX: 'Azure Pipelines ubuntu-18.04'
+  VM_IMAGE_WINDOWS: 'Azure-Pipelines-windows-2022'
+  VM_IMAGE_MAC: 'Azure-Pipelines-macOS-10.15'
+  VM_IMAGE_LINUX: 'Azure-Pipelines-ubuntu-18.04'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -60,9 +60,9 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure Pipelines ', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ')) }}:
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ')) }}:
             name: ${{ variables.VM_IMAGE_LINUX }}
         steps:
           - checkout: none
@@ -744,9 +744,9 @@ stages:
       - job: coverage_reports                      # Coverage Reports
         displayName: Coverage Reports
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure Pipelines ', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure Pipelines ')) }}:
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ')) }}:
             name: ${{ variables.VM_IMAGE_LINUX }}
         dependsOn:
           - tests_netcore_windows
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index b9d1734fc68..557882f3125 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -35,10 +35,10 @@ jobs:
     timeoutInMinutes: 180
     pool:
       demands: ${{ parameters.demands }}
-      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
-        vmImage: ${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
-      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
-        name: ${{ parameters.vmImage }} ${{startsWith(parameters.vmImage, 'Azure Pipelines ')}} ${{ parameters.vmImage }}
+      ${{ if startsWith(parameters.vmImage, 'Azure-Pipelines-') }}:
+        vmImage: ${{ trim(replace(parameters.vmImage, 'Azure-Pipelines-', '')) }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure-Pipelines-')) }}:
+        name: ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
     condition: ${{ parameters.condition }}
     variables: ${{ parameters.variables }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index a4c43faca16..bc14c2dd63a 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -11,9 +11,9 @@ jobs:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     pool:
-      ${{ if startsWith(parameters.vmImage, 'Azure Pipelines ') }}:
-        vmImage: ${{ replace(parameters.vmImage, 'Azure Pipelines ', '') }}
-      ${{ if not(startsWith(parameters.vmImage, 'Azure Pipelines ')) }}:
+      ${{ if startsWith(parameters.vmImage, 'Azure-Pipelines-') }}:
+        vmImage: ${{ trim(replace(parameters.vmImage, 'Azure-Pipelines-', '')) }}
+      ${{ if not(startsWith(parameters.vmImage, 'Azure-Pipelines-')) }}:
         name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}
     steps:

From c34b67d4ebd359c58939e17c511ab3471dfbd4ee Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:34:18 +0700
Subject: [PATCH 20/30] :shock:

---
 scripts/azure-pipelines.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index f5903f06add..dbe3156a814 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -60,9 +60,9 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ')) }}:
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-')) }}:
             name: ${{ variables.VM_IMAGE_LINUX }}
         steps:
           - checkout: none
@@ -744,9 +744,9 @@ stages:
       - job: coverage_reports                      # Coverage Reports
         displayName: Coverage Reports
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines- ')) }}:
+          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-') }}:
+            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-', '') }}
+          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-')) }}:
             name: ${{ variables.VM_IMAGE_LINUX }}
         dependsOn:
           - tests_netcore_windows

From 9f3aa5b2fbe1d2dd42023ba703f98df893fb6c8c Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:48:02 +0700
Subject: [PATCH 21/30] variables can't be used in the template

---
 scripts/azure-pipelines.yml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index dbe3156a814..25b23117aa8 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -13,6 +13,15 @@ parameters:
     displayName: 'The specific native artifacts to use for this build.'
     type: number
     default: 0
+  - name: VM_IMAGE_WINDOWS
+    type: string
+    default: 'Azure-Pipelines-windows-2022'
+  - name: VM_IMAGE_MAC
+    type: string
+    default: 'Azure-Pipelines-macOS-10.15'
+  - name: VM_IMAGE_LINUX
+    type: string
+    default: 'Azure-Pipelines-ubuntu-18.04'
 
 variables:
   SKIASHARP_VERSION: 2.88.0
@@ -35,9 +44,6 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: 'Azure-Pipelines-windows-2022'
-  VM_IMAGE_MAC: 'Azure-Pipelines-macOS-10.15'
-  VM_IMAGE_LINUX: 'Azure-Pipelines-ubuntu-18.04'
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -60,10 +66,10 @@ stages:
       - job: prepare                               # Prepare Build
         displayName: Prepare Build
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-')) }}:
-            name: ${{ variables.VM_IMAGE_LINUX }}
+          ${{ if startsWith(parameters.VM_IMAGE_LINUX, 'Azure-Pipelines-') }}:
+            vmImage: ${{ replace(parameters.VM_IMAGE_LINUX, 'Azure-Pipelines-', '') }}
+          ${{ if not(startsWith(parameters.VM_IMAGE_LINUX, 'Azure-Pipelines-')) }}:
+            name: ${{ parameters.VM_IMAGE_LINUX }}
         steps:
           - checkout: none
           - template: azure-templates-variables.yml
@@ -744,10 +750,10 @@ stages:
       - job: coverage_reports                      # Coverage Reports
         displayName: Coverage Reports
         pool:
-          ${{ if startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-') }}:
-            vmImage: ${{ replace(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-', '') }}
-          ${{ if not(startsWith(variables.VM_IMAGE_LINUX, 'Azure-Pipelines-')) }}:
-            name: ${{ variables.VM_IMAGE_LINUX }}
+          ${{ if startsWith(parameters.VM_IMAGE_LINUX, 'Azure-Pipelines-') }}:
+            vmImage: ${{ replace(parameters.VM_IMAGE_LINUX, 'Azure-Pipelines-', '') }}
+          ${{ if not(startsWith(parameters.VM_IMAGE_LINUX, 'Azure-Pipelines-')) }}:
+            name: ${{ parameters.VM_IMAGE_LINUX }}
         dependsOn:
           - tests_netcore_windows
           - tests_netcore_macos

From 3787c03958883695e8df1ac61f2a248dfa0da579 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:51:57 +0700
Subject: [PATCH 22/30] trying this

---
 scripts/azure-pipelines.yml              | 92 ++++++++++++------------
 scripts/azure-templates-linux-matrix.yml |  2 +-
 scripts/azure-templates-wasm-matrix.yml  |  2 +-
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 25b23117aa8..e1805ad4d84 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -85,7 +85,7 @@ stages:
           name: native_android_x86_windows
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-android
           additionalArgs: --buildarch=x86
           installWindowsSdk: false
@@ -95,7 +95,7 @@ stages:
           name: native_android_x64_windows
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-android
           additionalArgs: --buildarch=x64
           installWindowsSdk: false
@@ -105,7 +105,7 @@ stages:
           name: native_android_arm_windows
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-android
           additionalArgs: --buildarch=arm
           installWindowsSdk: false
@@ -115,7 +115,7 @@ stages:
           name: native_android_arm64_windows
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-android
           additionalArgs: --buildarch=arm64
           installWindowsSdk: false
@@ -125,7 +125,7 @@ stages:
           name: native_tizen_windows
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-tizen
           installWindowsSdk: false
           artifactName: native
@@ -134,7 +134,7 @@ stages:
           name: native_uwp_angle_x86_windows
           displayName: ANGLE x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x86
           artifactName: native
@@ -143,7 +143,7 @@ stages:
           name: native_uwp_angle_x64_windows
           displayName: ANGLE x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x64
           artifactName: native
@@ -152,7 +152,7 @@ stages:
           name: native_uwp_angle_arm_windows
           displayName: ANGLE arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm
           artifactName: native
@@ -161,7 +161,7 @@ stages:
           name: native_uwp_angle_arm64_windows
           displayName: ANGLE arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm64
           artifactName: native
@@ -170,7 +170,7 @@ stages:
           name: native_uwp_x86_windows
           displayName: UWP x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-uwp
           additionalArgs: --buildarch=x86 --skipAngle=true
           artifactName: native
@@ -179,7 +179,7 @@ stages:
           name: native_uwp_x64_windows
           displayName: UWP x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-uwp
           additionalArgs: --buildarch=x64 --skipAngle=true
           artifactName: native
@@ -188,7 +188,7 @@ stages:
           name: native_uwp_arm_windows
           displayName: UWP arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-uwp
           additionalArgs: --buildarch=arm --skipAngle=true
           artifactName: native
@@ -197,7 +197,7 @@ stages:
           name: native_uwp_arm64_windows
           displayName: UWP arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-uwp
           additionalArgs: --buildarch=arm64 --skipAngle=true
           artifactName: native
@@ -206,7 +206,7 @@ stages:
           name: native_win32_x86_windows
           displayName: Win32 x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-windows
           additionalArgs: --buildarch=x86
           artifactName: native
@@ -215,7 +215,7 @@ stages:
           name: native_win32_x64_windows
           displayName: Win32 x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-windows
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -224,7 +224,7 @@ stages:
           name: native_win32_arm64_windows
           displayName: Win32 arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-windows
           additionalArgs: --buildarch=arm64
           artifactName: native
@@ -233,7 +233,7 @@ stages:
           name: native_win32_x64_nanoserver_windows
           displayName: Nano Server x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: externals-nanoserver
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -249,7 +249,7 @@ stages:
           name: native_android_x86_macos
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=x86
       - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (macOS)
@@ -257,7 +257,7 @@ stages:
           name: native_android_x64_macos
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=x64
       - template: azure-templates-bootstrapper.yml # Build Native Android|arm (macOS)
@@ -265,7 +265,7 @@ stages:
           name: native_android_arm_macos
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=arm
       - template: azure-templates-bootstrapper.yml # Build Native Android|arm64 (macOS)
@@ -273,7 +273,7 @@ stages:
           name: native_android_arm64_macos
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=arm64
       - template: azure-templates-bootstrapper.yml # Build Native iOS (macOS)
@@ -281,7 +281,7 @@ stages:
           name: native_ios_macos
           displayName: iOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-ios
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native Mac Catalyst (macOS)
@@ -289,7 +289,7 @@ stages:
           name: native_maccatalyst_macos
           displayName: Mac Catalyst
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-maccatalyst
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native macOS (macOS)
@@ -297,7 +297,7 @@ stages:
           name: native_macos_macos
           displayName: macOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-macos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native tvOS (macOS)
@@ -305,7 +305,7 @@ stages:
           name: native_tvos_macos
           displayName: tvOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-tvos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native watchOS (macOS)
@@ -313,7 +313,7 @@ stages:
           name: native_watchos_macos
           displayName: watchOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-watchos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native Tizen (macOS)
@@ -321,7 +321,7 @@ stages:
           name: native_tizen_macos
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-tizen
           condition: false # TODO: TIZEN INSTALL BUGS
 
@@ -357,7 +357,7 @@ stages:
           name: native_tizen_linux
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(TIZEN_LINUX_PACKAGES)
           target: externals-tizen
 
@@ -389,7 +389,7 @@ stages:
         parameters:
           name: managed_windows
           displayName: Managed (Windows)
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: libs
           additionalArgs: --skipExternals="all"
           installPreviewVs: true
@@ -403,7 +403,7 @@ stages:
         parameters:
           name: managed_macos
           displayName: Managed (macOS)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: libs
           additionalArgs: --skipExternals="all"
           requiredArtifacts:
@@ -416,7 +416,7 @@ stages:
         parameters:
           name: managed_linux
           displayName: Managed (Linux)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: libs
           additionalArgs: --skipExternals="all"
@@ -435,7 +435,7 @@ stages:
         parameters:
           name: package_windows
           displayName: Package NuGets
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: nuget
           additionalArgs: --packall=true --skipbuild=true
           installWindowsSdk: false
@@ -479,7 +479,7 @@ stages:
         parameters:
           name: api_diff_windows
           displayName: API Diff
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: docs-api-diff
           additionalArgs: --nugetDiffPrerelease=$(NUGET_DIFF_PRERELEASE)
           shouldPublish: false
@@ -523,7 +523,7 @@ stages:
         parameters:
           name: tests_netfx_windows
           displayName: Windows (.NET Framework)
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           installPreviewVs: true
@@ -544,7 +544,7 @@ stages:
         parameters:
           name: tests_netcore_windows
           displayName: Windows (.NET Core)
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           installWindowsSdk: false
@@ -571,7 +571,7 @@ stages:
         parameters:
           name: tests_netfx_macos
           displayName: macOS (.NET Framework)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -589,7 +589,7 @@ stages:
         parameters:
           name: tests_netcore_macos
           displayName: macOS (.NET Core)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -614,7 +614,7 @@ stages:
         parameters:
           name: tests_android_macos
           displayName: Android (macOS)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-android
           additionalArgs: --device=android-emulator-32_30 --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -650,7 +650,7 @@ stages:
         parameters:
           name: tests_ios_macos
           displayName: iOS (macOS)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-ios
           additionalArgs: --device=ios-simulator-64 --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -682,7 +682,7 @@ stages:
         parameters:
           name: tests_netfx_linux
           displayName: Linux (.NET Framework)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
@@ -701,7 +701,7 @@ stages:
         parameters:
           name: tests_netcore_linux
           displayName: Linux (.NET Core)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
@@ -727,7 +727,7 @@ stages:
         parameters:
           name: tests_wasm_linux
           displayName: WASM (Linux)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES) ninja-build
           target: tests-wasm
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER)
@@ -790,7 +790,7 @@ stages:
         parameters:
           name: samples_windows
           displayName: Windows
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
           target: samples
           installPreviewVs: true
           requiredArtifactsMap:
@@ -803,7 +803,7 @@ stages:
         parameters:
           name: samples_macos
           displayName: macOS
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: samples
           shouldPublish: false
           requiredArtifactsMap:
@@ -815,7 +815,7 @@ stages:
         parameters:
           name: samples_linux
           displayName: Linux
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: samples
           shouldPublish: false
@@ -835,7 +835,7 @@ stages:
             name: native_checks_windows
             displayName: Run Code Checks
             condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/'))
-            vmImage: $(VM_IMAGE_WINDOWS)
+            vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
             target: git-sync-deps
             installWindowsSdk: false
             installDotNet: false
diff --git a/scripts/azure-templates-linux-matrix.yml b/scripts/azure-templates-linux-matrix.yml
index feb5c847ab5..de6c50b42fd 100644
--- a/scripts/azure-templates-linux-matrix.yml
+++ b/scripts/azure-templates-linux-matrix.yml
@@ -23,7 +23,7 @@ jobs:
           name: ${{ replace(replace(format('native_linux_{0}_{1}_{2}_{3}_linux', item.arch, item.variant, build.name, item.alt), '__', '_'), '__', '_') }}
           displayName: Linux ${{ replace(replace(replace(replace(replace(format('({0}|{1}|{2}|{3})', item.arch, item.variant, build.name, item.alt), '||', '|'), '||', '|'), '(|', '('), '|)', ')'), '|', ', ') }}
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           docker: ${{ item.docker }}
           dockerArgs: ${{ item.dockerArgs }}
           target: ${{ coalesce(item.target, 'externals-linux') }}
diff --git a/scripts/azure-templates-wasm-matrix.yml b/scripts/azure-templates-wasm-matrix.yml
index 24065860919..25e1fdd986f 100644
--- a/scripts/azure-templates-wasm-matrix.yml
+++ b/scripts/azure-templates-wasm-matrix.yml
@@ -10,7 +10,7 @@ jobs:
         name: native_wasm_${{ replace(version, '.', '_') }}_linux
         displayName: WASM (${{ version }})
         buildExternals: ${{ parameters.buildExternals }}
-        vmImage: $(VM_IMAGE_LINUX)
+        vmImage: ${{ parameters.VM_IMAGE_LINUX }}
         docker: scripts/Docker/wasm
         target: externals-wasm
         dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version }}

From d86abe38e812414067fc93e31db5ed660b139b74 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 03:52:33 +0700
Subject: [PATCH 23/30] Revert "trying this"

This reverts commit 3787c03958883695e8df1ac61f2a248dfa0da579.
---
 scripts/azure-pipelines.yml              | 92 ++++++++++++------------
 scripts/azure-templates-linux-matrix.yml |  2 +-
 scripts/azure-templates-wasm-matrix.yml  |  2 +-
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index e1805ad4d84..25b23117aa8 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -85,7 +85,7 @@ stages:
           name: native_android_x86_windows
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=x86
           installWindowsSdk: false
@@ -95,7 +95,7 @@ stages:
           name: native_android_x64_windows
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=x64
           installWindowsSdk: false
@@ -105,7 +105,7 @@ stages:
           name: native_android_arm_windows
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=arm
           installWindowsSdk: false
@@ -115,7 +115,7 @@ stages:
           name: native_android_arm64_windows
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
           additionalArgs: --buildarch=arm64
           installWindowsSdk: false
@@ -125,7 +125,7 @@ stages:
           name: native_tizen_windows
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-tizen
           installWindowsSdk: false
           artifactName: native
@@ -134,7 +134,7 @@ stages:
           name: native_uwp_angle_x86_windows
           displayName: ANGLE x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x86
           artifactName: native
@@ -143,7 +143,7 @@ stages:
           name: native_uwp_angle_x64_windows
           displayName: ANGLE x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x64
           artifactName: native
@@ -152,7 +152,7 @@ stages:
           name: native_uwp_angle_arm_windows
           displayName: ANGLE arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm
           artifactName: native
@@ -161,7 +161,7 @@ stages:
           name: native_uwp_angle_arm64_windows
           displayName: ANGLE arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm64
           artifactName: native
@@ -170,7 +170,7 @@ stages:
           name: native_uwp_x86_windows
           displayName: UWP x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=x86 --skipAngle=true
           artifactName: native
@@ -179,7 +179,7 @@ stages:
           name: native_uwp_x64_windows
           displayName: UWP x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=x64 --skipAngle=true
           artifactName: native
@@ -188,7 +188,7 @@ stages:
           name: native_uwp_arm_windows
           displayName: UWP arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=arm --skipAngle=true
           artifactName: native
@@ -197,7 +197,7 @@ stages:
           name: native_uwp_arm64_windows
           displayName: UWP arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
           additionalArgs: --buildarch=arm64 --skipAngle=true
           artifactName: native
@@ -206,7 +206,7 @@ stages:
           name: native_win32_x86_windows
           displayName: Win32 x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
           additionalArgs: --buildarch=x86
           artifactName: native
@@ -215,7 +215,7 @@ stages:
           name: native_win32_x64_windows
           displayName: Win32 x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -224,7 +224,7 @@ stages:
           name: native_win32_arm64_windows
           displayName: Win32 arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
           additionalArgs: --buildarch=arm64
           artifactName: native
@@ -233,7 +233,7 @@ stages:
           name: native_win32_x64_nanoserver_windows
           displayName: Nano Server x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-nanoserver
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -249,7 +249,7 @@ stages:
           name: native_android_x86_macos
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-android
           additionalArgs: --buildarch=x86
       - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (macOS)
@@ -257,7 +257,7 @@ stages:
           name: native_android_x64_macos
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-android
           additionalArgs: --buildarch=x64
       - template: azure-templates-bootstrapper.yml # Build Native Android|arm (macOS)
@@ -265,7 +265,7 @@ stages:
           name: native_android_arm_macos
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-android
           additionalArgs: --buildarch=arm
       - template: azure-templates-bootstrapper.yml # Build Native Android|arm64 (macOS)
@@ -273,7 +273,7 @@ stages:
           name: native_android_arm64_macos
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-android
           additionalArgs: --buildarch=arm64
       - template: azure-templates-bootstrapper.yml # Build Native iOS (macOS)
@@ -281,7 +281,7 @@ stages:
           name: native_ios_macos
           displayName: iOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-ios
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native Mac Catalyst (macOS)
@@ -289,7 +289,7 @@ stages:
           name: native_maccatalyst_macos
           displayName: Mac Catalyst
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-maccatalyst
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native macOS (macOS)
@@ -297,7 +297,7 @@ stages:
           name: native_macos_macos
           displayName: macOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-macos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native tvOS (macOS)
@@ -305,7 +305,7 @@ stages:
           name: native_tvos_macos
           displayName: tvOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-tvos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native watchOS (macOS)
@@ -313,7 +313,7 @@ stages:
           name: native_watchos_macos
           displayName: watchOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-watchos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native Tizen (macOS)
@@ -321,7 +321,7 @@ stages:
           name: native_tizen_macos
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: externals-tizen
           condition: false # TODO: TIZEN INSTALL BUGS
 
@@ -357,7 +357,7 @@ stages:
           name: native_tizen_linux
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           packages: $(TIZEN_LINUX_PACKAGES)
           target: externals-tizen
 
@@ -389,7 +389,7 @@ stages:
         parameters:
           name: managed_windows
           displayName: Managed (Windows)
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: libs
           additionalArgs: --skipExternals="all"
           installPreviewVs: true
@@ -403,7 +403,7 @@ stages:
         parameters:
           name: managed_macos
           displayName: Managed (macOS)
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: libs
           additionalArgs: --skipExternals="all"
           requiredArtifacts:
@@ -416,7 +416,7 @@ stages:
         parameters:
           name: managed_linux
           displayName: Managed (Linux)
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           packages: $(MANAGED_LINUX_PACKAGES)
           target: libs
           additionalArgs: --skipExternals="all"
@@ -435,7 +435,7 @@ stages:
         parameters:
           name: package_windows
           displayName: Package NuGets
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: nuget
           additionalArgs: --packall=true --skipbuild=true
           installWindowsSdk: false
@@ -479,7 +479,7 @@ stages:
         parameters:
           name: api_diff_windows
           displayName: API Diff
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: docs-api-diff
           additionalArgs: --nugetDiffPrerelease=$(NUGET_DIFF_PRERELEASE)
           shouldPublish: false
@@ -523,7 +523,7 @@ stages:
         parameters:
           name: tests_netfx_windows
           displayName: Windows (.NET Framework)
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           installPreviewVs: true
@@ -544,7 +544,7 @@ stages:
         parameters:
           name: tests_netcore_windows
           displayName: Windows (.NET Core)
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           installWindowsSdk: false
@@ -571,7 +571,7 @@ stages:
         parameters:
           name: tests_netfx_macos
           displayName: macOS (.NET Framework)
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -589,7 +589,7 @@ stages:
         parameters:
           name: tests_netcore_macos
           displayName: macOS (.NET Core)
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -614,7 +614,7 @@ stages:
         parameters:
           name: tests_android_macos
           displayName: Android (macOS)
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: tests-android
           additionalArgs: --device=android-emulator-32_30 --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -650,7 +650,7 @@ stages:
         parameters:
           name: tests_ios_macos
           displayName: iOS (macOS)
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: tests-ios
           additionalArgs: --device=ios-simulator-64 --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -682,7 +682,7 @@ stages:
         parameters:
           name: tests_netfx_linux
           displayName: Linux (.NET Framework)
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           packages: $(MANAGED_LINUX_PACKAGES)
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
@@ -701,7 +701,7 @@ stages:
         parameters:
           name: tests_netcore_linux
           displayName: Linux (.NET Core)
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           packages: $(MANAGED_LINUX_PACKAGES)
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
@@ -727,7 +727,7 @@ stages:
         parameters:
           name: tests_wasm_linux
           displayName: WASM (Linux)
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           packages: $(MANAGED_LINUX_PACKAGES) ninja-build
           target: tests-wasm
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER)
@@ -790,7 +790,7 @@ stages:
         parameters:
           name: samples_windows
           displayName: Windows
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+          vmImage: $(VM_IMAGE_WINDOWS)
           target: samples
           installPreviewVs: true
           requiredArtifactsMap:
@@ -803,7 +803,7 @@ stages:
         parameters:
           name: samples_macos
           displayName: macOS
-          vmImage: ${{ parameters.VM_IMAGE_MAC }}
+          vmImage: $(VM_IMAGE_MAC)
           target: samples
           shouldPublish: false
           requiredArtifactsMap:
@@ -815,7 +815,7 @@ stages:
         parameters:
           name: samples_linux
           displayName: Linux
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           packages: $(MANAGED_LINUX_PACKAGES)
           target: samples
           shouldPublish: false
@@ -835,7 +835,7 @@ stages:
             name: native_checks_windows
             displayName: Run Code Checks
             condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/'))
-            vmImage: ${{ parameters.VM_IMAGE_WINDOWS }}
+            vmImage: $(VM_IMAGE_WINDOWS)
             target: git-sync-deps
             installWindowsSdk: false
             installDotNet: false
diff --git a/scripts/azure-templates-linux-matrix.yml b/scripts/azure-templates-linux-matrix.yml
index de6c50b42fd..feb5c847ab5 100644
--- a/scripts/azure-templates-linux-matrix.yml
+++ b/scripts/azure-templates-linux-matrix.yml
@@ -23,7 +23,7 @@ jobs:
           name: ${{ replace(replace(format('native_linux_{0}_{1}_{2}_{3}_linux', item.arch, item.variant, build.name, item.alt), '__', '_'), '__', '_') }}
           displayName: Linux ${{ replace(replace(replace(replace(replace(format('({0}|{1}|{2}|{3})', item.arch, item.variant, build.name, item.alt), '||', '|'), '||', '|'), '(|', '('), '|)', ')'), '|', ', ') }}
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: $(VM_IMAGE_LINUX)
           docker: ${{ item.docker }}
           dockerArgs: ${{ item.dockerArgs }}
           target: ${{ coalesce(item.target, 'externals-linux') }}
diff --git a/scripts/azure-templates-wasm-matrix.yml b/scripts/azure-templates-wasm-matrix.yml
index 25e1fdd986f..24065860919 100644
--- a/scripts/azure-templates-wasm-matrix.yml
+++ b/scripts/azure-templates-wasm-matrix.yml
@@ -10,7 +10,7 @@ jobs:
         name: native_wasm_${{ replace(version, '.', '_') }}_linux
         displayName: WASM (${{ version }})
         buildExternals: ${{ parameters.buildExternals }}
-        vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+        vmImage: $(VM_IMAGE_LINUX)
         docker: scripts/Docker/wasm
         target: externals-wasm
         dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version }}

From a2bb49c0cf3e79c75863aa7a4a7f8372ad1e33a3 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 04:06:11 +0700
Subject: [PATCH 24/30] and variables

---
 scripts/azure-pipelines.yml          | 3 +++
 scripts/azure-templates-build.yml    | 2 +-
 scripts/azure-templates-download.yml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 25b23117aa8..0e067a0a8ae 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -44,6 +44,9 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
+  VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
+  VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
+  VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }}
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 557882f3125..896c2f34856 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -36,7 +36,7 @@ jobs:
     pool:
       demands: ${{ parameters.demands }}
       ${{ if startsWith(parameters.vmImage, 'Azure-Pipelines-') }}:
-        vmImage: ${{ trim(replace(parameters.vmImage, 'Azure-Pipelines-', '')) }}
+        vmImage: ${{ replace(parameters.vmImage, 'Azure-Pipelines-', '') }}
       ${{ if not(startsWith(parameters.vmImage, 'Azure-Pipelines-')) }}:
         name: ${{ parameters.vmImage }}
     dependsOn: ${{ parameters.dependsOn }}
diff --git a/scripts/azure-templates-download.yml b/scripts/azure-templates-download.yml
index bc14c2dd63a..f78bb72eab7 100644
--- a/scripts/azure-templates-download.yml
+++ b/scripts/azure-templates-download.yml
@@ -12,7 +12,7 @@ jobs:
     displayName: ${{ parameters.displayName }}
     pool:
       ${{ if startsWith(parameters.vmImage, 'Azure-Pipelines-') }}:
-        vmImage: ${{ trim(replace(parameters.vmImage, 'Azure-Pipelines-', '')) }}
+        vmImage: ${{ replace(parameters.vmImage, 'Azure-Pipelines-', '') }}
       ${{ if not(startsWith(parameters.vmImage, 'Azure-Pipelines-')) }}:
         name: ${{ parameters.vmImage }}
     condition: ${{ parameters.condition }}

From 52be4f1ab39761513cf2ad1a1ef06e4232538d7a Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 04:10:25 +0700
Subject: [PATCH 25/30] hehe

---
 scripts/azure-pipelines.yml              | 95 ++++++++++++------------
 scripts/azure-templates-linux-matrix.yml |  2 +-
 scripts/azure-templates-wasm-matrix.yml  |  2 +-
 3 files changed, 48 insertions(+), 51 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 0e067a0a8ae..7ac061c71f0 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -44,9 +44,6 @@ variables:
   DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/6.0.200/preview.13.json'
   VS_VERSION_PREVIEW: 17/pre
   CONFIGURATION: 'Release'
-  VM_IMAGE_WINDOWS: ${{ parameters.VM_IMAGE_WINDOWS }}
-  VM_IMAGE_MAC: ${{ parameters.VM_IMAGE_MAC }}
-  VM_IMAGE_LINUX: ${{ parameters.VM_IMAGE_LINUX }}
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   THROW_ON_TEST_FAILURE: true
   NUGET_DIFF_PRERELEASE: false
@@ -88,7 +85,7 @@ stages:
           name: native_android_x86_windows
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-android
           additionalArgs: --buildarch=x86
           installWindowsSdk: false
@@ -98,7 +95,7 @@ stages:
           name: native_android_x64_windows
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-android
           additionalArgs: --buildarch=x64
           installWindowsSdk: false
@@ -108,7 +105,7 @@ stages:
           name: native_android_arm_windows
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-android
           additionalArgs: --buildarch=arm
           installWindowsSdk: false
@@ -118,7 +115,7 @@ stages:
           name: native_android_arm64_windows
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-android
           additionalArgs: --buildarch=arm64
           installWindowsSdk: false
@@ -128,7 +125,7 @@ stages:
           name: native_tizen_windows
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-tizen
           installWindowsSdk: false
           artifactName: native
@@ -137,7 +134,7 @@ stages:
           name: native_uwp_angle_x86_windows
           displayName: ANGLE x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x86
           artifactName: native
@@ -146,7 +143,7 @@ stages:
           name: native_uwp_angle_x64_windows
           displayName: ANGLE x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x64
           artifactName: native
@@ -155,7 +152,7 @@ stages:
           name: native_uwp_angle_arm_windows
           displayName: ANGLE arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm
           artifactName: native
@@ -164,7 +161,7 @@ stages:
           name: native_uwp_angle_arm64_windows
           displayName: ANGLE arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm64
           artifactName: native
@@ -173,7 +170,7 @@ stages:
           name: native_uwp_x86_windows
           displayName: UWP x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-uwp
           additionalArgs: --buildarch=x86 --skipAngle=true
           artifactName: native
@@ -182,7 +179,7 @@ stages:
           name: native_uwp_x64_windows
           displayName: UWP x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-uwp
           additionalArgs: --buildarch=x64 --skipAngle=true
           artifactName: native
@@ -191,7 +188,7 @@ stages:
           name: native_uwp_arm_windows
           displayName: UWP arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-uwp
           additionalArgs: --buildarch=arm --skipAngle=true
           artifactName: native
@@ -200,7 +197,7 @@ stages:
           name: native_uwp_arm64_windows
           displayName: UWP arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-uwp
           additionalArgs: --buildarch=arm64 --skipAngle=true
           artifactName: native
@@ -209,7 +206,7 @@ stages:
           name: native_win32_x86_windows
           displayName: Win32 x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-windows
           additionalArgs: --buildarch=x86
           artifactName: native
@@ -218,7 +215,7 @@ stages:
           name: native_win32_x64_windows
           displayName: Win32 x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-windows
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -227,7 +224,7 @@ stages:
           name: native_win32_arm64_windows
           displayName: Win32 arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-windows
           additionalArgs: --buildarch=arm64
           artifactName: native
@@ -236,7 +233,7 @@ stages:
           name: native_win32_x64_nanoserver_windows
           displayName: Nano Server x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: externals-nanoserver
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -252,7 +249,7 @@ stages:
           name: native_android_x86_macos
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=x86
       - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (macOS)
@@ -260,7 +257,7 @@ stages:
           name: native_android_x64_macos
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=x64
       - template: azure-templates-bootstrapper.yml # Build Native Android|arm (macOS)
@@ -268,7 +265,7 @@ stages:
           name: native_android_arm_macos
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=arm
       - template: azure-templates-bootstrapper.yml # Build Native Android|arm64 (macOS)
@@ -276,7 +273,7 @@ stages:
           name: native_android_arm64_macos
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-android
           additionalArgs: --buildarch=arm64
       - template: azure-templates-bootstrapper.yml # Build Native iOS (macOS)
@@ -284,7 +281,7 @@ stages:
           name: native_ios_macos
           displayName: iOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-ios
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native Mac Catalyst (macOS)
@@ -292,7 +289,7 @@ stages:
           name: native_maccatalyst_macos
           displayName: Mac Catalyst
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-maccatalyst
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native macOS (macOS)
@@ -300,7 +297,7 @@ stages:
           name: native_macos_macos
           displayName: macOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-macos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native tvOS (macOS)
@@ -308,7 +305,7 @@ stages:
           name: native_tvos_macos
           displayName: tvOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-tvos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native watchOS (macOS)
@@ -316,7 +313,7 @@ stages:
           name: native_watchos_macos
           displayName: watchOS
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-watchos
           artifactName: native
       - template: azure-templates-bootstrapper.yml # Build Native Tizen (macOS)
@@ -324,7 +321,7 @@ stages:
           name: native_tizen_macos
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: externals-tizen
           condition: false # TODO: TIZEN INSTALL BUGS
 
@@ -360,7 +357,7 @@ stages:
           name: native_tizen_linux
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(TIZEN_LINUX_PACKAGES)
           target: externals-tizen
 
@@ -392,7 +389,7 @@ stages:
         parameters:
           name: managed_windows
           displayName: Managed (Windows)
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: libs
           additionalArgs: --skipExternals="all"
           installPreviewVs: true
@@ -406,7 +403,7 @@ stages:
         parameters:
           name: managed_macos
           displayName: Managed (macOS)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: libs
           additionalArgs: --skipExternals="all"
           requiredArtifacts:
@@ -419,7 +416,7 @@ stages:
         parameters:
           name: managed_linux
           displayName: Managed (Linux)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: libs
           additionalArgs: --skipExternals="all"
@@ -438,7 +435,7 @@ stages:
         parameters:
           name: package_windows
           displayName: Package NuGets
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: nuget
           additionalArgs: --packall=true --skipbuild=true
           installWindowsSdk: false
@@ -482,7 +479,7 @@ stages:
         parameters:
           name: api_diff_windows
           displayName: API Diff
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: docs-api-diff
           additionalArgs: --nugetDiffPrerelease=$(NUGET_DIFF_PRERELEASE)
           shouldPublish: false
@@ -526,7 +523,7 @@ stages:
         parameters:
           name: tests_netfx_windows
           displayName: Windows (.NET Framework)
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           installPreviewVs: true
@@ -547,7 +544,7 @@ stages:
         parameters:
           name: tests_netcore_windows
           displayName: Windows (.NET Core)
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           installWindowsSdk: false
@@ -574,7 +571,7 @@ stages:
         parameters:
           name: tests_netfx_macos
           displayName: macOS (.NET Framework)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -592,7 +589,7 @@ stages:
         parameters:
           name: tests_netcore_macos
           displayName: macOS (.NET Core)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -617,7 +614,7 @@ stages:
         parameters:
           name: tests_android_macos
           displayName: Android (macOS)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-android
           additionalArgs: --device=android-emulator-32_30 --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -653,7 +650,7 @@ stages:
         parameters:
           name: tests_ios_macos
           displayName: iOS (macOS)
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: tests-ios
           additionalArgs: --device=ios-simulator-64 --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
           shouldPublish: false
@@ -685,7 +682,7 @@ stages:
         parameters:
           name: tests_netfx_linux
           displayName: Linux (.NET Framework)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: tests-netfx
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
@@ -704,7 +701,7 @@ stages:
         parameters:
           name: tests_netcore_linux
           displayName: Linux (.NET Core)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: tests-netcore
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=$(ENABLE_CODE_COVERAGE)
@@ -730,7 +727,7 @@ stages:
         parameters:
           name: tests_wasm_linux
           displayName: WASM (Linux)
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES) ninja-build
           target: tests-wasm
           additionalArgs: --skipExternals="all" --throwOnTestFailure=$(THROW_ON_TEST_FAILURE) --coverage=false --chromedriver=$(CHROMEWEBDRIVER)
@@ -793,7 +790,7 @@ stages:
         parameters:
           name: samples_windows
           displayName: Windows
-          vmImage: $(VM_IMAGE_WINDOWS)
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
           target: samples
           installPreviewVs: true
           requiredArtifactsMap:
@@ -806,7 +803,7 @@ stages:
         parameters:
           name: samples_macos
           displayName: macOS
-          vmImage: $(VM_IMAGE_MAC)
+          vmImage: ${{ parameters.VM_IMAGE_MAC }}
           target: samples
           shouldPublish: false
           requiredArtifactsMap:
@@ -818,7 +815,7 @@ stages:
         parameters:
           name: samples_linux
           displayName: Linux
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           packages: $(MANAGED_LINUX_PACKAGES)
           target: samples
           shouldPublish: false
@@ -838,7 +835,7 @@ stages:
             name: native_checks_windows
             displayName: Run Code Checks
             condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/patch/'))
-            vmImage: $(VM_IMAGE_WINDOWS)
+            vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
             target: git-sync-deps
             installWindowsSdk: false
             installDotNet: false
diff --git a/scripts/azure-templates-linux-matrix.yml b/scripts/azure-templates-linux-matrix.yml
index feb5c847ab5..de6c50b42fd 100644
--- a/scripts/azure-templates-linux-matrix.yml
+++ b/scripts/azure-templates-linux-matrix.yml
@@ -23,7 +23,7 @@ jobs:
           name: ${{ replace(replace(format('native_linux_{0}_{1}_{2}_{3}_linux', item.arch, item.variant, build.name, item.alt), '__', '_'), '__', '_') }}
           displayName: Linux ${{ replace(replace(replace(replace(replace(format('({0}|{1}|{2}|{3})', item.arch, item.variant, build.name, item.alt), '||', '|'), '||', '|'), '(|', '('), '|)', ')'), '|', ', ') }}
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: $(VM_IMAGE_LINUX)
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           docker: ${{ item.docker }}
           dockerArgs: ${{ item.dockerArgs }}
           target: ${{ coalesce(item.target, 'externals-linux') }}
diff --git a/scripts/azure-templates-wasm-matrix.yml b/scripts/azure-templates-wasm-matrix.yml
index 24065860919..25e1fdd986f 100644
--- a/scripts/azure-templates-wasm-matrix.yml
+++ b/scripts/azure-templates-wasm-matrix.yml
@@ -10,7 +10,7 @@ jobs:
         name: native_wasm_${{ replace(version, '.', '_') }}_linux
         displayName: WASM (${{ version }})
         buildExternals: ${{ parameters.buildExternals }}
-        vmImage: $(VM_IMAGE_LINUX)
+        vmImage: ${{ parameters.VM_IMAGE_LINUX }}
         docker: scripts/Docker/wasm
         target: externals-wasm
         dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version }}

From d07a1a6b9d6bfc62fd28c53234c737fef29ba838 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 04:16:15 +0700
Subject: [PATCH 26/30] images

---
 scripts/azure-pipelines.yml              | 2 ++
 scripts/azure-templates-linux-matrix.yml | 3 ++-
 scripts/azure-templates-wasm-matrix.yml  | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 7ac061c71f0..1bc5c8af679 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -333,6 +333,7 @@ stages:
         parameters:
           artifactName: native
           buildExternals: ${{ parameters.buildExternals }}
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           builds:
             - name: ''
             - name: nodeps
@@ -368,6 +369,7 @@ stages:
       - template: azure-templates-wasm-matrix.yml # Build Native WASM (Linux)
         parameters:
           buildExternals: ${{ parameters.buildExternals }}
+          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
           artifactName: native
           emscripten:
             - 2.0.5
diff --git a/scripts/azure-templates-linux-matrix.yml b/scripts/azure-templates-linux-matrix.yml
index de6c50b42fd..9f06d41e7d8 100644
--- a/scripts/azure-templates-linux-matrix.yml
+++ b/scripts/azure-templates-linux-matrix.yml
@@ -1,6 +1,7 @@
 parameters:
   artifactName: ''                              # the name of the artifact to merge this run into
   buildExternals: ''                            # the build number to download externals from
+  vmImage: ''                                   # the VM image
   builds:
     - name: ''
       desc: ''
@@ -23,7 +24,7 @@ jobs:
           name: ${{ replace(replace(format('native_linux_{0}_{1}_{2}_{3}_linux', item.arch, item.variant, build.name, item.alt), '__', '_'), '__', '_') }}
           displayName: Linux ${{ replace(replace(replace(replace(replace(format('({0}|{1}|{2}|{3})', item.arch, item.variant, build.name, item.alt), '||', '|'), '||', '|'), '(|', '('), '|)', ')'), '|', ', ') }}
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+          vmImage: ${{ parameters.vmImage }}
           docker: ${{ item.docker }}
           dockerArgs: ${{ item.dockerArgs }}
           target: ${{ coalesce(item.target, 'externals-linux') }}
diff --git a/scripts/azure-templates-wasm-matrix.yml b/scripts/azure-templates-wasm-matrix.yml
index 25e1fdd986f..f2cb0fa818f 100644
--- a/scripts/azure-templates-wasm-matrix.yml
+++ b/scripts/azure-templates-wasm-matrix.yml
@@ -1,6 +1,7 @@
 parameters:
   artifactName: ''                              # the name of the artifact to merge this run into
   buildExternals: ''                            # the build number to download externals from
+  vmImage: ''                                   # the VM image
   emscripten: [ ]
 
 jobs:
@@ -10,7 +11,7 @@ jobs:
         name: native_wasm_${{ replace(version, '.', '_') }}_linux
         displayName: WASM (${{ version }})
         buildExternals: ${{ parameters.buildExternals }}
-        vmImage: ${{ parameters.VM_IMAGE_LINUX }}
+        vmImage: ${{ parameters.vmImage }}
         docker: scripts/Docker/wasm
         target: externals-wasm
         dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version }}

From c2a4b9df3c2a68a4581a8aec1e8b8da2b96511f5 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 04:28:33 +0700
Subject: [PATCH 27/30] python

---
 scripts/azure-templates-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 896c2f34856..e2cf27a23b5 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -74,11 +74,11 @@ jobs:
 
       # install extra bits for the native builds
       - ${{ if startsWith(parameters.name, 'native_') }}:
-        # switch to Python 3.x
+        # switch to the correct Python version
         - task: UsePythonVersion@0
-          displayName: Switch to Python to 3.x
+          displayName: Switch to Python to 2.7
           inputs:
-            versionSpec: '3.x'
+            versionSpec: '2.7'
             architecture: 'x64'
         - ${{ if not(contains(parameters.name, '_checks_')) }}:
           # install android ndk

From 917ce0d739a36c470300750ec7af93f86808d1ec Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 04:33:51 +0700
Subject: [PATCH 28/30] use args

---
 scripts/azure-templates-build.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index e2cf27a23b5..3d957bb559e 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -224,10 +224,9 @@ jobs:
           displayName: Build the Docker image for ${{ parameters.docker }}
           inputs:
             command: build
-            arguments: ${{ parameters.dockerArgs }}
-            tags: skiasharp
-            dockerfile: ${{ parameters.docker }}/Dockerfile
             buildContext: ${{ parameters.docker }}
+            dockerfile: ${{ parameters.docker }}/Dockerfile
+            arguments: --tag skiasharp ${{ parameters.dockerArgs }}
         - bash: |
             echo dotnet tool restore > cmd.sh
             echo dotnet cake --target=${{ parameters.target }} --verbosity=${{ parameters.verbosity }} --configuration=${{ coalesce(parameters.configuration, 'Release') }} ${{ parameters.additionalArgs }} >> cmd.sh

From 6be678d5a033eb50bf46bd67c04fc38810fb1cec Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 04:41:34 +0700
Subject: [PATCH 29/30] this

---
 scripts/azure-templates-build.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-templates-build.yml b/scripts/azure-templates-build.yml
index 3d957bb559e..5542662fe5f 100644
--- a/scripts/azure-templates-build.yml
+++ b/scripts/azure-templates-build.yml
@@ -76,9 +76,12 @@ jobs:
       - ${{ if startsWith(parameters.name, 'native_') }}:
         # switch to the correct Python version
         - task: UsePythonVersion@0
-          displayName: Switch to Python to 2.7
+          displayName: Switch to the correct Python version
           inputs:
-            versionSpec: '2.7'
+            ${{ if endsWith(parameters.name, '_windows') }}:
+              versionSpec: '3.x'
+            ${{ if not(endsWith(parameters.name, '_windows')) }}:
+              versionSpec: '2.7'
             architecture: 'x64'
         - ${{ if not(contains(parameters.name, '_checks_')) }}:
           # install android ndk

From 989ff2b72ca265f9bfe30d98d5235dd7dc93aa35 Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 8 Feb 2022 05:13:26 +0700
Subject: [PATCH 30/30] use an older one for now

---
 scripts/azure-pipelines.yml | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
index 1bc5c8af679..7c4d3b1fdd3 100644
--- a/scripts/azure-pipelines.yml
+++ b/scripts/azure-pipelines.yml
@@ -16,6 +16,9 @@ parameters:
   - name: VM_IMAGE_WINDOWS
     type: string
     default: 'Azure-Pipelines-windows-2022'
+  - name: VM_IMAGE_WINDOWS_NATIVE
+    type: string
+    default: 'Azure-Pipelines-windows-2019'
   - name: VM_IMAGE_MAC
     type: string
     default: 'Azure-Pipelines-macOS-10.15'
@@ -85,7 +88,7 @@ stages:
           name: native_android_x86_windows
           displayName: Android x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-android
           additionalArgs: --buildarch=x86
           installWindowsSdk: false
@@ -95,7 +98,7 @@ stages:
           name: native_android_x64_windows
           displayName: Android x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-android
           additionalArgs: --buildarch=x64
           installWindowsSdk: false
@@ -105,7 +108,7 @@ stages:
           name: native_android_arm_windows
           displayName: Android arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-android
           additionalArgs: --buildarch=arm
           installWindowsSdk: false
@@ -115,7 +118,7 @@ stages:
           name: native_android_arm64_windows
           displayName: Android arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-android
           additionalArgs: --buildarch=arm64
           installWindowsSdk: false
@@ -125,7 +128,7 @@ stages:
           name: native_tizen_windows
           displayName: Tizen
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-tizen
           installWindowsSdk: false
           artifactName: native
@@ -134,7 +137,7 @@ stages:
           name: native_uwp_angle_x86_windows
           displayName: ANGLE x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x86
           artifactName: native
@@ -143,7 +146,7 @@ stages:
           name: native_uwp_angle_x64_windows
           displayName: ANGLE x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=x64
           artifactName: native
@@ -152,7 +155,7 @@ stages:
           name: native_uwp_angle_arm_windows
           displayName: ANGLE arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm
           artifactName: native
@@ -161,7 +164,7 @@ stages:
           name: native_uwp_angle_arm64_windows
           displayName: ANGLE arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: ANGLE
           additionalArgs: -Script .\native\uwp\build.cake --buildarch=arm64
           artifactName: native
@@ -170,7 +173,7 @@ stages:
           name: native_uwp_x86_windows
           displayName: UWP x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-uwp
           additionalArgs: --buildarch=x86 --skipAngle=true
           artifactName: native
@@ -179,7 +182,7 @@ stages:
           name: native_uwp_x64_windows
           displayName: UWP x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-uwp
           additionalArgs: --buildarch=x64 --skipAngle=true
           artifactName: native
@@ -188,7 +191,7 @@ stages:
           name: native_uwp_arm_windows
           displayName: UWP arm
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-uwp
           additionalArgs: --buildarch=arm --skipAngle=true
           artifactName: native
@@ -197,7 +200,7 @@ stages:
           name: native_uwp_arm64_windows
           displayName: UWP arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-uwp
           additionalArgs: --buildarch=arm64 --skipAngle=true
           artifactName: native
@@ -206,7 +209,7 @@ stages:
           name: native_win32_x86_windows
           displayName: Win32 x86
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-windows
           additionalArgs: --buildarch=x86
           artifactName: native
@@ -215,7 +218,7 @@ stages:
           name: native_win32_x64_windows
           displayName: Win32 x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-windows
           additionalArgs: --buildarch=x64
           artifactName: native
@@ -224,7 +227,7 @@ stages:
           name: native_win32_arm64_windows
           displayName: Win32 arm64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-windows
           additionalArgs: --buildarch=arm64
           artifactName: native
@@ -233,7 +236,7 @@ stages:
           name: native_win32_x64_nanoserver_windows
           displayName: Nano Server x64
           buildExternals: ${{ parameters.buildExternals }}
-          vmImage: ${{ parameters.VM_IMAGE_WINDOWS}}
+          vmImage: ${{ parameters.VM_IMAGE_WINDOWS_NATIVE}}
           target: externals-nanoserver
           additionalArgs: --buildarch=x64
           artifactName: native