diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index beba31e..28c98d0 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -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 @@ -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 diff --git a/dist/setup/index.js b/dist/setup/index.js index 170e77f..395ec6a 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -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 => { @@ -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'; diff --git a/src/installer.ts b/src/installer.ts index 4773b8d..12f58d7 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -102,16 +102,9 @@ export class DotnetVersionResolver { maxRetries: 3 }); - let response; - try { - response = await httpClient.getJson( - DotnetVersionResolver.DotnetCoreIndexUrl - ); - } catch (error) { - response = await httpClient.getJson( - DotnetVersionResolver.DotnetCoreIndexFallbackUrl - ); - } + const response = await httpClient.getJson( + DotnetVersionResolver.DotnetCoreIndexUrl + ); const result = response.result || {}; const releasesInfo: any[] = result['releases-index']; @@ -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 {