Skip to content

Commit 97519f1

Browse files
1 parent 981f8c2 commit 97519f1

File tree

7 files changed

+9
-64
lines changed

7 files changed

+9
-64
lines changed

build-tools/automation/azure-pipelines-oss.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ stages:
4848
submodules: recursive
4949

5050
- template: yaml-templates/use-dot-net.yaml
51-
parameters:
52-
remove_dotnet: true
5351

5452
- bash: |
5553
keychains=`security list-keychains`

build-tools/automation/yaml-templates/build-windows.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ stages:
4242
displayName: set JI_JAVA_HOME
4343
4444
- template: use-dot-net.yaml
45-
parameters:
46-
remove_dotnet: true
4745

4846
# Downgrade the XA .vsix installed into the instance of VS that we are building with so that we don't restore/build against a test version.
4947
# The VS installer will attempt to resume any failed or partial installation before trying to downgrade Xamarin.Android.

build-tools/automation/yaml-templates/commercial-build.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ steps:
1111
displayName: set JI_JAVA_HOME
1212

1313
- template: use-dot-net.yaml
14-
parameters:
15-
remove_dotnet: true
1614

1715
- task: NuGetAuthenticate@0
1816
displayName: authenticate with azure artifacts

build-tools/automation/yaml-templates/setup-test-environment.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ steps:
4444
- ${{ if eq(parameters.installLegacyDotNet, true) }}:
4545
- template: use-dot-net.yaml
4646
parameters:
47-
version: 6.0
48-
quality: GA
49-
remove_dotnet: ${{ parameters.remove_dotnet }}
47+
version: $(DotNet6SdkVersion)
5048

5149
# Install latest .NET
5250
- template: use-dot-net.yaml

build-tools/automation/yaml-templates/setup-ubuntu.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ steps:
1717
displayName: update packages
1818

1919
- template: use-dot-net.yaml
20-
parameters:
21-
remove_dotnet: true
2220

2321
- task: NuGetToolInstaller@1
2422
displayName: Use NuGet 5.x

build-tools/automation/yaml-templates/use-dot-net.yaml

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,59 +3,14 @@
33

44
parameters:
55
version: $(DotNetSdkVersion)
6-
quality: $(DotNetSdkQuality)
7-
remove_dotnet: false
8-
retryCountOnTaskFailure: 3
6+
includePreviewVersions: false
97

108
steps:
119

12-
- pwsh: |
13-
$ErrorActionPreference = 'Stop'
14-
$ProgressPreference = 'SilentlyContinue'
15-
$DotNetRoot = "$env:ProgramFiles\dotnet\"
16-
if ("${{ parameters.remove_dotnet }}" -eq $true) {
17-
Remove-Item -Recurse $DotNetRoot -Verbose
18-
}
19-
$currentAttempt = 1
20-
$totalAttempts = 5
21-
$sleepTime = 5
22-
$completed = $false
23-
while (-not $completed -and $currentAttempt -le $totalAttempts) {
24-
try {
25-
$response = Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1 -PassThru
26-
if ($response.StatusCode -ne 200) {
27-
throw
28-
}
29-
$completed = $true
30-
} catch {
31-
if ($currentAttempt -eq $totalAttempts) {
32-
Write-Host "Unable to download 'dotnet-install.ps1' after $currentAttempt attempts."
33-
throw
34-
}
35-
Write-Host $_.Exception
36-
Write-Host "Retrying after $sleepTime seconds..."
37-
Start-Sleep $sleepTime
38-
$currentAttempt++
39-
$sleepTime = $sleepTime * 2
40-
}
41-
}
42-
& .\dotnet-install.ps1 -Channel ${{ parameters.version }} -Quality ${{ parameters.quality }} -InstallDir $DotNetRoot -SkipNonVersionedFiles -Verbose
43-
displayName: install .NET Core ${{ parameters.version }}
44-
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
45-
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
46-
47-
- bash: >
48-
DOTNET_ROOT=~/.dotnet/ &&
49-
(if [[ "${{ parameters.remove_dotnet }}" == "true" ]] ; then rm -rfv $DOTNET_ROOT; fi) &&
50-
curl -L https://dot.net/v1/dotnet-install.sh --retry 5 --retry-max-time 300 > dotnet-install.sh &&
51-
chmod +x dotnet-install.sh &&
52-
./dotnet-install.sh --channel ${{ parameters.version }} --quality ${{ parameters.quality }} --install-dir $DOTNET_ROOT --skip-non-versioned-files --verbose &&
53-
PATH="$DOTNET_ROOT:$PATH" &&
54-
echo "##vso[task.setvariable variable=DOTNET_ROOT]$DOTNET_ROOT" &&
55-
echo "##vso[task.setvariable variable=PATH]$PATH"
56-
displayName: install .NET Core ${{ parameters.version }}
57-
condition: and(succeeded(), ne(variables['agent.os'], 'Windows_NT'))
58-
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
10+
- task: UseDotNet@2
11+
inputs:
12+
version: ${{ parameters.version }}
13+
includePreviewVersions: ${{ parameters.includePreviewVersions }}
5914

6015
- script: dotnet --info
6116
displayName: display dotnet --info

build-tools/automation/yaml-templates/variables.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ variables:
1818
- name: NUnit.NumberOfTestWorkers
1919
value: 4
2020
- name: DotNetSdkVersion
21-
value: 7.0
22-
- name: DotNetSdkQuality
23-
value: GA
21+
value: 7.0.306
22+
- name: DotNet6SdkVersion
23+
value: 6.0.412
2424
- name: GitHub.Token
2525
value: $(github--pat--vs-mobiletools-engineering-service2)
2626
- name: HostedMacImage

0 commit comments

Comments
 (0)