Restore first before dotnet pack

Change-Id: Ic151159a3d7287f06659f7d58c3a6e6b1dedc98f

diff --git a/Tools/dotnet-build.sh b/Tools/dotnet-build.sh
index 0a8cece..d33ecb1 100755 (executable)
--- a/Tools/dotnet-build.sh
+++ b/Tools/dotnet-build.sh
@@ -42,7 +42,6 @@ cmd_build() {
 
 cmd_pack() {
   local OPTS=""
-  local PRE_OPTS=""
   [ -n "$CONFIGURATION" ] && OPTS="$OPTS -c $CONFIGURATION"
   [ -n "$VERSION" ] && OPTS="$OPTS /p:Version=$VERSION"
   if [[ $PROJECT == *".nuspec" ]]; then
@@ -51,10 +50,9 @@ cmd_pack() {
     TMPDIR=$(mktemp -d)
     cp $SCRIPT_DIR/dummypack.csproj $TMPDIR
     PROJECT=$TMPDIR/dummypack.csproj
-  else
-    PRE_OPTS="$PRE_OPTS --no-restore"
+    run_dotnet restore $PROJECT -s /nuget/
   fi
-  run_dotnet pack --no-build $PRE_OPTS $PROJECT $OPTS $@ /p:UsingRPMMacro=true
+  run_dotnet pack --no-build --no-restore $PRE_OPTS $PROJECT $OPTS $@ /p:UsingRPMMacro=true
 }
 
 cmd_install() {