Revert "Just install Java 21"

This reverts commit fa09d98.

Author: mattleibow

.github/workflows/copilot-setup-steps.yml

@@ -18,11 +18,11 @@ jobs:
     - name: Install Android workload
       run: dotnet workload install android
 
-    - name: Setup OpenJDK 21
+    - name: Setup OpenJDK 11
       uses: actions/setup-java@v4
       with:
         distribution: 'microsoft'
-        java-version: '21'
+        java-version: '11'
 
     - name: Restore dotnet tools
       run: dotnet tool restore

azure-pipelines-public.yml

@@ -18,6 +18,7 @@ stages:
         demands:
         - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
       use1ESTemplate: false
+      installAndroidDependencies: true
 
 - stage: build_mac
   displayName: Build - Mac
@@ -37,3 +38,4 @@ stages:
       name: $(NetCorePublicPoolName)
       demands:
       - ImageOverride -equals $(WindowsPoolImageNetCorePublic)
+    installAndroidDependencies: true

build/ci/build.yml

@@ -7,6 +7,7 @@ parameters:
   timeoutInMinutes: 600                                             # Max job runtime in minutes
   runAPIScan: false                                                 # Run APIScan analysis
   use1ESTemplate: true
+  installAndroidDependencies: false
   androidSdkRoot: $(Agent.TempDirectory)/android-sdk
 
   # Reporting/Analysis Parameters
@@ -36,6 +37,7 @@ jobs:
   steps:
     - template: setup-environment.yml
       parameters:
+        installAndroidDependencies: ${{ parameters.installAndroidDependencies }}
         androidSdkRoot: ${{ parameters.androidSdkRoot }}
 
     - template: build-and-test.yml

build/ci/job-extended-tests.yml

@@ -7,6 +7,7 @@ parameters:
   testFilter:                                     # Test category filter 
   testProject:                                    # The test .csproj to build
   testAssembly:                                   # The test .dll to execute
+  installAndroidDependencies: false
 
 jobs:
 - job: ${{ parameters.jobName }}_package_tests
@@ -18,6 +19,8 @@ jobs:
 
   steps:
   - template: setup-environment.yml
+    parameters:
+      installAndroidDependencies: ${{ parameters.installAndroidDependencies }}
 
   - task: DownloadPipelineArtifact@2
     inputs:

build/ci/setup-environment.yml

@@ -1,5 +1,7 @@
 parameters:
+  installAndroidDependencies: false
   androidSdkRoot: $(Agent.TempDirectory)/android-sdk
+  javaSdkRoot: $(Agent.ToolsDirectory)\jdk11
 
 steps:
   # before the build starts, make sure the tooling is as expected. Clear the cache on shared agents
@@ -42,11 +44,22 @@ steps:
       }
     displayName: Install .NET Workloads
 
+  - bash: |
+      if [[ "$(Agent.Name)" == *"Azure Pipelines"* ]]; then
+          echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+      else
+          echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home"
+      fi
+    displayName: Use Java 11 SDK (Mac)
+    condition: eq( variables['Agent.OS'], 'Darwin' )
+
   - task: JavaToolInstaller@0
-    displayName: Use Java 21 SDK
+    displayName: Use Java 11 SDK (Windows)
+    condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true))
     inputs:
-      versionSpec: '21'
+      versionSpec: '11'
       jdkArchitectureOption: 'x64'
+      jdkSourceOption: 'PreInstalled'
 
   - task: DotNetCoreCLI@2
     displayName: Install android dependencies GoogleV2
@@ -74,3 +87,25 @@ steps:
       Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory]${{ parameters.androidSdkRoot }}"
       Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT]${{ parameters.androidSdkRoot }}"
     displayName: Set ANDROID_SDK_ROOT to ${{ parameters.androidSdkRoot }}
+
+  - ${{ if eq(parameters.installAndroidDependencies, true) }}:
+    - pwsh: |
+        $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-windows-x64.zip"
+        if ($IsMacOS) {
+            $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-macos-x64.tar.gz"
+        }
+        $fileName = [System.IO.Path]::GetFileName($url)
+        Invoke-WebRequest -Uri $url -OutFile $fileName
+        Write-Host "##vso[task.setvariable variable=JDK_11_FILE_PATH]$(Build.StagingDirectory)/$fileName"
+      displayName: Download Java 11 SDK
+      workingDirectory: $(Build.StagingDirectory)
+
+    - task: JavaToolInstaller@0
+      displayName: Use Java 11 SDK
+      inputs:
+        versionSpec: '11'
+        jdkArchitectureOption: 'x64'
+        jdkSourceOption: LocalDirectory
+        jdkFile: $(JDK_11_FILE_PATH)
+        jdkDestinationDirectory: ${{ parameters.javaSdkRoot }}
+        cleanDestinationDirectory: true

build/ci/stage-standard-tests.yml

@@ -3,6 +3,7 @@
 parameters:
   buildPool:                                                        # VM pool information
   stageCondition: and(succeeded(), ne('$(skipUnitTests)', 'true'))  # When to run this stage
+  installAndroidDependencies: false
 
 stages:
 - stage: standard_tests
@@ -20,3 +21,4 @@ stages:
       testProject: $(standardTestProject)
       testAssembly: $(standardTestAssembly)
       buildPool: ${{ parameters.buildPool }}
+      installAndroidDependencies: ${{ parameters.installAndroidDependencies }}