Skip to content

Commit ea9897a

Browse files
V3 - Use new .NET CDN URLs and update to latest install scripts (#567)
* Update new cdn * new cdn changes * update latest install scripts * Format install scripts * Fix Ubuntu-latest issues * Fallback logic * Format check * Update signed version
1 parent 3447fd6 commit ea9897a

File tree

6 files changed

+1908
-1563
lines changed

6 files changed

+1908
-1563
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
20+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v3
@@ -40,7 +40,7 @@ jobs:
4040
strategy:
4141
fail-fast: false
4242
matrix:
43-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
43+
operating-system: [ubuntu-22.04, windows-latest, macos-13]
4444
steps:
4545
- name: Checkout
4646
uses: actions/checkout@v3
@@ -69,7 +69,7 @@ jobs:
6969
strategy:
7070
fail-fast: false
7171
matrix:
72-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
72+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
7373
steps:
7474
- name: Checkout
7575
uses: actions/checkout@v3
@@ -94,7 +94,7 @@ jobs:
9494
strategy:
9595
fail-fast: false
9696
matrix:
97-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
97+
operating-system: [ubuntu-22.04, windows-latest, macos-13]
9898
steps:
9999
- name: Checkout
100100
uses: actions/checkout@v3
@@ -114,7 +114,7 @@ jobs:
114114
strategy:
115115
fail-fast: false
116116
matrix:
117-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
117+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
118118
steps:
119119
- name: Checkout
120120
uses: actions/checkout@v3
@@ -138,7 +138,7 @@ jobs:
138138
strategy:
139139
fail-fast: false
140140
matrix:
141-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
141+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
142142
steps:
143143
- name: Checkout
144144
uses: actions/checkout@v3
@@ -159,7 +159,7 @@ jobs:
159159
strategy:
160160
fail-fast: false
161161
matrix:
162-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
162+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
163163
steps:
164164
- name: Checkout
165165
uses: actions/checkout@v3
@@ -183,7 +183,7 @@ jobs:
183183
strategy:
184184
fail-fast: false
185185
matrix:
186-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
186+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
187187
steps:
188188
- name: Checkout
189189
uses: actions/checkout@v3
@@ -209,7 +209,7 @@ jobs:
209209
strategy:
210210
fail-fast: false
211211
matrix:
212-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
212+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
213213
steps:
214214
- name: Checkout
215215
uses: actions/checkout@v3
@@ -234,7 +234,7 @@ jobs:
234234
strategy:
235235
fail-fast: false
236236
matrix:
237-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
237+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
238238
steps:
239239
- name: Checkout
240240
uses: actions/checkout@v3
@@ -256,7 +256,7 @@ jobs:
256256
strategy:
257257
fail-fast: false
258258
matrix:
259-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
259+
operating-system: [ubuntu-22.04, windows-latest, macos-latest]
260260
env:
261261
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
262262
steps:
@@ -287,7 +287,7 @@ jobs:
287287
strategy:
288288
fail-fast: false
289289
matrix:
290-
operating-system: [ubuntu-latest, windows-latest, macos-latest]
290+
operating-system: [ubuntu-22.04, windows-latest, macos-latest]
291291
env:
292292
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages
293293
steps:
@@ -316,7 +316,7 @@ jobs:
316316
strategy:
317317
fail-fast: false
318318
matrix:
319-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
319+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
320320
steps:
321321
- name: Checkout
322322
uses: actions/checkout@v3
@@ -342,7 +342,7 @@ jobs:
342342
strategy:
343343
fail-fast: false
344344
matrix:
345-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
345+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
346346
steps:
347347
- name: Checkout
348348
uses: actions/checkout@v3
@@ -366,7 +366,7 @@ jobs:
366366
if (-not ($version -eq '${{steps.step2.outputs.dotnet-version}}')) { throw "Unexpected output value" }
367367
368368
test-proxy:
369-
runs-on: ubuntu-latest
369+
runs-on: ubuntu-22.04
370370
container:
371371
image: ubuntu:latest
372372
options: --dns 127.0.0.1
@@ -406,7 +406,7 @@ jobs:
406406
__tests__/verify-dotnet.ps1 -Patterns "^6.0" -CheckNugetConfig
407407
408408
test-bypass-proxy:
409-
runs-on: ubuntu-latest
409+
runs-on: ubuntu-22.04
410410
env:
411411
https_proxy: http://no-such-proxy:3128
412412
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net

.github/workflows/test-dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
operating-system: [ubuntu-latest, windows-latest, macOS-latest]
20+
operating-system: [ubuntu-22.04, windows-latest, macOS-latest]
2121
dotnet-version: ['2.1', '2.2', '3.0', '3.1', '5.0', '6.0', '7.0', '8.0']
2222
steps:
2323
- name: Checkout

dist/setup/index.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71264,7 +71264,13 @@ class DotnetVersionResolver {
7126471264
allowRetries: true,
7126571265
maxRetries: 3
7126671266
});
71267-
const response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl);
71267+
let response;
71268+
try {
71269+
response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl);
71270+
}
71271+
catch (error) {
71272+
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexFallbackUrl);
71273+
}
7126871274
const result = response.result || {};
7126971275
const releasesInfo = result['releases-index'];
7127071276
const releaseInfo = releasesInfo.find(info => {
@@ -71279,7 +71285,8 @@ class DotnetVersionResolver {
7127971285
}
7128071286
}
7128171287
exports.DotnetVersionResolver = DotnetVersionResolver;
71282-
DotnetVersionResolver.DotNetCoreIndexUrl = 'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
71288+
DotnetVersionResolver.DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
71289+
DotnetVersionResolver.DotnetCoreIndexFallbackUrl = 'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
7128371290
class DotnetCoreInstaller {
7128471291
constructor(version, quality) {
7128571292
this.version = version;

0 commit comments

Comments
 (0)