actions/setup-msbuild
1
0
Fork 0
mirror of https://github.com/microsoft/setup-msbuild.git synced 2024-11-10 05:51:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix path resolution

Browse Source 
Looking for vswhere in the PATH was never triggered and had some bugs (like failing unconditionally if the code path was executed).
This commit is contained in:
Heath Stewart 2020-04-21 16:27:45 -07:00
parent 0ddbddf06e
commit 9499ca8787
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dist/index.js vendored
View File

@ -977,8 +977,7 @@ const path = __importStar(__webpack_require__(622));
const io = __importStar(__webpack_require__(1)); const io = __importStar(__webpack_require__(1));
const IS_WINDOWS = process.platform === 'win32'; const IS_WINDOWS = process.platform === 'win32';
const VS_VERSION = core.getInput('vs-version') || 'latest'; const VS_VERSION = core.getInput('vs-version') || 'latest';
const VSWHERE_PATH = core.getInput('vswhere-path') || const VSWHERE_PATH = core.getInput('vswhere-path');
path.join(process.env['ProgramFiles(x86)'], 'Microsoft Visual Studio\\Installer');
// if a specific version of VS is requested // if a specific version of VS is requested
let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest '; let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest ';
if (VS_VERSION !== 'latest') { if (VS_VERSION !== 'latest') {
@ -1007,12 +1006,17 @@ function run() {
vswhereToolExe = path.join(vsWhereInPath, 'vswhere.exe'); vswhereToolExe = path.join(vsWhereInPath, 'vswhere.exe');
} }
catch (_a) { catch (_a) {
// wasn't found because which threw // check for VS-installed path
} const vsWhereInInstallerPath = path.join(process.env['ProgramFiles(x86)'], 'Microsoft Visual Studio\\Installer\\vswhere.exe');
finally { if (fs.existsSync(vsWhereInInstallerPath)) {
core.setFailed('setup-msbuild requires the path to where vswhere.exe exists'); vswhereToolExe = vsWhereInInstallerPath;
}
} }
} }
if (!fs.existsSync(vswhereToolExe)) {
core.setFailed('setup-msbuild requires the path to where vswhere.exe exists');
return;
}
core.debug(`Full tool exe: ${vswhereToolExe}`); core.debug(`Full tool exe: ${vswhereToolExe}`);
let foundToolPath = ''; let foundToolPath = '';
const options = {}; const options = {};

27
src/main.ts
View File

@ -7,12 +7,7 @@ import {ExecOptions} from '@actions/exec/lib/interfaces'
const IS_WINDOWS = process.platform === 'win32' const IS_WINDOWS = process.platform === 'win32'
const VS_VERSION = core.getInput('vs-version') || 'latest' const VS_VERSION = core.getInput('vs-version') || 'latest'
const VSWHERE_PATH = const VSWHERE_PATH = core.getInput('vswhere-path')
core.getInput('vswhere-path') ||
path.join(
process.env['ProgramFiles(x86)'] as string,
'Microsoft Visual Studio\\Installer'
)
// if a specific version of VS is requested // if a specific version of VS is requested
let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest ' let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest '
@ -43,14 +38,26 @@ async function run(): Promise<void> {
core.debug(`Found tool in PATH: ${vsWhereInPath}`) core.debug(`Found tool in PATH: ${vsWhereInPath}`)
vswhereToolExe = path.join(vsWhereInPath, 'vswhere.exe') vswhereToolExe = path.join(vsWhereInPath, 'vswhere.exe')
} catch { } catch {
// wasn't found because which threw // check for VS-installed path
} finally { const vsWhereInInstallerPath = path.join(
core.setFailed( process.env['ProgramFiles(x86)'] as string,
'setup-msbuild requires the path to where vswhere.exe exists' 'Microsoft Visual Studio\\Installer\\vswhere.exe'
) )
if (fs.existsSync(vsWhereInInstallerPath)) {
vswhereToolExe = vsWhereInInstallerPath
}
} }
} }
if (!fs.existsSync(vswhereToolExe)) {
core.setFailed(
'setup-msbuild requires the path to where vswhere.exe exists'
)
return
}
core.debug(`Full tool exe: ${vswhereToolExe}`) core.debug(`Full tool exe: ${vswhereToolExe}`)
let foundToolPath = '' let foundToolPath = ''