mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2319 from dotnet/brthor/remove-nuget-config

Browse source 
Remove NuGet.config from the default dotnet new drop.
This commit is contained in:
Bryan Thornbury 2016-04-06 22:35:12 -07:00
commit 3e903438b3
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dotnet/commands/dotnet-new/CSharp_Console/NuGet.Config
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>

1
src/dotnet/commands/dotnet-new/FSharp_Console/NuGet.Config
View file

@ -3,7 +3,6 @@
<packageSources> <packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below --> <!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear /> <clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" /> <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" /> <add key="fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />

19
test/EndToEnd/EndToEndTest.cs
View file

@ -207,6 +207,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
catch(Exception) {} catch(Exception) {}
Directory.CreateDirectory(RestoredTestProjectDirectory); Directory.CreateDirectory(RestoredTestProjectDirectory);
WriteNuGetConfig(RestoredTestProjectDirectory);
var currentDirectory = Directory.GetCurrentDirectory(); var currentDirectory = Directory.GetCurrentDirectory();
Directory.SetCurrentDirectory(RestoredTestProjectDirectory); Directory.SetCurrentDirectory(RestoredTestProjectDirectory);
@ -243,6 +244,24 @@ namespace Microsoft.DotNet.Tests.EndToEnd
return isSupported; return isSupported;
} }
// Todo: this is a hack until corefx is on nuget.org remove this After RC 2 Release
private static void WriteNuGetConfig(string directory)
{
var contents = @"<?xml version=""1.0"" encoding=""utf-8""?>
<configuration>
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key=""dotnet-core"" value=""https://dotnet.myget.org/F/dotnet-core/api/v3/index.json"" />
<add key=""api.nuget.org"" value=""https://api.nuget.org/v3/index.json"" />
</packageSources>
</configuration>";
var path = Path.Combine(directory, "NuGet.config");
File.WriteAllText(path, contents);
}
private static DateTime GetLastWriteTimeUtcOfDirectoryFiles(string outputDirectory) private static DateTime GetLastWriteTimeUtcOfDirectoryFiles(string outputDirectory)
{ {
return Directory.EnumerateFiles(outputDirectory).Max(f => File.GetLastWriteTimeUtc(f)); return Directory.EnumerateFiles(outputDirectory).Max(f => File.GetLastWriteTimeUtc(f));