Actions/setup-dotnet
1
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2025-11-04 04:33:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with warning

Browse Source
This commit is contained in:
IvanZosimov 2022-08-17 10:30:18 +02:00
parent 48c496df53
commit 536591c258
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dist/index.js vendored
View File

@ -280,9 +280,14 @@ class DotnetCoreInstaller {
.replace(/'/g, "''"); .replace(/'/g, "''");
let command = `& '${escapedScript}'`; let command = `& '${escapedScript}'`;
command += ` ${versionObject.type} ${versionObject.value}`; command += ` ${versionObject.type} ${versionObject.value}`;
if (this.quality && versionObject.qualityFlag) { if (this.quality) {
if (versionObject.qualityFlag) {
command += ` -Quality ${this.quality}`; command += ` -Quality ${this.quality}`;
} }
else {
core.warning("'dotnet-quality' input can't be used with exact version of .NET. 'dotnet-quality' input is ignored.");
}
}
if (process.env['https_proxy'] != null) { if (process.env['https_proxy'] != null) {
command += ` -ProxyAddress ${process.env['https_proxy']}`; command += ` -ProxyAddress ${process.env['https_proxy']}`;
} }
@ -320,9 +325,14 @@ class DotnetCoreInstaller {
const scriptPath = yield io.which(escapedScript, true); const scriptPath = yield io.which(escapedScript, true);
let scriptArguments = []; let scriptArguments = [];
scriptArguments.push(versionObject.type, versionObject.value); scriptArguments.push(versionObject.type, versionObject.value);
if (this.quality && versionObject.qualityFlag) { if (this.quality) {
if (versionObject.qualityFlag) {
scriptArguments.push("--quality", this.quality); scriptArguments.push("--quality", this.quality);
} }
else {
core.warning("'dotnet-quality' input can't be used with exact version of .NET. 'dotnet-quality' input is ignored.");
}
}
if (IS_LINUX) { if (IS_LINUX) {
scriptArguments.push('--install-dir', installationDirectoryLinux); scriptArguments.push('--install-dir', installationDirectoryLinux);
} }

12
src/installer.ts
View File

@ -116,8 +116,12 @@ export class DotnetCoreInstaller {
command += ` ${versionObject.type} ${versionObject.value}`; command += ` ${versionObject.type} ${versionObject.value}`;
if (this.quality && versionObject.qualityFlag) { if (this.quality) {
if (versionObject.qualityFlag) {
command += ` -Quality ${this.quality}`; command += ` -Quality ${this.quality}`;
} else {
core.warning("'dotnet-quality' input can't be used with exact version of .NET. 'dotnet-quality' input is ignored.");
}
} }
if (process.env['https_proxy'] != null) { if (process.env['https_proxy'] != null) {
@ -168,8 +172,12 @@ export class DotnetCoreInstaller {
scriptArguments.push(versionObject.type, versionObject.value); scriptArguments.push(versionObject.type, versionObject.value);
if (this.quality && versionObject.qualityFlag) { if (this.quality) {
if (versionObject.qualityFlag){
scriptArguments.push("--quality", this.quality); scriptArguments.push("--quality", this.quality);
} else {
core.warning("'dotnet-quality' input can't be used with exact version of .NET. 'dotnet-quality' input is ignored.");
}
} }
if (IS_LINUX) { if (IS_LINUX) {