From cf782740933415b39ca04c22e9d1831760630630 Mon Sep 17 00:00:00 2001
From: Michael Yanni <miyanni@microsoft.com>
Date: Tue, 12 Mar 2024 13:29:59 -0700
Subject: [PATCH] Attempt to use 1ES template instead of MicroBuild.

---
 .vsts-ci.yml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 33be66921..c661922cd 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -47,19 +47,32 @@ resources:
     type: git
     name: 1ESPipelineTemplates/MicroBuildTemplate
     ref: refs/tags/release
-  containers:
-  - container: MuslArm
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
-  - container: MuslX64
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
-  - container: PortableDeb
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
-  - container: PortableRpm
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+  # containers:
+  # - container: MuslArm
+  #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+  # - container: MuslX64
+  #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+  # - container: PortableDeb
+  #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
+  # - container: PortableRpm
+  #   image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
 
 extends:
-  template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
+    containers:
+    - container: MuslArm
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+    - container: MuslX64
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+    - container: PortableDeb
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
+    - container: PortableRpm
+      image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
     sdl:
       sourceAnalysisPool:
         name: $(DncEngInternalBuildPool)