From bcac8774f100ce409798296019c34d62432f86a6 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Thu, 3 Jul 2025 16:42:29 -0700
Subject: [PATCH 1/2] Update default-build.yml

Use same images as aspnetcore
https://github.com/dotnet/aspnetcore/blob/1eda5387220d8c1ee5f3be433d867cae817df4ed/.azure/pipelines/jobs/default-build.yml#L325
---
 .azure/default-build.yml | 13 +++++++++----
 global.json              |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.azure/default-build.yml b/.azure/default-build.yml
index 090fd23..2e53e3e 100644
--- a/.azure/default-build.yml
+++ b/.azure/default-build.yml
@@ -83,6 +83,7 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       enablePublishBuildAssets: false
+      NativeToolsOnMachine: true
       ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
         enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
       enablePublishTestResults: true # publish test results to AzDO (populates AzDO Tests tab)
@@ -90,20 +91,24 @@ jobs:
       pool:
         ${{ if eq(parameters.agentOs, 'macOS') }}:
           name: Azure Pipelines
-          image: macOS-12
+          image: macOS-13
           os: macOS
         ${{ if eq(parameters.agentOs, 'Linux') }}:
           name: $(DncEngInternalBuildPool)
-          image: 1es-ubuntu-2004
+          image: 1es-ubuntu-2204
           os: linux
         ${{ if eq(parameters.agentOs, 'Windows') }}:
           name: $(DncEngInternalBuildPool)
-          image: windows.vs2019.amd64
+          image: windows.vs2022preview.amd64
           os: windows
       steps:
       - checkout: self
         clean: true
 
+      - ${{ if eq(parameters.agentOs, 'Windows') }}:
+        - script: eng\common\init-tools-native.cmd
+          displayName: Install native dependencies
+
       - task: CacheBeta@1
         inputs:
           key: vcpkg | ${{ parameters.agentOs }} | azure-pipelines.yml
@@ -145,4 +150,4 @@ jobs:
         inputs:
           testRunner: junit
           testResultsFiles: '$(Build.ArtifactStagingDirectory)/testOut/**/*.xml'
-          testRunTitle: ${{ parameters.agentOs }}-unit_test
\ No newline at end of file
+          testRunTitle: ${{ parameters.agentOs }}-unit_test
diff --git a/global.json b/global.json
index dfc2445..5aa6121 100644
--- a/global.json
+++ b/global.json
@@ -10,5 +10,8 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24475.3"
+  },
+  "native-tools": {
+    "cmake": "3.21.0"
   }
 }

From 5da470d3b335f103c2fdad6f9391ba0bc25b62b8 Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Mon, 7 Jul 2025 12:57:16 -0700
Subject: [PATCH 2/2] remove

---
 .azure/default-build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.azure/default-build.yml b/.azure/default-build.yml
index 2e53e3e..43f5039 100644
--- a/.azure/default-build.yml
+++ b/.azure/default-build.yml
@@ -83,7 +83,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       enablePublishBuildAssets: false
-      NativeToolsOnMachine: true
       ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}:
         enablePublishUsingPipelines: ${{ variables._PublishUsingPipelines }}
       enablePublishTestResults: true # publish test results to AzDO (populates AzDO Tests tab)