Merge pull request #2147 from dotnet-bot/from-tfs

Merge changes from TFS

Author: stephentoub

dir.props

@@ -57,16 +57,27 @@
     <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand>
   </PropertyGroup>
 
+  <!-- list of nuget package sources passed to dnu -->
+  <ItemGroup>
+    <DnuSourceList Include="https://www.myget.org/F/dotnet-core/" />
+    <DnuSourceList Include="https://www.myget.org/F/dotnet-coreclr/" />
+    <DnuSourceList Include="https://www.myget.org/F/dotnet-corefx/" />
+    <DnuSourceList Include="https://www.myget.org/F/dotnet-corefxtestdata/" />
+    <DnuSourceList Include="https://www.myget.org/F/dotnet-buildtools/" />
+    <DnuSourceList Include="https://www.nuget.org/api/v2/" />
+  </ItemGroup>
 
   <PropertyGroup>
     <DnxPackageDir Condition="'$(DnxPackageDir)'==''">$(PackagesDir)/$(DnxPackageName)/</DnxPackageDir>
     <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'!='Unix'">$(DnxPackageDir)\bin\dnu.cmd</DnuToolPath>
     <DnuToolPath Condition="'$(DnuToolPath)'=='' and '$(OsEnvironment)'=='Unix'">$(DnxPackageDir)/bin/dnu</DnuToolPath>
 
+    <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource>
+
     <DnuRestoreCommand>"$(DnuToolPath)"</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) --parallel</DnuRestoreCommand>
-    <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/'))"</DnuRestoreCommand>
+    <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/'))" $(DnuRestoreSource)</DnuRestoreCommand>
     <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand>
   </PropertyGroup>
 

dir.targets

@@ -87,14 +87,6 @@
     <!-- Restore build tools -->
     <Exec Command="$(_RestoreBuildToolsCommand)" StandardOutputImportance="Low" />
 
-    <!-- currently DNU doesn't support -ConfigFile: https://github.com/aspnet/dnx/issues/1693
-         Our DnuRestoreCommand doesn't force a config file  and we rely on the
-         directory probing for it to find nuget.config.  This works for restore from source,
-         but not restore from PackagesDir as happens for test project restore since PackagesDir
-         will not be under src.  To workaround, copy our nuget.config to packages. -->
-    <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(PackagesDir)" SkipUnchangedFiles="true" />
-    <Copy Condition="Exists('$(NuGetConfigFile)')" SourceFiles="$(NuGetConfigFile)" DestinationFolder="$(IntermediateOutputRootPath)" SkipUnchangedFiles="true" />
-
     <!-- Add DNU and Roslyn tool execute rights -->
     <Exec Condition="'$(OsEnvironment)'=='Unix'"
           Command="chmod a+x &quot;$(DnxPackageDir)/bin/dnu&quot;" />

src/NuGet.Config

@@ -3,12 +3,13 @@
   <packageRestore>
     <add key="enabled" value="True" />
   </packageRestore>
+  <!--
+    this is used for boot-strapping build tools.  if you need to add a new
+    nuget package source please add it to the item group in dir.props instead.
+  -->
   <packageSources>
     <clear/>
-    <add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/" />
-    <add key="myget.org dotnet-corefxtestdata" value="https://www.myget.org/F/dotnet-corefxtestdata/" />
     <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
   </packageSources>
   <config>
     <add key="repositoryPath" value="..\packages" />