Skip to content

Commit b2ace4b

Browse files
v3 - Remove azureedge.net fallback logic and update install scripts (#573)
* Remove logic for azureedge.net fallback in preparation for install script changes (v3) * remove fallback in index.js * fix ci * add updated install scripts * Update e2e-tests.yml * Update e2e-tests.yml to remove outdated URLs in workflow * Fix audit issues * Revert audit fixes for heap memory failures --------- Co-authored-by: HarithaVattikuti <[email protected]>
1 parent ea9897a commit b2ace4b

File tree

5 files changed

+221
-269
lines changed

5 files changed

+221
-269
lines changed

.github/workflows/e2e-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ jobs:
409409
runs-on: ubuntu-22.04
410410
env:
411411
https_proxy: http://no-such-proxy:3128
412-
no_proxy: github.com,dotnetcli.blob.core.windows.net,download.visualstudio.microsoft.com,api.nuget.org,dotnetcli.azureedge.net
412+
no_proxy: github.com,download.visualstudio.microsoft.com,api.nuget.org,builds.dotnet.microsoft.com,ci.dot.net
413413
steps:
414414
- name: Checkout
415415
uses: actions/checkout@v3

dist/setup/index.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71264,13 +71264,7 @@ class DotnetVersionResolver {
7126471264
allowRetries: true,
7126571265
maxRetries: 3
7126671266
});
71267-
let response;
71268-
try {
71269-
response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl);
71270-
}
71271-
catch (error) {
71272-
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexFallbackUrl);
71273-
}
71267+
const response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl);
7127471268
const result = response.result || {};
7127571269
const releasesInfo = result['releases-index'];
7127671270
const releaseInfo = releasesInfo.find(info => {
@@ -71286,7 +71280,6 @@ class DotnetVersionResolver {
7128671280
}
7128771281
exports.DotnetVersionResolver = DotnetVersionResolver;
7128871282
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';
7129071283
class DotnetCoreInstaller {
7129171284
constructor(version, quality) {
7129271285
this.version = version;

0 commit comments

Comments
 (0)