File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -1652,7 +1652,7 @@ const IS_WINDOWS = process.platform === 'win32';
1652
1652
const VS_VERSION = core . getInput ( 'vs-version' ) || 'latest' ;
1653
1653
const VSWHERE_PATH = core . getInput ( 'vswhere-path' ) ;
1654
1654
const ALLOW_PRERELEASE = core . getInput ( 'vs-prerelease' ) || 'false' ;
1655
- const MSBUILD_ARCH = core . getInput ( 'msbuild-architecture' ) || 'x86' ;
1655
+ let MSBUILD_ARCH = core . getInput ( 'msbuild-architecture' ) || 'x86' ;
1656
1656
// if a specific version of VS is requested
1657
1657
let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest ' ;
1658
1658
if ( ALLOW_PRERELEASE === 'true' ) {
@@ -1703,6 +1703,10 @@ function run() {
1703
1703
core . debug ( `Found installation path: ${ installationPath } ` ) ;
1704
1704
// x64 and arm64 only exist in one possible location, so no fallback probing
1705
1705
if ( MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64' ) {
1706
+ // x64 is actually amd64 so change to that
1707
+ if ( MSBUILD_ARCH === 'x64' ) {
1708
+ MSBUILD_ARCH = 'amd64' ;
1709
+ }
1706
1710
let toolPath = path . join ( installationPath , `MSBuild\\Current\\Bin\\${ MSBUILD_ARCH } \\MSBuild.exe` ) ;
1707
1711
core . debug ( `Checking for path: ${ toolPath } ` ) ;
1708
1712
if ( ! fs . existsSync ( toolPath ) ) {
Original file line number Diff line number Diff line change @@ -9,7 +9,7 @@ const IS_WINDOWS = process.platform === 'win32'
9
9
const VS_VERSION = core . getInput ( 'vs-version' ) || 'latest'
10
10
const VSWHERE_PATH = core . getInput ( 'vswhere-path' )
11
11
const ALLOW_PRERELEASE = core . getInput ( 'vs-prerelease' ) || 'false'
12
- const MSBUILD_ARCH = core . getInput ( 'msbuild-architecture' ) || 'x86'
12
+ let MSBUILD_ARCH = core . getInput ( 'msbuild-architecture' ) || 'x86'
13
13
14
14
// if a specific version of VS is requested
15
15
let VSWHERE_EXEC = '-products * -requires Microsoft.Component.MSBuild -property installationPath -latest '
@@ -73,6 +73,10 @@ async function run(): Promise<void> {
73
73
74
74
// x64 and arm64 only exist in one possible location, so no fallback probing
75
75
if ( MSBUILD_ARCH === 'x64' || MSBUILD_ARCH === 'arm64' ) {
76
+ // x64 is actually amd64 so change to that
77
+ if ( MSBUILD_ARCH === 'x64' ) {
78
+ MSBUILD_ARCH = 'amd64'
79
+ }
76
80
let toolPath = path . join (
77
81
installationPath ,
78
82
`MSBuild\\Current\\Bin\\${ MSBUILD_ARCH } \\MSBuild.exe`
You can’t perform that action at this time.
0 commit comments