Merge branch 'main' into dabritch-net9-hybridwebview

dotnet · Nov 14, 2024 · 61539cb · 61539cb
2 parents a9c0ed2 + c4d697f
commit 61539cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-14]
+        os: [windows-latest, macos-15]
 
     runs-on: ${{ matrix.os }}
 
@@ -27,7 +27,7 @@ jobs:
 
     - name: Select Xcode Version
       run: sudo xcode-select -s /Applications/Xcode_16.app
-      if: runner.os == 'macOS' # Remove when Xcode 15+ is default on the hosted runners
+      if: runner.os == 'macOS'
 
     - name: Find and build all C# projects
       run: |

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-14]
+        os: [windows-latest, macos-15]
 
     runs-on: ${{ matrix.os }}