This commit is contained in:
James Newton-King
2016-05-14 16:42:29 +12:00
parent 73dd434d73
commit cdecb70915
3 changed files with 26 additions and 16 deletions
+1 -1
View File
@@ -350,7 +350,7 @@ function Update-Project {
$json = (Get-Content $projectPath) -join "`n" | ConvertFrom-Json
$options = @{"warningsAsErrors" = $true; "xmlDoc" = $true; "keyFile" = $file; "define" = ((GetConstants "dotnet" $sign) -split ";") }
Add-Member -InputObject $json -MemberType NoteProperty -Name "compilationOptions" -Value $options -Force
Add-Member -InputObject $json -MemberType NoteProperty -Name "buildOptions" -Value $options -Force
$json.version = GetNuGetVersion
+1 -3
View File
@@ -1,7 +1,5 @@
{
"version": "1.0.0-*",
"exclude": [
],
"dependencies": {
"Newtonsoft.Json": {
"target": "project"
@@ -85,7 +83,7 @@
}
},*/
"netcoreapp1.0": {
"compilationOptions": {
"buildOptions": {
"define": [ "NETSTANDARD10", "DNXCORE50", "PORTABLE" ]
},
"dependencies": {
+24 -12
View File
@@ -2,13 +2,18 @@
"version": "1.0.0-*",
"title": "Json.NET",
"description": "Json.NET is a popular high-performance JSON framework for .NET",
"authors": [ "James Newton-King" ],
"tags": [ "json" ],
"projectUrl": "http://www.newtonsoft.com/json",
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
"iconUrl": "http://www.newtonsoft.com/content/images/nugeticon.png",
"language": "en-US",
"authors": [ "James Newton-King" ],
"packOptions": {
"projectUrl": "http://www.newtonsoft.com/json",
"tags": [ "json" ],
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
"iconUrl": "http://www.newtonsoft.com/content/images/nugeticon.png",
"repository": {
"type": "git",
"url": "git://github.com/JamesNK/Newtonsoft.Json"
}
},
"frameworks": {
"net45": {
"frameworkAssemblies": {
@@ -44,8 +49,10 @@
}
},
".NETPortable,Version=v4.5,Profile=Profile259": {
"compilationOptions": {
"define": [ "PORTABLE" ]
"buildOptions": {
"define": [
"PORTABLE"
]
},
"frameworkAssemblies": {
"Microsoft.CSharp": "",
@@ -78,8 +85,10 @@
}
},
".NETPortable,Version=v4.0,Profile=Profile328": {
"compilationOptions": {
"define": [ "PORTABLE40" ]
"buildOptions": {
"define": [
"PORTABLE40"
]
},
"frameworkAssemblies": {
"mscorlib": "",
@@ -90,8 +99,11 @@
}
},
"netstandard1.0": {
"compilationOptions": {
"define": [ "NETSTANDARD10", "PORTABLE" ]
"buildOptions": {
"define": [
"NETSTANDARD10",
"PORTABLE"
]
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027",