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

update version of nuget

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2016-03-07 09:34:18 -08:00
parent 5d78743324
commit 444e4f9fd7
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
TestAssets/TestProjects/TestAppWithContentPackage/NuGet.Config → TestAssets/TestProjects/NuGet.Config
View file

0
TestAssets/TestProjects/TestAppWithContentPackage/Packages/SharedContentA.1.0.0.nupkg → TestAssets/TestProjects/Packages/SharedContentA.1.0.0.nupkg
View file

2
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -6,7 +6,7 @@
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"System.Reflection.Metadata": "1.2.0-rc2-23901", "System.Reflection.Metadata": "1.2.0-rc2-23901",
"NuGet.Packaging": "3.4.0-beta-632", "NuGet.Packaging": "3.4.0-rtm-0724",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
"Microsoft.Extensions.JsonParser.Sources": { "Microsoft.Extensions.JsonParser.Sources": {
"type": "build", "type": "build",

6
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -180,7 +180,7 @@ namespace Microsoft.DotNet.Tools.Restore
Console.WriteLine($"Restoring Tool '{tooldep.Name}' for '{projectPath}' in '{tempPath}'"); Console.WriteLine($"Restoring Tool '{tooldep.Name}' for '{projectPath}' in '{tempPath}'");
File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"netstandardapp1.5"}, tooldep)); File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"netstandardapp1.5"}, tooldep));
return NuGet3.Restore(new [] { $"{projectPath}", "--runtime", $"{DefaultRid}"}.Concat(args), quiet) == 0; return NuGet3.Restore(new[] { $"{projectPath}" }.Concat(args), quiet) == 0;
} }
private static string GenerateProjectJsonContents(IEnumerable<string> frameworks, LibraryRange tooldep) private static string GenerateProjectJsonContents(IEnumerable<string> frameworks, LibraryRange tooldep)
@ -194,9 +194,11 @@ namespace Microsoft.DotNet.Tools.Restore
foreach (var framework in frameworks) foreach (var framework in frameworks)
{ {
var importsStatement = "\"imports\": [ \"dnxcore50\", \"portable-net452+win81\" ]"; var importsStatement = "\"imports\": [ \"dnxcore50\", \"portable-net452+win81\" ]";
sb.AppendLine($" \"{framework}\": {{ {importsStatement} }}"); sb.AppendLine($" \"{framework}\": {{ {importsStatement} }}");
} }
sb.AppendLine(" },");
sb.AppendLine(" \"runtimes\": { ");
sb.AppendLine($" \"{DefaultRid}\": {{}}");
sb.AppendLine(" }"); sb.AppendLine(" }");
sb.AppendLine("}"); sb.AppendLine("}");
var pjContents = sb.ToString(); var pjContents = sb.ToString();

2
src/dotnet/project.json
View file

@ -24,7 +24,7 @@
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02", "Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160225-02",
"Microsoft.DiaSymReader.Native": "1.3.3", "Microsoft.DiaSymReader.Native": "1.3.3",
"NuGet.CommandLine.XPlat": "3.4.0-beta-632", "NuGet.CommandLine.XPlat": "3.4.0-rtm-0724",
"System.CommandLine": "0.1.0-e160119-1", "System.CommandLine": "0.1.0-e160119-1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",

2
test/Installer/testmsi.ps1
View file

@ -42,7 +42,6 @@ pushd "$Stage2Dir\bin"
try { try {
.\dotnet restore ` .\dotnet restore `
--runtime win-anycpu `
$testDir ` $testDir `
-f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host -f https://www.myget.org/F/dotnet-buildtools/api/v3/index.json | Out-Host
@ -53,7 +52,6 @@ try {
.\dotnet publish ` .\dotnet publish `
--framework net46 ` --framework net46 `
--runtime win-anycpu `
--output $testBin ` --output $testBin `
$testDir | Out-Host $testDir | Out-Host