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

Merge pull request #4279 from livarcocc/update_nuget

Browse source 
Bumping nuget to 3.6.0-beta.1.msbuild.17
This commit is contained in:
Livar 2016-09-29 15:34:07 -07:00 • committed by GitHub
commit bbf9fe92cf
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_projects/dotnet-cli-build/project.json
View file

@ -20,7 +20,7 @@
"System.Runtime.Serialization.Primitives": "4.1.1",
"System.Xml.XmlSerializer": "4.0.11",
"WindowsAzure.Storage": "6.2.2-preview",
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.16",
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.17",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00043-160929",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933"
},

2
src/Microsoft.DotNet.Cli.Utils/CommandResolution/ToolPathCalculator.cs
View file

@ -57,7 +57,7 @@ namespace Microsoft.DotNet.Cli.Utils
GetBaseToolPath(packageId),
version.ToNormalizedString().ToLowerInvariant(),
framework.GetShortFolderName(),
"project.lock.json");
"project.assets.json");
}
private string GetBaseToolPath(string packageId)

8
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -9,10 +9,10 @@
"target": "project"
},
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933",
"NuGet.Versioning": "3.6.0-beta.1.msbuild.16",
"NuGet.Packaging": "3.6.0-beta.1.msbuild.16",
"NuGet.Frameworks": "3.6.0-beta.1.msbuild.16",
"NuGet.ProjectModel": "3.6.0-beta.1.msbuild.16"
"NuGet.Versioning": "3.6.0-beta.1.msbuild.17",
"NuGet.Packaging": "3.6.0-beta.1.msbuild.17",
"NuGet.Frameworks": "3.6.0-beta.1.msbuild.17",
"NuGet.ProjectModel": "3.6.0-beta.1.msbuild.17"
},
"frameworks": {
"net451": {

2
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -14,7 +14,7 @@
"Microsoft.DotNet.Files": {
"target": "project"
},
"NuGet.ProjectModel": "3.6.0-beta.1.msbuild.16"
"NuGet.ProjectModel": "3.6.0-beta.1.msbuild.17"
},
"frameworks": {
"net451": {

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

@ -8,10 +8,10 @@
"Microsoft.Extensions.DependencyModel": "1.0.1-beta-000933",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000933",
"Newtonsoft.Json": "9.0.1",
"NuGet.Configuration": "3.6.0-beta.1.msbuild.16",
"NuGet.Packaging": "3.6.0-beta.1.msbuild.16",
"NuGet.RuntimeModel": "3.6.0-beta.1.msbuild.16",
"NuGet.ProjectModel": "3.6.0-beta.1.msbuild.16",
"NuGet.Configuration": "3.6.0-beta.1.msbuild.17",
"NuGet.Packaging": "3.6.0-beta.1.msbuild.17",
"NuGet.RuntimeModel": "3.6.0-beta.1.msbuild.17",
"NuGet.ProjectModel": "3.6.0-beta.1.msbuild.17",
"System.Reflection.Metadata": "1.4.1-beta-24410-02"
},
"frameworks": {

2
src/redist/project.json
View file

@ -27,7 +27,7 @@
"Microsoft.Build": "0.1.0-preview-00043-160929",
"Microsoft.CodeAnalysis.Build.Tasks": "2.0.0-beta6-60922-08",
"System.Runtime.Serialization.Xml": "4.1.1",
"NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.16",
"NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.17",
"Microsoft.TestPlatform.CLI": "15.0.0-preview-20160915-01"
},
"frameworks": {

2
src/tool_nuget/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.1"
},
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.16"
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.17"
},
"frameworks": {
"netcoreapp1.0": {