Small fixes #21982
Merged
Small fixes #21982
Conversation
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
nits: - remove extra configure-toolset.ps1|sh imports - remove duplicate `/v:$verbosity` addition to `msbuild` command line from build.sh
Pilchie
added
the
area-infrastructure
dougbu
commented
May 19, 2020
|
/azp run |
|
Azure Pipelines successfully started running 2 pipeline(s). |
wtgodbe
approved these changes
May 19, 2020
dougbu
commented
May 19, 2020
| if (Test-Path $configureToolsetScript) { | ||
| . $configureToolsetScript | ||
| } | ||
|
|
There was a problem hiding this comment.
This was old cruft. Sourcing tools.ps1 sources this file for us already and makes all settings available in this scope. Same for the similar block near the end of build.sh.
| # Set verbosity | ||
| echo "Setting msbuild verbosity to $verbosity" | ||
| msbuild_args[${#msbuild_args[*]}]="-verbosity:$verbosity" | ||
|
|
There was a problem hiding this comment.
If I didn't remove this, we end up with extra options on the msbuild command line because tools.sh handles $verbosity itself. Doesn't matter much but also doesn't help at all.
| # Add default .binlog location if not already on the command line. tools.ps1 does not handle this; it just checks | ||
| # $BinaryLog, $CI and $ExcludeCIBinarylog values for an error case. But tools.ps1 provides a nice function to help. | ||
| if ($BinaryLog) { | ||
| $bl = GetMSBuildBinaryLogCommandLineArgument($MSBuildArguments) |
There was a problem hiding this comment.
This and the similar for loop in build.sh are somewhat better than was here before. The scripts won't bother to add a /bl:Build.binlog option if anything one starting with /bl: or /binaryLogger: (plus -bl: or -binaryLogger: in the build.sh case) already exists.
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.
$BinaryLog