Fix for path issue for VS 2019 described in comments of #278#283
Merged
devblackops merged 1 commit intopsake:masterfrom Aug 16, 2019
jaymclain:master
Merged
Fix for path issue for VS 2019 described in comments of #278#283devblackops merged 1 commit intopsake:masterfrom jaymclain:master
devblackops merged 1 commit intopsake:masterfrom
jaymclain:master
Conversation
|
I think - after reading the CONRIBUTING document - you need to move the PR from master to a feature-branch and then do a pull request from there. Maybe that might help to get it accepted. |
devblackops
reviewed
Jul 25, 2019
devblackops
added a commit
to devblackops/psake
that referenced
this pull request
Aug 16, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix issues described in #278, where the path for 15.0 tools is determined when only 16.0 tools are installed.
Description
The logic in ConfigureBuildEnvironment which determines $frameworkDirs was incorrectly including 16.0 (e.g. VS 2019) in it's version lookup. If 16.0+ of VSSetupInstance existed, the $frameworkDir would incorrectly be set to MSBuild\15.0\Bin\amd64.
Change the logic to constrain version search to [15.0, 16.0) for $buildToolsVersions containing "15.0", and allowing [16.0, ] to be considered for "16.0"
Also, include MSBuild 16.0 in the 4.8 environment configuration path.
Related Issue
#278
Motivation and Context
Allows building when only VS 2019 (or tools) are installed.
How Has This Been Tested?
Executed .\build.ps1 Build && .\build.ps1 Test

Locally on two machines -
1 containing VS 2019 Professional only,
1 containing VS 2017 build tools (https://visualstudio.microsoft.com/thank-you-downloading-visual-studio/?sku=BuildTools&rel=15&src=myvs) and VS 2019 Professional
Screenshots (if appropriate):
Types of changes
Checklist: