diff --git a/eng/pipelines/common/pack.yml b/eng/pipelines/common/pack.yml index eb3cb7da5aad..44db61145f1b 100644 --- a/eng/pipelines/common/pack.yml +++ b/eng/pipelines/common/pack.yml @@ -88,41 +88,6 @@ steps: - ${{ each pair in step }}: ${{ pair.key }}: ${{ pair.value }} - - pwsh: | - if ($env:JAVA_HOME_11_X64) { - $env:JAVA_HOME = $env:JAVA_HOME_11_X64 - } else { - $path = (Get-ChildItem $env:ProgramFiles\Microsoft\jdk-11.*\bin\java.exe) | Select-Object -First 1 - if ($path -and (Test-Path $path)) { - $env:JAVA_HOME = $path.Directory.Parent.FullName - } - } - if ($env:JAVA_HOME) { - echo "##vso[task.setvariable variable=JAVA_HOME]$env:JAVA_HOME" - echo "JAVA_HOME set to '$env:JAVA_HOME'" - } else { - echo "Unable to set JAVA_HOME" - } - displayName: 'Setup JDK Paths' - condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) - - - pwsh: | - if ($env:ANDROID_SDK_ROOT) { - echo "ANDROID_SDK_ROOT already set to '$env:ANDROID_SDK_ROOT'" - } else { - if ((Test-Path "${env:ProgramFiles(x86)}\Android\android-sdk")) { - $env:ANDROID_SDK_ROOT = "${env:ProgramFiles(x86)}\Android\android-sdk" - } - if ($env:ANDROID_SDK_ROOT) { - echo "##vso[task.setvariable variable=ANDROID_SDK_ROOT]$env:ANDROID_SDK_ROOT" - echo "ANDROID_SDK_ROOT set to '$env:ANDROID_SDK_ROOT'" - } else { - echo "Unable to set ANDROID_SDK_ROOT" - } - } - displayName: 'Setup ANDROID_SDK_ROOT Paths' - condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) - - pwsh: ./build.ps1 --target=dotnet --configuration="${{ parameters.buildConfiguration }}" --verbosity=diagnostic --nugetsource="${{ parameters.nugetFolder }}" displayName: 'Install .NET' retryCountOnTaskFailure: 3 diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml index 13302d8e0025..7c01c600ae5b 100644 --- a/eng/pipelines/common/provision.yml +++ b/eng/pipelines/common/provision.yml @@ -117,23 +117,6 @@ steps: displayName: 'Setup JDK Paths' condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) - - pwsh: | - if ($env:ANDROID_SDK_ROOT) { - echo "ANDROID_SDK_ROOT already set to '$env:ANDROID_SDK_ROOT'" - } else { - if ((Test-Path "${env:ProgramFiles(x86)}\Android\android-sdk")) { - $env:ANDROID_SDK_ROOT = "${env:ProgramFiles(x86)}\Android\android-sdk" - } - if ($env:ANDROID_SDK_ROOT) { - echo "##vso[task.setvariable variable=ANDROID_SDK_ROOT]$env:ANDROID_SDK_ROOT" - echo "ANDROID_SDK_ROOT set to '$env:ANDROID_SDK_ROOT'" - } else { - echo "Unable to set ANDROID_SDK_ROOT" - } - } - displayName: 'Setup ANDROID_SDK_ROOT Paths' - condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT')) - # Prepare Both - task: UseDotNet@2 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops displayName: 'Use .NET SDK $(DOTNET_VERSION)' diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 1f29c6c8278d..a977580644eb 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -8,7 +8,7 @@ variables: - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true - name: DOTNET_VERSION - value: 9.0.100-preview.4.24267.66 + value: 9.0.100-rc.2.24474.11 - name: REQUIRED_XCODE value: 16.0.0 - name: DEVICETESTS_REQUIRED_XCODE diff --git a/eng/pipelines/handlers.yml b/eng/pipelines/handlers.yml index ad1740cba0e3..77803b315cff 100644 --- a/eng/pipelines/handlers.yml +++ b/eng/pipelines/handlers.yml @@ -240,6 +240,7 @@ stages: skipAndroidSdks: true skipAndroidImages: true installDefaultAndroidApi: true + skipProvisioning: true - stage: samples_net displayName: Test .NET MAUI Samples diff --git a/eng/pipelines/maui-release.yml b/eng/pipelines/maui-release.yml index c25664848a36..6e8b0655aa65 100644 --- a/eng/pipelines/maui-release.yml +++ b/eng/pipelines/maui-release.yml @@ -173,6 +173,7 @@ extends: skipAndroidImages: true skipAndroidSdks: true installDefaultAndroidApi: true + skipProvisioning: true - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}: # Sign only using the private server - template: /eng/pipelines/common/sign.yml@self diff --git a/src/Core/src/maui.aar b/src/Core/src/maui.aar index 12f3432cfcea..59ac436a1a1d 100644 Binary files a/src/Core/src/maui.aar and b/src/Core/src/maui.aar differ