From 61dc8125e64628c2b71010807833db243fda8e89 Mon Sep 17 00:00:00 2001
From: "Eric St. John" <ericstj@microsoft.com>
Date: Thu, 2 Oct 2025 16:40:31 -0700
Subject: [PATCH] Update Windows image, fix mac build

---
 build/vsts-ci.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index 616d6b1dc3..03880b39b1 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -28,7 +28,7 @@ variables:
 - name: LinuxImage
   value: 1es-ubuntu-2204
 - name: WindowsImage
-  value: 1es-windows-2019
+  value: 1es-windows-2022
 - name: MacImage
   value: macOS-13
 - ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -164,12 +164,10 @@ extends:
             PathtoPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
             ArtifactName: pkgassets
         steps:
-        # Work around MacOS Homebrew image/environment bug: https://github.com/actions/virtual-environments/issues/2322#issuecomment-749211076
-        - script: |
-            rm -rf /usr/local/bin/2to3
-          displayName: MacOS Homebrew bug Workaround
-          continueOnError: true
-        - script: brew update && brew install -f --overwrite python@3.13 && brew install libomp && brew link libomp --force
+        - script:  |
+            brew update
+            brew install libomp
+            brew link libomp --force
           displayName: Install build dependencies
         # Only build native assets to avoid conflicts.
         - script: ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=arm64 /p:CopyPackageAssets=true