[ci] macos12 is no longer available, use macos14.

dotnet · Nov 5, 2024 · 08aa99b · 08aa99b
1 parent 182fce6
commit 08aa99b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -77,8 +77,10 @@ extends:
           name: macos
           buildPool:
             name: $(macosAgentPoolName)
-            vmImage: $(macosImage)
             os: macOS
+            demands:
+              - macOS.Name -equals Sonoma
+              - macOS.Architecture -equals x64
           runDotnetNextTest: ${{ parameters.RunDotnetNextTest }}
 
     - template: build/ci/stage-standard-tests.yml@self

diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml
@@ -53,8 +53,14 @@ steps:
         }
       displayName: Install Preview .NET Workloads
 
+  - bash: |
+      echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home"
+    displayName: Use Java 11 SDK (Mac)
+    condition: eq( variables['Agent.OS'], 'Darwin' )
+          
   - task: JavaToolInstaller@0
-    displayName: Use Java 11 SDK
+    displayName: Use Java 11 SDK (Windows)
+    condition: eq( variables['Agent.OS'], 'Windows_NT' )
     inputs:
       versionSpec: '11'
       jdkArchitectureOption: 'x64'

diff --git a/build/ci/variables.yml b/build/ci/variables.yml
@@ -16,8 +16,7 @@ variables:
   windowsImage: 1ESPT-Windows2022                                                       # Windows VM image name
 
   # macOS specific variables
-  macosAgentPoolName: Azure Pipelines                                                   # macOS VM pool name
-  macosImage: internal-macos12                                                          # macOS VM image name
+  macosAgentPoolName: VSEng-VSMac-Xamarin-Shared                                        # macOS VM pool name
 
   # Tool variables
   dotnetVersion: '8.0.403'                                                              # .NET version to install on agent

diff --git a/utilities.cake b/utilities.cake
@@ -1620,6 +1620,7 @@ Task("tools-executive-oreder-csv-and-markdown")
     (
         () =>
         {
+        try {
             StringBuilder sb = new StringBuilder();
             StringBuilder sb_md = new StringBuilder();
             sb.AppendLine("BuildToolName,BuildToolVersion");
@@ -1887,6 +1888,10 @@ Task("tools-executive-oreder-csv-and-markdown")
 			System.IO.File.WriteAllText("./docs/buildtoolsinventory.md", sb_md.ToString());
 
             return;
+        } catch (Exception ex) { 
+          // Don't fail the build if this fails.
+          Console.WriteLine (ex); 
+        }
         }
     );