Fix dotnet-wrapper to disable nodeReuse

Change-Id: I734c7ff46a6f4027599e49792f1283752fcf5921

diff --git a/tools/dotnet-wrapper.sh b/tools/dotnet-wrapper.sh
index 0b73238..0ef3f90 100755 (executable)
--- a/tools/dotnet-wrapper.sh
+++ b/tools/dotnet-wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 DOTNET_CLI_PATH=/usr/share/dotnet-build-tools/sdk/dotnet
 
@@ -7,9 +7,8 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
 export DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=2
 export MSBUILDDISABLENODEREUSE=true
 
-if [ "$1" == "msbuild" ]; then
-  ARGS="$@ /nodeReuse:false /p:UseSharedCompilation=false"
-elif [ "$1" == "restore" ]; then
+CMD=$1
+if [ "$CMD" == "restore" ]; then
   while [[ $# -gt 0 ]]; do
     x="$1"
     if [ $x == "-s" ] || [ $x == "--source" ]; then
@@ -22,11 +21,13 @@ elif [ "$1" == "restore" ]; then
     fi
     shift
   done
-elif [ "$1" == "build" ]; then
-  ARGS="$@ /p:UseSharedCompilation=false"
 else
   ARGS="$@"
 fi
 
+if [ "$CMD" == "msbuild" -o "$CMD" == "build" -o  "$CMD" == "restore" ] ; then
+  ARGS+=" /nodeReuse:false /p:UseSharedCompilation=false"
+fi
+
 echo $DOTNET_CLI_PATH $ARGS
 $DOTNET_CLI_PATH $ARGS