diff --git a/Tasks/MSBuildV1/MSBuild.ps1 b/Tasks/MSBuildV1/MSBuild.ps1 index fe7184cb79d1..2aeded27d67f 100644 --- a/Tasks/MSBuildV1/MSBuild.ps1 +++ b/Tasks/MSBuildV1/MSBuild.ps1 @@ -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 diff --git a/Tasks/MSBuildV1/Tests/PassesArguments.ps1 b/Tasks/MSBuildV1/Tests/PassesArguments.ps1 index 773cb46b9582..70edb9b354ea 100644 --- a/Tasks/MSBuildV1/Tests/PassesArguments.ps1 +++ b/Tasks/MSBuildV1/Tests/PassesArguments.ps1 @@ -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. diff --git a/Tasks/MSBuildV1/task.json b/Tasks/MSBuildV1/task.json index adb8ec5ea03e..d0b32fa5fbbb 100644 --- a/Tasks/MSBuildV1/task.json +++ b/Tasks/MSBuildV1/task.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 186, + "Minor": 187, "Patch": 0 }, "demands": [ diff --git a/Tasks/MSBuildV1/task.loc.json b/Tasks/MSBuildV1/task.loc.json index 3eba64a0a4f1..3716d7537d8a 100644 --- a/Tasks/MSBuildV1/task.loc.json +++ b/Tasks/MSBuildV1/task.loc.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 186, + "Minor": 187, "Patch": 0 }, "demands": [ diff --git a/Tasks/VSBuildV1/Tests/PassesArguments.ps1 b/Tasks/VSBuildV1/Tests/PassesArguments.ps1 index e4a5518ec7e6..a712a9de0021 100644 --- a/Tasks/VSBuildV1/Tests/PassesArguments.ps1 +++ b/Tasks/VSBuildV1/Tests/PassesArguments.ps1 @@ -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. diff --git a/Tasks/VSBuildV1/VSBuild.ps1 b/Tasks/VSBuildV1/VSBuild.ps1 index a8fedef498dd..1d9d8dd070d9 100644 --- a/Tasks/VSBuildV1/VSBuild.ps1 +++ b/Tasks/VSBuildV1/VSBuild.ps1 @@ -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 diff --git a/Tasks/VSBuildV1/task.json b/Tasks/VSBuildV1/task.json index 1cb9690580f6..11a23c24c976 100644 --- a/Tasks/VSBuildV1/task.json +++ b/Tasks/VSBuildV1/task.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 183, + "Minor": 187, "Patch": 0 }, "demands": [ diff --git a/Tasks/VSBuildV1/task.loc.json b/Tasks/VSBuildV1/task.loc.json index 725b36c02d28..982903cf4d4d 100644 --- a/Tasks/VSBuildV1/task.loc.json +++ b/Tasks/VSBuildV1/task.loc.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 183, + "Minor": 187, "Patch": 0 }, "demands": [