Actions/setup-dotnet
1
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2025-08-20 15:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix version parts check

Browse Source
This commit is contained in:
Zachary Eisinger 2020-09-22 13:09:40 -07:00
parent 55206de730
commit 8796bdbb05
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js vendored
View File

@ -16974,8 +16974,8 @@ class DotnetCoreInstaller {
releasesInfo = releasesInfo.filter((info) => { releasesInfo = releasesInfo.filter((info) => {
// channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x. // channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x.
const sdkParts = info['channel-version'].split('.'); const sdkParts = info['channel-version'].split('.');
if (versionParts.length == 2 && if (versionParts.length >= 2 &&
!(versionParts[2] == 'x' || versionParts[2] == '*')) { !(versionParts[1] == 'x' || versionParts[1] == '*')) {
return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1]; return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1];
} }
return versionParts[0] == sdkParts[0]; return versionParts[0] == sdkParts[0];

4
src/installer.ts
View File

@ -255,8 +255,8 @@ export class DotnetCoreInstaller {
// channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x. // channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x.
const sdkParts: string[] = info['channel-version'].split('.'); const sdkParts: string[] = info['channel-version'].split('.');
if ( if (
versionParts.length == 2 && versionParts.length >= 2 &&
!(versionParts[2] == 'x' || versionParts[2] == '*') !(versionParts[1] == 'x' || versionParts[1] == '*')
) { ) {
return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1]; return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1];
} }