[net9.0] Update dependencies from dotnet/android (#24539)

* Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24429.1+azdo.10133834 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.87 -> To Version 35.0.0-rc.2.89 * Update dependencies from https://github.com/dotnet/android build main-e237401724371b999f3113778f50591de5f63ccb-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.89 -> To Version 35.0.0-rc.2.93 * Update provision.yml * Update NuGet.config * Update dependencies from https://github.com/dotnet/android build main-550f66e519b2efddddd864bf9dc8e47e953b031c-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.93 -> To Version 35.0.0-rc.2.96 * Update dependencies from https://github.com/dotnet/android build main-ac8a922d495dff28fdc29310d509a21fa139b883-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.96 -> To Version 35.0.0-rc.2.99 * Update dependencies from https://github.com/dotnet/android build main-d187a1d1e5af373b3b02c530fc1b8f2519bb5a38-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.99 -> To Version 35.0.0-rc.2.100 * Update dependencies from https://github.com/dotnet/android build main-88a07ce4034701457eebe5ba6f16fd2b4f66b054-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.100 -> To Version 35.0.0-rc.2.101 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24461.1+azdo.10203443 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.101 -> To Version 35.0.0-rc.2.107 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24461.1+azdo.10204821 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.107 -> To Version 35.0.0-rc.2.109 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24463.1+azdo.10221673 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.109 -> To Version 35.0.0-rc.2.111 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24469.1+azdo.10247408 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.111 -> To Version 35.0.0-rc.2.115 * Update dependencies from https://github.com/dotnet/android build 9.0.0-rc.2.24474.1+azdo.10268209 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.115 -> To Version 35.0.0-rc.2.117 * Update dependencies from https://github.com/dotnet/android build main-e885d694c51db9733305ba331519dd01df6076a4-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.117 -> To Version 35.0.0-rc.2.130 * Update NuGet.config * Update dependencies from https://github.com/dotnet/android build main-7d730228379df63d318603d45a354fe9a2b4274d-1 Microsoft.Android.Sdk.Windows From Version 35.0.0-rc.2.130 -> To Version 35.0.1-ci.main.1 * `> darc update-dependencies --id 240097` Looking up build with BAR id 240097 Updating 'Microsoft.Android.Sdk.Windows': '35.0.1-ci.main.1' => '35.0.0-rc.2.134' (from build '9.0.1xx-rc2-b795a653460417af9da75f94e4a487a2665faa7f-1' of 'https://github.com/dotnet/android') Checking for coherency updates... Local dependencies updated based on build with BAR id 240097 (9.0.1xx-rc2-b795a653460417af9da75f94e4a487a2665faa7f-1 from https://github.com/dotnet/android@release/9.0.1xx-rc2) * Don t install java 11 * Gradle needs it * Try java17 provisionator * Use the new sonoma * Skip android images on templates * Install JDK17 via homebrew --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Rui Marinho <[email protected]> Co-authored-by: Jonathan Peppers <[email protected]> Co-authored-by: redth <[email protected]>
dotnet · Sep 27, 2024 · b27176d · b27176d
1 parent 0d0f25a
commit b27176d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 19 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -25,7 +25,7 @@
     <add key="darc-pub-dotnet-emsdk-2674f58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2674f580/nuget/v3/index.json" />
     <add key="darc-pub-dotnet-runtime-ed13b35" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json" />
     <!-- Added manually for .NET 8 Android -->
-    <add key="darc-pub-dotnet-android-b0fd011" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-b0fd0113/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-android-45bb7f3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-45bb7f36/nuget/v3/index.json" />
     <!-- Added manually for .NET 8 iOS -->
     <add key="darc-pub-xamarin-xamarin-macios-bc01f5e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-xamarin-xamarin-macios-bc01f5e0/nuget/v3/index.json" />
   </packageSources>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -8,9 +8,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.0-rc.2.87">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.0-rc.2.134">
       <Uri>https://github.com/dotnet/android</Uri>
-      <Sha>c77c22c9e281e518fddfbd2f3ec41939ba631778</Sha>
+      <Sha>b795a653460417af9da75f94e4a487a2665faa7f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_17.5" Version="17.5.9334-net9-rc2">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -50,7 +50,7 @@
     <MicrosoftExtensionsLoggingDebugVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsLoggingDebugVersion>
     <MicrosoftExtensionsPrimitivesVersion>9.0.0-rc.2.24463.7</MicrosoftExtensionsPrimitivesVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>35.0.0-rc.2.87</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>35.0.0-rc.2.134</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftMacCatalystSdknet90_175PackageVersion>17.5.9334-net9-rc2</MicrosoftMacCatalystSdknet90_175PackageVersion>
     <MicrosoftmacOSSdknet90_145PackageVersion>14.5.9334-net9-rc2</MicrosoftmacOSSdknet90_145PackageVersion>

diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml
@@ -148,6 +148,7 @@ jobs:
     - template: provision.yml
       parameters:
         skipXcode: ${{ eq(RunPlatform.testName, 'RunOnAndroid') }}
+        skipAndroidImages: ${{ ne(RunPlatform.testName, 'RunOnAndroid') }}
         checkoutDirectory: ${{ parameters.checkoutDirectory }}
 
     - task: DownloadBuildArtifacts@0

diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
@@ -57,20 +57,21 @@ steps:
 
   # Setup JDK Paths (gradle needs it)
   - bash: |
-      echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_11_X64)"
-      echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)"
+      echo "##vso[task.setvariable variable=JI_JAVA_HOME]$(JAVA_HOME_17_X64)"
+      echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_17_X64)"
+      brew install --cask microsoft-openjdk@17
     displayName: 'Setup JDK Paths'
     condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))  
   # Configure VS Mac for Xcode
   # This seems to be needed or else it will pick other xcode for example on xharness
