Skip to content

Commit

Permalink
MSBuild task has been updated - build log file will be created only w…
Browse files Browse the repository at this point in the history
…hen createLogFile = true (#14769)

* Debug switch has been removed from creation of log file

* Patch version has been changed

* Version, Task ID and Name have been changed

* ID and Task Name have been restored

* Description has been restored

* Test\PassedArrguments has been modified

* Try to fix tests

* VSBuild has been modified

* package.json and package-lock.json have been reverted from master branch

* MSBuildV1\package-lock.json has been reverted from master

* MSBuild and VSBuild versions have been updatet to 1.187.0

Co-authored-by: Andrey Mishechkin <[email protected]>
  • Loading branch information
andy-mishechkin and Andrey Mishechkin authored Apr 26, 2021
1 parent 923a354 commit c345a93
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Tasks/MSBuildV1/MSBuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ try {
[bool]$maximumCpuCount = Get-VstsInput -Name MaximumCpuCount -AsBool
[bool]$restoreNuGetPackages = Get-VstsInput -Name RestoreNuGetPackages -AsBool
[bool]$logProjectEvents = Get-VstsInput -Name LogProjectEvents -AsBool
[bool]$createLogFile = (Get-VstsInput -Name CreateLogFile -AsBool) -or $debug
[bool]$createLogFile = (Get-VstsInput -Name CreateLogFile -AsBool)
[string]$logFileVerbosity = if ($debug) { "diagnostic" } else { Get-VstsInput -Name LogFileVerbosity }
[string]$msBuildVersion = Get-VstsInput -Name MSBuildVersion
[string]$msBuildArchitecture = Get-VstsInput -Name MSBuildArchitecture
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MSBuildV1/Tests/PassesArguments.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ foreach ($variableSet in $variableSets) {
Register-Mock Select-MSBuildPath { 'Some location' } -- -Method 'Some input method' -Location 'Some input location' -PreferredVersion 'Some input version' -Architecture 'Some input architecture'
Register-Mock Invoke-BuildTools { 'Some build output line 1', 'Some build output line 2' }

$ExpectedCreateLogFile = if ($variableSet.Debug) { $true } else { $variableSet.CreateLogFile }
$ExpectedCreateLogFile = $variableSet.CreateLogFile
$ExpectedLogFileVerbosity = if ($variableSet.Debug) { 'diagnostic' } else { $variableSet.LogFileVerbosity }

# Act.
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MSBuildV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 186,
"Minor": 187,
"Patch": 0
},
"demands": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/MSBuildV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 186,
"Minor": 187,
"Patch": 0
},
"demands": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VSBuildV1/Tests/PassesArguments.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ foreach ($variableSet in $variableSets) {
Register-Mock Format-MSBuildArguments { 'Some formatted arguments' } -- -MSBuildArguments 'Some input arguments' -Platform 'Some input platform' -Configuration 'Some input configuration' -VSVersion $variableSet.VSVersion -MaximumCpuCount: $variableSet.MaximumCpuCount
Register-Mock Invoke-BuildTools { 'Some build output' }

$ExpectedCreateLogFile = if ($variableSet.Debug) { $true } else { $variableSet.CreateLogFile }
$ExpectedCreateLogFile = $variableSet.CreateLogFile
$ExpectedLogFileVerbosity = if ($variableSet.Debug) { 'diagnostic' } else { $variableSet.LogFileVerbosity }

# Act.
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VSBuildV1/VSBuild.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ try {
[bool]$maximumCpuCount = Get-VstsInput -Name MaximumCpuCount -AsBool
[bool]$restoreNugetPackages = Get-VstsInput -Name RestoreNugetPackages -AsBool
[bool]$logProjectEvents = Get-VstsInput -Name LogProjectEvents -AsBool
[bool]$createLogFile = (Get-VstsInput -Name CreateLogFile -AsBool) -or $debug
[bool]$createLogFile = Get-VstsInput -Name CreateLogFile -AsBool
[string]$logFileVerbosity = if ($debug) { "diagnostic" } else { Get-VstsInput -Name LogFileVerbosity }
[bool]$enableDefaultLogger = Get-VstsInput -Name EnableDefaultLogger -AsBool

Expand Down
2 changes: 1 addition & 1 deletion Tasks/VSBuildV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 183,
"Minor": 187,
"Patch": 0
},
"demands": [
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VSBuildV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 183,
"Minor": 187,
"Patch": 0
},
"demands": [
Expand Down

0 comments on commit c345a93

Please sign in to comment.