From 15355a22fcc863aa17b6ab18ae25f065bf15d828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Tue, 2 Apr 2024 21:44:19 +0200
Subject: [PATCH] Backport arcade and pipeline changes from main

---
 azure-pipelines-official.yml | 13 +++++++------
 azure-pipelines.yml          |  4 ++--
 eng/Version.Details.xml      |  8 ++++----
 global.json                  |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index e3645dbb50..f156892e0b 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -40,6 +40,7 @@ parameters:
   default: False
 
 variables:
+  - template: /eng/common/templates-official/variables/pool-providers.yml@self
   # Cannot use key:value syntax in root defined variables
   - name: _TeamName
     value: MSTest
@@ -87,8 +88,8 @@ extends:
     featureFlags:
       autoBaseline: true
     pool:
-      name: netcore1espool-internal
-      image: 1es-windows-2022-pt
+      name: $(DncEngInternalBuildPool)
+      image: windows.vs2022.amd64
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling
@@ -111,8 +112,8 @@ extends:
           - job: Windows
             timeoutInMinutes: 90
             pool:
-              name: netcore1espool-internal
-              image: 1es-windows-2022-pt
+              name: $(DncEngInternalBuildPool)
+              image: windows.vs2022.amd64
               os: windows
             steps:
             - task: PowerShell@2
@@ -167,7 +168,7 @@ extends:
           - job: Linux
             timeoutInMinutes: 90
             pool:
-              name: netcore1espool-internal
+              name: $(DncEngInternalBuildPool)
               image: 1es-ubuntu-2204-pt
               os: linux
             steps:
@@ -194,4 +195,4 @@ extends:
             LclSource: lclFilesfromPackage
             LclPackageId: 'LCL-JUNO-PROD-TESTFX'
 
-    - template: eng\common\templates-official\post-build\post-build.yml@self
+    - template: eng\common\templates-official\post-build\post-build.yml@self
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 35ab1a58b2..37667ff54b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -122,7 +122,7 @@ stages:
         timeoutInMinutes: 90
         pool:
           name: NetCore-Public
-          demands: ImageOverride -equals build.ubuntu.2004.amd64.open          
+          demands: ImageOverride -equals build.ubuntu.2004.amd64.open
         strategy:
           matrix:
             Release:
@@ -143,4 +143,4 @@ stages:
               chmod +x ./test.sh
               ./test.sh --configuration $(_BuildConfig) --ci --test --integrationTest
             name: Test
-            displayName: Tests
+            displayName: Tests
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0cf0813884..4fae6bde2c 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24161.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.24179.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>5c3fdd3b5aaaa32b24383ec12a60b37ebff13079</Sha>
+      <Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24161.7">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.24179.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>cd10e5d3748676d70ae2b4d9c84f073eeb203cac</Sha>
+      <Sha>fc2b7849b25c4a21457feb6da5fc7c9806a80976</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/global.json b/global.json
index d2d12802dc..af40f2b701 100644
--- a/global.json
+++ b/global.json
@@ -19,7 +19,7 @@
     "rollForward": "patch"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24179.4",
     "MSBuild.Sdk.Extras": "3.0.44"
   }
 }