Merge branch 'main' into mu-20240211-improvements-data-acquisition-bu…

…ild-timings-measurements
dotnet · Nov 6, 2024 · e1e93c7 · e1e93c7
2 parents 78431af + ec062c5
commit e1e93c7
Show file tree

Hide file tree

Showing 16 changed files with 1,417 additions and 1,350 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