mirror of
https://github.com/microsoft/setup-msbuild.git
synced 2024-11-10 05:51:07 +07:00
Merging x64 probe and typos
This commit is contained in:
parent
84e0d709b2
commit
ab534842b4
7
.github/workflows/test.yml
vendored
7
.github/workflows/test.yml
vendored
@ -33,6 +33,13 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
PATH: ''
|
PATH: ''
|
||||||
|
|
||||||
|
- name: Setup MSBuild (x64)
|
||||||
|
id: setup_msbuild_path
|
||||||
|
uses: ./
|
||||||
|
with:
|
||||||
|
vs-prerelease: true
|
||||||
|
msbuild-architecture: 'x64'
|
||||||
|
|
||||||
- name: echo msbuild path
|
- name: echo msbuild path
|
||||||
run: |
|
run: |
|
||||||
echo "vswhere-path: ${{ steps.setup_msbuild_explicit.outputs.msbuildPath }}"
|
echo "vswhere-path: ${{ steps.setup_msbuild_explicit.outputs.msbuildPath }}"
|
||||||
|
@ -15,7 +15,7 @@ inputs:
|
|||||||
description: 'Enable searching for pre-release versions of Visual Studio/MSBuild'
|
description: 'Enable searching for pre-release versions of Visual Studio/MSBuild'
|
||||||
required: false
|
required: false
|
||||||
msbuild-architecture:
|
msbuild-architecture:
|
||||||
description: 'The preferred processor architecture of msbuild. Can be either "x86" or "x64". "x64" is only available from Visual Studio version 17.0 and later.'
|
description: 'The preferred processor architecture of MSBuild. Can be either "x86" or "x64". "x64" is only available from Visual Studio version 17.0 and later.'
|
||||||
required: false
|
required: false
|
||||||
default: 'x86'
|
default: 'x86'
|
||||||
outputs:
|
outputs:
|
||||||
|
12
dist/index.js
vendored
12
dist/index.js
vendored
@ -1041,6 +1041,7 @@ 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');
|
||||||
const ALLOW_PRERELEASE = core.getInput('vs-prerelease') || 'false';
|
const ALLOW_PRERELEASE = core.getInput('vs-prerelease') || 'false';
|
||||||
|
const MSBUILD_ARCH = core.getInput('msbuild-architecture') || 'x86';
|
||||||
// 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 (ALLOW_PRERELEASE === 'true') {
|
if (ALLOW_PRERELEASE === 'true') {
|
||||||
@ -1089,6 +1090,16 @@ function run() {
|
|||||||
stdout: (data) => {
|
stdout: (data) => {
|
||||||
const installationPath = data.toString().trim();
|
const installationPath = data.toString().trim();
|
||||||
core.debug(`Found installation path: ${installationPath}`);
|
core.debug(`Found installation path: ${installationPath}`);
|
||||||
|
// x64 only exists in one possible location, so no fallback probing
|
||||||
|
if (MSBUILD_ARCH === "x64") {
|
||||||
|
let toolPath = path.join(installationPath, 'MSBuild\\Current\\Bin\\amd64\\MSBuild.exe');
|
||||||
|
core.debug(`Checking for path: ${toolPath}`);
|
||||||
|
if (!fs.existsSync(toolPath)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
foundToolPath = toolPath;
|
||||||
|
}
|
||||||
|
else {
|
||||||
let toolPath = path.join(installationPath, 'MSBuild\\Current\\Bin\\MSBuild.exe');
|
let toolPath = path.join(installationPath, 'MSBuild\\Current\\Bin\\MSBuild.exe');
|
||||||
core.debug(`Checking for path: ${toolPath}`);
|
core.debug(`Checking for path: ${toolPath}`);
|
||||||
if (!fs.existsSync(toolPath)) {
|
if (!fs.existsSync(toolPath)) {
|
||||||
@ -1100,6 +1111,7 @@ function run() {
|
|||||||
}
|
}
|
||||||
foundToolPath = toolPath;
|
foundToolPath = toolPath;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
// execute the find putting the result of the command in the options foundToolPath
|
// execute the find putting the result of the command in the options foundToolPath
|
||||||
yield exec.exec(`"${vswhereToolExe}" ${VSWHERE_EXEC}`, [], options);
|
yield exec.exec(`"${vswhereToolExe}" ${VSWHERE_EXEC}`, [], options);
|
||||||
|
8241
package-lock.json
generated
8241
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "setup-msbuild",
|
"name": "setup-msbuild",
|
||||||
"version": "1.0.3",
|
"version": "1.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "Helps set up specific MSBuild tool into PATH for later usage.",
|
"description": "Helps set up specific MSBuild tool into PATH for later usage.",
|
||||||
"main": "lib/main.js",
|
"main": "lib/main.js",
|
||||||
|
@ -9,7 +9,7 @@ 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')
|
||||||
const ALLOW_PRERELEASE = core.getInput('vs-prerelease') || 'false'
|
const ALLOW_PRERELEASE = core.getInput('vs-prerelease') || 'false'
|
||||||
const MSBUILD_ARCH = core.getInput('msbuild-architecture') || 'x86';
|
const MSBUILD_ARCH = core.getInput('msbuild-architecture') || 'x86'
|
||||||
|
|
||||||
// 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 '
|
||||||
|
Loading…
Reference in New Issue
Block a user