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

Format code

Browse Source
This commit is contained in:
IvanZosimov 2022-08-18 14:54:19 +02:00
parent 588be98f80
commit 49deee5a82
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/index.js vendored
View File

@ -224,7 +224,8 @@ class DotnetVersionResolver {
this.resolvedArgument.qualityFlag = true; this.resolvedArgument.qualityFlag = true;
if (semver_1.default.validRange(this.inputVersion)) { if (semver_1.default.validRange(this.inputVersion)) {
let coercedVersion = semver_1.default.coerce(this.inputVersion); let coercedVersion = semver_1.default.coerce(this.inputVersion);
this.resolvedArgument.value = (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.major) + "." + (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.minor); this.resolvedArgument.value =
(coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.major) + '.' + (coercedVersion === null || coercedVersion === void 0 ? void 0 : coercedVersion.minor);
} }
else { else {
this.resolvedArgument.value = this.inputVersion; this.resolvedArgument.value = this.inputVersion;
@ -362,7 +363,7 @@ class DotnetCoreInstaller {
} }
} }
exports.DotnetCoreInstaller = DotnetCoreInstaller; exports.DotnetCoreInstaller = DotnetCoreInstaller;
DotnetCoreInstaller.installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', "dotnet"); DotnetCoreInstaller.installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', 'dotnet');
DotnetCoreInstaller.installationDirectoryLinux = '/usr/share/dotnet'; DotnetCoreInstaller.installationDirectoryLinux = '/usr/share/dotnet';
function logWarning(message) { function logWarning(message) {
const warningPrefix = '[warning]'; const warningPrefix = '[warning]';

19
src/installer.ts
View File

@ -56,7 +56,8 @@ export class DotnetVersionResolver {
this.resolvedArgument.qualityFlag = true; this.resolvedArgument.qualityFlag = true;
if (semver.validRange(this.inputVersion)) { if (semver.validRange(this.inputVersion)) {
let coercedVersion = semver.coerce(this.inputVersion); let coercedVersion = semver.coerce(this.inputVersion);
this.resolvedArgument.value = coercedVersion?.major + "." + coercedVersion?.minor; this.resolvedArgument.value =
coercedVersion?.major + '.' + coercedVersion?.minor;
} else { } else {
this.resolvedArgument.value = this.inputVersion; this.resolvedArgument.value = this.inputVersion;
} }
@ -83,7 +84,10 @@ export class DotnetVersionResolver {
export class DotnetCoreInstaller { export class DotnetCoreInstaller {
private version: string; private version: string;
private quality: string; private quality: string;
static readonly installationDirectoryWindows = path.join(process.env['PROGRAMFILES'] + '', "dotnet"); static readonly installationDirectoryWindows = path.join(
process.env['PROGRAMFILES'] + '',
'dotnet'
);
static readonly installationDirectoryLinux = '/usr/share/dotnet'; static readonly installationDirectoryLinux = '/usr/share/dotnet';
constructor(version: string, quality: string) { constructor(version: string, quality: string) {
@ -94,7 +98,6 @@ export class DotnetCoreInstaller {
public async installDotnet() { public async installDotnet() {
let output = ''; let output = '';
let resultCode = 0; let resultCode = 0;
const versionResolver = new DotnetVersionResolver(this.version); const versionResolver = new DotnetVersionResolver(this.version);
const versionObject = versionResolver.createVersionObject(); const versionObject = versionResolver.createVersionObject();
@ -179,7 +182,10 @@ export class DotnetCoreInstaller {
} }
if (IS_LINUX) { if (IS_LINUX) {
scriptArguments.push('--install-dir', DotnetCoreInstaller.installationDirectoryLinux); scriptArguments.push(
'--install-dir',
DotnetCoreInstaller.installationDirectoryLinux
);
} }
// process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used // process.env must be explicitly passed in for DOTNET_INSTALL_DIR to be used
@ -209,13 +215,12 @@ export class DotnetCoreInstaller {
'DOTNET_ROOT', 'DOTNET_ROOT',
DotnetCoreInstaller.installationDirectoryWindows DotnetCoreInstaller.installationDirectoryWindows
); );
} } else if (IS_LINUX) {
else if (IS_LINUX) {
core.addPath(DotnetCoreInstaller.installationDirectoryLinux); core.addPath(DotnetCoreInstaller.installationDirectoryLinux);
core.exportVariable( core.exportVariable(
'DOTNET_ROOT', 'DOTNET_ROOT',
DotnetCoreInstaller.installationDirectoryLinux DotnetCoreInstaller.installationDirectoryLinux
); );
} else { } else {
// This is the default set in install-dotnet.sh // This is the default set in install-dotnet.sh
core.addPath(path.join(process.env['HOME'] + '', '.dotnet')); core.addPath(path.join(process.env['HOME'] + '', '.dotnet'));