diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index c5527233dd7..3442771985f 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -342,6 +342,8 @@ extends: parameters: xaSourcePath: $(Build.SourcesDirectory)/xamarin-android androidSdkPlatforms: $(DefaultTestSdkPlatforms) + dotnetVersion: 9.0 + dotnetQuality: preview - task: NuGetAuthenticate@1 displayName: authenticate with azure artifacts diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml index 1d774bb7c04..d01ae3a4921 100644 --- a/build-tools/automation/yaml-templates/setup-test-environment.yaml +++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml @@ -3,9 +3,10 @@ parameters: xaSourcePath: $(System.DefaultWorkingDirectory) jdkTestFolder: $(JAVA_HOME_17_X64) remove_dotnet: false + dotnetVersion: $(DotNetSdkVersion) + dotnetQuality: $(DotNetSdkQuality) installTestSlicer: false installApkDiff: true - installLegacyDotNet: false installLegacyXamarinAndroid: false updateMono: false androidSdkPlatforms: $(DefaultTestSdkPlatforms) @@ -33,16 +34,12 @@ steps: displayName: set JI_JAVA_HOME to ${{ parameters.jdkTestFolder }} condition: and(succeeded(), eq(variables['agent.os'], 'Windows_NT')) -# Install .NET 6 for legacy tests -- ${{ if eq(parameters.installLegacyDotNet, true) }}: - - template: /build-tools/automation/yaml-templates/use-dot-net.yaml - parameters: - version: 6.0 - quality: GA - remove_dotnet: ${{ parameters.remove_dotnet }} - # Install latest .NET - template: /build-tools/automation/yaml-templates/use-dot-net.yaml + parameters: + version: ${{ parameters.dotnetVersion }} + quality: ${{ parameters.dotnetQuality }} + remove_dotnet: ${{ parameters.remove_dotnet }} - task: DotNetCoreCLI@2 displayName: shut down existing build daemons