From 0d71a87375bfa54af10b68b74a4c8d93430ed308 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Tue, 23 Feb 2016 14:37:36 -0600
Subject: 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.
---
 src/NuGet.Config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/NuGet.Config')

diff --git a/src/NuGet.Config b/src/NuGet.Config
index e821d142f2..0054b4914e 100644
--- a/src/NuGet.Config
+++ b/src/NuGet.Config
@@ -4,9 +4,8 @@
     <add key="enabled" value="True" />
   </packageRestore>
   <packageSources>
-    <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />
+    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-    <add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
-- 
cgit v1.2.3