Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't hardcode the path to v141 platform toolset #3434

Merged
merged 27 commits into from
Oct 18, 2019
Merged

Don't hardcode the path to v141 platform toolset #3434

Changes from 2 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
eb05ae5
Don't hardcode the path to v141 platform toolset
Oct 16, 2019
5259e65
fix linting
Oct 16, 2019
e8526ce
Change files
Oct 16, 2019
b842623
Support 2017/2019 installs and side-by-side installs
Oct 17, 2019
c3fa729
eslint
Oct 17, 2019
e59d5bf
pass verbose to msbuildtools functions
Oct 17, 2019
36e4570
require v141 tools but not UWP since that doesn't seem necessary
Oct 17, 2019
4d0205d
print out VS component list
Oct 17, 2019
f9cd558
bump
Oct 17, 2019
c3d1218
bump
Oct 17, 2019
75568e1
dump
Oct 17, 2019
02e7472
bump
Oct 17, 2019
0028d0e
bump
Oct 17, 2019
a03bba6
bump
Oct 17, 2019
456dc75
bump
Oct 17, 2019
3f50304
bump
Oct 17, 2019
91c83a0
bump
Oct 17, 2019
0ee6a70
bump
Oct 17, 2019
f92ffce
bump
Oct 17, 2019
aa97611
bump
Oct 17, 2019
6ebc102
bump
Oct 17, 2019
8bfe689
bump
Oct 17, 2019
fd46b52
bump
Oct 17, 2019
9221747
run shell instead of installer
Oct 17, 2019
35449a4
bump
Oct 17, 2019
d283956
install UWP v141 in the lab
Oct 18, 2019
1d1541d
per-arch v141 package stuff
Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions vnext/local-cli/runWindows/utils/msbuildtools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/
// @ts-check
'use strict';

const EOL = require('os').EOL;
const fs = require('fs');
const path = require('path');
Expand Down Expand Up @@ -65,11 +64,21 @@ class MSBuildTools {

// Set platform toolset for VS 2019
if (this.version === '16.0') {
const results =
child_process
.execSync(
'"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe" -requires Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 -property installationPath',
)
.toString()
.split(EOL)[0] + '\\MSBuild\\Microsoft\\VC\\v150\\';
JunielKatarn marked this conversation as resolved.
Show resolved Hide resolved

console.warn('v141Path = ' + results);
asklar marked this conversation as resolved.
Show resolved Hide resolved

args.push('/p:PlatformToolset=v141');
args.push('/p:VisualStudioVersion=16.0');
args.push(
'/p:VCTargetsPath=C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Microsoft\\VC\\v150\\',
);
args.push('/p:VCTargetsPath=' + results);

console.warn(args.join(' '));
}

if (config) {
Expand Down