diff --git a/.gitignore b/.gitignore index 77d94f81..2029d1b7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,8 +11,7 @@ AppPackages/ _ReSharper.* *.ReSharper.user *.resharper.user -project.lock.json -*.xproj +*.lock.json .vs/ *.props *.targets diff --git a/Build/build.ps1 b/Build/build.ps1 index 344f52c1..2caccf08 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -11,7 +11,7 @@ $buildNuGet = $true $treatWarningsAsErrors = $false $workingName = if ($workingName) {$workingName} else {"Working"} - $dnvmVersion = "1.0.0-beta8-15530" + $dnvmVersion = "1.0.0-beta8-15618" $baseDir = resolve-path .. $buildDir = "$baseDir\Build" @@ -56,7 +56,7 @@ task Clean { task Build -depends Clean { Write-Host "Copying source to working source directory $workingSourceDir" - robocopy $sourceDir $workingSourceDir /MIR /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user | Out-Default + robocopy $sourceDir $workingSourceDir /MIR /NP /XD bin obj TestResults AppPackages $packageDirs /XF *.suo *.user *.project.lock.json | Out-Default Write-Host -ForegroundColor Green "Updating assembly version" Write-Host @@ -130,7 +130,7 @@ task Package -depends Build { } } - robocopy $workingSourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD Newtonsoft.Json.Tests Newtonsoft.Json.TestConsole obj | Out-Default + robocopy $workingSourceDir $workingDir\NuGet\src *.cs /S /NFL /NDL /NJS /NC /NS /NP /XD Newtonsoft.Json.Tests Newtonsoft.Json.TestConsole obj .vs artifacts | Out-Default Write-Host "Building NuGet package with ID $packageId and version $nugetVersion" -ForegroundColor Green Write-Host @@ -195,21 +195,22 @@ function MSBuildBuild($build) $finalDir = $build.FinalDir Write-Host - Write-Host "Restoring $workingSourceDir\$name.sln" + Write-Host "Restoring $workingSourceDir\$name.sln" -ForegroundColor Green [Environment]::SetEnvironmentVariable("EnableNuGetPackageRestore", "true", "Process") exec { .\Tools\NuGet\NuGet.exe update -self } - exec { .\Tools\NuGet\NuGet.exe restore "$workingSourceDir\$name.sln" -verbosity detailed | Out-Default } "Error restoring $name" + exec { .\Tools\NuGet\NuGet.exe restore "$workingSourceDir\$name.sln" -verbosity detailed -configfile $workingSourceDir\nuget.config | Out-Default } "Error restoring $name" $constants = GetConstants $build.Constants $signAssemblies Write-Host - Write-Host "Building" - exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:Platform=Any CPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$signAssemblies" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:VisualStudioVersion=14.0" /p:DefineConstants=`"$constants`" "$workingSourceDir\$name.sln" | Out-Default } "Error building $name" + Write-Host "Building $workingSourceDir\$name.sln" -ForegroundColor Green + exec { msbuild "/t:Clean;Rebuild" /p:Configuration=Release "/p:CopyNuGetImplementations=true" "/p:Platform=Any CPU" "/p:PlatformTarget=AnyCPU" /p:OutputPath=bin\Release\$finalDir\ /p:AssemblyOriginatorKeyFile=$signKeyPath "/p:SignAssembly=$signAssemblies" "/p:TreatWarningsAsErrors=$treatWarningsAsErrors" "/p:VisualStudioVersion=14.0" /p:DefineConstants=`"$constants`" "$workingSourceDir\$name.sln" | Out-Default } "Error building $name" } function DnxBuild($build) { $name = $build.Name + $projectPath = "$workingSourceDir\Newtonsoft.Json\project.json" exec { dnvm install $dnvmVersion -r clr -u | Out-Default } exec { dnvm use $dnvmVersion -r clr | Out-Default } @@ -218,7 +219,7 @@ function DnxBuild($build) Write-Host exec { try { - dnu restore "$workingSourceDir\Newtonsoft.Json\project.json" | Out-Default + dnu restore $projectPath | Out-Default Write-Host "Restore last exit code: $lastexitcode" } catch [System.Management.Automation.RemoteException] @@ -230,7 +231,8 @@ function DnxBuild($build) } } - exec { dnu build "$workingSourceDir\Newtonsoft.Json\project.json" --configuration Release | Out-Default } + Write-Host -ForegroundColor Green "Building $projectPath" + exec { dnu build $projectPath --configuration Release | Out-Default } } function DnxTests($build) @@ -266,7 +268,7 @@ function DnxTests($build) try { Set-Location "$workingSourceDir\Newtonsoft.Json.Tests" - exec { dnx -p "$workingSourceDir\Newtonsoft.Json.Tests\project.json" --configuration Release test | Out-Default } + exec { dnx --configuration Release test | Out-Default } } finally { diff --git a/Build/install.ps1 b/Build/install.ps1 index 3715c2da..0cebb5e8 100644 --- a/Build/install.ps1 +++ b/Build/install.ps1 @@ -99,7 +99,11 @@ catch if ($selection.Text.StartsWith("Attempting to gather dependencies information for package 'Newtonsoft.Json." + $package.Version + "'")) { - $dte2.ItemOperations.Navigate($url) | Out-Null + # don't show on upgrade + if (!$selection.Text.Contains("Removed package")) + { + $dte2.ItemOperations.Navigate($url) | Out-Null + } } } catch diff --git a/Doc/SerializationAttributes.aml b/Doc/SerializationAttributes.aml index e3a90f2e..ca4558df 100644 --- a/Doc/SerializationAttributes.aml +++ b/Doc/SerializationAttributes.aml @@ -1,4 +1,4 @@ - + @@ -60,7 +60,9 @@
JsonArrayAttribute/JsonDictionaryAttribute - The JsonArrayAttribute and JsonDictionaryAttributes are used to specify whether a class is serialized as that collection type. + The T:Newtonsoft.Json.JsonArrayAttribute and + T:Newtonsoft.Json.JsonDictionaryAttribute are used to specify + whether a class is serialized as that collection type. The collection attributes have options to customize the JsonConverter, type name handling, and reference handling that are applied to collection items.
diff --git a/Src/Newtonsoft.Json.Dotnet.sln b/Src/Newtonsoft.Json.Dotnet.sln index 733e00dd..1e0211d5 100644 --- a/Src/Newtonsoft.Json.Dotnet.sln +++ b/Src/Newtonsoft.Json.Dotnet.sln @@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution NuGet.Config = NuGet.Config EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Dotnet", "Newtonsoft.Json\Newtonsoft.Json.Dotnet.xproj", "{2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Dotnet", "Newtonsoft.Json\Newtonsoft.Json.Dotnet.xproj", "{779E052E-7218-4DA3-B419-FFB0F4C95081}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Tests.Dotnet", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Dotnet.xproj", "{A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Newtonsoft.Json.Tests.Dotnet", "Newtonsoft.Json.Tests\Newtonsoft.Json.Tests.Dotnet.xproj", "{13E906AE-5A47-4354-8CAF-E63E8AC541ED}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,14 +19,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2ACDB8C2-9BB8-4EB9-8D6A-4BB8CCF89377}.Release|Any CPU.Build.0 = Release|Any CPU - {A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1643B3F-D2C4-4312-AA04-07CF1B09A1E9}.Release|Any CPU.Build.0 = Release|Any CPU + {779E052E-7218-4DA3-B419-FFB0F4C95081}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {779E052E-7218-4DA3-B419-FFB0F4C95081}.Debug|Any CPU.Build.0 = Debug|Any CPU + {779E052E-7218-4DA3-B419-FFB0F4C95081}.Release|Any CPU.ActiveCfg = Release|Any CPU + {779E052E-7218-4DA3-B419-FFB0F4C95081}.Release|Any CPU.Build.0 = Release|Any CPU + {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13E906AE-5A47-4354-8CAF-E63E8AC541ED}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.project.json b/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.project.json new file mode 100644 index 00000000..8a7fd6ef --- /dev/null +++ b/Src/Newtonsoft.Json.TestConsole/Newtonsoft.Json.TestConsole.project.json @@ -0,0 +1,8 @@ +{ + "frameworks": { + "net45": {} + }, + "runtimes": { + "win-anycpu": {} + } +} \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Dotnet.xproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Dotnet.xproj new file mode 100644 index 00000000..f3c3d980 --- /dev/null +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Dotnet.xproj @@ -0,0 +1,19 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + 13e906ae-5a47-4354-8caf-e63e8ac541ed + Newtonsoft.Json.Tests + ..\artifacts\obj\$(MSBuildProjectName) + ..\artifacts\bin\$(MSBuildProjectName)\ + + + + 2.0 + + + \ No newline at end of file diff --git a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj index e2a98ba7..5dc30cae 100644 --- a/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj +++ b/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj @@ -65,10 +65,6 @@ AllRules.ruleset - - False - ..\packages\NUnit.2.6.2\lib\nunit.framework.dll - @@ -132,9 +128,7 @@ - - Component - + @@ -349,6 +343,9 @@ PreserveNewest + + + - - - + + + \ No newline at end of file diff --git a/Src/global.json b/Src/global.json index c61283d5..1b2bb451 100644 --- a/Src/global.json +++ b/Src/global.json @@ -1,6 +1,6 @@ { "projects": [ "src" ], "sdk": { - "version": "1.0.0-beta8-15530" + "version": "1.0.0-beta8-15618" } } diff --git a/Tools/NuGet/NuGet.exe b/Tools/NuGet/NuGet.exe index be85ec2c..a9c681c8 100644 Binary files a/Tools/NuGet/NuGet.exe and b/Tools/NuGet/NuGet.exe differ