From 0586729723197a473ed56316d291c3cca85e13b6 Mon Sep 17 00:00:00 2001 From: Dylan <67774922+heavymachinery@users.noreply.github.com> Date: Tue, 24 Dec 2024 20:12:34 +0000 Subject: [PATCH] Add fallback to old CDN URL --- dist/setup/index.js | 9 ++++++++- src/installer.ts | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 5a0d6a8..d415cbd 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -93806,7 +93806,13 @@ class DotnetVersionResolver { allowRetries: true, maxRetries: 3 }); - const response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl); + let response; + try { + response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl); + } + catch (error) { + response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexFallbackUrl); + } const result = response.result || {}; const releasesInfo = result['releases-index']; const releaseInfo = releasesInfo.find(info => { @@ -93822,6 +93828,7 @@ 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'; diff --git a/src/installer.ts b/src/installer.ts index bdc1b13..4773b8d 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -101,9 +101,18 @@ export class DotnetVersionResolver { allowRetries: true, maxRetries: 3 }); - const response = await httpClient.getJson( - DotnetVersionResolver.DotnetCoreIndexUrl - ); + + let response; + try { + response = await httpClient.getJson( + DotnetVersionResolver.DotnetCoreIndexUrl + ); + } catch (error) { + response = await httpClient.getJson( + DotnetVersionResolver.DotnetCoreIndexFallbackUrl + ); + } + const result = response.result || {}; const releasesInfo: any[] = result['releases-index']; @@ -123,6 +132,8 @@ 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 {