mirror of
https://github.com/actions/setup-dotnet.git
synced 2025-01-18 22:31:44 +07:00
Remove logic for azureedge.net fallback in preparation for install script changes
This commit is contained in:
parent
87b7050bc5
commit
09ddc958fd
10
dist/setup/index.js
vendored
10
dist/setup/index.js
vendored
@ -93806,13 +93806,8 @@ class DotnetVersionResolver {
|
|||||||
allowRetries: true,
|
allowRetries: true,
|
||||||
maxRetries: 3
|
maxRetries: 3
|
||||||
});
|
});
|
||||||
let response;
|
const response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
|
||||||
try {
|
|
||||||
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexUrl);
|
|
||||||
}
|
|
||||||
catch (error) {
|
|
||||||
response = yield httpClient.getJson(DotnetVersionResolver.DotnetCoreIndexFallbackUrl);
|
|
||||||
}
|
|
||||||
const result = response.result || {};
|
const result = response.result || {};
|
||||||
const releasesInfo = result['releases-index'];
|
const releasesInfo = result['releases-index'];
|
||||||
const releaseInfo = releasesInfo.find(info => {
|
const releaseInfo = releasesInfo.find(info => {
|
||||||
@ -93828,7 +93823,6 @@ class DotnetVersionResolver {
|
|||||||
}
|
}
|
||||||
exports.DotnetVersionResolver = DotnetVersionResolver;
|
exports.DotnetVersionResolver = DotnetVersionResolver;
|
||||||
DotnetVersionResolver.DotnetCoreIndexUrl = 'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
|
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 {
|
class DotnetInstallScript {
|
||||||
constructor() {
|
constructor() {
|
||||||
this.scriptName = utils_1.IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
|
this.scriptName = utils_1.IS_WINDOWS ? 'install-dotnet.ps1' : 'install-dotnet.sh';
|
||||||
|
@ -102,16 +102,9 @@ export class DotnetVersionResolver {
|
|||||||
maxRetries: 3
|
maxRetries: 3
|
||||||
});
|
});
|
||||||
|
|
||||||
let response;
|
const response = await httpClient.getJson<any>(
|
||||||
try {
|
DotnetVersionResolver.DotnetCoreIndexUrl
|
||||||
response = await httpClient.getJson<any>(
|
);
|
||||||
DotnetVersionResolver.DotnetCoreIndexUrl
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
response = await httpClient.getJson<any>(
|
|
||||||
DotnetVersionResolver.DotnetCoreIndexFallbackUrl
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const result = response.result || {};
|
const result = response.result || {};
|
||||||
const releasesInfo: any[] = result['releases-index'];
|
const releasesInfo: any[] = result['releases-index'];
|
||||||
@ -132,8 +125,6 @@ export class DotnetVersionResolver {
|
|||||||
|
|
||||||
static DotnetCoreIndexUrl =
|
static DotnetCoreIndexUrl =
|
||||||
'https://builds.dotnet.microsoft.com/dotnet/release-metadata/releases-index.json';
|
'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 {
|
export class DotnetInstallScript {
|
||||||
|
Loading…
Reference in New Issue
Block a user