From 0058c73fa53e3a60cf962ca1bf018ea2dd272e95 Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Fri, 7 Oct 2022 17:22:10 -0400
Subject: [PATCH] Fix for pipelines broken in #75473 (#76758)

---
 eng/pipelines/runtime-android.yml          | 14 ++++++++------
 eng/pipelines/runtime-androidemulator.yml  | 14 ++++++++------
 eng/pipelines/runtime-ioslike.yml          | 14 ++++++++------
 eng/pipelines/runtime-ioslikesimulator.yml | 14 ++++++++------
 eng/pipelines/runtime-linuxbionic.yml      | 14 ++++++++------
 eng/pipelines/runtime-maccatalyst.yml      | 14 ++++++++------
 6 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/eng/pipelines/runtime-android.yml b/eng/pipelines/runtime-android.yml
index 8c00427ee64b98..efdd851bc3e21b 100644
--- a/eng/pipelines/runtime-android.yml
+++ b/eng/pipelines/runtime-android.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isAndroidOnlyBuild: ${{ variables.isAndroidOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-android.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isAndroidOnlyBuild: ${{ variables.isAndroidOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-androidemulator.yml b/eng/pipelines/runtime-androidemulator.yml
index bdc8f9154e0b10..c1ca71cd633a62 100644
--- a/eng/pipelines/runtime-androidemulator.yml
+++ b/eng/pipelines/runtime-androidemulator.yml
@@ -8,10 +8,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isAndroidEmulatorOnlyBuild: ${{ variables.isAndroidEmulatorOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isAndroidEmulatorOnlyBuild: ${{ variables.isAndroidEmulatorOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-ioslike.yml b/eng/pipelines/runtime-ioslike.yml
index c97c256f826644..83569d577c5f36 100644
--- a/eng/pipelines/runtime-ioslike.yml
+++ b/eng/pipelines/runtime-ioslike.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslike.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isiOSLikeOnlyBuild: ${{ variables.isiOSLikeOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-ioslikesimulator.yml b/eng/pipelines/runtime-ioslikesimulator.yml
index 82227927c71fcb..aa4281f592c49a 100644
--- a/eng/pipelines/runtime-ioslikesimulator.yml
+++ b/eng/pipelines/runtime-ioslikesimulator.yml
@@ -8,10 +8,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-ioslikesimulator.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isiOSLikeSimulatorOnlyBuild: ${{ variables.isiOSLikeSimulatorOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-linuxbionic.yml b/eng/pipelines/runtime-linuxbionic.yml
index f55f6ffe44754c..b255bca3f3c572 100644
--- a/eng/pipelines/runtime-linuxbionic.yml
+++ b/eng/pipelines/runtime-linuxbionic.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isLinuxBionicOnlyBuild: ${{ variables.isLinuxBionicOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-linuxbionic.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isLinuxBionicOnlyBuild: ${{ variables.isLinuxBionicOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}
diff --git a/eng/pipelines/runtime-maccatalyst.yml b/eng/pipelines/runtime-maccatalyst.yml
index 9f152cc856195e..979a6998e496d7 100644
--- a/eng/pipelines/runtime-maccatalyst.yml
+++ b/eng/pipelines/runtime-maccatalyst.yml
@@ -7,10 +7,12 @@ trigger: none
 variables:
   - template: /eng/pipelines/common/variables.yml
 
-jobs:
-
-- template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+extends:
+  template:  /eng/pipelines/common/templates/single-stage-pipeline-with-resources.yml
   parameters:
-    isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
-    isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }}
-    isRollingBuild: ${{ variables.isRollingBuild }}
+    jobs:
+    - template: /eng/pipelines/extra-platforms/runtime-extra-platforms-maccatalyst.yml
+      parameters:
+        isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }}
+        isMacCatalystOnlyBuild: ${{ variables.isMacCatalystOnlyBuild }}
+        isRollingBuild: ${{ variables.isRollingBuild }}