dotnet-restore fix

add rid to all restores in test

Add Rid to appdep script, fix common

more script fixes!

fixes

script fix

script fix

Fix up the Runtests script

more fixes :)

scripts/build/build_appdeps.sh

@@ -25,7 +25,7 @@ popd
 
 ## App Deps ##
 pushd $APPDEPS_PROJECT_DIR
-dotnet restore --packages $APPDEPS_PROJECT_DIR/packages $DISABLE_PARALLEL
+dotnet restore --runtime $RID --packages $APPDEPS_PROJECT_DIR/packages $DISABLE_PARALLEL
 APPDEP_SDK=$APPDEPS_PROJECT_DIR/packages/toolchain*/*/
 popd
 

scripts/common/_common.sh

@@ -40,8 +40,7 @@ source "$COMMONDIR/_configuration.sh"
 
 #TODO this is a workaround for a nuget bug on ubuntu. Remove
 export DISABLE_PARALLEL=""
-[[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL="--disable-parallel" && echo "heyheyhey"
+[[ "$RID" =~ "ubuntu" ]] && export DISABLE_PARALLEL="--disable-parallel"
-
 
 unset COMMONSOURCE
 unset COMMONDIR

scripts/test/build-tests.sh

@@ -17,10 +17,10 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 source "$DIR/../common/_common.sh"
 
-for project in loadTestList()
+PROJECTS=$(loadTestProjectList)
+
+for project in $PROJECTS
 do
-    dotnet publish --framework "dnxcore50" --runtime "$Rid" --output "$TestBinRoot" --configuration "$CONFIGURATION" "$REPOROOT/test/$project"
+    dotnet publish --framework "dnxcore50" --runtime "$RID" --output "$TEST_BIN_ROOT" --configuration "$CONFIGURATION" "$REPOROOT/test/$project"
 done
 
-# TODO: Remove this when publish paths change back
-cp -a "$TestBinRoot/Debug/dnxcore50/." "$TestBinRoot"

scripts/test/restore-tests.ps1

@@ -9,4 +9,3 @@ info "Restoring Test Projects"
 
 # Restore packages
 & dotnet restore "$RepoRoot\test" -f "$TestPackageDir"
-

scripts/test/restore-tests.sh

@@ -18,4 +18,4 @@ source "$DIR/../common/_common.sh"
 
 header "Restoring Test Packages"
 
-dotnet restore "$REPOROOT/test" -f "$TEST_PACKAGE_DIR" $DISABLE_PARALLEL
+dotnet restore "$REPOROOT/test" --runtime $RID -f "$TEST_PACKAGE_DIR/debug" $DISABLE_PARALLEL

scripts/test/run-tests.sh

@@ -16,17 +16,17 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 source "$DIR/../common/_common.sh"
 
-local TestProjects=$(loadTestProjectList)
+TestProjects=$(loadTestProjectList)
-local TestScripts=$(loadTestScriptList)
+TestScripts=$(loadTestScriptList)
 
-local failedTests=()
+failedTests=()
-local failCount=0
+failCount=0
 
-# Copy TestProjects to $TestBinRoot
+# Copy TestProjects to $TEST_BIN_ROOT
-mkdir -p "$TestBinRoot/TestProjects"
+mkdir -p "$TEST_BIN_ROOT/TestProjects"
-cp -a $REPOROOT/test/TestProjects/* $TestBinRoot/TestProjects
+cp -a $REPOROOT/test/TestProjects/* $TEST_BIN_ROOT/TestProjects
 
-pushd "$TestBinRoot"
+pushd "$TEST_BIN_ROOT"
 set +e
 
 for project in $TestProjects
@@ -42,7 +42,8 @@ done
 popd
 
 for script in $TestScripts
-    local scriptName=${script}.sh
+do
+    scriptName=${script}.sh
 
     "$REPOROOT/scripts/test/${scriptName}"
     exitCode=$?
@@ -54,7 +55,7 @@ done
 
 for test in ${failedTests[@]}
 do
-    error "$test failed. Logs in '$TestBinRoot/${test}-testResults.xml'"
+    error "$test failed. Logs in '$TEST_BIN_ROOT/${test}-testResults.xml'"
 done
 
 set -e

scripts/test/setup/restore-test-prerequisites.sh

@@ -17,8 +17,8 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 source "$DIR/../../common/_common.sh"
 
 header "Restoring packages"
-dotnet restore "$REPOROOT/test/TestPackages" --quiet $DISABLE_PARALLEL
+dotnet restore "$REPOROOT/test/TestPackages" --runtime $RID --quiet $DISABLE_PARALLEL
 
 set +e
-dotnet restore "$REPOROOT/testapp"  $DISABLE_PARALLEL >/dev/null 2>&1
+dotnet restore "$REPOROOT/testapp" --runtime $RID  $DISABLE_PARALLEL >/dev/null 2>&1
 set -e

src/dotnet-restore/Program.cs

@@ -41,8 +41,9 @@ namespace Microsoft.DotNet.Tools.Restore
             if (!args.Any(s => s.Equals("--runtime", StringComparison.OrdinalIgnoreCase)))
             {
                 args = Enumerable.Concat(
-                    PlatformServices.Default.Runtime.GetOverrideRestoreRuntimeIdentifiers().SelectMany(r => new [] { "--runtime", r }),
+                    args,
-                    args).ToArray();
+                    PlatformServices.Default.Runtime.GetOverrideRestoreRuntimeIdentifiers().SelectMany(r => new [] { "--runtime", r })
+                    ).ToArray();
             }
 
             app.OnExecute(() =>