You've already forked setup-msbuild
mirror of
https://github.com/microsoft/setup-msbuild.git
synced 2025-07-07 15:40:32 +07:00
Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
1ff57057b5 | |||
0e7c76c8f5 | |||
3ac564e2a5 | |||
d3ea839497 | |||
0a09b7fae9 |
18
action-types.yml
Normal file
18
action-types.yml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# See https://github.com/krzema12/github-actions-typing
|
||||||
|
inputs:
|
||||||
|
vswhere-path:
|
||||||
|
type: string
|
||||||
|
vs-version:
|
||||||
|
type: string
|
||||||
|
vs-prerelease:
|
||||||
|
type: boolean
|
||||||
|
msbuild-architecture:
|
||||||
|
type: enum
|
||||||
|
name: Architecture
|
||||||
|
allowed-values:
|
||||||
|
- x86
|
||||||
|
- x64
|
||||||
|
- arm64
|
||||||
|
outputs:
|
||||||
|
msbuildPath:
|
||||||
|
type: string
|
@ -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", "x64", or "arm64". "x64" is only available from Visual Studio version 17.0 and later.'
|
||||||
required: false
|
required: false
|
||||||
default: 'x86'
|
default: 'x86'
|
||||||
outputs:
|
outputs:
|
||||||
|
6
dist/index.js
vendored
6
dist/index.js
vendored
@ -1652,7 +1652,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';
|
let 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') {
|
||||||
@ -1703,6 +1703,10 @@ function run() {
|
|||||||
core.debug(`Found installation path: ${installationPath}`);
|
core.debug(`Found installation path: ${installationPath}`);
|
||||||
// x64 and arm64 only exist in one possible location, so no fallback probing
|
// x64 and arm64 only exist in one possible location, so no fallback probing
|
||||||
if (MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64') {
|
if (MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64') {
|
||||||
|
// x64 is actually amd64 so change to that
|
||||||
|
if (MSBUILD_ARCH === 'x64') {
|
||||||
|
MSBUILD_ARCH = 'amd64';
|
||||||
|
}
|
||||||
let toolPath = path.join(installationPath, `MSBuild\\Current\\Bin\\${MSBUILD_ARCH}\\MSBuild.exe`);
|
let toolPath = path.join(installationPath, `MSBuild\\Current\\Bin\\${MSBUILD_ARCH}\\MSBuild.exe`);
|
||||||
core.debug(`Checking for path: ${toolPath}`);
|
core.debug(`Checking for path: ${toolPath}`);
|
||||||
if (!fs.existsSync(toolPath)) {
|
if (!fs.existsSync(toolPath)) {
|
||||||
|
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "setup-msbuild",
|
"name": "setup-msbuild",
|
||||||
"version": "1.2.0",
|
"version": "1.3.0",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "setup-msbuild",
|
"name": "setup-msbuild",
|
||||||
"version": "1.2.0",
|
"version": "1.3.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@actions/core": "^1.10.0",
|
"@actions/core": "^1.10.0",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "setup-msbuild",
|
"name": "setup-msbuild",
|
||||||
"version": "1.2.0",
|
"version": "1.3.1",
|
||||||
"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'
|
let 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 '
|
||||||
@ -73,6 +73,10 @@ async function run(): Promise<void> {
|
|||||||
|
|
||||||
// x64 and arm64 only exist in one possible location, so no fallback probing
|
// x64 and arm64 only exist in one possible location, so no fallback probing
|
||||||
if (MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64') {
|
if (MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64') {
|
||||||
|
// x64 is actually amd64 so change to that
|
||||||
|
if (MSBUILD_ARCH === 'x64') {
|
||||||
|
MSBUILD_ARCH = 'amd64'
|
||||||
|
}
|
||||||
let toolPath = path.join(
|
let toolPath = path.join(
|
||||||
installationPath,
|
installationPath,
|
||||||
`MSBuild\\Current\\Bin\\${MSBUILD_ARCH}\\MSBuild.exe`
|
`MSBuild\\Current\\Bin\\${MSBUILD_ARCH}\\MSBuild.exe`
|
||||||
|
Reference in New Issue
Block a user