Upgrade CLI version and buildtools, and make build file changes.

Unset CORE_ROOT in environment on Windows before doing restore so that dotnet CLI doesn't try to run using binaries from the test CORE_ROOT.

Restore the xunit wrapper projects in a batch rather than individually to save a lot of time.

Work around xunit.runner.msbuild not having compatible package layout by ignoring errors and adding import so that a future fix will work.

Hard-code C# language for generated wrapper projects: the $(Language) property wasn't set.

Also Change www.myget.org to dotnet.myget.org, as we switched to enterprise myget.

Add System.ObjectModel to tests\src\JIT\config\benchmark+serialize\project.json to manually upgrade it to a version that doesn't require lifting for runtime. This fixes System.ObjectModel.dll being missing from CORE_ROOT and causing the test to fail.

Switch to v3 nuget feeds and sync NuGet.Configs.

1 files changed, 20 insertions, 6 deletions

diff --git a/tests/runtest.proj b/tests/runtest.proj
index 33507aead0..f882a466ea 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -84,7 +84,6 @@ $(_XunitEpilog)
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <SolutionDir Condition="%24(SolutionDir) == '' Or %24(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <RestorePackages>true</RestorePackages>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <IsTestProject>true</IsTestProject>
@@ -132,7 +131,9 @@ $(_XunitEpilog)
     "xunit.runner.msbuild": "2.1.0"
   },
   "frameworks": {
-    "net45": {}
+    "net45": {
+      "imports": "portable-net45+win8"
+    }
   }
 }
       ]]>
@@ -160,9 +161,11 @@ $(_XunitEpilog)
       File="$(XunitWrapperSrcDir)\project.json"
       Lines="$(XunitWrapperGenPackConfig)"
       Overwrite="true" />
-
-    <MSBuild Projects="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj" />
-
+  </Target>
+  
+  <Target Name="BuildXunitWrapper">
+    <MSBuild Projects="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj"
+             Properties="RestorePackages=false"/>
   </Target>
 
   <Target Name="CreateXunitFacts">
@@ -299,6 +302,16 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
 
   <Target Name="CreateAllWrappers" DependsOnTargets="GetListOfTestCmds;FindCmdDirectories">
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" />
+
+    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." />
+    <!-- Restore all wrapper projects' project.jsons in one pass for perf & to avoid concurrency problems -->
+    <Exec Command="$(DnuRestoreCommand) &quot;$(XunitWrapperGeneratedCSDirBase.TrimEnd('\\'))&quot;"
+          StandardOutputImportance="Low"
+          CustomErrorRegularExpression="^Unable to locate .*"
+          ContinueOnError="WarnAndContinue" />
+    <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." />
+
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="BuildXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" />
   </Target>
 
   <Target Name="GetListOfTestCmds">
@@ -312,7 +325,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
 
   <Target Name="CreateTestOverlay">
     <MSBuild Projects="$(MSBuildProjectFile)"
-             Targets="CopyDependecyToCoreRoot"/>
+             Targets="CopyDependecyToCoreRoot"
+             Properties="Language=C#" />
   </Target>
 
   <!-- All the test projects need to add dependency to currently built runtime as they require that to run.