diff --git a/NuGet.config b/NuGet.config index 60455ce31c6f..4d9a98e5b813 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df25e1a53a9a..f8150876bcd9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,9 +8,9 @@ https://github.com/dotnet/runtime 6f23d04dc2b2039e9eaf97bee2ac02a77ce56b21 - + https://github.com/dotnet/android - c77c22c9e281e518fddfbd2f3ec41939ba631778 + b795a653460417af9da75f94e4a487a2665faa7f https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 7a79fb496fe3..8fc3873ec6f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 9.0.0-rc.2.24463.7 9.0.0-rc.2.24463.7 - 35.0.0-rc.2.87 + 35.0.0-rc.2.134 17.5.9334-net9-rc2 14.5.9334-net9-rc2 diff --git a/eng/pipelines/common/maui-templates.yml b/eng/pipelines/common/maui-templates.yml index 7dc7e513dfe6..2648a6e37fc9 100644 --- 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 index 9911fff49a9a..9af973d9291b 100644 --- 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 index 473e91533789..a9e60ea4edb9 100644 --- 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 index b45e4c333668..96d382861008 100644 --- 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");