From 0a09b7fae9e23fc54eea8775ae54b3f417e53d86 Mon Sep 17 00:00:00 2001 From: Tim Heuer Date: Tue, 13 Dec 2022 08:07:05 -0800 Subject: [PATCH 1/4] Fixes #104 reassigning input arg [skip ci] --- dist/index.js | 6 +++++- src/main.ts | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dist/index.js b/dist/index.js index 2b30209..134764c 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1652,7 +1652,7 @@ const IS_WINDOWS = process.platform === 'win32'; const VS_VERSION = core.getInput('vs-version') || 'latest'; const VSWHERE_PATH = core.getInput('vswhere-path'); 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 let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest '; if (ALLOW_PRERELEASE === 'true') { @@ -1703,6 +1703,10 @@ function run() { core.debug(`Found installation path: ${installationPath}`); // x64 and arm64 only exist in one possible location, so no fallback probing 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`); core.debug(`Checking for path: ${toolPath}`); if (!fs.existsSync(toolPath)) { diff --git a/src/main.ts b/src/main.ts index 5668bba..b449dc3 100644 --- a/src/main.ts +++ b/src/main.ts @@ -9,7 +9,7 @@ const IS_WINDOWS = process.platform === 'win32' const VS_VERSION = core.getInput('vs-version') || 'latest' const VSWHERE_PATH = core.getInput('vswhere-path') 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 let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest ' @@ -73,6 +73,10 @@ async function run(): Promise { // x64 and arm64 only exist in one possible location, so no fallback probing 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` From d3ea839497466fb4c6b91ce85831f3a251a2fe3f Mon Sep 17 00:00:00 2001 From: Tim Heuer Date: Tue, 13 Dec 2022 08:12:09 -0800 Subject: [PATCH 2/4] Version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2938370..00a3193 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "setup-msbuild", - "version": "1.2.0", + "version": "1.3.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "setup-msbuild", - "version": "1.2.0", + "version": "1.3.0", "license": "MIT", "dependencies": { "@actions/core": "^1.10.0", diff --git a/package.json b/package.json index cb76856..7802170 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "setup-msbuild", - "version": "1.2.0", + "version": "1.3.0", "private": true, "description": "Helps set up specific MSBuild tool into PATH for later usage.", "main": "lib/main.js", From 3ac564e2a5beebdc04d35fd6fe9658f5796e5cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= Date: Thu, 2 Feb 2023 21:38:05 +0100 Subject: [PATCH 3/4] Implement #109 adding action types file --- action-types.yml | 18 ++++++++++++++++++ action.yml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 action-types.yml diff --git a/action-types.yml b/action-types.yml new file mode 100644 index 0000000..794fd5e --- /dev/null +++ b/action-types.yml @@ -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 diff --git a/action.yml b/action.yml index e88ae5b..afbcc2f 100644 --- a/action.yml +++ b/action.yml @@ -15,7 +15,7 @@ inputs: description: 'Enable searching for pre-release versions of Visual Studio/MSBuild' required: false 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 default: 'x86' outputs: From 1ff57057b5cfdc39105cd07a01d78e9b0ea0c14c Mon Sep 17 00:00:00 2001 From: Tim Heuer Date: Fri, 3 Feb 2023 15:02:07 -0800 Subject: [PATCH 4/4] Added action-types --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7802170..2ab4da2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "setup-msbuild", - "version": "1.3.0", + "version": "1.3.1", "private": true, "description": "Helps set up specific MSBuild tool into PATH for later usage.", "main": "lib/main.js",