mirror of
https://github.com/microsoft/setup-msbuild.git
synced 2026-10-05 16:44:15 +07:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b20eeebd7e |
No files matched your search
Vendored
+1
-18
@@ -114,30 +114,13 @@ function run() {
|
||||
core.setFailed('Unable to find MSBuild.');
|
||||
return;
|
||||
}
|
||||
core.info(`Found MSBuild tool path: ${foundToolPath}`);
|
||||
core.info(`Using MSBuild architecture: ${MSBUILD_ARCH}`);
|
||||
// try to get the MSBuild version for diagnostic purposes; a failure here shouldn't fail the action
|
||||
try {
|
||||
let msbuildVersion = '';
|
||||
const versionOptions = {};
|
||||
versionOptions.listeners = {
|
||||
stdout: (data) => {
|
||||
msbuildVersion += data.toString();
|
||||
}
|
||||
};
|
||||
yield exec.exec(`"${foundToolPath}" -version -nologo`, [], versionOptions);
|
||||
core.info(`Found MSBuild version: ${msbuildVersion.trim()}`);
|
||||
}
|
||||
catch (error) {
|
||||
core.debug(`Unable to determine MSBuild version: ${error.message}`);
|
||||
}
|
||||
// extract the folder location for the tool
|
||||
const toolFolderPath = path.dirname(foundToolPath);
|
||||
// set the outputs for the action to the folder path of msbuild
|
||||
core.setOutput('msbuildPath', toolFolderPath);
|
||||
// add tool path to PATH
|
||||
core.addPath(toolFolderPath);
|
||||
core.info(`Tool path added to PATH: ${toolFolderPath}`);
|
||||
core.debug(`Tool path added to PATH: ${toolFolderPath}`);
|
||||
}
|
||||
catch (error) {
|
||||
core.setFailed(error.message);
|
||||
|
||||
Generated
+8
-7
@@ -23,7 +23,7 @@
|
||||
"eslint-plugin-jest": "^22.21.0",
|
||||
"jest": "^24.9.0",
|
||||
"jest-circus": "^24.9.0",
|
||||
"js-yaml": "^3.13.1",
|
||||
"js-yaml": "^3.15.2",
|
||||
"prettier": "^1.19.1",
|
||||
"ts-jest": "^24.2.0",
|
||||
"typescript": "^3.6.4"
|
||||
@@ -5262,10 +5262,11 @@
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/js-yaml": {
|
||||
"version": "3.13.1",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
|
||||
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
|
||||
"version": "3.15.2",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
|
||||
"integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"argparse": "^1.0.7",
|
||||
"esprima": "^4.0.0"
|
||||
@@ -12461,9 +12462,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"js-yaml": {
|
||||
"version": "3.13.1",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
|
||||
"integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
|
||||
"version": "3.15.2",
|
||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.2.tgz",
|
||||
"integrity": "sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"argparse": "^1.0.7",
|
||||
|
||||
+1
-1
@@ -42,7 +42,7 @@
|
||||
"eslint-plugin-jest": "^22.21.0",
|
||||
"jest": "^24.9.0",
|
||||
"jest-circus": "^24.9.0",
|
||||
"js-yaml": "^3.13.1",
|
||||
"js-yaml": "^3.15.2",
|
||||
"prettier": "^1.19.1",
|
||||
"ts-jest": "^24.2.0",
|
||||
"typescript": "^3.6.4"
|
||||
|
||||
+1
-19
@@ -118,24 +118,6 @@ async function run(): Promise<void> {
|
||||
return
|
||||
}
|
||||
|
||||
core.info(`Found MSBuild tool path: ${foundToolPath}`)
|
||||
core.info(`Using MSBuild architecture: ${MSBUILD_ARCH}`)
|
||||
|
||||
// try to get the MSBuild version for diagnostic purposes; a failure here shouldn't fail the action
|
||||
try {
|
||||
let msbuildVersion = ''
|
||||
const versionOptions: ExecOptions = {}
|
||||
versionOptions.listeners = {
|
||||
stdout: (data: Buffer) => {
|
||||
msbuildVersion += data.toString()
|
||||
}
|
||||
}
|
||||
await exec.exec(`"${foundToolPath}" -version -nologo`, [], versionOptions)
|
||||
core.info(`Found MSBuild version: ${msbuildVersion.trim()}`)
|
||||
} catch (error) {
|
||||
core.debug(`Unable to determine MSBuild version: ${error.message}`)
|
||||
}
|
||||
|
||||
// extract the folder location for the tool
|
||||
const toolFolderPath = path.dirname(foundToolPath)
|
||||
|
||||
@@ -144,7 +126,7 @@ async function run(): Promise<void> {
|
||||
|
||||
// add tool path to PATH
|
||||
core.addPath(toolFolderPath)
|
||||
core.info(`Tool path added to PATH: ${toolFolderPath}`)
|
||||
core.debug(`Tool path added to PATH: ${toolFolderPath}`)
|
||||
} catch (error) {
|
||||
core.setFailed(error.message)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user