Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
Fix event logging arg in build-test.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
sbomer committed Jan 11, 2019
1 parent a660c3c commit 8a15c6b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,10 @@ build_MSBuild_projects()
__BuildErr="$__LogsDir/${__BuildLogRootName}.${__BuildOS}.${__BuildArch}.${__BuildType}.err"

# Use binclashlogger by default if no other logger is specified
elif [[ "${extraBuildParameters[*]}" == *"/l:"* ]]; then
msbuildEventLoggingMSBuildArg=
if [[ "${extraBuildParameters[*]}" == *"/l:"* ]]; then
__msbuildEventLogging=
else
msbuildEventLoggingMSBuildArg="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log"
__msbuildEventLogging="/l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log"
fi

if [[ "$subDirectoryName" == "Tests_Managed" ]]; then
Expand Down Expand Up @@ -394,7 +394,7 @@ build_MSBuild_projects()
buildArgs+=("/p:UsePartialNGENOptimization=false" "/maxcpucount")

buildArgs+=("$projectName" "${__msbuildLog}" "${__msbuildWrn}" "${__msbuildErr}")
buildArgs+=("$msbuildEventLoggingMSBuildArg")
buildArgs+=("$__msbuildEventLogging")
buildArgs+=("${extraBuildParameters[@]}")
buildArgs+=("${__CommonMSBuildArgs[@]}")
buildArgs+=("${__UnprocessedBuildArgs[@]}")
Expand Down Expand Up @@ -426,7 +426,7 @@ build_MSBuild_projects()
buildArgs+=("/p:UsePartialNGENOptimization=false" "/maxcpucount")

buildArgs+=("$projectName" "${__msbuildLog}" "${__msbuildWrn}" "${__msbuildErr}")
buildArgs+=("$msbuildEventLoggingMSBuildArg")
buildArgs+=("$__msbuildEventLogging")
buildArgs+=("${extraBuildParameters[@]}")
buildArgs+=("${__CommonMSBuildArgs[@]}")
buildArgs+=("${__UnprocessedBuildArgs[@]}")
Expand Down

0 comments on commit 8a15c6b

Please sign in to comment.