[release/4.0] Update To MacOS 13 (dotnet#7293)

* mac 13 testing * build fixes --------- Co-authored-by: Michael Sharp <misharp@microsoft.com>
michaelgsharp · Nov 8, 2024 · 2a879f6 · 2a879f6
1 parent b0fa194
commit 2a879f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml
@@ -123,8 +123,8 @@ jobs:
     buildScript: ./build.sh
     innerLoop: true
     pool:
-      vmImage: macOS-12
-    helixQueue: OSX.1200.Amd64.Open
+      vmImage: macOS-13
+    helixQueue: OSX.13.Amd64.Open
 
 - template: /build/ci/job-template.yml
   parameters:
@@ -144,8 +144,8 @@ jobs:
         _targetFramework: net6.0
     innerLoop: true
     pool:
-      vmImage: macOS-12
-    helixQueue: OSX.1200.Arm64.Open
+      vmImage: macOS-13
+    helixQueue: OSX.13.Arm64.Open
 
 - template: /build/ci/job-template.yml
   parameters:

diff --git a/build/.night-build.yml b/build/.night-build.yml
@@ -63,7 +63,7 @@ jobs:
     buildScript: ./build.sh
     nightlyBuild: true
     pool:
-      vmImage: macOS-12
+      vmImage: macOS-13
 
 - template: /build/ci/job-template.yml
   parameters:

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
@@ -67,7 +67,7 @@ jobs:
     steps:
     # Extra MacOS step required to install OS-specific dependencies
     - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross')))  }}:
-      - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
+      - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
         displayName: Install MacOS build dependencies
     # Extra Apple MacOS step required to install OS-specific dependencies
     - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross'))  }}:

diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
@@ -30,7 +30,7 @@ variables:
 - name: WindowsImage
   value: 1es-windows-2019
 - name: MacImage
-  value: macOS-12
+  value: macOS-13
 - ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
   - name: enableSourceIndex
     value: true
@@ -142,7 +142,7 @@ extends:
             PathtoPublish: $(Build.SourcesDirectory)/artifacts/pkgassets
             ArtifactName: pkgassets
         steps:
-        - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 &&  rm '/usr/local/bin/2to3-3.11' && brew unlink libomp && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
+        - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 &&  rm '/usr/local/bin/2to3-3.11' && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula
           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=x64 /p:CopyPackageAssets=true