-  - bash: |
-      set -x
-      mkdir -p ~/Library/Preferences/Xamarin
-      rm -f ~/Library/Preferences/Xamarin/Settings.plist
-      /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
-      cat ~/Library/Preferences/Xamarin/Settings.plist || true
-    displayName: 'Configure Visual Studio'
-    condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
+  # - bash: |
+  #     set -x
+  #     mkdir -p ~/Library/Preferences/Xamarin
+  #     rm -f ~/Library/Preferences/Xamarin/Settings.plist
+  #     /usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
+  #     cat ~/Library/Preferences/Xamarin/Settings.plist || true
+  #   displayName: 'Configure Visual Studio'
+  #   condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
 
   # Prepare Windows
   # Provision Additional Software
@@ -90,10 +91,10 @@ steps:
           SKIP_ANDROID_API_IMAGES: 'true'
 
   - pwsh: |
-      if ($env:JAVA_HOME_11_X64) {
-        $env:JAVA_HOME = $env:JAVA_HOME_11_X64
+      if ($env:JAVA_HOME_17_X64) {
+        $env:JAVA_HOME = $env:JAVA_HOME_17_X64
       } else {
-        $path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-11.*\bin\java.exe) | Select-Object -First 1
+        $path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-17.*\bin\java.exe) | Select-Object -First 1
         if ($path -and (Test-Path $path)) {
           $env:JAVA_HOME = $path.Directory.Parent.FullName
         }

diff --git a/eng/pipelines/device-tests.yml b/eng/pipelines/device-tests.yml
@@ -66,7 +66,7 @@ parameters:
       name: $(androidTestsVmPool)
       vmImage: $(androidTestsVmImage)
       demands:
-        - macOS.Name -equals Ventura
+        - macOS.Name -equals Sonoma
         - macOS.Architecture -equals x64
 
   - name: iosPool

diff --git a/eng/provisioning/provisioning.csx b/eng/provisioning/provisioning.csx
@@ -1,7 +1,7 @@
 if (IsMac)
 {
 	ForceJavaCleanup();
-	MicrosoftOpenJdk ("11.0.13.8.1");
+	MicrosoftOpenJdk ("17.0.12");
 	//this is needed for tools on macos like for nuget pack additional target and for classic xamarin projects
 	Item("https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.206.macos10.xamarin.universal.pkg");