Add the coreclr blob feed as a restore source for test builds. (#22839)

* Add the coreclr blob feed as a restore source for test builds.
* Use one NuGet.config in the root folder for restore targets.

diff --git a/NuGet.config b/NuGet.config
index 6c8b2e3..33e9d87 100644 (file)
--- a/NuGet.config
+++ b/NuGet.config
@@ -1,10 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <packageRestore>
+    <add key="enabled" value="True" />
+  </packageRestore>
   <packageSources>
     <clear />
-    <add key="arcade" value="https://dotnetfeed.blob.core.windows.net/dotnet-tools-internal/index.json" />
-    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-coreclr" value="https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json" />
+    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
+  <disabledPackageSources>
+    <clear />
+  </disabledPackageSources>
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+</configuration>
\ No newline at end of file

diff --git a/src/NuGet.Config b/src/NuGet.Config
deleted file mode 100644 (file)
index 57f1b8b..0000000
--- a/src/NuGet.Config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageRestore>
-    <add key="enabled" value="True" />
-  </packageRestore>
-  <packageSources>
-    <clear />
-    <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/" />
-  </packageSources>
-  <activePackageSource>
-    <add key="All" value="(Aggregate source)" />
-  </activePackageSource>
-</configuration>

diff --git a/tests/src/NuGet.Config b/tests/src/NuGet.Config
deleted file mode 100644 (file)
index 0922300..0000000
--- a/tests/src/NuGet.Config
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageRestore>
-    <add key="enabled" value="True" />
-  </packageRestore>
-  <packageSources>
-    <clear/>
-    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
-    <add key="myget.org nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-  <activePackageSource>
-    <add key="All" value="(Aggregate source)" />
-  </activePackageSource>
-</configuration>