Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions build/ci/setup-environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ steps:

- task: JavaToolInstaller@0
displayName: Use Java 21 SDK (Windows)
condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true))
condition: eq( variables['Agent.OS'], 'Windows_NT' )
inputs:
versionSpec: '21'
jdkArchitectureOption: 'x64'
Expand All @@ -78,17 +78,6 @@ steps:
displayName: Clean and create Android SDK directory
condition: eq(${{ parameters.installAndroidDependencies }}, true)

- task: DotNetCoreCLI@2
displayName: Install android dependencies GoogleV2
inputs:
command: build
projects: build/scripts/provision-android/provision-android.csproj
arguments: >-
-t:InstallAndroidDependencies -p:AcceptAndroidSdkLicenses=true -p:AndroidManifestType=GoogleV2
-p:AndroidSdkDirectory=${{ parameters.androidSdkRoot }}
-v:n -bl:output/install-android-dependencies-GoogleV2.binlog
retryCountOnTaskFailure: 3

- task: DotNetCoreCLI@2
displayName: Install android dependencies Xamarin
inputs:
Expand All @@ -100,6 +89,21 @@ steps:
-v:n -bl:output/install-android-dependencies-Xamarin.binlog
retryCountOnTaskFailure: 3

- pwsh: |
$sdkManager = Join-Path "${{ parameters.androidSdkRoot }}" "cmdline-tools" "latest" "bin" "sdkmanager"
if ($IsWindows) {
$sdkManager += ".bat"
}

if (Test-Path $sdkManager) {
Write-Host "Accepting Android SDK licenses..."
Write-Host "y" | & $sdkManager --licenses --sdk_root="${{ parameters.androidSdkRoot }}"
} else {
Write-Host "SDK Manager not found at: $sdkManager"
}
displayName: Accept Android SDK licenses
condition: eq(${{ parameters.installAndroidDependencies }}, true)

- pwsh: |
Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory]${{ parameters.androidSdkRoot }}"
Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT]${{ parameters.androidSdkRoot }}"
Expand Down
4 changes: 2 additions & 2 deletions build/ci/variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variables:
macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name

# Tool variables
dotnetVersion: '9.0.303' # .NET version to install on agent
dotnetVersion: '9.0.305' # .NET version to install on agent
dotnetFrameworkVersion: 9 # The number to use for TF (eg: netX.0-android)
dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads

Expand All @@ -34,7 +34,7 @@ variables:
extendedTestAssembly: tests/extended/bin/$(configuration)/net$(dotnetFrameworkVersion).0/ExtendedTests.dll # Extended tests compiled binary

# dotnet-next test variables
dotnetNextVersion: 10.0.100-preview.6.25358.103 # .NET preview version to install
dotnetNextVersion: 10.0.100-rc.1.25451.107 # .NET preview version to install
dotnetNextFrameworkVersion: 10 # The number to use for TF (eg: netX.0-android)

# dnceng-public variables
Expand Down