From 0d16f91084b30b7581351f95345985829bd380d9 Mon Sep 17 00:00:00 2001 From: Zachary Taylor Date: Thu, 2 Jan 2025 00:47:52 +0000 Subject: [PATCH 1/4] Remove storage account fallback logic (v1) --- dist/index.js | 11 ++--------- src/installer.ts | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/dist/index.js b/dist/index.js index a45fa28b1..6d788e176 100644 --- a/dist/index.js +++ b/dist/index.js @@ -18168,13 +18168,8 @@ class DotnetCoreInstaller { } getReleasesJsonUrl(httpClient, versionParts) { return __awaiter(this, void 0, void 0, function* () { - let response; - try { - response = yield httpClient.getJson(DotNetCoreIndexUrl); - } - catch (error) { - response = yield httpClient.getJson(DotnetCoreIndexFallbackUrl); - } + const response = yield httpClient.getJson(DotNetCoreIndexUrl); + const result = response.result || {}; let releasesInfo = result['releases-index']; releasesInfo = releasesInfo.filter((info) => { @@ -18199,8 +18194,6 @@ class DotnetCoreInstaller { } exports.DotnetCoreInstaller = DotnetCoreInstaller; const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json'; -const DotnetCoreIndexFallbackUrl = 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json'; - /***/ }), diff --git a/src/installer.ts b/src/installer.ts index bb085424b..d80569f54 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -261,12 +261,8 @@ export class DotnetCoreInstaller { httpClient: hc.HttpClient, versionParts: string[] ): Promise { - let response; - try { - response = await httpClient.getJson(DotNetCoreIndexUrl); - } catch (error) { - response = await httpClient.getJson(DotnetCoreIndexFallbackUrl); - } + const response = await httpClient.getJson(DotNetCoreIndexUrl); + const result = response.result || {}; let releasesInfo: any[] = result['releases-index']; @@ -306,6 +302,3 @@ export class DotnetCoreInstaller { const DotNetCoreIndexUrl: string = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json'; - -const DotnetCoreIndexFallbackUrl: string = - 'https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/releases-index.json'; From e31c9045e5500251a3bc062d658da0be72413dde Mon Sep 17 00:00:00 2001 From: Zachary Taylor Date: Thu, 2 Jan 2025 01:02:11 +0000 Subject: [PATCH 2/4] remove extra spacing --- dist/index.js | 1 - src/installer.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 6d788e176..1cb55c37c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -18169,7 +18169,6 @@ class DotnetCoreInstaller { getReleasesJsonUrl(httpClient, versionParts) { return __awaiter(this, void 0, void 0, function* () { const response = yield httpClient.getJson(DotNetCoreIndexUrl); - const result = response.result || {}; let releasesInfo = result['releases-index']; releasesInfo = releasesInfo.filter((info) => { diff --git a/src/installer.ts b/src/installer.ts index d80569f54..968f352ca 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -262,7 +262,6 @@ export class DotnetCoreInstaller { versionParts: string[] ): Promise { const response = await httpClient.getJson(DotNetCoreIndexUrl); - const result = response.result || {}; let releasesInfo: any[] = result['releases-index']; From 8f3cbf74e2a1776e59c6925c3577d5fde4cc921f Mon Sep 17 00:00:00 2001 From: Zachary Taylor Date: Thu, 2 Jan 2025 01:53:55 +0000 Subject: [PATCH 3/4] get rid of extra space --- dist/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/dist/index.js b/dist/index.js index 1cb55c37c..4373019dc 100644 --- a/dist/index.js +++ b/dist/index.js @@ -18193,7 +18193,6 @@ class DotnetCoreInstaller { } exports.DotnetCoreInstaller = DotnetCoreInstaller; const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json'; - /***/ }), /***/ 750: From f2d774a272457e308449a4bacb8b0b8bf319f887 Mon Sep 17 00:00:00 2001 From: Zachary Taylor Date: Thu, 2 Jan 2025 02:05:44 +0000 Subject: [PATCH 4/4] fix ci --- dist/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dist/index.js b/dist/index.js index 4373019dc..82db21a44 100644 --- a/dist/index.js +++ b/dist/index.js @@ -18193,6 +18193,8 @@ class DotnetCoreInstaller { } exports.DotnetCoreInstaller = DotnetCoreInstaller; const DotNetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json'; + + /***/ }), /***/ 750: