Skip to content

v4 - Remove azureedge.net fallback logic and update install scripts #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 12, 2025
Merged

v4 - Remove azureedge.net fallback logic and update install scripts #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
09ddc95
Remove logic for azureedge.net fallback in preparation for install sc…
zaataylor Jan 1, 2025
f52b857
remove extra spacing
zaataylor Jan 2, 2025
aaf97af
Update README.md (#587)
Jan 16, 2025
0afe910
upgrade cache from 3.2.4 to 4.0.0 (#586)
aparnajyothi-y Jan 16, 2025
a1362b1
Configure Dependabot settings (#585)
HarithaVattikuti Jan 21, 2025
64ef90d
Bump actions/publish-immutable-action from 0.0.3 to 0.0.4 (#590)
dependabot[bot] Jan 29, 2025
dde6ed4
Bump @actions/http-client from 2.2.1 to 2.2.3 (#592)
dependabot[bot] Jan 29, 2025
312555a
Bump undici from 5.28.4 to 5.28.5 (#596)
dependabot[bot] Jan 29, 2025
af14fc7
Remove old URLs from E2E tests workflow
zaataylor Jan 30, 2025
f2a38b9
Merge branch 'main' into remove-fallback-cdn-logic-v4
zaataylor Jan 30, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/e2e-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ jobs:
runs-on: ubuntu-22.04
env:
https_proxy: http://no-such-proxy:3128
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net,builds.dotnet.microsoft.com,ci.dot.net
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -741,7 +741,7 @@ jobs:
runs-on: ubuntu-latest
env:
https_proxy: http://no-such-proxy:3128
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net,builds.dotnet.microsoft.com,ci.dot.net
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
9 changes: 1 addition & 8 deletions dist/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102230,13 +102230,7 @@ class DotnetVersionResolver {
allowRetries: true,
maxRetries: 3
});
let response;
try {
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
}
catch (error) {
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexFallbackUrl);
}
const response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
const result = response.result || {};
const releasesInfo = result['releases-index'];
const releaseInfo = releasesInfo.find(info => {
Expand All @@ -102252,7 +102246,6 @@ class DotnetVersionResolver {
}
exports.DotnetVersionResolver = DotnetVersionResolver;
DotnetVersionResolver.DotnetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
DotnetVersionResolver.DotnetCoreIndexFallbackUrl = 'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
class DotnetInstallScript {
constructor() {
this.scriptName = utils_1.IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
Expand Down
15 changes: 3 additions & 12 deletions src/installer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,9 @@ export class DotnetVersionResolver {
maxRetries: 3
});

let response;
try {
response = await httpClient.getJson<any>(
DotnetVersionResolver.DotnetCoreIndexUrl
);
} catch (error) {
response = await httpClient.getJson<any>(
DotnetVersionResolver.DotnetCoreIndexFallbackUrl
);
}
const response = await httpClient.getJson<any>(
DotnetVersionResolver.DotnetCoreIndexUrl
);

const result = response.result || {};
const releasesInfo: any[] = result['releases-index'];
Expand All @@ -132,8 +125,6 @@ export class DotnetVersionResolver {

static DotnetCoreIndexUrl =
'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
static DotnetCoreIndexFallbackUrl =
'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json';
}

export class DotnetInstallScript {
Expand Down
Loading