From d1447447d4a889a0c70f1eed4050f3788099e58a Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 27 Nov 2023 15:49:31 -0500 Subject: [PATCH 1/2] [build] Bump Android SDK component versions Context: https://github.com/xamarin/xamarin-android-tools/pull/218 Context: https://github.com/xamarin/monodroid/pull/1399 Changes: * xamarin/xamarin-android-tools@08a6990 Bump android-sdk NDK version to 26.1.10909125 * xamarin/xamarin-android-tools@6ae1f2a Bump android-sdk build-tool version to 34.0.0 * xamarin/xamarin-android-tools@184b6b3 Bump android-sdk cmdline-tools to version 11.0 * xamarin/xamarin-android-tools@1365e33 Bump android-sdk platforms-tools to version 34.0.5 * xamarin/xamarin-android-tools@8d38281 Update the maximum NDK version to 26 (#219) Updates our recommended Android SDK component versions to the following: * build-tools 34.0.0 * cmdline-tools 11.0 * platform-tools 34.0.5 * android-ndk 26.1.10909125 All PR test jobs have been updated to use JDK 17, while one nightly test job will remain on JDK 11. --- .external | 2 +- Configuration.props | 6 +++--- build-tools/automation/azure-pipelines-nightly.yaml | 6 +++--- build-tools/automation/azure-pipelines.yaml | 6 +++--- build-tools/automation/yaml-templates/build-windows.yaml | 4 ++-- .../automation/yaml-templates/setup-test-environment.yaml | 6 +++--- build-tools/scripts/TestApks.targets | 3 --- external/xamarin-android-tools | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.external b/.external index 8ac8bb230e4..225c44dd334 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@47bdaaa9b8ac16d6197a8982c8cc810d177c5cff +xamarin/monodroid:dev/pjc/rel8-tools-34@2d96a249551b3142cf19fdeafbfe2d3977a8066a mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d diff --git a/Configuration.props b/Configuration.props index fa0577572ae..e50269fb7ac 100644 --- a/Configuration.props +++ b/Configuration.props @@ -146,7 +146,7 @@ 30.0.3 30.0.3 - 34.0.1 + 34.0.5 False 1.15.1 $(NUGET_PACKAGES) @@ -187,8 +187,8 @@ avdmanager.bat $(AndroidSdkFullPath)\tools $(AndroidToolPath)\bin - 7.0 - 8512546_latest + 11.0 + 10406996_latest $(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin 9364964 diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index cadf59d37ec..720e5e4a576 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -118,6 +118,7 @@ stages: restoreNUnitConsole: false updateMono: false xaprepareScenario: EmulatorTestDependencies + jdkTestFolder: $(JAVA_HOME_11_X64) - template: yaml-templates/run-dotnet-preview.yaml parameters: @@ -126,9 +127,6 @@ stages: displayName: prepare java.interop $(XA.Build.Configuration) continueOnError: false - - script: echo "##vso[task.setvariable variable=Java8SdkDirectory]$JAVA_HOME_8_X64" - displayName: set Java8SdkDirectory - - template: yaml-templates/start-stop-emulator.yaml parameters: specificImage: true @@ -197,6 +195,7 @@ stages: restoreNUnitConsole: false updateMono: false xaprepareScenario: EmulatorTestDependencies + jdkTestFolder: $HOME/android-toolchain/jdk-17 - task: DownloadPipelineArtifact@2 inputs: @@ -250,6 +249,7 @@ stages: restoreNUnitConsole: false updateMono: false xaprepareScenario: EmulatorTestDependencies + jdkTestFolder: $HOME/android-toolchain/jdk-17 - task: DownloadPipelineArtifact@2 inputs: diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 3488fb0bbb2..8d28320f2f4 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -350,9 +350,9 @@ stages: forceReinstallCredentialProvider: true - script: | - echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64% - echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_11_X64% - displayName: set JI_JAVA_HOME, JAVA_HOME + echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64% + echo ##vso[task.setvariable variable=JAVA_HOME]%JAVA_HOME_17_X64% + displayName: set JI_JAVA_HOME, JAVA_HOME to $(JAVA_HOME_17_X64) - task: DownloadPipelineArtifact@2 inputs: diff --git a/build-tools/automation/yaml-templates/build-windows.yaml b/build-tools/automation/yaml-templates/build-windows.yaml index 133c87ba616..389b67f8afb 100644 --- a/build-tools/automation/yaml-templates/build-windows.yaml +++ b/build-tools/automation/yaml-templates/build-windows.yaml @@ -38,8 +38,8 @@ stages: - template: clean.yaml - script: | - echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_11_X64% - displayName: set JI_JAVA_HOME + echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64% + displayName: set JI_JAVA_HOME to $(JAVA_HOME_17_X64) - template: use-dot-net.yaml parameters: diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index 0a8e6a787fe..bcd91d29145 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -1,7 +1,7 @@ parameters: configuration: $(XA.Build.Configuration) xaSourcePath: $(System.DefaultWorkingDirectory) - jdkTestFolder: $(JAVA_HOME_11_X64) + jdkTestFolder: $(JAVA_HOME_17_X64) remove_dotnet: false installTestSlicer: false installApkDiff: true @@ -26,13 +26,13 @@ steps: - script: | echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}" echo "##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet" - displayName: set JI_JAVA_HOME + displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }} condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT')) - script: | echo ##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }} echo ##vso[task.setvariable variable=DOTNET_TOOL_PATH]${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe - displayName: set JI_JAVA_HOME + displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }} condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT')) # Install .NET 6 for legacy tests diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets index 484bf5eadde..95ba391d170 100644 --- a/build-tools/scripts/TestApks.targets +++ b/build-tools/scripts/TestApks.targets @@ -371,7 +371,6 @@ @@ -381,7 +380,6 @@ /> @@ -392,7 +390,6 @@ /> diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 8a971d94a3f..08a69900df2 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 8a971d94a3fa2f0e8f69c5cf742c6836c14be1cd +Subproject commit 08a69900df23e9f95057f3cacae72bd40d640a27 From 7068031d0b7a8499d275691fc4c3d76047a8df91 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 27 Nov 2023 19:10:53 -0500 Subject: [PATCH 2/2] Bump --- .external | 2 +- build-tools/automation/azure-pipelines-nightly.yaml | 9 +++++++++ .../automation/yaml-templates/run-emulator-tests.yaml | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/.external b/.external index 225c44dd334..0a2df102e2c 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:dev/pjc/rel8-tools-34@2d96a249551b3142cf19fdeafbfe2d3977a8066a +xamarin/monodroid:release/8.0.1xx@7b6faa349a2e8587b6e55357fcf007a5790f1555 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d diff --git a/build-tools/automation/azure-pipelines-nightly.yaml b/build-tools/automation/azure-pipelines-nightly.yaml index 720e5e4a576..4370dc175d1 100644 --- a/build-tools/automation/azure-pipelines-nightly.yaml +++ b/build-tools/automation/azure-pipelines-nightly.yaml @@ -156,6 +156,7 @@ stages: emulatorMSBuildArgs: -p:TestAvdExtraBootArgs=-writable-system jobName: SystemApplicationTests jobTimeout: 120 + jdkTestFolder: $HOME/android-toolchain/jdk-17 testSteps: - template: run-nunit-tests.yaml parameters: @@ -188,6 +189,10 @@ stages: steps: - template: agent-cleanser/v1.yml@yaml-templates + - script: | + echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17" + displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17 + - template: yaml-templates/setup-test-environment.yaml parameters: installTestSlicer: true @@ -242,6 +247,10 @@ stages: steps: - template: agent-cleanser/v1.yml@yaml-templates + - script: | + echo "##vso[task.setvariable variable=JAVA_HOME]$HOME/android-toolchain/jdk-17" + displayName: set JAVA_HOME to $HOME/android-toolchain/jdk-17 + - template: yaml-templates/setup-test-environment.yaml parameters: installTestSlicer: true diff --git a/build-tools/automation/yaml-templates/run-emulator-tests.yaml b/build-tools/automation/yaml-templates/run-emulator-tests.yaml index cd43adf44bf..e3484dd5c5b 100644 --- a/build-tools/automation/yaml-templates/run-emulator-tests.yaml +++ b/build-tools/automation/yaml-templates/run-emulator-tests.yaml @@ -4,6 +4,7 @@ parameters: emulatorMSBuildArgs: '' jobName: CheckTimeZoneInfoIsCorrectNode1 jobTimeout: 360 + jdkTestFolder: $(JAVA_HOME_17_X64) testSteps: [] jobs: @@ -20,12 +21,17 @@ jobs: steps: - template: agent-cleanser/v1.yml@yaml-templates + - script: | + echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkTestFolder }}" + displayName: set JAVA_HOME to ${{ parameters.jdkTestFolder }} + - template: setup-test-environment.yaml parameters: installLegacyDotNet: false restoreNUnitConsole: false updateMono: false xaprepareScenario: EmulatorTestDependencies + jdkTestFolder: ${{ parameters.jdkTestFolder }} - task: DownloadPipelineArtifact@2 inputs: