actions
/
setup-dotnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inconsistent splitting behavior fix

This commit is contained in:
Danny McCormick 2019-07-25 14:18:57 -04:00
parent 035f3d68f7
commit e6ea2e057b
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/installer.js
View File

@ -215,6 +215,7 @@ class DotnetCoreInstaller {
if (downloadUrls.length == 0) { if (downloadUrls.length == 0) {
throw `Could not construct download URL. Please ensure that specified version ${version} is valid.`; throw `Could not construct download URL. Please ensure that specified version ${version} is valid.`;
} }
core.debug(`Got download urls ${downloadUrls}`);
return downloadUrls; return downloadUrls;
}); });
} }
@ -276,6 +277,10 @@ class DotnetCoreInstaller {
let legacyUrl = ''; let legacyUrl = '';
if (!!output && output.length > 0) { if (!!output && output.length > 0) {
let lines = output.split(os.EOL); let lines = output.split(os.EOL);
// Fallback to \n if initial split doesn't work (not consistent across versions)
if (lines.length === 1) {
lines = output.split('\n');
}
if (!!lines && lines.length > 0) { if (!!lines && lines.length > 0) {
lines.forEach((line) => { lines.forEach((line) => {
if (!line) { if (!line) {

7
src/installer.ts
View File

@ -232,6 +232,8 @@ export class DotnetCoreInstaller {
throw `Could not construct download URL. Please ensure that specified version ${version} is valid.`; throw `Could not construct download URL. Please ensure that specified version ${version} is valid.`;
} }
core.debug(`Got download urls ${downloadUrls}`);
return downloadUrls; return downloadUrls;
} }
@ -307,6 +309,11 @@ export class DotnetCoreInstaller {
let legacyUrl: string = ''; let legacyUrl: string = '';
if (!!output && output.length > 0) { if (!!output && output.length > 0) {
let lines: string[] = output.split(os.EOL); let lines: string[] = output.split(os.EOL);
// Fallback to \n if initial split doesn't work (not consistent across versions)
if (lines.length === 1) {
lines = output.split('\n');
}
if (!!lines && lines.length > 0) { if (!!lines && lines.length > 0) {
lines.forEach((line: string) => { lines.forEach((line: string) => {
if (!line) { if (!line) {