Merge branch 'master' into naming-strategy
This commit is contained in:
@@ -11,5 +11,37 @@
|
|||||||
<iconUrl>http://www.newtonsoft.com/content/images/nugeticon.png</iconUrl>
|
<iconUrl>http://www.newtonsoft.com/content/images/nugeticon.png</iconUrl>
|
||||||
<licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</licenseUrl>
|
<licenseUrl>https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md</licenseUrl>
|
||||||
<tags>json</tags>
|
<tags>json</tags>
|
||||||
|
<dependencies>
|
||||||
|
<group targetFramework=".NETFramework4.5" />
|
||||||
|
<group targetFramework=".NETFramework4.0" />
|
||||||
|
<group targetFramework=".NETFramework3.5" />
|
||||||
|
<group targetFramework=".NETFramework2.0" />
|
||||||
|
<group targetFramework=".NETPortable4.5-Profile259" />
|
||||||
|
<group targetFramework=".NETPortable4.0-Profile328" />
|
||||||
|
<group targetFramework=".NETStandard1.0">
|
||||||
|
<dependency id="Microsoft.CSharp" version="4.0.1-rc2-24027" />
|
||||||
|
<dependency id="System.Collections" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Diagnostics.Debug" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Globalization" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.IO" version="4.1.0-rc2-24027" />
|
||||||
|
<dependency id="System.Linq" version="4.1.0-rc2-24027" />
|
||||||
|
<dependency id="System.Linq.Expressions" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.ObjectModel" version="4.0.12-rc2-24027" />
|
||||||
|
<dependency id="System.Reflection" version="4.1.0-rc2-24027" />
|
||||||
|
<dependency id="System.Reflection.Extensions" version="4.0.1-rc2-24027" />
|
||||||
|
<dependency id="System.Resources.ResourceManager" version="4.0.1-rc2-24027" />
|
||||||
|
<dependency id="System.Runtime" version="4.1.0-rc2-24027" />
|
||||||
|
<dependency id="System.Runtime.Extensions" version="4.1.0-rc2-24027" />
|
||||||
|
<dependency id="System.Runtime.Serialization.Primitives" version="4.1.1-rc2-24027" />
|
||||||
|
<dependency id="System.Text.Encoding" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Text.Encoding.Extensions" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Text.RegularExpressions" version="4.0.12-rc2-24027" />
|
||||||
|
<dependency id="System.Threading" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Threading.Tasks" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Xml.ReaderWriter" version="4.0.11-rc2-24027" />
|
||||||
|
<dependency id="System.Xml.XDocument" version="4.0.11-rc2-24027" />
|
||||||
|
</group>
|
||||||
|
</dependencies>
|
||||||
</metadata>
|
</metadata>
|
||||||
</package>
|
</package>
|
||||||
+33
-27
@@ -1,8 +1,8 @@
|
|||||||
properties {
|
properties {
|
||||||
$zipFileName = "Json80r3.zip"
|
$zipFileName = "Json80r4.zip"
|
||||||
$majorVersion = "8.0"
|
$majorVersion = "8.0"
|
||||||
$majorWithReleaseVersion = "8.0.3"
|
$majorWithReleaseVersion = "8.0.4"
|
||||||
$nugetPrelease = $null
|
$nugetPrerelease = "beta1"
|
||||||
$version = GetVersion $majorWithReleaseVersion
|
$version = GetVersion $majorWithReleaseVersion
|
||||||
$packageId = "Newtonsoft.Json"
|
$packageId = "Newtonsoft.Json"
|
||||||
$signAssemblies = $false
|
$signAssemblies = $false
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
$buildNuGet = $true
|
$buildNuGet = $true
|
||||||
$treatWarningsAsErrors = $false
|
$treatWarningsAsErrors = $false
|
||||||
$workingName = if ($workingName) {$workingName} else {"Working"}
|
$workingName = if ($workingName) {$workingName} else {"Working"}
|
||||||
$dnvmVersion = "1.0.0-rc1-update1"
|
$netCliVersion = "1.0.0-preview1-002702"
|
||||||
|
|
||||||
$baseDir = resolve-path ..
|
$baseDir = resolve-path ..
|
||||||
$buildDir = "$baseDir\Build"
|
$buildDir = "$baseDir\Build"
|
||||||
@@ -22,9 +22,9 @@
|
|||||||
$workingDir = "$baseDir\$workingName"
|
$workingDir = "$baseDir\$workingName"
|
||||||
$workingSourceDir = "$workingDir\Src"
|
$workingSourceDir = "$workingDir\Src"
|
||||||
$builds = @(
|
$builds = @(
|
||||||
@{Name = "Newtonsoft.Json.Dotnet"; TestsName = "Newtonsoft.Json.Tests.Dotnet"; BuildFunction = "DnxBuild"; TestsFunction = "DnxTests"; Constants="dotnet"; FinalDir=$null; NuGetDir = $null; Framework=$null},
|
@{Name = "Newtonsoft.Json.Dotnet"; TestsName = "Newtonsoft.Json.Tests.Dotnet"; BuildFunction = "NetCliBuild"; TestsFunction = "NetCliTests"; Constants="dotnet"; FinalDir="netstandard1.0"; NuGetDir = "netstandard1.0"; Framework=$null},
|
||||||
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"},
|
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants=""; FinalDir="Net45"; NuGetDir = "net45"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81+dnxcore50"; Framework="net-4.0"},
|
@{Name = "Newtonsoft.Json.Portable"; TestsName = "Newtonsoft.Json.Tests.Portable"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="PORTABLE"; FinalDir="Portable"; NuGetDir = "portable-net45+wp80+win8+wpa81"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"},
|
@{Name = "Newtonsoft.Json.Portable40"; TestsName = "Newtonsoft.Json.Tests.Portable40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="PORTABLE40"; FinalDir="Portable40"; NuGetDir = "portable-net40+sl5+wp80+win8+wpa81"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"},
|
@{Name = "Newtonsoft.Json.Net40"; TestsName = "Newtonsoft.Json.Tests.Net40"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET40"; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"},
|
||||||
@{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"},
|
@{Name = "Newtonsoft.Json.Net35"; TestsName = "Newtonsoft.Json.Tests.Net35"; BuildFunction = "MSBuildBuild"; TestsFunction = "NUnitTests"; Constants="NET35"; FinalDir="Net35"; NuGetDir = "net35"; Framework="net-2.0"},
|
||||||
@@ -90,11 +90,7 @@ task Package -depends Build {
|
|||||||
|
|
||||||
if ($buildNuGet)
|
if ($buildNuGet)
|
||||||
{
|
{
|
||||||
$nugetVersion = $majorWithReleaseVersion
|
$nugetVersion = GetNuGetVersion
|
||||||
if ($nugetPrelease -ne $null)
|
|
||||||
{
|
|
||||||
$nugetVersion = $nugetVersion + "-" + $nugetPrelease
|
|
||||||
}
|
|
||||||
|
|
||||||
New-Item -Path $workingDir\NuGet -ItemType Directory
|
New-Item -Path $workingDir\NuGet -ItemType Directory
|
||||||
|
|
||||||
@@ -136,6 +132,7 @@ task Package -depends Build {
|
|||||||
Write-Host
|
Write-Host
|
||||||
|
|
||||||
exec { .\Tools\NuGet\NuGet.exe pack $nuspecPath -Symbols }
|
exec { .\Tools\NuGet\NuGet.exe pack $nuspecPath -Symbols }
|
||||||
|
exec { dotnet pack $workingSourceDir\Newtonsoft.Json\project.json -c Release }
|
||||||
move -Path .\*.nupkg -Destination $workingDir\NuGet
|
move -Path .\*.nupkg -Destination $workingDir\NuGet
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,36 +201,32 @@ function MSBuildBuild($build)
|
|||||||
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"
|
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)
|
function NetCliBuild($build)
|
||||||
{
|
{
|
||||||
$name = $build.Name
|
$name = $build.Name
|
||||||
$projectPath = "$workingSourceDir\Newtonsoft.Json\project.json"
|
$projectPath = "$workingSourceDir\Newtonsoft.Json\project.json"
|
||||||
|
|
||||||
exec { dnvm install $dnvmVersion -r clr | Out-Default }
|
exec { .\Tools\Dotnet\install.ps1 -Version $netCliVersion | Out-Default }
|
||||||
exec { dnvm use $dnvmVersion -r clr | Out-Default }
|
exec { dotnet --version | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
||||||
Write-Host
|
Write-Host
|
||||||
exec { dnu restore $projectPath | Out-Default }
|
exec { dotnet restore $projectPath | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Building $projectPath"
|
Write-Host -ForegroundColor Green "Building $projectPath"
|
||||||
exec { dnu build $projectPath --configuration Release | Out-Default }
|
exec { dotnet build $projectPath -f netstandard1.0 -c Release -o bin\Release\netstandard1.0 | Out-Default }
|
||||||
}
|
}
|
||||||
|
|
||||||
function DnxTests($build)
|
function NetCliTests($build)
|
||||||
{
|
{
|
||||||
$name = $build.TestsName
|
$name = $build.TestsName
|
||||||
|
|
||||||
#Write-Host -ForegroundColor Green "Ensuring latest CoreCLR is installed for $name"
|
exec { .\Tools\Dotnet\install.ps1 -Version $netCliVersion | Out-Default }
|
||||||
#Write-Host
|
exec { dotnet --version | Out-Default }
|
||||||
#exec { & $toolsDir\Kvm\kvm.ps1 upgrade -r CoreCLR -NoNative | Out-Default }
|
|
||||||
|
|
||||||
exec { dnvm install $dnvmVersion -r coreclr | Out-Default }
|
|
||||||
exec { dnvm use $dnvmVersion -r coreclr | Out-Default }
|
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
Write-Host -ForegroundColor Green "Restoring packages for $name"
|
||||||
Write-Host
|
Write-Host
|
||||||
exec { dnu restore "$workingSourceDir\Newtonsoft.Json.Tests\project.json" | Out-Default }
|
exec { dotnet restore "$workingSourceDir\Newtonsoft.Json.Tests\project.json" | Out-Default }
|
||||||
|
|
||||||
Write-Host -ForegroundColor Green "Ensuring test project builds for $name"
|
Write-Host -ForegroundColor Green "Ensuring test project builds for $name"
|
||||||
Write-Host
|
Write-Host
|
||||||
@@ -241,7 +234,7 @@ function DnxTests($build)
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
Set-Location "$workingSourceDir\Newtonsoft.Json.Tests"
|
Set-Location "$workingSourceDir\Newtonsoft.Json.Tests"
|
||||||
exec { dnx --configuration Release test | Out-Default }
|
exec { dotnet test "$workingSourceDir\Newtonsoft.Json.Tests\project.json" -f netcoreapp1.0 -c Release -parallel none | Out-Default }
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
{
|
{
|
||||||
@@ -266,6 +259,17 @@ function NUnitTests($build)
|
|||||||
exec { .\Tools\NUnit\nunit-console.exe "$workingDir\Deployed\Bin\$finalDir\Newtonsoft.Json.Tests.dll" /framework=$framework /xml:$workingDir\$name.xml | Out-Default } "Error running $name tests"
|
exec { .\Tools\NUnit\nunit-console.exe "$workingDir\Deployed\Bin\$finalDir\Newtonsoft.Json.Tests.dll" /framework=$framework /xml:$workingDir\$name.xml | Out-Default } "Error running $name tests"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function GetNuGetVersion()
|
||||||
|
{
|
||||||
|
$nugetVersion = $majorWithReleaseVersion
|
||||||
|
if ($nugetPrerelease -ne $null)
|
||||||
|
{
|
||||||
|
$nugetVersion = $nugetVersion + "-" + $nugetPrerelease
|
||||||
|
}
|
||||||
|
|
||||||
|
return $nugetVersion
|
||||||
|
}
|
||||||
|
|
||||||
function GetConstants($constants, $includeSigned)
|
function GetConstants($constants, $includeSigned)
|
||||||
{
|
{
|
||||||
$signed = switch($includeSigned) { $true { ";SIGNED" } default { "" } }
|
$signed = switch($includeSigned) { $true { ";SIGNED" } default { "" } }
|
||||||
@@ -345,8 +349,10 @@ function Update-Project {
|
|||||||
$file = switch($sign) { $true { $signKeyPath } default { $null } }
|
$file = switch($sign) { $true { $signKeyPath } default { $null } }
|
||||||
|
|
||||||
$json = (Get-Content $projectPath) -join "`n" | ConvertFrom-Json
|
$json = (Get-Content $projectPath) -join "`n" | ConvertFrom-Json
|
||||||
$options = @{"warningsAsErrors" = $true; "keyFile" = $file; "define" = ((GetConstants "dotnet" $sign) -split ";") }
|
$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
|
||||||
|
|
||||||
ConvertTo-Json $json -Depth 10 | Set-Content $projectPath
|
ConvertTo-Json $json -Depth 10 | Set-Content $projectPath
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
cls
|
cls
|
||||||
powershell -Command "& { [Console]::WindowWidth = 150; [Console]::WindowHeight = 50; Start-Transcript %~dp0runbuild.txt; Import-Module %~dp0..\Tools\PSake\psake.psm1; Invoke-psake %~dp0..\Build\build.ps1 %*; Stop-Transcript; exit !($psake.build_success); }"
|
powershell -Command "& { [Console]::WindowWidth = 150; [Console]::WindowHeight = 50; Start-Transcript '%~dp0runbuild.txt'; Import-Module '%~dp0..\Tools\PSake\psake.psm1'; Invoke-psake '%~dp0..\Build\build.ps1' %*; Stop-Transcript; exit !($psake.build_success); }"
|
||||||
|
|
||||||
ECHO %ERRORLEVEL%
|
ECHO %ERRORLEVEL%
|
||||||
EXIT /B %ERRORLEVEL%
|
EXIT /B %ERRORLEVEL%
|
||||||
@@ -431,7 +431,7 @@
|
|||||||
<entry><para><markup><img src="../cross.png" /></markup></para></entry>
|
<entry><para><markup><img src="../cross.png" /></markup></para></entry>
|
||||||
</row>
|
</row>
|
||||||
<row>
|
<row>
|
||||||
<entry><para>Serailizes Entity Framework</para></entry>
|
<entry><para>Serializes Entity Framework</para></entry>
|
||||||
<entry><para><markup><img src="../tick.png" /></markup></para></entry>
|
<entry><para><markup><img src="../tick.png" /></markup></para></entry>
|
||||||
<entry><para><markup><img src="../cross.png" /></markup></para></entry>
|
<entry><para><markup><img src="../cross.png" /></markup></para></entry>
|
||||||
<entry><para><markup><img src="../cross.png" /></markup></para></entry>
|
<entry><para><markup><img src="../cross.png" /></markup></para></entry>
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ using System.Linq;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Web.Script.Serialization;
|
using System.Web.Script.Serialization;
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
using Newtonsoft.Json.Tests;
|
using Newtonsoft.Json.Tests;
|
||||||
using Newtonsoft.Json.Tests.Converters;
|
using Newtonsoft.Json.Tests.Converters;
|
||||||
|
|
||||||
@@ -52,6 +53,7 @@ namespace Newtonsoft.Json.TestConsole
|
|||||||
//t.DeserializeLargeJson();
|
//t.DeserializeLargeJson();
|
||||||
|
|
||||||
//PerformanceTests t = new PerformanceTests();
|
//PerformanceTests t = new PerformanceTests();
|
||||||
|
LargeArrayJTokenPathPerformance();
|
||||||
//t.Iterations = 50000;
|
//t.Iterations = 50000;
|
||||||
//t.BenchmarkDeserializeMethod<TestClass>(PerformanceTests.SerializeMethod.JsonNet, PerformanceTests.JsonText);
|
//t.BenchmarkDeserializeMethod<TestClass>(PerformanceTests.SerializeMethod.JsonNet, PerformanceTests.JsonText);
|
||||||
|
|
||||||
@@ -62,7 +64,7 @@ namespace Newtonsoft.Json.TestConsole
|
|||||||
|
|
||||||
//ReadLargeJson();
|
//ReadLargeJson();
|
||||||
//WriteLargeJson();
|
//WriteLargeJson();
|
||||||
DeserializeJson();
|
//DeserializeJson();
|
||||||
//ReadLargeJson();
|
//ReadLargeJson();
|
||||||
//ReadLargeJsonJavaScriptSerializer();
|
//ReadLargeJsonJavaScriptSerializer();
|
||||||
|
|
||||||
@@ -72,6 +74,28 @@ namespace Newtonsoft.Json.TestConsole
|
|||||||
Console.ReadKey();
|
Console.ReadKey();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void LargeArrayJTokenPathPerformance()
|
||||||
|
{
|
||||||
|
JArray a = new JArray();
|
||||||
|
for (int i = 0; i < 100000; i++)
|
||||||
|
{
|
||||||
|
a.Add(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
JToken last = a.Last;
|
||||||
|
|
||||||
|
int interations = 1000;
|
||||||
|
|
||||||
|
Console.WriteLine("Ready!!!");
|
||||||
|
Console.ReadKey();
|
||||||
|
|
||||||
|
string p = null;
|
||||||
|
for (int i = 0; i < interations; i++)
|
||||||
|
{
|
||||||
|
p = last.Path;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void DeserializeJson()
|
public static void DeserializeJson()
|
||||||
{
|
{
|
||||||
PerformanceTests t = new PerformanceTests();
|
PerformanceTests t = new PerformanceTests();
|
||||||
|
|||||||
@@ -130,6 +130,36 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if !NET20
|
#if !NET20
|
||||||
|
[Test]
|
||||||
|
public void SerializeDollarProperty()
|
||||||
|
{
|
||||||
|
string json1 = @"{""$"":""test""}";
|
||||||
|
|
||||||
|
var doc = JsonConvert.DeserializeXNode(json1);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"<_x0024_>test</_x0024_>", doc.ToString());
|
||||||
|
|
||||||
|
var json2 = JsonConvert.SerializeXNode(doc);
|
||||||
|
|
||||||
|
Assert.AreEqual(json1, json2);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeNonKnownDollarProperty()
|
||||||
|
{
|
||||||
|
string json1 = @"{""$JELLY"":""test""}";
|
||||||
|
|
||||||
|
var doc = JsonConvert.DeserializeXNode(json1);
|
||||||
|
|
||||||
|
Console.WriteLine(doc.ToString());
|
||||||
|
|
||||||
|
Assert.AreEqual(@"<_x0024_JELLY>test</_x0024_JELLY>", doc.ToString());
|
||||||
|
|
||||||
|
var json2 = JsonConvert.SerializeXNode(doc);
|
||||||
|
|
||||||
|
Assert.AreEqual(json1, json2);
|
||||||
|
}
|
||||||
|
|
||||||
public class MyModel
|
public class MyModel
|
||||||
{
|
{
|
||||||
public string MyProperty { get; set; }
|
public string MyProperty { get; set; }
|
||||||
@@ -2670,6 +2700,58 @@ namespace Newtonsoft.Json.Tests.Converters
|
|||||||
|
|
||||||
Assert.AreEqual("null", json);
|
Assert.AreEqual("null", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeElementExplicitAttributeNamespace()
|
||||||
|
{
|
||||||
|
var original = XElement.Parse("<MyElement xmlns=\"http://example.com\" />");
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", original.ToString());
|
||||||
|
|
||||||
|
var json = JsonConvert.SerializeObject(original);
|
||||||
|
Assert.AreEqual(@"{""MyElement"":{""@xmlns"":""http://example.com""}}", json);
|
||||||
|
|
||||||
|
var deserialized = JsonConvert.DeserializeObject<XElement>(json);
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", deserialized.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeElementImplicitAttributeNamespace()
|
||||||
|
{
|
||||||
|
var original = new XElement("{http://example.com}MyElement");
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", original.ToString());
|
||||||
|
|
||||||
|
var json = JsonConvert.SerializeObject(original);
|
||||||
|
Assert.AreEqual(@"{""MyElement"":{""@xmlns"":""http://example.com""}}", json);
|
||||||
|
|
||||||
|
var deserialized = JsonConvert.DeserializeObject<XElement>(json);
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", deserialized.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeDocumentExplicitAttributeNamespace()
|
||||||
|
{
|
||||||
|
var original = XDocument.Parse("<MyElement xmlns=\"http://example.com\" />");
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", original.ToString());
|
||||||
|
|
||||||
|
var json = JsonConvert.SerializeObject(original);
|
||||||
|
Assert.AreEqual(@"{""MyElement"":{""@xmlns"":""http://example.com""}}", json);
|
||||||
|
|
||||||
|
var deserialized = JsonConvert.DeserializeObject<XDocument>(json);
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", deserialized.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void SerializeDocumentImplicitAttributeNamespace()
|
||||||
|
{
|
||||||
|
var original = new XDocument(new XElement("{http://example.com}MyElement"));
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", original.ToString());
|
||||||
|
|
||||||
|
var json = JsonConvert.SerializeObject(original);
|
||||||
|
Assert.AreEqual(@"{""MyElement"":{""@xmlns"":""http://example.com""}}", json);
|
||||||
|
|
||||||
|
var deserialized = JsonConvert.DeserializeObject<XDocument>(json);
|
||||||
|
Assert.AreEqual(@"<MyElement xmlns=""http://example.com"" />", deserialized.ToString());
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,8 +54,10 @@ using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Documentation
|
namespace Newtonsoft.Json.Tests.Documentation
|
||||||
{
|
{
|
||||||
public class ConvertingJsonAndXmlTests
|
[TestFixture]
|
||||||
|
public class ConvertingJsonAndXmlTests : TestFixtureBase
|
||||||
{
|
{
|
||||||
|
[Test]
|
||||||
public void SerializeXmlNode()
|
public void SerializeXmlNode()
|
||||||
{
|
{
|
||||||
#region SerializeXmlNode
|
#region SerializeXmlNode
|
||||||
@@ -98,6 +100,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void DeserializeXmlNode()
|
public void DeserializeXmlNode()
|
||||||
{
|
{
|
||||||
#region DeserializeXmlNode
|
#region DeserializeXmlNode
|
||||||
@@ -137,6 +140,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void ForceJsonArray()
|
public void ForceJsonArray()
|
||||||
{
|
{
|
||||||
#region ForceJsonArray
|
#region ForceJsonArray
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
{
|
{
|
||||||
public static StreamReader OpenText(string path)
|
public static StreamReader OpenText(string path)
|
||||||
{
|
{
|
||||||
return null;
|
return new StreamReader(new MemoryStream(Encoding.UTF8.GetBytes("{}")));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static StreamWriter CreateText(string path)
|
public static StreamWriter CreateText(string path)
|
||||||
@@ -76,7 +76,8 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class LinqToJsonTests
|
[TestFixture]
|
||||||
|
public class LinqToJsonTests : TestFixtureBase
|
||||||
{
|
{
|
||||||
public void LinqToJsonBasic()
|
public void LinqToJsonBasic()
|
||||||
{
|
{
|
||||||
@@ -129,9 +130,10 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
|
|
||||||
private List<Post> GetPosts()
|
private List<Post> GetPosts()
|
||||||
{
|
{
|
||||||
return null;
|
return new List<Post>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonCreateDeclaratively()
|
public void LinqToJsonCreateDeclaratively()
|
||||||
{
|
{
|
||||||
#region LinqToJsonCreateDeclaratively
|
#region LinqToJsonCreateDeclaratively
|
||||||
@@ -163,7 +165,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// "channel": {
|
// "channel": {
|
||||||
// "title": "James Newton-King",
|
// "title": "James Newton-King",
|
||||||
// "link": "http://james.newtonking.com",
|
// "link": "http://james.newtonking.com",
|
||||||
// "description": "James Newton-King's blog.",
|
// "description": "James Newton-King\'s blog.",
|
||||||
// "item": [
|
// "item": [
|
||||||
// {
|
// {
|
||||||
// "title": "Json.NET 1.3 + New license + Now on CodePlex",
|
// "title": "Json.NET 1.3 + New license + Now on CodePlex",
|
||||||
@@ -189,9 +191,10 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonCreateFromObject()
|
public void LinqToJsonCreateFromObject()
|
||||||
{
|
{
|
||||||
List<Post> posts = null;
|
List<Post> posts = GetPosts();
|
||||||
|
|
||||||
#region LinqToJsonCreateFromObject
|
#region LinqToJsonCreateFromObject
|
||||||
JObject o = JObject.FromObject(new
|
JObject o = JObject.FromObject(new
|
||||||
@@ -216,6 +219,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonCreateParse()
|
public void LinqToJsonCreateParse()
|
||||||
{
|
{
|
||||||
#region LinqToJsonCreateParse
|
#region LinqToJsonCreateParse
|
||||||
@@ -231,6 +235,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonCreateParseArray()
|
public void LinqToJsonCreateParseArray()
|
||||||
{
|
{
|
||||||
#region LinqToJsonCreateParseArray
|
#region LinqToJsonCreateParseArray
|
||||||
@@ -244,6 +249,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonReadObject()
|
public void LinqToJsonReadObject()
|
||||||
{
|
{
|
||||||
#region LinqToJsonReadObject
|
#region LinqToJsonReadObject
|
||||||
@@ -255,6 +261,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonSimpleQuerying()
|
public void LinqToJsonSimpleQuerying()
|
||||||
{
|
{
|
||||||
#region LinqToJsonSimpleQuerying
|
#region LinqToJsonSimpleQuerying
|
||||||
@@ -262,7 +269,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
'channel': {
|
'channel': {
|
||||||
'title': 'James Newton-King',
|
'title': 'James Newton-King',
|
||||||
'link': 'http://james.newtonking.com',
|
'link': 'http://james.newtonking.com',
|
||||||
'description': 'James Newton-King's blog.',
|
'description': 'James Newton-King\'s blog.',
|
||||||
'item': [
|
'item': [
|
||||||
{
|
{
|
||||||
'title': 'Json.NET 1.3 + New license + Now on CodePlex',
|
'title': 'Json.NET 1.3 + New license + Now on CodePlex',
|
||||||
@@ -303,9 +310,36 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonQuerying()
|
public void LinqToJsonQuerying()
|
||||||
{
|
{
|
||||||
JObject rss = new JObject();
|
JObject rss = JObject.Parse(@"{
|
||||||
|
'channel': {
|
||||||
|
'title': 'James Newton-King',
|
||||||
|
'link': 'http://james.newtonking.com',
|
||||||
|
'description': 'James Newton-King\'s blog.',
|
||||||
|
'item': [
|
||||||
|
{
|
||||||
|
'title': 'Json.NET 1.3 + New license + Now on CodePlex',
|
||||||
|
'description': 'Annoucing the release of Json.NET 1.3, the MIT license and the source on CodePlex',
|
||||||
|
'link': 'http://james.newtonking.com/projects/json-net.aspx',
|
||||||
|
'categories': [
|
||||||
|
'Json.NET',
|
||||||
|
'CodePlex'
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'title': 'LINQ to JSON beta',
|
||||||
|
'description': 'Annoucing LINQ to JSON',
|
||||||
|
'link': 'http://james.newtonking.com/projects/json-net.aspx',
|
||||||
|
'categories': [
|
||||||
|
'Json.NET',
|
||||||
|
'LINQ'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}");
|
||||||
|
|
||||||
#region LinqToJsonQuerying
|
#region LinqToJsonQuerying
|
||||||
var postTitles =
|
var postTitles =
|
||||||
@@ -321,7 +355,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
//Json.NET 1.3 + New license + Now on CodePlex
|
//Json.NET 1.3 + New license + Now on CodePlex
|
||||||
|
|
||||||
var categories =
|
var categories =
|
||||||
from c in rss["channel"]["item"].Children()["category"].Values<string>()
|
from c in rss["channel"]["item"].SelectMany(i => i["categories"]).Values<string>()
|
||||||
group c by c
|
group c by c
|
||||||
into g
|
into g
|
||||||
orderby g.Count() descending
|
orderby g.Count() descending
|
||||||
@@ -336,6 +370,9 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
//LINQ - Count: 1
|
//LINQ - Count: 1
|
||||||
//CodePlex - Count: 1
|
//CodePlex - Count: 1
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(2, postTitles.Count());
|
||||||
|
Assert.AreEqual(3, categories.Count());
|
||||||
}
|
}
|
||||||
|
|
||||||
#region LinqToJsonDeserializeObject
|
#region LinqToJsonDeserializeObject
|
||||||
@@ -354,6 +391,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void LinqToJsonDeserializeExample()
|
public void LinqToJsonDeserializeExample()
|
||||||
{
|
{
|
||||||
#region LinqToJsonDeserializeExample
|
#region LinqToJsonDeserializeExample
|
||||||
@@ -365,6 +403,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
'code': 0,
|
'code': 0,
|
||||||
'msg': 'No action taken'
|
'msg': 'No action taken'
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}";
|
}";
|
||||||
|
|
||||||
JObject json = JObject.Parse(jsonText);
|
JObject json = JObject.Parse(jsonText);
|
||||||
@@ -386,17 +425,53 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
Console.WriteLine(shortie.Error.ErrorMessage);
|
Console.WriteLine(shortie.Error.ErrorMessage);
|
||||||
// No action taken
|
// No action taken
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("http://www.foo.com/", shortie.Original);
|
||||||
|
Assert.AreEqual("No action taken", shortie.Error.ErrorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SelectTokenSimple()
|
public void SelectTokenSimple()
|
||||||
{
|
{
|
||||||
JObject o = new JObject();
|
JObject o = JObject.Parse(@"{
|
||||||
|
'Stores': [
|
||||||
|
'Lambton Quay',
|
||||||
|
'Willis Street'
|
||||||
|
],
|
||||||
|
'Manufacturers': [
|
||||||
|
{
|
||||||
|
'Name': 'Acme Co',
|
||||||
|
'Products': [
|
||||||
|
{
|
||||||
|
'Name': 'Anvil',
|
||||||
|
'Price': 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'Name': 'Contoso',
|
||||||
|
'Products': [
|
||||||
|
{
|
||||||
|
'Name': 'Elbow Grease',
|
||||||
|
'Price': 99.95
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'Name': 'Headlight Fluid',
|
||||||
|
'Price': 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}");
|
||||||
|
|
||||||
#region SelectTokenSimple
|
#region SelectTokenSimple
|
||||||
string name = (string)o.SelectToken("Manufacturers[0].Name");
|
string name = (string)o.SelectToken("Manufacturers[0].Name");
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("Acme Co", name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SelectTokenComplex()
|
public void SelectTokenComplex()
|
||||||
{
|
{
|
||||||
#region SelectTokenComplex
|
#region SelectTokenComplex
|
||||||
@@ -440,11 +515,45 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
string productName = (string)o.SelectToken("Manufacturers[1].Products[0].Name");
|
string productName = (string)o.SelectToken("Manufacturers[1].Products[0].Name");
|
||||||
// Elbow Grease
|
// Elbow Grease
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("Acme Co", name);
|
||||||
|
Assert.AreEqual(50m, productPrice);
|
||||||
|
Assert.AreEqual("Elbow Grease", productName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SelectTokenLinq()
|
public void SelectTokenLinq()
|
||||||
{
|
{
|
||||||
JObject o = new JObject();
|
JObject o = JObject.Parse(@"{
|
||||||
|
'Stores': [
|
||||||
|
'Lambton Quay',
|
||||||
|
'Willis Street'
|
||||||
|
],
|
||||||
|
'Manufacturers': [
|
||||||
|
{
|
||||||
|
'Name': 'Acme Co',
|
||||||
|
'Products': [
|
||||||
|
{
|
||||||
|
'Name': 'Anvil',
|
||||||
|
'Price': 50
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'Name': 'Contoso',
|
||||||
|
'Products': [
|
||||||
|
{
|
||||||
|
'Name': 'Elbow Grease',
|
||||||
|
'Price': 99.95
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'Name': 'Headlight Fluid',
|
||||||
|
'Price': 4
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}");
|
||||||
|
|
||||||
#region SelectTokenLinq
|
#region SelectTokenLinq
|
||||||
IList<string> storeNames = o.SelectToken("Stores").Select(s => (string)s).ToList();
|
IList<string> storeNames = o.SelectToken("Stores").Select(s => (string)s).ToList();
|
||||||
@@ -458,6 +567,10 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
decimal totalPrice = o["Manufacturers"].Sum(m => (decimal)m.SelectToken("Products[0].Price"));
|
decimal totalPrice = o["Manufacturers"].Sum(m => (decimal)m.SelectToken("Products[0].Price"));
|
||||||
// 149.95
|
// 149.95
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(2, storeNames.Count);
|
||||||
|
Assert.AreEqual(2, firstProductNames.Count);
|
||||||
|
Assert.AreEqual(149.95m, totalPrice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,8 +53,10 @@ using ErrorEventArgs = Newtonsoft.Json.Serialization.ErrorEventArgs;
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.Documentation
|
namespace Newtonsoft.Json.Tests.Documentation
|
||||||
{
|
{
|
||||||
public class SerializationTests
|
[TestFixture]
|
||||||
|
public class SerializationTests : TestFixtureBase
|
||||||
{
|
{
|
||||||
|
[Test]
|
||||||
public void SerializeObject()
|
public void SerializeObject()
|
||||||
{
|
{
|
||||||
#region SerializeObject
|
#region SerializeObject
|
||||||
@@ -79,6 +81,8 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
|
|
||||||
Product deserializedProduct = JsonConvert.DeserializeObject<Product>(output);
|
Product deserializedProduct = JsonConvert.DeserializeObject<Product>(output);
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("Apple", deserializedProduct.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void JsonSerializerToStream()
|
public void JsonSerializerToStream()
|
||||||
@@ -175,6 +179,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializationCallbacksExample()
|
public void SerializationCallbacksExample()
|
||||||
{
|
{
|
||||||
#region SerializationCallbacksExample
|
#region SerializationCallbacksExample
|
||||||
@@ -216,8 +221,11 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
Console.WriteLine(obj.Member4);
|
Console.WriteLine(obj.Member4);
|
||||||
// This value was set after deserialization.
|
// This value was set after deserialization.
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(11, obj.Member1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializationErrorHandling()
|
public void SerializationErrorHandling()
|
||||||
{
|
{
|
||||||
#region SerializationErrorHandling
|
#region SerializationErrorHandling
|
||||||
@@ -251,8 +259,11 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// Unexpected token parsing date. Expected String, got StartArray.
|
// Unexpected token parsing date. Expected String, got StartArray.
|
||||||
// Cannot convert null value to System.DateTime.
|
// Cannot convert null value to System.DateTime.
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(new DateTime(2009, 9, 9, 0, 0, 0, DateTimeKind.Utc), c[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializationErrorHandlingWithParent()
|
public void SerializationErrorHandlingWithParent()
|
||||||
{
|
{
|
||||||
#region SerializationErrorHandlingWithParent
|
#region SerializationErrorHandlingWithParent
|
||||||
@@ -302,6 +313,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializationErrorHandlingAttributeExample()
|
public void SerializationErrorHandlingAttributeExample()
|
||||||
{
|
{
|
||||||
#region SerializationErrorHandlingAttributeExample
|
#region SerializationErrorHandlingAttributeExample
|
||||||
@@ -322,6 +334,12 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// "Title": "Mister Manager"
|
// "Title": "Mister Manager"
|
||||||
//}
|
//}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"{
|
||||||
|
""Name"": ""George Michael Bluth"",
|
||||||
|
""Age"": 16,
|
||||||
|
""Title"": ""Mister Manager""
|
||||||
|
}", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PreservingObjectReferencesOff()
|
public void PreservingObjectReferencesOff()
|
||||||
@@ -352,11 +370,33 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// }
|
// }
|
||||||
//]
|
//]
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"[
|
||||||
|
{
|
||||||
|
""Name"": ""James"",
|
||||||
|
""BirthDate"": ""1980-12-23T00:00:00Z"",
|
||||||
|
""LastModified"": ""2009-02-20T12:59:21Z""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""Name"": ""James"",
|
||||||
|
""BirthDate"": ""1980-12-23T00:00:00Z"",
|
||||||
|
""LastModified"": ""2009-02-20T12:59:21Z""
|
||||||
|
}
|
||||||
|
]", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void PreservingObjectReferencesOn()
|
public void PreservingObjectReferencesOn()
|
||||||
{
|
{
|
||||||
List<Person> people = new List<Person>();
|
Person p = new Person
|
||||||
|
{
|
||||||
|
Name = "James"
|
||||||
|
};
|
||||||
|
List<Person> people = new List<Person>
|
||||||
|
{
|
||||||
|
p,
|
||||||
|
p
|
||||||
|
};
|
||||||
|
|
||||||
#region PreservingObjectReferencesOn
|
#region PreservingObjectReferencesOn
|
||||||
string json = JsonConvert.SerializeObject(people, Formatting.Indented,
|
string json = JsonConvert.SerializeObject(people, Formatting.Indented,
|
||||||
@@ -391,6 +431,8 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
bool equal = Object.ReferenceEquals(p1, p2);
|
bool equal = Object.ReferenceEquals(p1, p2);
|
||||||
// true
|
// true
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(true, equal);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region PreservingObjectReferencesAttribute
|
#region PreservingObjectReferencesAttribute
|
||||||
@@ -429,9 +471,25 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void CustomCreationConverterExample()
|
public void CustomCreationConverterExample()
|
||||||
{
|
{
|
||||||
string json = null;
|
string json = @"[
|
||||||
|
{
|
||||||
|
""FirstName"": ""Maurice"",
|
||||||
|
""LastName"": ""Moss"",
|
||||||
|
""BirthDate"": ""1981-03-08T00:00Z"",
|
||||||
|
""Department"": ""IT"",
|
||||||
|
""JobTitle"": ""Support""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""FirstName"": ""Jen"",
|
||||||
|
""LastName"": ""Barber"",
|
||||||
|
""BirthDate"": ""1985-12-10T00:00Z"",
|
||||||
|
""Department"": ""IT"",
|
||||||
|
""JobTitle"": ""Manager""
|
||||||
|
}
|
||||||
|
]";
|
||||||
|
|
||||||
#region CustomCreationConverterExample
|
#region CustomCreationConverterExample
|
||||||
//[
|
//[
|
||||||
@@ -466,8 +524,11 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
Console.WriteLine(employee.JobTitle);
|
Console.WriteLine(employee.JobTitle);
|
||||||
// Support
|
// Support
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("Support", employee.JobTitle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void ContractResolver()
|
public void ContractResolver()
|
||||||
{
|
{
|
||||||
#region ContractResolver
|
#region ContractResolver
|
||||||
@@ -488,7 +549,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
|
|
||||||
//{
|
//{
|
||||||
// "name": "Widget",
|
// "name": "Widget",
|
||||||
// "expiryDate": "2010-12-20T18:01Z",
|
// "expiryDate": "2010-12-20T18:01:00Z",
|
||||||
// "price": 9.99,
|
// "price": 9.99,
|
||||||
// "sizes": [
|
// "sizes": [
|
||||||
// "Small",
|
// "Small",
|
||||||
@@ -497,8 +558,20 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// ]
|
// ]
|
||||||
//}
|
//}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""name"": ""Widget"",
|
||||||
|
""expiryDate"": ""2010-12-20T18:01:00Z"",
|
||||||
|
""price"": 9.99,
|
||||||
|
""sizes"": [
|
||||||
|
""Small"",
|
||||||
|
""Medium"",
|
||||||
|
""Large""
|
||||||
|
]
|
||||||
|
}", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializingCollectionsSerializing()
|
public void SerializingCollectionsSerializing()
|
||||||
{
|
{
|
||||||
#region SerializingCollectionsSerializing
|
#region SerializingCollectionsSerializing
|
||||||
@@ -523,20 +596,36 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
//[
|
//[
|
||||||
// {
|
// {
|
||||||
// "Name": "Product 1",
|
// "Name": "Product 1",
|
||||||
// "ExpiryDate": "2000-12-29T00:00Z",
|
// "ExpiryDate": "2000-12-29T00:00:00Z",
|
||||||
// "Price": 99.95,
|
// "Price": 99.95,
|
||||||
// "Sizes": null
|
// "Sizes": null
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
// "Name": "Product 2",
|
// "Name": "Product 2",
|
||||||
// "ExpiryDate": "2009-07-31T00:00Z",
|
// "ExpiryDate": "2009-07-31T00:00:00Z",
|
||||||
// "Price": 12.50,
|
// "Price": 12.50,
|
||||||
// "Sizes": null
|
// "Sizes": null
|
||||||
// }
|
// }
|
||||||
//]
|
//]
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(@"[
|
||||||
|
{
|
||||||
|
""Name"": ""Product 1"",
|
||||||
|
""ExpiryDate"": ""2000-12-29T00:00:00Z"",
|
||||||
|
""Price"": 99.95,
|
||||||
|
""Sizes"": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""Name"": ""Product 2"",
|
||||||
|
""ExpiryDate"": ""2009-07-31T00:00:00Z"",
|
||||||
|
""Price"": 12.50,
|
||||||
|
""Sizes"": null
|
||||||
|
}
|
||||||
|
]", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializingCollectionsDeserializing()
|
public void SerializingCollectionsDeserializing()
|
||||||
{
|
{
|
||||||
#region SerializingCollectionsDeserializing
|
#region SerializingCollectionsDeserializing
|
||||||
@@ -565,8 +654,11 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
Console.WriteLine(p1.Name);
|
Console.WriteLine(p1.Name);
|
||||||
// Product 1
|
// Product 1
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("Product 1", p1.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializingCollectionsDeserializingDictionaries()
|
public void SerializingCollectionsDeserializingDictionaries()
|
||||||
{
|
{
|
||||||
#region SerializingCollectionsDeserializingDictionaries
|
#region SerializingCollectionsDeserializingDictionaries
|
||||||
@@ -580,6 +672,8 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
Console.WriteLine(values["key1"]);
|
Console.WriteLine(values["key1"]);
|
||||||
// value1
|
// value1
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("value1", values["key1"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region SerializingDatesInJson
|
#region SerializingDatesInJson
|
||||||
@@ -658,6 +752,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void ReducingSerializedJsonSizeNullValueHandlingExample()
|
public void ReducingSerializedJsonSizeNullValueHandlingExample()
|
||||||
{
|
{
|
||||||
#region ReducingSerializedJsonSizeNullValueHandlingExample
|
#region ReducingSerializedJsonSizeNullValueHandlingExample
|
||||||
@@ -687,6 +782,20 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// "Description": "It's no Bad Boys"
|
// "Description": "It's no Bad Boys"
|
||||||
// }
|
// }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""Name"": ""Bad Boys III"",
|
||||||
|
""Description"": ""It's no Bad Boys"",
|
||||||
|
""Classification"": null,
|
||||||
|
""Studio"": null,
|
||||||
|
""ReleaseDate"": null,
|
||||||
|
""ReleaseCountries"": null
|
||||||
|
}", included);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""Name"": ""Bad Boys III"",
|
||||||
|
""Description"": ""It's no Bad Boys""
|
||||||
|
}", ignored);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region ReducingSerializedJsonSizeDefaultValueHandlingObject
|
#region ReducingSerializedJsonSizeDefaultValueHandlingObject
|
||||||
@@ -744,6 +853,20 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// "Amount": 50.0
|
// "Amount": 50.0
|
||||||
// }
|
// }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""Company"": ""Acme Ltd."",
|
||||||
|
""Amount"": 50.0,
|
||||||
|
""Paid"": false,
|
||||||
|
""PaidDate"": null,
|
||||||
|
""FollowUpDays"": 30,
|
||||||
|
""FollowUpEmailAddress"": """"
|
||||||
|
}", included);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""Company"": ""Acme Ltd."",
|
||||||
|
""Amount"": 50.0
|
||||||
|
}", included);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region ReducingSerializedJsonSizeContractResolverObject
|
#region ReducingSerializedJsonSizeContractResolverObject
|
||||||
@@ -807,6 +930,17 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// "BookPrice": 16.19
|
// "BookPrice": 16.19
|
||||||
// }
|
// }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""AuthorName"": ""Brandon Sanderson"",
|
||||||
|
""AuthorAge"": 34,
|
||||||
|
""AuthorCountry"": ""United States of America""
|
||||||
|
}", startingWithA);
|
||||||
|
|
||||||
|
Assert.AreEqual(@"{
|
||||||
|
""BookName"": ""The Gathering Storm"",
|
||||||
|
""BookPrice"": 16.19
|
||||||
|
}", startingWithB);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region SerializingPartialJsonFragmentsObject
|
#region SerializingPartialJsonFragmentsObject
|
||||||
@@ -818,6 +952,7 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializingPartialJsonFragmentsExample()
|
public void SerializingPartialJsonFragmentsExample()
|
||||||
{
|
{
|
||||||
#region SerializingPartialJsonFragmentsExample
|
#region SerializingPartialJsonFragmentsExample
|
||||||
@@ -894,8 +1029,11 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
// Content = Self: Zoolander. Socialite <b>Paris Hilton</b>...
|
// Content = Self: Zoolander. Socialite <b>Paris Hilton</b>...
|
||||||
// Url = http://www.imdb.com/name/nm0385296/
|
// Url = http://www.imdb.com/name/nm0385296/
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
Assert.AreEqual("<b>Paris Hilton</b> - Wikipedia, the free encyclopedia", searchResults[0].Title);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
public void SerializeMultidimensionalArrayExample()
|
public void SerializeMultidimensionalArrayExample()
|
||||||
{
|
{
|
||||||
string[,] famousCouples = new string[,]
|
string[,] famousCouples = new string[,]
|
||||||
@@ -918,6 +1056,8 @@ namespace Newtonsoft.Json.Tests.Documentation
|
|||||||
|
|
||||||
Console.WriteLine(deserialized[3, 0] + ", " + deserialized[3, 1]);
|
Console.WriteLine(deserialized[3, 0] + ", " + deserialized[3, 1]);
|
||||||
// Han, Leia
|
// Han, Leia
|
||||||
|
|
||||||
|
Assert.AreEqual("Han", deserialized[3, 0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,6 +61,126 @@ namespace Newtonsoft.Json.Tests
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class JsonTextReaderTest : TestFixtureBase
|
public class JsonTextReaderTest : TestFixtureBase
|
||||||
{
|
{
|
||||||
|
[Test]
|
||||||
|
public void Float_NaN_Read()
|
||||||
|
{
|
||||||
|
const string testJson = "{float: NaN}";
|
||||||
|
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(testJson));
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(double.NaN, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsFalse(reader.Read());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Float_NaN_ReadAsInt32()
|
||||||
|
{
|
||||||
|
const string testJson = "{float: NaN}";
|
||||||
|
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(testJson));
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
|
||||||
|
ExceptionAssert.Throws<JsonReaderException>(() => reader.ReadAsInt32(), "Cannot read NaN value. Path 'float', line 1, position 11.");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Float_NaNAndInifinity_ReadAsDouble()
|
||||||
|
{
|
||||||
|
const string testJson = @"[
|
||||||
|
NaN,
|
||||||
|
Infinity,
|
||||||
|
-Infinity
|
||||||
|
]"; ;
|
||||||
|
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(testJson));
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
|
||||||
|
Assert.AreEqual(double.NaN, reader.ReadAsDouble());
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(double.NaN, reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual(double.PositiveInfinity, reader.ReadAsDouble());
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(double.PositiveInfinity, reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual(double.NegativeInfinity, reader.ReadAsDouble());
|
||||||
|
Assert.AreEqual(JsonToken.Float, reader.TokenType);
|
||||||
|
Assert.AreEqual(double.NegativeInfinity, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsFalse(reader.Read());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void Float_NaNAndInifinity_ReadAsString()
|
||||||
|
{
|
||||||
|
const string testJson = @"[
|
||||||
|
NaN,
|
||||||
|
Infinity,
|
||||||
|
-Infinity
|
||||||
|
]"; ;
|
||||||
|
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(testJson));
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
|
||||||
|
Assert.AreEqual(JsonConvert.NaN, reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual(JsonConvert.NaN, reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual(JsonConvert.PositiveInfinity, reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual(JsonConvert.PositiveInfinity, reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual(JsonConvert.NegativeInfinity, reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual(JsonConvert.NegativeInfinity, reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsFalse(reader.Read());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void FloatParseHandling_ReadAsString()
|
||||||
|
{
|
||||||
|
string json = "[9223372036854775807, 1.7976931348623157E+308, 792281625142643375935439503.35, 792281625142643375935555555555555555555555555555555555555555555555555439503.35]";
|
||||||
|
|
||||||
|
JsonTextReader reader = new JsonTextReader(new StringReader(json));
|
||||||
|
reader.FloatParseHandling = Json.FloatParseHandling.Decimal;
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
|
||||||
|
|
||||||
|
Assert.AreEqual("9223372036854775807", reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("9223372036854775807", reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual("1.7976931348623157E+308", reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("1.7976931348623157E+308", reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual("792281625142643375935439503.35", reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("792281625142643375935439503.35", reader.Value);
|
||||||
|
|
||||||
|
Assert.AreEqual("792281625142643375935555555555555555555555555555555555555555555555555439503.35", reader.ReadAsString());
|
||||||
|
Assert.AreEqual(JsonToken.String, reader.TokenType);
|
||||||
|
Assert.AreEqual("792281625142643375935555555555555555555555555555555555555555555555555439503.35", reader.Value);
|
||||||
|
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(JsonToken.EndArray, reader.TokenType);
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void LineInfoAndNewLines()
|
public void LineInfoAndNewLines()
|
||||||
{
|
{
|
||||||
@@ -455,7 +575,7 @@ third line", jsonTextReader.Value);
|
|||||||
Assert.IsTrue(reader.Read());
|
Assert.IsTrue(reader.Read());
|
||||||
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
|
Assert.AreEqual(JsonToken.StartArray, reader.TokenType);
|
||||||
|
|
||||||
ExceptionAssert.Throws<JsonReaderException>(() => reader.Read(), "Cannot read NaN as a decimal.");
|
ExceptionAssert.Throws<JsonReaderException>(() => reader.Read(), "Cannot read NaN value. Path '', line 1, position 4.");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
|||||||
@@ -51,6 +51,20 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class JTokenReaderTest : TestFixtureBase
|
public class JTokenReaderTest : TestFixtureBase
|
||||||
{
|
{
|
||||||
|
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE)
|
||||||
|
[Test]
|
||||||
|
public void ConvertBigIntegerToDouble()
|
||||||
|
{
|
||||||
|
var jObject = JObject.Parse("{ maxValue:10000000000000000000}");
|
||||||
|
|
||||||
|
JsonReader reader = jObject.CreateReader();
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
Assert.AreEqual(10000000000000000000d, reader.ReadAsDouble());
|
||||||
|
Assert.IsTrue(reader.Read());
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void ErrorTokenIndex()
|
public void ErrorTokenIndex()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -249,6 +249,100 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
]", writer.Token.ToString());
|
]", writer.Token.ToString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void WriteTokenWithParent()
|
||||||
|
{
|
||||||
|
JObject o = new JObject
|
||||||
|
{
|
||||||
|
["prop1"] = new JArray(1),
|
||||||
|
["prop2"] = 1
|
||||||
|
};
|
||||||
|
|
||||||
|
JTokenWriter writer = new JTokenWriter();
|
||||||
|
|
||||||
|
writer.WriteStartArray();
|
||||||
|
|
||||||
|
writer.WriteToken(o.CreateReader());
|
||||||
|
|
||||||
|
Assert.AreEqual(WriteState.Array, writer.WriteState);
|
||||||
|
|
||||||
|
writer.WriteEndArray();
|
||||||
|
|
||||||
|
Console.WriteLine(writer.Token.ToString());
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"[
|
||||||
|
{
|
||||||
|
""prop1"": [
|
||||||
|
1
|
||||||
|
],
|
||||||
|
""prop2"": 1
|
||||||
|
}
|
||||||
|
]", writer.Token.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void WriteTokenWithPropertyParent()
|
||||||
|
{
|
||||||
|
JValue v = new JValue(1);
|
||||||
|
|
||||||
|
JTokenWriter writer = new JTokenWriter();
|
||||||
|
|
||||||
|
writer.WriteStartObject();
|
||||||
|
writer.WritePropertyName("Prop1");
|
||||||
|
|
||||||
|
writer.WriteToken(v.CreateReader());
|
||||||
|
|
||||||
|
Assert.AreEqual(WriteState.Object, writer.WriteState);
|
||||||
|
|
||||||
|
writer.WriteEndObject();
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"{
|
||||||
|
""Prop1"": 1
|
||||||
|
}", writer.Token.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void WriteValueTokenWithParent()
|
||||||
|
{
|
||||||
|
JValue v = new JValue(1);
|
||||||
|
|
||||||
|
JTokenWriter writer = new JTokenWriter();
|
||||||
|
|
||||||
|
writer.WriteStartArray();
|
||||||
|
|
||||||
|
writer.WriteToken(v.CreateReader());
|
||||||
|
|
||||||
|
Assert.AreEqual(WriteState.Array, writer.WriteState);
|
||||||
|
|
||||||
|
writer.WriteEndArray();
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"[
|
||||||
|
1
|
||||||
|
]", writer.Token.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void WriteEmptyToken()
|
||||||
|
{
|
||||||
|
JObject o = new JObject();
|
||||||
|
JsonReader reader = o.CreateReader();
|
||||||
|
while (reader.Read())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
JTokenWriter writer = new JTokenWriter();
|
||||||
|
|
||||||
|
writer.WriteStartArray();
|
||||||
|
|
||||||
|
writer.WriteToken(reader);
|
||||||
|
|
||||||
|
Assert.AreEqual(WriteState.Array, writer.WriteState);
|
||||||
|
|
||||||
|
writer.WriteEndArray();
|
||||||
|
|
||||||
|
StringAssert.AreEqual(@"[]", writer.Token.ToString());
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void WriteRawValue()
|
public void WriteRawValue()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -902,5 +902,52 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
|
|||||||
Assert.AreEqual("Headlight Fluid", firstProductNames[1]);
|
Assert.AreEqual("Headlight Fluid", firstProductNames[1]);
|
||||||
Assert.AreEqual(149.95m, totalPrice);
|
Assert.AreEqual(149.95m, totalPrice);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void NotEqualsAndNonPrimativeValues()
|
||||||
|
{
|
||||||
|
string json = @"[
|
||||||
|
{
|
||||||
|
""name"": ""string"",
|
||||||
|
""value"": ""aString""
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": ""number"",
|
||||||
|
""value"": 123
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": ""array"",
|
||||||
|
""value"": [
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
3,
|
||||||
|
4
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": ""object"",
|
||||||
|
""value"": {
|
||||||
|
""1"": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]";
|
||||||
|
|
||||||
|
JArray a = JArray.Parse(json);
|
||||||
|
|
||||||
|
List<JToken> result = a.SelectTokens("$.[?(@.value!=1)]").ToList();
|
||||||
|
Assert.AreEqual(4, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value!='2000-12-05T05:07:59-10:00')]").ToList();
|
||||||
|
Assert.AreEqual(4, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value!=null)]").ToList();
|
||||||
|
Assert.AreEqual(4, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value!=123)]").ToList();
|
||||||
|
Assert.AreEqual(3, result.Count);
|
||||||
|
|
||||||
|
result = a.SelectTokens("$.[?(@.value)]").ToList();
|
||||||
|
Assert.AreEqual(4, result.Count);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -55,6 +55,46 @@ namespace Newtonsoft.Json.Tests.Linq
|
|||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class LinqToJsonTest : TestFixtureBase
|
public class LinqToJsonTest : TestFixtureBase
|
||||||
{
|
{
|
||||||
|
[Test]
|
||||||
|
public void FromObjectGuid()
|
||||||
|
{
|
||||||
|
var token1 = new JValue(Guid.NewGuid());
|
||||||
|
var token2 = JToken.FromObject(token1);
|
||||||
|
Assert.IsTrue(JToken.DeepEquals(token1, token2));
|
||||||
|
Assert.AreEqual(token1.Type, token2.Type);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void FromObjectTimeSpan()
|
||||||
|
{
|
||||||
|
var token1 = new JValue(TimeSpan.FromDays(1));
|
||||||
|
var token2 = JToken.FromObject(token1);
|
||||||
|
Assert.IsTrue(JToken.DeepEquals(token1, token2));
|
||||||
|
Assert.AreEqual(token1.Type, token2.Type);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void FromObjectUri()
|
||||||
|
{
|
||||||
|
var token1 = new JValue(new Uri("http://www.newtonsoft.com"));
|
||||||
|
var token2 = JToken.FromObject(token1);
|
||||||
|
Assert.IsTrue(JToken.DeepEquals(token1, token2));
|
||||||
|
Assert.AreEqual(token1.Type, token2.Type);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void ToObject_Guid()
|
||||||
|
{
|
||||||
|
JObject anon = new JObject
|
||||||
|
{
|
||||||
|
["id"] = Guid.NewGuid()
|
||||||
|
};
|
||||||
|
Assert.AreEqual(JTokenType.Guid, anon["id"].Type);
|
||||||
|
|
||||||
|
Dictionary<string, JToken> dict = anon.ToObject<Dictionary<string, JToken>>();
|
||||||
|
Assert.AreEqual(JTokenType.Guid, dict["id"].Type);
|
||||||
|
}
|
||||||
|
|
||||||
public class TestClass_ULong
|
public class TestClass_ULong
|
||||||
{
|
{
|
||||||
public ulong Value { get; set; }
|
public ulong Value { get; set; }
|
||||||
|
|||||||
@@ -9,9 +9,8 @@
|
|||||||
<ProjectGuid>13e906ae-5a47-4354-8caf-e63e8ac541ed</ProjectGuid>
|
<ProjectGuid>13e906ae-5a47-4354-8caf-e63e8ac541ed</ProjectGuid>
|
||||||
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
|
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -171,15 +171,15 @@
|
|||||||
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
||||||
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
||||||
<Compile Include="TestObjects\PropertyCase.cs" />
|
<Compile Include="TestObjects\PropertyCase.cs" />
|
||||||
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
|
||||||
<Compile Include="TestObjects\Ratio.cs" />
|
<Compile Include="TestObjects\Ratio.cs" />
|
||||||
<Compile Include="TestObjects\RequestOnly.cs" />
|
<Compile Include="TestObjects\RequestOnly.cs" />
|
||||||
<Compile Include="TestObjects\RequiredObject.cs" />
|
<Compile Include="TestObjects\RequiredObject.cs" />
|
||||||
|
|||||||
@@ -202,12 +202,12 @@
|
|||||||
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
||||||
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PersonError.cs" />
|
<Compile Include="TestObjects\PersonError.cs" />
|
||||||
<Compile Include="TestObjects\PersonPropertyClass.cs" />
|
<Compile Include="TestObjects\PersonPropertyClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\Content.cs" />
|
<Compile Include="TestObjects\Content.cs" />
|
||||||
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
||||||
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
||||||
@@ -232,8 +232,8 @@
|
|||||||
<Compile Include="TestObjects\LogEntry.cs" />
|
<Compile Include="TestObjects\LogEntry.cs" />
|
||||||
<Compile Include="TestObjects\NonRequest.cs" />
|
<Compile Include="TestObjects\NonRequest.cs" />
|
||||||
<Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
|
<Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
|
||||||
<Compile Include="TestObjects\Ratio.cs" />
|
<Compile Include="TestObjects\Ratio.cs" />
|
||||||
<Compile Include="TestObjects\RequiredObject.cs" />
|
<Compile Include="TestObjects\RequiredObject.cs" />
|
||||||
<Compile Include="TestObjects\SearchResult.cs" />
|
<Compile Include="TestObjects\SearchResult.cs" />
|
||||||
|
|||||||
@@ -318,7 +318,7 @@
|
|||||||
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
||||||
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\Content.cs" />
|
<Compile Include="TestObjects\Content.cs" />
|
||||||
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
||||||
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
||||||
@@ -346,10 +346,10 @@
|
|||||||
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
||||||
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
|
||||||
<Compile Include="TestObjects\Ratio.cs" />
|
<Compile Include="TestObjects\Ratio.cs" />
|
||||||
<Compile Include="TestObjects\RequiredObject.cs" />
|
<Compile Include="TestObjects\RequiredObject.cs" />
|
||||||
<Compile Include="TestObjects\SearchResult.cs" />
|
<Compile Include="TestObjects\SearchResult.cs" />
|
||||||
|
|||||||
@@ -193,7 +193,7 @@
|
|||||||
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
||||||
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\Content.cs" />
|
<Compile Include="TestObjects\Content.cs" />
|
||||||
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
||||||
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
||||||
@@ -221,10 +221,10 @@
|
|||||||
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
||||||
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
|
||||||
<Compile Include="TestObjects\Ratio.cs" />
|
<Compile Include="TestObjects\Ratio.cs" />
|
||||||
<Compile Include="TestObjects\RequiredObject.cs" />
|
<Compile Include="TestObjects\RequiredObject.cs" />
|
||||||
<Compile Include="TestObjects\SearchResult.cs" />
|
<Compile Include="TestObjects\SearchResult.cs" />
|
||||||
|
|||||||
@@ -197,7 +197,7 @@
|
|||||||
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
<Compile Include="TestObjects\PersonWithPrivateConstructor.cs" />
|
||||||
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\Content.cs" />
|
<Compile Include="TestObjects\Content.cs" />
|
||||||
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
||||||
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
||||||
@@ -225,10 +225,10 @@
|
|||||||
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
||||||
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
|
||||||
<Compile Include="TestObjects\Ratio.cs" />
|
<Compile Include="TestObjects\Ratio.cs" />
|
||||||
<Compile Include="TestObjects\RequiredObject.cs" />
|
<Compile Include="TestObjects\RequiredObject.cs" />
|
||||||
<Compile Include="TestObjects\SearchResult.cs" />
|
<Compile Include="TestObjects\SearchResult.cs" />
|
||||||
|
|||||||
@@ -383,7 +383,7 @@
|
|||||||
<Compile Include="TestObjects\PhoneNumber.cs" />
|
<Compile Include="TestObjects\PhoneNumber.cs" />
|
||||||
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
<Compile Include="TestObjects\PocoDataContractSerializationAttributesClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PrivateConstructorWithPublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationAClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
<Compile Include="TestObjects\PrivateImplementationBClass.cs" />
|
||||||
<Compile Include="TestObjects\PrivateMembersClass.cs" />
|
<Compile Include="TestObjects\PrivateMembersClass.cs" />
|
||||||
@@ -392,10 +392,10 @@
|
|||||||
<Compile Include="TestObjects\ProductShort.cs" />
|
<Compile Include="TestObjects\ProductShort.cs" />
|
||||||
<Compile Include="TestObjects\PropertyCase.cs" />
|
<Compile Include="TestObjects\PropertyCase.cs" />
|
||||||
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
<Compile Include="TestObjects\PropertyItemConverter.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorRequiringConverterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorRequiringConverterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithNonPropertyParameterTestClass.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithNonPropertyParameterTestClass.cs" />
|
||||||
<Compile Include="TestObjects\PublicParametizedConstructorWithPropertyNameConflict.cs" />
|
<Compile Include="TestObjects\PublicParameterizedConstructorWithPropertyNameConflict.cs" />
|
||||||
<Compile Include="TestObjects\Ratio.cs" />
|
<Compile Include="TestObjects\Ratio.cs" />
|
||||||
<Compile Include="TestObjects\RequestOnly.cs" />
|
<Compile Include="TestObjects\RequestOnly.cs" />
|
||||||
<Compile Include="TestObjects\RequiredMembersClass.cs" />
|
<Compile Include="TestObjects\RequiredMembersClass.cs" />
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
"Autofac": "4.0.0-beta7-130",
|
"Autofac": "4.0.0-beta7-130",
|
||||||
"FSharp.Core": "4.0.0.1",
|
"FSharp.Core": "4.0.0.1",
|
||||||
"NUnit": "2.6.2",
|
"NUnit": "2.6.2",
|
||||||
"System.Buffers": "4.0.0-rc2-23826",
|
"System.Buffers": "4.0.0-rc2-24027",
|
||||||
"System.Collections.Immutable": "1.1.37"
|
"System.Collections.Immutable": "1.1.37"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
|
|||||||
@@ -23,10 +23,9 @@
|
|||||||
// OTHER DEALINGS IN THE SOFTWARE.
|
// OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE || PORTABLE40 || DNXCORE50)
|
#if !(NET20 || NET35 || NET40 || NETFX_CORE || PORTABLE40 || DNXCORE50)
|
||||||
using System.Xml;
|
using System.Xml;
|
||||||
using System;
|
using System;
|
||||||
using System.Buffers;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
@@ -258,6 +257,7 @@ namespace Newtonsoft.Json.Tests
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if !(PORTABLE40)
|
#if !(PORTABLE40)
|
||||||
|
#if !(PORTABLE)
|
||||||
[Test]
|
[Test]
|
||||||
public void ConvertXmlNode()
|
public void ConvertXmlNode()
|
||||||
{
|
{
|
||||||
@@ -269,6 +269,7 @@ namespace Newtonsoft.Json.Tests
|
|||||||
|
|
||||||
JsonConvert.SerializeXmlNode(doc);
|
JsonConvert.SerializeXmlNode(doc);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void ConvertXNode()
|
public void ConvertXNode()
|
||||||
@@ -301,6 +302,77 @@ namespace Newtonsoft.Json.Tests
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void LargeArrayJTokenPathPerformance()
|
||||||
|
{
|
||||||
|
JArray a = new JArray();
|
||||||
|
for (int i = 0; i < 100000; i++)
|
||||||
|
{
|
||||||
|
a.Add(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
JToken first = a.First;
|
||||||
|
JToken last = a.Last;
|
||||||
|
|
||||||
|
int interations = 1000;
|
||||||
|
|
||||||
|
TimeOperation(() =>
|
||||||
|
{
|
||||||
|
string p = null;
|
||||||
|
for (int i = 0; i < interations; i++)
|
||||||
|
{
|
||||||
|
p = first.Path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}, "First");
|
||||||
|
|
||||||
|
TimeOperation(() =>
|
||||||
|
{
|
||||||
|
string p = null;
|
||||||
|
for (int i = 0; i < interations; i++)
|
||||||
|
{
|
||||||
|
p = last.Path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return p;
|
||||||
|
}, "Last");
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void LargeArrayAddPerformance()
|
||||||
|
{
|
||||||
|
JArray a1 = new JArray();
|
||||||
|
|
||||||
|
JArray a2 = new JArray();
|
||||||
|
for (int i = 0; i < 100000; i++)
|
||||||
|
{
|
||||||
|
a2.Add(i);
|
||||||
|
}
|
||||||
|
|
||||||
|
int interations = 1000;
|
||||||
|
|
||||||
|
TimeOperation(() =>
|
||||||
|
{
|
||||||
|
for (int i = 0; i < interations; i++)
|
||||||
|
{
|
||||||
|
a1.Add(interations);
|
||||||
|
}
|
||||||
|
|
||||||
|
return a1;
|
||||||
|
}, "Small");
|
||||||
|
|
||||||
|
TimeOperation(() =>
|
||||||
|
{
|
||||||
|
for (int i = 0; i < interations; i++)
|
||||||
|
{
|
||||||
|
a2.Add(interations);
|
||||||
|
}
|
||||||
|
|
||||||
|
return a2;
|
||||||
|
}, "Large");
|
||||||
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void BuildJObject()
|
public void BuildJObject()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,7 +31,9 @@ using System.Security;
|
|||||||
// set of attributes. Change these attribute values to modify the information
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// associated with an assembly.
|
// associated with an assembly.
|
||||||
|
|
||||||
#if PORTABLE40
|
#if NETSTANDARD10
|
||||||
|
[assembly: AssemblyTitle("Json.NET Tests .NET Standard 1.0")]
|
||||||
|
#elif PORTABLE40
|
||||||
[assembly: AssemblyTitle("Json.NET Tests Portable .NET 4.0")]
|
[assembly: AssemblyTitle("Json.NET Tests Portable .NET 4.0")]
|
||||||
#elif PORTABLE
|
#elif PORTABLE
|
||||||
[assembly: AssemblyTitle("Json.NET Tests Portable")]
|
[assembly: AssemblyTitle("Json.NET Tests Portable")]
|
||||||
|
|||||||
@@ -77,22 +77,22 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void FailWithPrivateConstructorPlusParametizedAndDefault()
|
public void FailWithPrivateConstructorPlusParameterizedAndDefault()
|
||||||
{
|
{
|
||||||
ExceptionAssert.Throws<Exception>(() =>
|
ExceptionAssert.Throws<Exception>(() =>
|
||||||
{
|
{
|
||||||
string json = @"{Name:""Name!""}";
|
string json = @"{Name:""Name!""}";
|
||||||
|
|
||||||
PrivateConstructorWithPublicParametizedConstructorTestClass c = JsonConvert.DeserializeObject<PrivateConstructorWithPublicParametizedConstructorTestClass>(json);
|
PrivateConstructorWithPublicParameterizedConstructorTestClass c = JsonConvert.DeserializeObject<PrivateConstructorWithPublicParameterizedConstructorTestClass>(json);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPrivateConstructorPlusParametizedAndAllowNonPublic()
|
public void SuccessWithPrivateConstructorPlusParameterizedAndAllowNonPublic()
|
||||||
{
|
{
|
||||||
string json = @"{Name:""Name!""}";
|
string json = @"{Name:""Name!""}";
|
||||||
|
|
||||||
PrivateConstructorWithPublicParametizedConstructorTestClass c = JsonConvert.DeserializeObject<PrivateConstructorWithPublicParametizedConstructorTestClass>(json,
|
PrivateConstructorWithPublicParameterizedConstructorTestClass c = JsonConvert.DeserializeObject<PrivateConstructorWithPublicParameterizedConstructorTestClass>(json,
|
||||||
new JsonSerializerSettings
|
new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
|
ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor
|
||||||
@@ -103,71 +103,71 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPublicParametizedConstructor()
|
public void SuccessWithPublicParameterizedConstructor()
|
||||||
{
|
{
|
||||||
string json = @"{Name:""Name!""}";
|
string json = @"{Name:""Name!""}";
|
||||||
|
|
||||||
var c = JsonConvert.DeserializeObject<PublicParametizedConstructorTestClass>(json);
|
var c = JsonConvert.DeserializeObject<PublicParameterizedConstructorTestClass>(json);
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual("Name!", c.Name);
|
Assert.AreEqual("Name!", c.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPublicParametizedConstructorWhenParamaterIsNotAProperty()
|
public void SuccessWithPublicParameterizedConstructorWhenParameterIsNotAProperty()
|
||||||
{
|
{
|
||||||
string json = @"{nameParameter:""Name!""}";
|
string json = @"{nameParameter:""Name!""}";
|
||||||
|
|
||||||
PublicParametizedConstructorWithNonPropertyParameterTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithNonPropertyParameterTestClass>(json);
|
PublicParameterizedConstructorWithNonPropertyParameterTestClass c = JsonConvert.DeserializeObject<PublicParameterizedConstructorWithNonPropertyParameterTestClass>(json);
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual("Name!", c.Name);
|
Assert.AreEqual("Name!", c.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverter()
|
public void SuccessWithPublicParameterizedConstructorWhenParameterRequiresAConverter()
|
||||||
{
|
{
|
||||||
string json = @"{nameParameter:""Name!""}";
|
string json = @"{nameParameter:""Name!""}";
|
||||||
|
|
||||||
PublicParametizedConstructorRequiringConverterTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorRequiringConverterTestClass>(json, new NameContainerConverter());
|
PublicParameterizedConstructorRequiringConverterTestClass c = JsonConvert.DeserializeObject<PublicParameterizedConstructorRequiringConverterTestClass>(json, new NameContainerConverter());
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual("Name!", c.Name.Value);
|
Assert.AreEqual("Name!", c.Name.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverterWithParameterAttribute()
|
public void SuccessWithPublicParameterizedConstructorWhenParameterRequiresAConverterWithParameterAttribute()
|
||||||
{
|
{
|
||||||
string json = @"{nameParameter:""Name!""}";
|
string json = @"{nameParameter:""Name!""}";
|
||||||
|
|
||||||
PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass>(json);
|
PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass c = JsonConvert.DeserializeObject<PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass>(json);
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual("Name!", c.Name.Value);
|
Assert.AreEqual("Name!", c.Name.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPublicParametizedConstructorWhenParamaterRequiresAConverterWithPropertyAttribute()
|
public void SuccessWithPublicParameterizedConstructorWhenParameterRequiresAConverterWithPropertyAttribute()
|
||||||
{
|
{
|
||||||
string json = @"{name:""Name!""}";
|
string json = @"{name:""Name!""}";
|
||||||
|
|
||||||
PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass c = JsonConvert.DeserializeObject<PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass>(json);
|
PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass c = JsonConvert.DeserializeObject<PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass>(json);
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual("Name!", c.Name.Value);
|
Assert.AreEqual("Name!", c.Name.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void SuccessWithPublicParametizedConstructorWhenParamaterNameConflictsWithPropertyName()
|
public void SuccessWithPublicParameterizedConstructorWhenParameterNameConflictsWithPropertyName()
|
||||||
{
|
{
|
||||||
string json = @"{name:""1""}";
|
string json = @"{name:""1""}";
|
||||||
|
|
||||||
PublicParametizedConstructorWithPropertyNameConflict c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithPropertyNameConflict>(json);
|
PublicParameterizedConstructorWithPropertyNameConflict c = JsonConvert.DeserializeObject<PublicParameterizedConstructorWithPropertyNameConflict>(json);
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual(1, c.Name);
|
Assert.AreEqual(1, c.Name);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void PublicParametizedConstructorWithPropertyNameConflictWithAttribute()
|
public void PublicParameterizedConstructorWithPropertyNameConflictWithAttribute()
|
||||||
{
|
{
|
||||||
string json = @"{name:""1""}";
|
string json = @"{name:""1""}";
|
||||||
|
|
||||||
PublicParametizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithPropertyNameConflictWithAttribute>(json);
|
PublicParameterizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject<PublicParameterizedConstructorWithPropertyNameConflictWithAttribute>(json);
|
||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual(1, c.Name);
|
Assert.AreEqual(1, c.Name);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -441,12 +441,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
public void ParameterizedCreator()
|
public void ParameterizedCreator()
|
||||||
{
|
{
|
||||||
var resolver = new DefaultContractResolver();
|
var resolver = new DefaultContractResolver();
|
||||||
var contract = (JsonObjectContract)resolver.ResolveContract(typeof(PublicParametizedConstructorWithPropertyNameConflictWithAttribute));
|
var contract = (JsonObjectContract)resolver.ResolveContract(typeof(PublicParameterizedConstructorWithPropertyNameConflictWithAttribute));
|
||||||
|
|
||||||
Assert.IsNull(contract.DefaultCreator);
|
Assert.IsNull(contract.DefaultCreator);
|
||||||
Assert.IsNotNull(contract.ParameterizedCreator);
|
Assert.IsNotNull(contract.ParameterizedCreator);
|
||||||
#pragma warning disable 618
|
#pragma warning disable 618
|
||||||
Assert.AreEqual(contract.ParametrizedConstructor, typeof(PublicParametizedConstructorWithPropertyNameConflictWithAttribute).GetConstructor(new[] { typeof(string) }));
|
Assert.AreEqual(contract.ParametrizedConstructor, typeof(PublicParameterizedConstructorWithPropertyNameConflictWithAttribute).GetConstructor(new[] { typeof(string) }));
|
||||||
#pragma warning restore 618
|
#pragma warning restore 618
|
||||||
Assert.AreEqual(1, contract.CreatorParameters.Count);
|
Assert.AreEqual(1, contract.CreatorParameters.Count);
|
||||||
Assert.AreEqual("name", contract.CreatorParameters[0].PropertyName);
|
Assert.AreEqual("name", contract.CreatorParameters[0].PropertyName);
|
||||||
@@ -461,12 +461,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
public void OverrideCreator()
|
public void OverrideCreator()
|
||||||
{
|
{
|
||||||
var resolver = new DefaultContractResolver();
|
var resolver = new DefaultContractResolver();
|
||||||
var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParamatrizedConstructorsJsonConstructor));
|
var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParametrizedConstructorsJsonConstructor));
|
||||||
|
|
||||||
Assert.IsNull(contract.DefaultCreator);
|
Assert.IsNull(contract.DefaultCreator);
|
||||||
Assert.IsNotNull(contract.OverrideCreator);
|
Assert.IsNotNull(contract.OverrideCreator);
|
||||||
#pragma warning disable 618
|
#pragma warning disable 618
|
||||||
Assert.AreEqual(contract.OverrideConstructor, typeof(MultipleParamatrizedConstructorsJsonConstructor).GetConstructor(new[] { typeof(string), typeof(int) }));
|
Assert.AreEqual(contract.OverrideConstructor, typeof(MultipleParametrizedConstructorsJsonConstructor).GetConstructor(new[] { typeof(string), typeof(int) }));
|
||||||
#pragma warning restore 618
|
#pragma warning restore 618
|
||||||
Assert.AreEqual(2, contract.CreatorParameters.Count);
|
Assert.AreEqual(2, contract.CreatorParameters.Count);
|
||||||
Assert.AreEqual("Value", contract.CreatorParameters[0].PropertyName);
|
Assert.AreEqual("Value", contract.CreatorParameters[0].PropertyName);
|
||||||
@@ -482,20 +482,20 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
public void CustomOverrideCreator()
|
public void CustomOverrideCreator()
|
||||||
{
|
{
|
||||||
var resolver = new DefaultContractResolver();
|
var resolver = new DefaultContractResolver();
|
||||||
var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParamatrizedConstructorsJsonConstructor));
|
var contract = (JsonObjectContract)resolver.ResolveContract(typeof(MultipleParametrizedConstructorsJsonConstructor));
|
||||||
|
|
||||||
bool ensureCustomCreatorCalled = false;
|
bool ensureCustomCreatorCalled = false;
|
||||||
|
|
||||||
contract.OverrideCreator = args =>
|
contract.OverrideCreator = args =>
|
||||||
{
|
{
|
||||||
ensureCustomCreatorCalled = true;
|
ensureCustomCreatorCalled = true;
|
||||||
return new MultipleParamatrizedConstructorsJsonConstructor((string)args[0], (int)args[1]);
|
return new MultipleParametrizedConstructorsJsonConstructor((string)args[0], (int)args[1]);
|
||||||
};
|
};
|
||||||
#pragma warning disable 618
|
#pragma warning disable 618
|
||||||
Assert.IsNull(contract.OverrideConstructor);
|
Assert.IsNull(contract.OverrideConstructor);
|
||||||
#pragma warning restore 618
|
#pragma warning restore 618
|
||||||
|
|
||||||
var o = JsonConvert.DeserializeObject<MultipleParamatrizedConstructorsJsonConstructor>("{Value:'value!', Age:1}", new JsonSerializerSettings
|
var o = JsonConvert.DeserializeObject<MultipleParametrizedConstructorsJsonConstructor>("{Value:'value!', Age:1}", new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
ContractResolver = resolver
|
ContractResolver = resolver
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ using System;
|
|||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Runtime.Serialization;
|
using System.Runtime.Serialization;
|
||||||
#if !(NET20 || NET35 || NETFX_CORE || PORTABLE)
|
#if !(NET20 || NET35 || NETFX_CORE || PORTABLE || DNXCORE50)
|
||||||
using System.Runtime.Serialization.Json;
|
using System.Runtime.Serialization.Json;
|
||||||
#endif
|
#endif
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|||||||
@@ -374,6 +374,40 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual(7, c.ExtensionData.Count);
|
Assert.AreEqual(7, c.ExtensionData.Count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[JsonObject(MemberSerialization.OptIn)]
|
||||||
|
public class MyClass
|
||||||
|
{
|
||||||
|
public int NotForJson { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyAttribute(Required = Required.Always)]
|
||||||
|
public int ForJson { get; set; }
|
||||||
|
|
||||||
|
[JsonExtensionData(ReadData = true, WriteData = true)]
|
||||||
|
public IDictionary<String, JToken> ExtraInfoJson { get; set; }
|
||||||
|
|
||||||
|
public MyClass(MyClass other = null)
|
||||||
|
{
|
||||||
|
if (other != null)
|
||||||
|
{
|
||||||
|
// copy construct
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void PopulateWithExtensionData()
|
||||||
|
{
|
||||||
|
string jsonStirng = @"{ ""ForJson"" : 33 , ""extra1"" : 11, ""extra2"" : 22 }";
|
||||||
|
|
||||||
|
MyClass c = new MyClass();
|
||||||
|
|
||||||
|
JsonConvert.PopulateObject(jsonStirng, c);
|
||||||
|
|
||||||
|
Assert.AreEqual(2, c.ExtraInfoJson.Count);
|
||||||
|
Assert.AreEqual(11, (int)c.ExtraInfoJson["extra1"]);
|
||||||
|
Assert.AreEqual(22, (int)c.ExtraInfoJson["extra2"]);
|
||||||
|
}
|
||||||
|
|
||||||
public class MultipleExtensionDataAttributesTestClass
|
public class MultipleExtensionDataAttributesTestClass
|
||||||
{
|
{
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
|
|||||||
@@ -1917,6 +1917,86 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual(deserializeTest2["testkey"], "");
|
Assert.AreEqual(deserializeTest2["testkey"], "");
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void DeserializeCollectionWithConstructorArrayArgument()
|
||||||
|
{
|
||||||
|
var v = new ReadOnlyCollectionWithArrayArgument<double>(new[] { -0.014147478859765236, -0.011419606805541858, -0.010038461483676238 });
|
||||||
|
var json = JsonConvert.SerializeObject(v);
|
||||||
|
|
||||||
|
ExceptionAssert.Throws<JsonSerializationException>(() =>
|
||||||
|
{
|
||||||
|
JsonConvert.DeserializeObject<ReadOnlyCollectionWithArrayArgument<double>>(json);
|
||||||
|
}, "Unable to find a constructor to use for type Newtonsoft.Json.Tests.Serialization.ReadOnlyCollectionWithArrayArgument`1[System.Double]. Path '', line 1, position 1.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ReadOnlyCollectionWithArrayArgument<T> : IList<T>
|
||||||
|
{
|
||||||
|
private readonly IList<T> _values;
|
||||||
|
|
||||||
|
public ReadOnlyCollectionWithArrayArgument(T[] args)
|
||||||
|
{
|
||||||
|
_values = args ?? (IList<T>)new List<T>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public IEnumerator<T> GetEnumerator()
|
||||||
|
{
|
||||||
|
return _values.GetEnumerator();
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator IEnumerable.GetEnumerator()
|
||||||
|
{
|
||||||
|
return _values.GetEnumerator();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Add(T item)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Clear()
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Contains(T item)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void CopyTo(T[] array, int arrayIndex)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Remove(T item)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public int Count { get; }
|
||||||
|
public bool IsReadOnly { get; }
|
||||||
|
public int IndexOf(T item)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Insert(int index, T item)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RemoveAt(int index)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public T this[int index]
|
||||||
|
{
|
||||||
|
get { throw new NotImplementedException(); }
|
||||||
|
set { throw new NotImplementedException(); }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
||||||
|
|||||||
@@ -5286,7 +5286,7 @@ Path '', line 1, position 1.");
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !NETFX_CORE
|
#if !(NETFX_CORE || DNXCORE50)
|
||||||
public class XmlNodeTestObject
|
public class XmlNodeTestObject
|
||||||
{
|
{
|
||||||
public XmlDocument Document { get; set; }
|
public XmlDocument Document { get; set; }
|
||||||
@@ -6104,15 +6104,15 @@ Path '', line 1, position 1.");
|
|||||||
public void PublicConstructorOverridenByJsonConstructorTest()
|
public void PublicConstructorOverridenByJsonConstructorTest()
|
||||||
{
|
{
|
||||||
PublicConstructorOverridenByJsonConstructor c = JsonConvert.DeserializeObject<PublicConstructorOverridenByJsonConstructor>("{Value:'value!'}");
|
PublicConstructorOverridenByJsonConstructor c = JsonConvert.DeserializeObject<PublicConstructorOverridenByJsonConstructor>("{Value:'value!'}");
|
||||||
Assert.AreEqual("Public Paramatized", c.Constructor);
|
Assert.AreEqual("Public Parameterized", c.Constructor);
|
||||||
Assert.AreEqual("value!", c.Value);
|
Assert.AreEqual("value!", c.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void MultipleParamatrizedConstructorsJsonConstructorTest()
|
public void MultipleParametrizedConstructorsJsonConstructorTest()
|
||||||
{
|
{
|
||||||
MultipleParamatrizedConstructorsJsonConstructor c = JsonConvert.DeserializeObject<MultipleParamatrizedConstructorsJsonConstructor>("{Value:'value!', Age:1}");
|
MultipleParametrizedConstructorsJsonConstructor c = JsonConvert.DeserializeObject<MultipleParametrizedConstructorsJsonConstructor>("{Value:'value!', Age:1}");
|
||||||
Assert.AreEqual("Public Paramatized 2", c.Constructor);
|
Assert.AreEqual("Public Parameterized 2", c.Constructor);
|
||||||
Assert.AreEqual("value!", c.Value);
|
Assert.AreEqual("value!", c.Value);
|
||||||
Assert.AreEqual(1, c.Age);
|
Assert.AreEqual(1, c.Age);
|
||||||
}
|
}
|
||||||
@@ -9760,7 +9760,7 @@ Path '', line 1, position 1.");
|
|||||||
public NonPublicConstructorWithJsonConstructor(string value)
|
public NonPublicConstructorWithJsonConstructor(string value)
|
||||||
{
|
{
|
||||||
Value = value;
|
Value = value;
|
||||||
Constructor = "Public Paramatized";
|
Constructor = "Public Parameterized";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -9803,28 +9803,28 @@ Path '', line 1, position 1.");
|
|||||||
public PublicConstructorOverridenByJsonConstructor(string value)
|
public PublicConstructorOverridenByJsonConstructor(string value)
|
||||||
{
|
{
|
||||||
Value = value;
|
Value = value;
|
||||||
Constructor = "Public Paramatized";
|
Constructor = "Public Parameterized";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class MultipleParamatrizedConstructorsJsonConstructor
|
public class MultipleParametrizedConstructorsJsonConstructor
|
||||||
{
|
{
|
||||||
public string Value { get; private set; }
|
public string Value { get; private set; }
|
||||||
public int Age { get; private set; }
|
public int Age { get; private set; }
|
||||||
public string Constructor { get; private set; }
|
public string Constructor { get; private set; }
|
||||||
|
|
||||||
public MultipleParamatrizedConstructorsJsonConstructor(string value)
|
public MultipleParametrizedConstructorsJsonConstructor(string value)
|
||||||
{
|
{
|
||||||
Value = value;
|
Value = value;
|
||||||
Constructor = "Public Paramatized 1";
|
Constructor = "Public Parameterized 1";
|
||||||
}
|
}
|
||||||
|
|
||||||
[JsonConstructor]
|
[JsonConstructor]
|
||||||
public MultipleParamatrizedConstructorsJsonConstructor(string value, int age)
|
public MultipleParametrizedConstructorsJsonConstructor(string value, int age)
|
||||||
{
|
{
|
||||||
Value = value;
|
Value = value;
|
||||||
Age = age;
|
Age = age;
|
||||||
Constructor = "Public Paramatized 2";
|
Constructor = "Public Parameterized 2";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -528,6 +528,72 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
JObject o = (JObject)actual.Payload;
|
JObject o = (JObject)actual.Payload;
|
||||||
Assert.AreEqual("System.Byte[], mscorlib", (string)o["$type"]);
|
Assert.AreEqual("System.Byte[], mscorlib", (string)o["$type"]);
|
||||||
Assert.AreEqual("AAECAwQFBgcICQ==", (string)o["$value"]);
|
Assert.AreEqual("AAECAwQFBgcICQ==", (string)o["$value"]);
|
||||||
|
Assert.AreEqual(null, o.Parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void ReadAhead_JObject_NoParent()
|
||||||
|
{
|
||||||
|
ItemWithUntypedPayload actual = JsonConvert.DeserializeObject<ItemWithUntypedPayload>(@"{
|
||||||
|
""Payload"": {}
|
||||||
|
}",
|
||||||
|
new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
|
||||||
|
});
|
||||||
|
|
||||||
|
JObject o = (JObject)actual.Payload;
|
||||||
|
Assert.AreEqual(null, o.Parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ItemWithJTokens
|
||||||
|
{
|
||||||
|
public JValue Payload1 { get; set; }
|
||||||
|
public JObject Payload2 { get; set; }
|
||||||
|
public JArray Payload3 { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void ReadAhead_TypedJValue_NoParent()
|
||||||
|
{
|
||||||
|
ItemWithJTokens actual = (ItemWithJTokens)JsonConvert.DeserializeObject(@"{
|
||||||
|
""Payload1"": 1,
|
||||||
|
""Payload2"": {'prop1':1,'prop2':[2]},
|
||||||
|
""Payload3"": [1],
|
||||||
|
""$type"": ""Newtonsoft.Json.Tests.Serialization.MetadataPropertyHandlingTests+ItemWithJTokens, Newtonsoft.Json.Tests""
|
||||||
|
}",
|
||||||
|
new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead,
|
||||||
|
TypeNameHandling = TypeNameHandling.All
|
||||||
|
});
|
||||||
|
|
||||||
|
Assert.AreEqual(JTokenType.Integer, actual.Payload1.Type);
|
||||||
|
Assert.AreEqual(1, (int)actual.Payload1);
|
||||||
|
Assert.AreEqual(null, actual.Payload1.Parent);
|
||||||
|
|
||||||
|
Assert.AreEqual(JTokenType.Object, actual.Payload2.Type);
|
||||||
|
Assert.AreEqual(1, (int)actual.Payload2["prop1"]);
|
||||||
|
Assert.AreEqual(2, (int)actual.Payload2["prop2"][0]);
|
||||||
|
Assert.AreEqual(null, actual.Payload2.Parent);
|
||||||
|
|
||||||
|
Assert.AreEqual(1, (int)actual.Payload3[0]);
|
||||||
|
Assert.AreEqual(null, actual.Payload3.Parent);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void ReadAhead_JArray_NoParent()
|
||||||
|
{
|
||||||
|
ItemWithUntypedPayload actual = JsonConvert.DeserializeObject<ItemWithUntypedPayload>(@"{
|
||||||
|
""Payload"": [1]
|
||||||
|
}",
|
||||||
|
new JsonSerializerSettings
|
||||||
|
{
|
||||||
|
MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
|
||||||
|
});
|
||||||
|
|
||||||
|
JArray o = (JArray)actual.Payload;
|
||||||
|
Assert.AreEqual(null, o.Parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ItemWithUntypedPayload
|
public class ItemWithUntypedPayload
|
||||||
|
|||||||
@@ -71,7 +71,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
[Test]
|
[Test]
|
||||||
public void GetAttributes_Property()
|
public void GetAttributes_Property()
|
||||||
{
|
{
|
||||||
PropertyInfo property = typeof(ReflectionTestObject).GetProperty("TestProperty");
|
PropertyInfo property;
|
||||||
|
#if DNXCORE50
|
||||||
|
property = Newtonsoft.Json.Utilities.TypeExtensions.GetProperty(typeof(ReflectionTestObject), "TestProperty");
|
||||||
|
#else
|
||||||
|
property = typeof(ReflectionTestObject).GetProperty("TestProperty");
|
||||||
|
#endif
|
||||||
|
|
||||||
ReflectionAttributeProvider provider = new ReflectionAttributeProvider(property);
|
ReflectionAttributeProvider provider = new ReflectionAttributeProvider(property);
|
||||||
|
|
||||||
@@ -85,7 +90,12 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
[Test]
|
[Test]
|
||||||
public void GetAttributes_Field()
|
public void GetAttributes_Field()
|
||||||
{
|
{
|
||||||
FieldInfo field = (FieldInfo)typeof(ReflectionTestObject).GetField("TestField");
|
FieldInfo field;
|
||||||
|
#if DNXCORE50
|
||||||
|
field = (FieldInfo)Newtonsoft.Json.Utilities.TypeExtensions.GetField(typeof(ReflectionTestObject), "TestField");
|
||||||
|
#else
|
||||||
|
field = typeof(ReflectionTestObject).GetField("TestField");
|
||||||
|
#endif
|
||||||
|
|
||||||
ReflectionAttributeProvider provider = new ReflectionAttributeProvider(field);
|
ReflectionAttributeProvider provider = new ReflectionAttributeProvider(field);
|
||||||
|
|
||||||
|
|||||||
@@ -74,11 +74,14 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
var possibleMsgs = new[]
|
var possibleMsgs = new[]
|
||||||
{
|
{
|
||||||
"[1] - Error message for member 1 = An item with the same key has already been added.",
|
"[1] - Error message for member 1 = An item with the same key has already been added.",
|
||||||
"[1] - Error message for member 1 = An element with the same key already exists in the dictionary." // mono
|
"[1] - Error message for member 1 = An element with the same key already exists in the dictionary.", // mono
|
||||||
|
"[1] - Error message for member 1 = An item with the same key has already been added. Key: Jim" // netcore
|
||||||
};
|
};
|
||||||
VersionKeyedCollection c = JsonConvert.DeserializeObject<VersionKeyedCollection>(json);
|
VersionKeyedCollection c = JsonConvert.DeserializeObject<VersionKeyedCollection>(json);
|
||||||
Assert.AreEqual(1, c.Count);
|
Assert.AreEqual(1, c.Count);
|
||||||
Assert.AreEqual(1, c.Messages.Count);
|
Assert.AreEqual(1, c.Messages.Count);
|
||||||
|
|
||||||
|
Console.WriteLine(c.Messages[0]);
|
||||||
Assert.IsTrue(possibleMsgs.Any(m => m == c.Messages[0]), "Expected One of: " + Environment.NewLine + string.Join(Environment.NewLine, possibleMsgs) + Environment.NewLine + "Was: " + Environment.NewLine + c.Messages[0]);
|
Assert.IsTrue(possibleMsgs.Any(m => m == c.Messages[0]), "Expected One of: " + Environment.NewLine + string.Join(Environment.NewLine, possibleMsgs) + Environment.NewLine + "Was: " + Environment.NewLine + c.Messages[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -733,7 +733,7 @@ Newtonsoft.Json Error: 0 : Error!
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void PublicParametizedConstructorWithPropertyNameConflictWithAttribute()
|
public void PublicParameterizedConstructorWithPropertyNameConflictWithAttribute()
|
||||||
{
|
{
|
||||||
InMemoryTraceWriter traceWriter = new InMemoryTraceWriter
|
InMemoryTraceWriter traceWriter = new InMemoryTraceWriter
|
||||||
{
|
{
|
||||||
@@ -742,7 +742,7 @@ Newtonsoft.Json Error: 0 : Error!
|
|||||||
|
|
||||||
string json = @"{name:""1""}";
|
string json = @"{name:""1""}";
|
||||||
|
|
||||||
PublicParametizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject<PublicParametizedConstructorWithPropertyNameConflictWithAttribute>(json, new JsonSerializerSettings
|
PublicParameterizedConstructorWithPropertyNameConflictWithAttribute c = JsonConvert.DeserializeObject<PublicParameterizedConstructorWithPropertyNameConflictWithAttribute>(json, new JsonSerializerSettings
|
||||||
{
|
{
|
||||||
TraceWriter = traceWriter
|
TraceWriter = traceWriter
|
||||||
});
|
});
|
||||||
@@ -750,7 +750,7 @@ Newtonsoft.Json Error: 0 : Error!
|
|||||||
Assert.IsNotNull(c);
|
Assert.IsNotNull(c);
|
||||||
Assert.AreEqual(1, c.Name);
|
Assert.AreEqual(1, c.Name);
|
||||||
|
|
||||||
Assert.AreEqual("Deserializing Newtonsoft.Json.Tests.TestObjects.PublicParametizedConstructorWithPropertyNameConflictWithAttribute using creator with parameters: name. Path 'name', line 1, position 6.", traceWriter.TraceRecords[0].Message);
|
Assert.AreEqual("Deserializing Newtonsoft.Json.Tests.TestObjects.PublicParameterizedConstructorWithPropertyNameConflictWithAttribute using creator with parameters: name. Path 'name', line 1, position 6.", traceWriter.TraceRecords[0].Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ using Assert = Newtonsoft.Json.Tests.XUnitAssert;
|
|||||||
#else
|
#else
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
#endif
|
#endif
|
||||||
#if !(NETFX_CORE || NET20 || NET35)
|
#if !(NETFX_CORE || NET20 || NET35 || DNXCORE50)
|
||||||
using System.Runtime.Serialization.Json;
|
using System.Runtime.Serialization.Json;
|
||||||
#endif
|
#endif
|
||||||
using Newtonsoft.Json.Serialization;
|
using Newtonsoft.Json.Serialization;
|
||||||
|
|||||||
@@ -66,7 +66,11 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
|
|
||||||
public override bool CanConvert(Type objectType)
|
public override bool CanConvert(Type objectType)
|
||||||
{
|
{
|
||||||
|
#if DNXCORE50
|
||||||
|
return Newtonsoft.Json.Utilities.TypeExtensions.IsAssignableFrom(typeof(IList<T>), objectType);
|
||||||
|
#else
|
||||||
return typeof(IList<T>).IsAssignableFrom(objectType);
|
return typeof(IList<T>).IsAssignableFrom(objectType);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-3
@@ -27,17 +27,17 @@ using System;
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.TestObjects
|
namespace Newtonsoft.Json.Tests.TestObjects
|
||||||
{
|
{
|
||||||
public class PrivateConstructorWithPublicParametizedConstructorTestClass
|
public class PrivateConstructorWithPublicParameterizedConstructorTestClass
|
||||||
{
|
{
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
public int Age { get; set; }
|
public int Age { get; set; }
|
||||||
|
|
||||||
private PrivateConstructorWithPublicParametizedConstructorTestClass()
|
private PrivateConstructorWithPublicParameterizedConstructorTestClass()
|
||||||
{
|
{
|
||||||
Age = 1;
|
Age = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public PrivateConstructorWithPublicParametizedConstructorTestClass(string dummy)
|
public PrivateConstructorWithPublicParameterizedConstructorTestClass(string dummy)
|
||||||
{
|
{
|
||||||
throw new Exception("Should never get here.");
|
throw new Exception("Should never get here.");
|
||||||
}
|
}
|
||||||
+6
-6
@@ -62,11 +62,11 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class PublicParametizedConstructorRequiringConverterTestClass
|
public class PublicParameterizedConstructorRequiringConverterTestClass
|
||||||
{
|
{
|
||||||
private readonly NameContainer _nameContainer;
|
private readonly NameContainer _nameContainer;
|
||||||
|
|
||||||
public PublicParametizedConstructorRequiringConverterTestClass(NameContainer nameParameter)
|
public PublicParameterizedConstructorRequiringConverterTestClass(NameContainer nameParameter)
|
||||||
{
|
{
|
||||||
_nameContainer = nameParameter;
|
_nameContainer = nameParameter;
|
||||||
}
|
}
|
||||||
@@ -77,11 +77,11 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass
|
public class PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass
|
||||||
{
|
{
|
||||||
private readonly NameContainer _nameContainer;
|
private readonly NameContainer _nameContainer;
|
||||||
|
|
||||||
public PublicParametizedConstructorRequiringConverterWithParameterAttributeTestClass([JsonConverter(typeof(NameContainerConverter))] NameContainer nameParameter)
|
public PublicParameterizedConstructorRequiringConverterWithParameterAttributeTestClass([JsonConverter(typeof(NameContainerConverter))] NameContainer nameParameter)
|
||||||
{
|
{
|
||||||
_nameContainer = nameParameter;
|
_nameContainer = nameParameter;
|
||||||
}
|
}
|
||||||
@@ -92,11 +92,11 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass
|
public class PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass
|
||||||
{
|
{
|
||||||
private readonly NameContainer _nameContainer;
|
private readonly NameContainer _nameContainer;
|
||||||
|
|
||||||
public PublicParametizedConstructorRequiringConverterWithPropertyAttributeTestClass(NameContainer name)
|
public PublicParameterizedConstructorRequiringConverterWithPropertyAttributeTestClass(NameContainer name)
|
||||||
{
|
{
|
||||||
_nameContainer = name;
|
_nameContainer = name;
|
||||||
}
|
}
|
||||||
+2
-2
@@ -25,11 +25,11 @@
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.TestObjects
|
namespace Newtonsoft.Json.Tests.TestObjects
|
||||||
{
|
{
|
||||||
public class PublicParametizedConstructorTestClass
|
public class PublicParameterizedConstructorTestClass
|
||||||
{
|
{
|
||||||
private readonly string _name;
|
private readonly string _name;
|
||||||
|
|
||||||
public PublicParametizedConstructorTestClass(string name)
|
public PublicParameterizedConstructorTestClass(string name)
|
||||||
{
|
{
|
||||||
_name = name;
|
_name = name;
|
||||||
}
|
}
|
||||||
+2
-2
@@ -25,11 +25,11 @@
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.TestObjects
|
namespace Newtonsoft.Json.Tests.TestObjects
|
||||||
{
|
{
|
||||||
public class PublicParametizedConstructorWithNonPropertyParameterTestClass
|
public class PublicParameterizedConstructorWithNonPropertyParameterTestClass
|
||||||
{
|
{
|
||||||
private readonly string _name;
|
private readonly string _name;
|
||||||
|
|
||||||
public PublicParametizedConstructorWithNonPropertyParameterTestClass(string nameParameter)
|
public PublicParameterizedConstructorWithNonPropertyParameterTestClass(string nameParameter)
|
||||||
{
|
{
|
||||||
_name = nameParameter;
|
_name = nameParameter;
|
||||||
}
|
}
|
||||||
+4
-4
@@ -27,11 +27,11 @@ using System;
|
|||||||
|
|
||||||
namespace Newtonsoft.Json.Tests.TestObjects
|
namespace Newtonsoft.Json.Tests.TestObjects
|
||||||
{
|
{
|
||||||
public class PublicParametizedConstructorWithPropertyNameConflict
|
public class PublicParameterizedConstructorWithPropertyNameConflict
|
||||||
{
|
{
|
||||||
private readonly int _value;
|
private readonly int _value;
|
||||||
|
|
||||||
public PublicParametizedConstructorWithPropertyNameConflict(string name)
|
public PublicParameterizedConstructorWithPropertyNameConflict(string name)
|
||||||
{
|
{
|
||||||
_value = Convert.ToInt32(name);
|
_value = Convert.ToInt32(name);
|
||||||
}
|
}
|
||||||
@@ -42,11 +42,11 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class PublicParametizedConstructorWithPropertyNameConflictWithAttribute
|
public class PublicParameterizedConstructorWithPropertyNameConflictWithAttribute
|
||||||
{
|
{
|
||||||
private readonly int _value;
|
private readonly int _value;
|
||||||
|
|
||||||
public PublicParametizedConstructorWithPropertyNameConflictWithAttribute([JsonProperty("name")] string nameParameter)
|
public PublicParameterizedConstructorWithPropertyNameConflictWithAttribute([JsonProperty("name")] string nameParameter)
|
||||||
{
|
{
|
||||||
_value = Convert.ToInt32(nameParameter);
|
_value = Convert.ToInt32(nameParameter);
|
||||||
}
|
}
|
||||||
@@ -175,6 +175,24 @@ namespace Newtonsoft.Json.Tests.Utilities
|
|||||||
JsonSerializerTest.DictionaryKey key = (JsonSerializerTest.DictionaryKey)result;
|
JsonSerializerTest.DictionaryKey key = (JsonSerializerTest.DictionaryKey)result;
|
||||||
Assert.AreEqual("First!", key.Value);
|
Assert.AreEqual("First!", key.Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void CreatePropertyGetter()
|
||||||
|
{
|
||||||
|
PropertyInfo namePropertyInfo = typeof(Person).GetProperty(nameof(Person.Name));
|
||||||
|
|
||||||
|
Assert.IsNotNull(namePropertyInfo);
|
||||||
|
|
||||||
|
var call = DynamicReflectionDelegateFactory.Instance.CreateGet<Person>(namePropertyInfo);
|
||||||
|
|
||||||
|
Person p = new Person();
|
||||||
|
p.Name = "Name!";
|
||||||
|
|
||||||
|
object result = call(p);
|
||||||
|
Assert.IsNotNull(result);
|
||||||
|
|
||||||
|
Assert.AreEqual("Name!", (string)result);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ namespace Newtonsoft.Json.Tests.Utilities
|
|||||||
Assert.AreEqual(" IPhone", StringUtils.ToCamelCase(" IPhone"));
|
Assert.AreEqual(" IPhone", StringUtils.ToCamelCase(" IPhone"));
|
||||||
Assert.AreEqual("isCIA", StringUtils.ToCamelCase("IsCIA"));
|
Assert.AreEqual("isCIA", StringUtils.ToCamelCase("IsCIA"));
|
||||||
Assert.AreEqual("vmQ", StringUtils.ToCamelCase("VmQ"));
|
Assert.AreEqual("vmQ", StringUtils.ToCamelCase("VmQ"));
|
||||||
|
Assert.AreEqual("xml2Json", StringUtils.ToCamelCase("Xml2Json"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,17 +1,13 @@
|
|||||||
{
|
{
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"exclude": [
|
|
||||||
],
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Newtonsoft.Json": {
|
"Newtonsoft.Json": {
|
||||||
"target": "project"
|
"target": "project"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"commands": {
|
"testRunner": "xunit",
|
||||||
"test": "xunit.runner.dnx -parallel none"
|
|
||||||
},
|
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
/*"net45": {
|
||||||
"frameworkAssemblies": {
|
"frameworkAssemblies": {
|
||||||
"System.Collections": "",
|
"System.Collections": "",
|
||||||
"System.ComponentModel.DataAnnotations": "",
|
"System.ComponentModel.DataAnnotations": "",
|
||||||
@@ -38,7 +34,6 @@
|
|||||||
},
|
},
|
||||||
"net40": {
|
"net40": {
|
||||||
"frameworkAssemblies": {
|
"frameworkAssemblies": {
|
||||||
"System.Collections": "",
|
|
||||||
"System.ComponentModel.DataAnnotations": "",
|
"System.ComponentModel.DataAnnotations": "",
|
||||||
"System.Data": "",
|
"System.Data": "",
|
||||||
"System.Data.DataSetExtensions": "",
|
"System.Data.DataSetExtensions": "",
|
||||||
@@ -46,7 +41,6 @@
|
|||||||
"System.Data.Linq": "",
|
"System.Data.Linq": "",
|
||||||
"System.Drawing": "",
|
"System.Drawing": "",
|
||||||
"System.Numerics": "",
|
"System.Numerics": "",
|
||||||
"System.Runtime": "",
|
|
||||||
"System.Runtime.Serialization": "",
|
"System.Runtime.Serialization": "",
|
||||||
"System.Web": "",
|
"System.Web": "",
|
||||||
"System.Web.Extensions": "",
|
"System.Web.Extensions": "",
|
||||||
@@ -87,40 +81,27 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NUnit": "2.6.4"
|
"NUnit": "2.6.4"
|
||||||
}
|
}
|
||||||
|
},*/
|
||||||
|
"netcoreapp1.0": {
|
||||||
|
"buildOptions": {
|
||||||
|
"define": [ "NETSTANDARD10", "DNXCORE50", "PORTABLE" ]
|
||||||
},
|
},
|
||||||
"dnxcore50": {
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CSharp": "4.0.0",
|
"Microsoft.NETCore.App": {
|
||||||
"System.Collections": "4.0.10",
|
"type": "platform",
|
||||||
"System.Collections.Immutable": "1.1.37",
|
"version": "1.0.0-rc2-3002702"
|
||||||
"System.ComponentModel.TypeConverter": "4.0.0",
|
},
|
||||||
"System.Diagnostics.Debug": "4.0.10",
|
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
|
||||||
"System.Dynamic.Runtime": "4.0.10",
|
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
|
||||||
"System.Globalization": "4.0.10",
|
"System.Runtime.Serialization.Json": "4.0.2-rc2-24027",
|
||||||
"System.IO": "4.0.10",
|
"System.Runtime.Serialization.Xml": "4.1.1-rc2-24027",
|
||||||
"System.Linq": "4.0.0",
|
"xunit": "2.1.0",
|
||||||
"System.Linq.Expressions": "4.0.10",
|
"dotnet-test-xunit": "1.0.0-rc2-build10015"
|
||||||
"System.Reflection.Emit.ILGeneration": "4.0.0",
|
},
|
||||||
"System.Reflection.Extensions": "4.0.0",
|
"imports": [
|
||||||
"System.Reflection.TypeExtensions": "4.0.0",
|
"dnxcore50",
|
||||||
"System.Runtime": "4.0.20",
|
"portable-net45+win8"
|
||||||
"System.Runtime.Extensions": "4.0.10",
|
]
|
||||||
"System.Runtime.Numerics": "4.0.0",
|
|
||||||
"System.Runtime.Serialization.Json": "4.0.0",
|
|
||||||
"System.Runtime.Serialization.Primitives": "4.0.10",
|
|
||||||
"System.Runtime.Serialization.Xml": "4.0.10",
|
|
||||||
"System.Text.Encoding": "4.0.10",
|
|
||||||
"System.Text.Encoding.CodePages": "4.0.0",
|
|
||||||
"System.Text.Encoding.Extensions": "4.0.10",
|
|
||||||
"System.Text.RegularExpressions": "4.0.10",
|
|
||||||
"System.Threading": "4.0.10",
|
|
||||||
"System.Xml.ReaderWriter": "4.0.10",
|
|
||||||
"System.Xml.XDocument": "4.0.10",
|
|
||||||
"System.Xml.XmlDocument": "4.0.0",
|
|
||||||
"System.Xml.XmlSerializer": "4.0.10",
|
|
||||||
"xunit": "2.1.0-*",
|
|
||||||
"xunit.runner.dnx": "2.1.0-rc1-build204"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -178,7 +178,7 @@ namespace Newtonsoft.Json.Bson
|
|||||||
/// Reads the next JSON token from the stream.
|
/// Reads the next JSON token from the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the next token was read successfully; false if there are no more tokens to read.
|
/// <c>true</c> if the next token was read successfully; <c>false</c> if there are no more tokens to read.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public override bool Read()
|
public override bool Read()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,12 +31,12 @@ namespace Newtonsoft.Json
|
|||||||
public enum ConstructorHandling
|
public enum ConstructorHandling
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// First attempt to use the public default constructor, then fall back to single paramatized constructor, then the non-public default constructor.
|
/// First attempt to use the public default constructor, then fall back to single parameterized constructor, then the non-public default constructor.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Default = 0,
|
Default = 0,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Json.NET will use a non-public default constructor before falling back to a paramatized constructor.
|
/// Json.NET will use a non-public default constructor before falling back to a parameterized constructor.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
AllowNonPublicDefaultConstructor = 1
|
AllowNonPublicDefaultConstructor = 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,16 +37,9 @@ using Newtonsoft.Json.Serialization;
|
|||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
#endif
|
#endif
|
||||||
using Newtonsoft.Json.Utilities;
|
using Newtonsoft.Json.Utilities;
|
||||||
#if NET20
|
|
||||||
using Newtonsoft.Json.Utilities.LinqBridge;
|
|
||||||
#else
|
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Converters
|
namespace Newtonsoft.Json.Converters
|
||||||
{
|
{
|
||||||
|
|
||||||
#region XmlNodeWrappers
|
#region XmlNodeWrappers
|
||||||
#if !DOTNET && !PORTABLE && !PORTABLE40
|
#if !DOTNET && !PORTABLE && !PORTABLE40
|
||||||
internal class XmlDocumentWrapper : XmlNodeWrapper, IXmlDocument
|
internal class XmlDocumentWrapper : XmlNodeWrapper, IXmlDocument
|
||||||
@@ -234,7 +227,8 @@ namespace Newtonsoft.Json.Converters
|
|||||||
internal class XmlNodeWrapper : IXmlNode
|
internal class XmlNodeWrapper : IXmlNode
|
||||||
{
|
{
|
||||||
private readonly XmlNode _node;
|
private readonly XmlNode _node;
|
||||||
private IList<IXmlNode> _childNodes;
|
private List<IXmlNode> _childNodes;
|
||||||
|
private List<IXmlNode> _attributes;
|
||||||
|
|
||||||
public XmlNodeWrapper(XmlNode node)
|
public XmlNodeWrapper(XmlNode node)
|
||||||
{
|
{
|
||||||
@@ -256,7 +250,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
get { return _node.LocalName; }
|
get { return _node.LocalName; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<IXmlNode> ChildNodes
|
public List<IXmlNode> ChildNodes
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -264,7 +258,11 @@ namespace Newtonsoft.Json.Converters
|
|||||||
// cache results to prevent multiple reads which kills perf in large documents
|
// cache results to prevent multiple reads which kills perf in large documents
|
||||||
if (_childNodes == null)
|
if (_childNodes == null)
|
||||||
{
|
{
|
||||||
_childNodes = _node.ChildNodes.Cast<XmlNode>().Select(WrapNode).ToList();
|
_childNodes = new List<IXmlNode>(_node.ChildNodes.Count);
|
||||||
|
foreach (XmlNode childNode in _node.ChildNodes)
|
||||||
|
{
|
||||||
|
_childNodes.Add(WrapNode(childNode));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return _childNodes;
|
return _childNodes;
|
||||||
@@ -286,7 +284,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public IList<IXmlNode> Attributes
|
public List<IXmlNode> Attributes
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -295,7 +293,18 @@ namespace Newtonsoft.Json.Converters
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return _node.Attributes.Cast<XmlAttribute>().Select(WrapNode).ToList();
|
// attributes is read multiple times
|
||||||
|
// cache results to prevent multiple reads which kills perf in large documents
|
||||||
|
if (_attributes == null)
|
||||||
|
{
|
||||||
|
_attributes = new List<IXmlNode>(_node.Attributes.Count);
|
||||||
|
foreach (XmlAttribute attribute in _node.Attributes)
|
||||||
|
{
|
||||||
|
_attributes.Add(WrapNode(attribute));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return _attributes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -327,6 +336,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
XmlNodeWrapper xmlNodeWrapper = (XmlNodeWrapper)newChild;
|
XmlNodeWrapper xmlNodeWrapper = (XmlNodeWrapper)newChild;
|
||||||
_node.AppendChild(xmlNodeWrapper._node);
|
_node.AppendChild(xmlNodeWrapper._node);
|
||||||
_childNodes = null;
|
_childNodes = null;
|
||||||
|
_attributes = null;
|
||||||
|
|
||||||
return newChild;
|
return newChild;
|
||||||
}
|
}
|
||||||
@@ -384,8 +394,8 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
XmlNodeType NodeType { get; }
|
XmlNodeType NodeType { get; }
|
||||||
string LocalName { get; }
|
string LocalName { get; }
|
||||||
IList<IXmlNode> ChildNodes { get; }
|
List<IXmlNode> ChildNodes { get; }
|
||||||
IList<IXmlNode> Attributes { get; }
|
List<IXmlNode> Attributes { get; }
|
||||||
IXmlNode ParentNode { get; }
|
IXmlNode ParentNode { get; }
|
||||||
string Value { get; set; }
|
string Value { get; set; }
|
||||||
IXmlNode AppendChild(IXmlNode newChild);
|
IXmlNode AppendChild(IXmlNode newChild);
|
||||||
@@ -477,11 +487,11 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override IList<IXmlNode> ChildNodes
|
public override List<IXmlNode> ChildNodes
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
IList<IXmlNode> childNodes = base.ChildNodes;
|
List<IXmlNode> childNodes = base.ChildNodes;
|
||||||
|
|
||||||
if (Document.Declaration != null && childNodes[0].NodeType != XmlNodeType.XmlDeclaration)
|
if (Document.Declaration != null && childNodes[0].NodeType != XmlNodeType.XmlDeclaration)
|
||||||
{
|
{
|
||||||
@@ -672,7 +682,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
internal class XContainerWrapper : XObjectWrapper
|
internal class XContainerWrapper : XObjectWrapper
|
||||||
{
|
{
|
||||||
private IList<IXmlNode> _childNodes;
|
private List<IXmlNode> _childNodes;
|
||||||
|
|
||||||
private XContainer Container
|
private XContainer Container
|
||||||
{
|
{
|
||||||
@@ -684,7 +694,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public override IList<IXmlNode> ChildNodes
|
public override List<IXmlNode> ChildNodes
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
@@ -692,7 +702,11 @@ namespace Newtonsoft.Json.Converters
|
|||||||
// cache results to prevent multiple reads which kills perf in large documents
|
// cache results to prevent multiple reads which kills perf in large documents
|
||||||
if (_childNodes == null)
|
if (_childNodes == null)
|
||||||
{
|
{
|
||||||
_childNodes = Container.Nodes().Select(WrapNode).ToList();
|
_childNodes = new List<IXmlNode>();
|
||||||
|
foreach (XNode node in Container.Nodes())
|
||||||
|
{
|
||||||
|
_childNodes.Add(WrapNode(node));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return _childNodes;
|
return _childNodes;
|
||||||
@@ -763,6 +777,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
internal class XObjectWrapper : IXmlNode
|
internal class XObjectWrapper : IXmlNode
|
||||||
{
|
{
|
||||||
|
private static readonly List<IXmlNode> EmptyChildNodes = new List<IXmlNode>();
|
||||||
private readonly XObject _xmlObject;
|
private readonly XObject _xmlObject;
|
||||||
|
|
||||||
public XObjectWrapper(XObject xmlObject)
|
public XObjectWrapper(XObject xmlObject)
|
||||||
@@ -785,12 +800,12 @@ namespace Newtonsoft.Json.Converters
|
|||||||
get { return null; }
|
get { return null; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual IList<IXmlNode> ChildNodes
|
public virtual List<IXmlNode> ChildNodes
|
||||||
{
|
{
|
||||||
get { return new List<IXmlNode>(); }
|
get { return EmptyChildNodes; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual IList<IXmlNode> Attributes
|
public virtual List<IXmlNode> Attributes
|
||||||
{
|
{
|
||||||
get { return null; }
|
get { return null; }
|
||||||
}
|
}
|
||||||
@@ -861,6 +876,8 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
internal class XElementWrapper : XContainerWrapper, IXmlElement
|
internal class XElementWrapper : XContainerWrapper, IXmlElement
|
||||||
{
|
{
|
||||||
|
private List<IXmlNode> _attributes;
|
||||||
|
|
||||||
private XElement Element
|
private XElement Element
|
||||||
{
|
{
|
||||||
get { return (XElement)WrappedNode; }
|
get { return (XElement)WrappedNode; }
|
||||||
@@ -875,11 +892,56 @@ namespace Newtonsoft.Json.Converters
|
|||||||
{
|
{
|
||||||
XObjectWrapper wrapper = (XObjectWrapper)attribute;
|
XObjectWrapper wrapper = (XObjectWrapper)attribute;
|
||||||
Element.Add(wrapper.WrappedNode);
|
Element.Add(wrapper.WrappedNode);
|
||||||
|
_attributes = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override IList<IXmlNode> Attributes
|
public override List<IXmlNode> Attributes
|
||||||
{
|
{
|
||||||
get { return Element.Attributes().Select(a => new XAttributeWrapper(a)).Cast<IXmlNode>().ToList(); }
|
get
|
||||||
|
{
|
||||||
|
// attributes is read multiple times
|
||||||
|
// cache results to prevent multiple reads which kills perf in large documents
|
||||||
|
if (_attributes == null)
|
||||||
|
{
|
||||||
|
_attributes = new List<IXmlNode>();
|
||||||
|
foreach (XAttribute attribute in Element.Attributes())
|
||||||
|
{
|
||||||
|
_attributes.Add(new XAttributeWrapper(attribute));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ensure elements created with a namespace but no namespace attribute are converted correctly
|
||||||
|
// e.g. new XElement("{http://example.com}MyElement");
|
||||||
|
string namespaceUri = NamespaceUri;
|
||||||
|
if (!string.IsNullOrEmpty(namespaceUri) && namespaceUri != ParentNode?.NamespaceUri)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(GetPrefixOfNamespace(namespaceUri)))
|
||||||
|
{
|
||||||
|
bool namespaceDeclared = false;
|
||||||
|
foreach (IXmlNode attribute in _attributes)
|
||||||
|
{
|
||||||
|
if (attribute.LocalName == "xmlns" && string.IsNullOrEmpty(attribute.NamespaceUri) && attribute.Value == namespaceUri)
|
||||||
|
{
|
||||||
|
namespaceDeclared = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!namespaceDeclared)
|
||||||
|
{
|
||||||
|
_attributes.Insert(0, new XAttributeWrapper(new XAttribute("xmlns", namespaceUri)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return _attributes;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override IXmlNode AppendChild(IXmlNode newChild)
|
||||||
|
{
|
||||||
|
IXmlNode result = base.AppendChild(newChild);
|
||||||
|
_attributes = null;
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string Value
|
public override string Value
|
||||||
@@ -1085,11 +1147,18 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
private bool IsArray(IXmlNode node)
|
private bool IsArray(IXmlNode node)
|
||||||
{
|
{
|
||||||
IXmlNode jsonArrayAttribute = (node.Attributes != null)
|
if (node.Attributes != null)
|
||||||
? node.Attributes.SingleOrDefault(a => a.LocalName == "Array" && a.NamespaceUri == JsonNamespaceUri)
|
{
|
||||||
: null;
|
foreach (IXmlNode attribute in node.Attributes)
|
||||||
|
{
|
||||||
|
if (attribute.LocalName == "Array" && attribute.NamespaceUri == JsonNamespaceUri)
|
||||||
|
{
|
||||||
|
return XmlConvert.ToBoolean(attribute.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return (jsonArrayAttribute != null && XmlConvert.ToBoolean(jsonArrayAttribute.Value));
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SerializeGroupedNodes(JsonWriter writer, IXmlNode node, XmlNamespaceManager manager, bool writePropertyName)
|
private void SerializeGroupedNodes(JsonWriter writer, IXmlNode node, XmlNamespaceManager manager, bool writePropertyName)
|
||||||
@@ -1162,7 +1231,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
SerializeGroupedNodes(writer, node, manager, writePropertyName);
|
SerializeGroupedNodes(writer, node, manager, writePropertyName);
|
||||||
break;
|
break;
|
||||||
case XmlNodeType.Element:
|
case XmlNodeType.Element:
|
||||||
if (IsArray(node) && node.ChildNodes.All(n => n.LocalName == node.LocalName) && node.ChildNodes.Count > 0)
|
if (IsArray(node) && AllSameName(node) && node.ChildNodes.Count > 0)
|
||||||
{
|
{
|
||||||
SerializeGroupedNodes(writer, node, manager, false);
|
SerializeGroupedNodes(writer, node, manager, false);
|
||||||
}
|
}
|
||||||
@@ -1188,7 +1257,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
writer.WritePropertyName(GetPropertyName(node, manager));
|
writer.WritePropertyName(GetPropertyName(node, manager));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ValueAttributes(node.Attributes).Any() && node.ChildNodes.Count == 1
|
if (!ValueAttributes(node.Attributes) && node.ChildNodes.Count == 1
|
||||||
&& node.ChildNodes[0].NodeType == XmlNodeType.Text)
|
&& node.ChildNodes[0].NodeType == XmlNodeType.Text)
|
||||||
{
|
{
|
||||||
// write elements with a single text child as a name value pair
|
// write elements with a single text child as a name value pair
|
||||||
@@ -1312,6 +1381,18 @@ namespace Newtonsoft.Json.Converters
|
|||||||
throw new JsonSerializationException("Unexpected XmlNodeType when serializing nodes: " + node.NodeType);
|
throw new JsonSerializationException("Unexpected XmlNodeType when serializing nodes: " + node.NodeType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool AllSameName(IXmlNode node)
|
||||||
|
{
|
||||||
|
foreach (IXmlNode childNode in node.ChildNodes)
|
||||||
|
{
|
||||||
|
if (childNode.LocalName != node.LocalName)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Reading
|
#region Reading
|
||||||
@@ -1459,27 +1540,31 @@ namespace Newtonsoft.Json.Converters
|
|||||||
string attributePrefix = MiscellaneousUtils.GetPrefix(attributeName);
|
string attributePrefix = MiscellaneousUtils.GetPrefix(attributeName);
|
||||||
|
|
||||||
AddAttribute(reader, document, currentNode, attributeName, manager, attributePrefix);
|
AddAttribute(reader, document, currentNode, attributeName, manager, attributePrefix);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else if (propertyName.StartsWith('$'))
|
|
||||||
|
if (propertyName.StartsWith('$'))
|
||||||
{
|
{
|
||||||
if (propertyName == JsonTypeReflector.ArrayValuesPropertyName)
|
switch (propertyName)
|
||||||
{
|
{
|
||||||
|
case JsonTypeReflector.ArrayValuesPropertyName:
|
||||||
propertyName = propertyName.Substring(1);
|
propertyName = propertyName.Substring(1);
|
||||||
elementPrefix = manager.LookupPrefix(JsonNamespaceUri);
|
elementPrefix = manager.LookupPrefix(JsonNamespaceUri);
|
||||||
CreateElement(reader, document, currentNode, propertyName, manager, elementPrefix, attributeNameValues);
|
CreateElement(reader, document, currentNode, propertyName, manager, elementPrefix, attributeNameValues);
|
||||||
}
|
return;
|
||||||
else
|
case JsonTypeReflector.IdPropertyName:
|
||||||
{
|
case JsonTypeReflector.RefPropertyName:
|
||||||
|
case JsonTypeReflector.TypePropertyName:
|
||||||
|
case JsonTypeReflector.ValuePropertyName:
|
||||||
string attributeName = propertyName.Substring(1);
|
string attributeName = propertyName.Substring(1);
|
||||||
string attributePrefix = manager.LookupPrefix(JsonNamespaceUri);
|
string attributePrefix = manager.LookupPrefix(JsonNamespaceUri);
|
||||||
AddAttribute(reader, document, currentNode, attributeName, manager, attributePrefix);
|
AddAttribute(reader, document, currentNode, attributeName, manager, attributePrefix);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
CreateElement(reader, document, currentNode, propertyName, manager, elementPrefix, attributeNameValues);
|
CreateElement(reader, document, currentNode, propertyName, manager, elementPrefix, attributeNameValues);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void CreateElement(JsonReader reader, IXmlDocument document, IXmlNode currentNode, string elementName, XmlNamespaceManager manager, string elementPrefix, Dictionary<string, string> attributeNameValues)
|
private void CreateElement(JsonReader reader, IXmlDocument document, IXmlNode currentNode, string elementName, XmlNamespaceManager manager, string elementPrefix, Dictionary<string, string> attributeNameValues)
|
||||||
{
|
{
|
||||||
@@ -1624,8 +1709,15 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
if (count == 1 && WriteArrayAttribute)
|
if (count == 1 && WriteArrayAttribute)
|
||||||
{
|
{
|
||||||
IXmlElement arrayElement = nestedArrayElement.ChildNodes.OfType<IXmlElement>().Single(n => n.LocalName == propertyName);
|
foreach (IXmlNode childNode in nestedArrayElement.ChildNodes)
|
||||||
AddJsonArrayAttribute(arrayElement, document);
|
{
|
||||||
|
IXmlElement element = childNode as IXmlElement;
|
||||||
|
if (element != null && element.LocalName == propertyName)
|
||||||
|
{
|
||||||
|
AddJsonArrayAttribute(element, document);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1688,6 +1780,13 @@ namespace Newtonsoft.Json.Converters
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case '$':
|
case '$':
|
||||||
|
switch (attributeName)
|
||||||
|
{
|
||||||
|
case JsonTypeReflector.ArrayValuesPropertyName:
|
||||||
|
case JsonTypeReflector.IdPropertyName:
|
||||||
|
case JsonTypeReflector.RefPropertyName:
|
||||||
|
case JsonTypeReflector.TypePropertyName:
|
||||||
|
case JsonTypeReflector.ValuePropertyName:
|
||||||
// check that JsonNamespaceUri is in scope
|
// check that JsonNamespaceUri is in scope
|
||||||
// if it isn't then add it to document and namespace manager
|
// if it isn't then add it to document and namespace manager
|
||||||
string jsonPrefix = manager.LookupPrefix(JsonNamespaceUri);
|
string jsonPrefix = manager.LookupPrefix(JsonNamespaceUri);
|
||||||
@@ -1727,6 +1826,11 @@ namespace Newtonsoft.Json.Converters
|
|||||||
finishedAttributes = true;
|
finishedAttributes = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
finishedAttributes = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1858,8 +1962,15 @@ namespace Newtonsoft.Json.Converters
|
|||||||
|
|
||||||
if (count == 1 && WriteArrayAttribute)
|
if (count == 1 && WriteArrayAttribute)
|
||||||
{
|
{
|
||||||
IXmlElement arrayElement = currentNode.ChildNodes.OfType<IXmlElement>().Single(n => n.LocalName == propertyName);
|
foreach (IXmlNode childNode in currentNode.ChildNodes)
|
||||||
AddJsonArrayAttribute(arrayElement, document);
|
{
|
||||||
|
IXmlElement element = childNode as IXmlElement;
|
||||||
|
if (element != null && element.LocalName == propertyName)
|
||||||
|
{
|
||||||
|
AddJsonArrayAttribute(element, document);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -1893,7 +2004,7 @@ namespace Newtonsoft.Json.Converters
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="attributeName">Attribute name to test.</param>
|
/// <param name="attributeName">Attribute name to test.</param>
|
||||||
/// <param name="prefix">The attribute name prefix if it has one, otherwise an empty string.</param>
|
/// <param name="prefix">The attribute name prefix if it has one, otherwise an empty string.</param>
|
||||||
/// <returns>True if attribute name is for a namespace attribute, otherwise false.</returns>
|
/// <returns><c>true</c> if attribute name is for a namespace attribute, otherwise <c>false</c>.</returns>
|
||||||
private bool IsNamespaceAttribute(string attributeName, out string prefix)
|
private bool IsNamespaceAttribute(string attributeName, out string prefix)
|
||||||
{
|
{
|
||||||
if (attributeName.StartsWith("xmlns", StringComparison.Ordinal))
|
if (attributeName.StartsWith("xmlns", StringComparison.Ordinal))
|
||||||
@@ -1913,9 +2024,17 @@ namespace Newtonsoft.Json.Converters
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerable<IXmlNode> ValueAttributes(IEnumerable<IXmlNode> c)
|
private bool ValueAttributes(List<IXmlNode> c)
|
||||||
{
|
{
|
||||||
return c.Where(a => a.NamespaceUri != JsonNamespaceUri);
|
foreach (IXmlNode xmlNode in c)
|
||||||
|
{
|
||||||
|
if (xmlNode.NamespaceUri != JsonNamespaceUri)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -407,7 +407,7 @@ namespace Newtonsoft.Json
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Reads the next JSON token from the stream.
|
/// Reads the next JSON token from the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>true if the next token was read successfully; false if there are no more tokens to read.</returns>
|
/// <returns><c>true</c> if the next token was read successfully; <c>false</c> if there are no more tokens to read.</returns>
|
||||||
public abstract bool Read();
|
public abstract bool Read();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -622,7 +622,19 @@ namespace Newtonsoft.Json
|
|||||||
case JsonToken.Float:
|
case JsonToken.Float:
|
||||||
if (!(Value is double))
|
if (!(Value is double))
|
||||||
{
|
{
|
||||||
SetToken(JsonToken.Float, Convert.ToDouble(Value, CultureInfo.InvariantCulture), false);
|
double d;
|
||||||
|
#if !(NET20 || NET35 || PORTABLE40 || PORTABLE)
|
||||||
|
if (Value is BigInteger)
|
||||||
|
{
|
||||||
|
d = (double)(BigInteger)Value;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
d = Convert.ToDouble(Value, CultureInfo.InvariantCulture);
|
||||||
|
}
|
||||||
|
|
||||||
|
SetToken(JsonToken.Float, d, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
return (double)Value;
|
return (double)Value;
|
||||||
|
|||||||
@@ -362,7 +362,7 @@ namespace Newtonsoft.Json
|
|||||||
/// Reads the next JSON token from the stream.
|
/// Reads the next JSON token from the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the next token was read successfully; false if there are no more tokens to read.
|
/// <c>true</c> if the next token was read successfully; <c>false</c> if there are no more tokens to read.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public override bool Read()
|
public override bool Read()
|
||||||
{
|
{
|
||||||
@@ -598,6 +598,15 @@ namespace Newtonsoft.Json
|
|||||||
throw new ArgumentOutOfRangeException(nameof(readType));
|
throw new ArgumentOutOfRangeException(nameof(readType));
|
||||||
}
|
}
|
||||||
case '-':
|
case '-':
|
||||||
|
if (EnsureChars(1, true) && _chars[_charPos + 1] == 'I')
|
||||||
|
{
|
||||||
|
return ParseNumberNegativeInfinity(readType);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ParseNumber(readType);
|
||||||
|
return Value;
|
||||||
|
}
|
||||||
case '.':
|
case '.':
|
||||||
case '0':
|
case '0':
|
||||||
case '1':
|
case '1':
|
||||||
@@ -614,10 +623,8 @@ namespace Newtonsoft.Json
|
|||||||
_charPos++;
|
_charPos++;
|
||||||
throw CreateUnexpectedCharacterException(currentChar);
|
throw CreateUnexpectedCharacterException(currentChar);
|
||||||
}
|
}
|
||||||
ParseNumber(ReadType.Read);
|
ParseNumber(ReadType.ReadAsString);
|
||||||
string s = ((IFormattable)Value).ToString(null, CultureInfo.InvariantCulture);
|
return Value;
|
||||||
SetToken(JsonToken.String, s);
|
|
||||||
return s;
|
|
||||||
case 't':
|
case 't':
|
||||||
case 'f':
|
case 'f':
|
||||||
if (readType != ReadType.ReadAsString)
|
if (readType != ReadType.ReadAsString)
|
||||||
@@ -632,6 +639,10 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
SetToken(JsonToken.String, expected);
|
SetToken(JsonToken.String, expected);
|
||||||
return expected;
|
return expected;
|
||||||
|
case 'I':
|
||||||
|
return ParseNumberPositiveInfinity(readType);
|
||||||
|
case 'N':
|
||||||
|
return ParseNumberNaN(readType);
|
||||||
case 'n':
|
case 'n':
|
||||||
HandleNull();
|
HandleNull();
|
||||||
return null;
|
return null;
|
||||||
@@ -860,7 +871,20 @@ namespace Newtonsoft.Json
|
|||||||
case 'n':
|
case 'n':
|
||||||
HandleNull();
|
HandleNull();
|
||||||
return null;
|
return null;
|
||||||
|
case 'N':
|
||||||
|
return ParseNumberNaN(readType);
|
||||||
|
case 'I':
|
||||||
|
return ParseNumberPositiveInfinity(readType);
|
||||||
case '-':
|
case '-':
|
||||||
|
if (EnsureChars(1, true) && _chars[_charPos + 1] == 'I')
|
||||||
|
{
|
||||||
|
return ParseNumberNegativeInfinity(readType);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ParseNumber(readType);
|
||||||
|
return Value;
|
||||||
|
}
|
||||||
case '.':
|
case '.':
|
||||||
case '0':
|
case '0':
|
||||||
case '1':
|
case '1':
|
||||||
@@ -1569,15 +1593,15 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
case 'N':
|
case 'N':
|
||||||
ParseNumberNaN();
|
ParseNumberNaN(ReadType.Read);
|
||||||
return true;
|
return true;
|
||||||
case 'I':
|
case 'I':
|
||||||
ParseNumberPositiveInfinity();
|
ParseNumberPositiveInfinity(ReadType.Read);
|
||||||
return true;
|
return true;
|
||||||
case '-':
|
case '-':
|
||||||
if (EnsureChars(1, true) && _chars[_charPos + 1] == 'I')
|
if (EnsureChars(1, true) && _chars[_charPos + 1] == 'I')
|
||||||
{
|
{
|
||||||
ParseNumberNegativeInfinity();
|
ParseNumberNegativeInfinity(ReadType.Read);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -1807,7 +1831,42 @@ namespace Newtonsoft.Json
|
|||||||
bool singleDigit = (char.IsDigit(firstChar) && _stringReference.Length == 1);
|
bool singleDigit = (char.IsDigit(firstChar) && _stringReference.Length == 1);
|
||||||
bool nonBase10 = (firstChar == '0' && _stringReference.Length > 1 && _stringReference.Chars[_stringReference.StartIndex + 1] != '.' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'e' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'E');
|
bool nonBase10 = (firstChar == '0' && _stringReference.Length > 1 && _stringReference.Chars[_stringReference.StartIndex + 1] != '.' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'e' && _stringReference.Chars[_stringReference.StartIndex + 1] != 'E');
|
||||||
|
|
||||||
if (readType == ReadType.ReadAsInt32)
|
if (readType == ReadType.ReadAsString)
|
||||||
|
{
|
||||||
|
string number = _stringReference.ToString();
|
||||||
|
|
||||||
|
// validate that the string is a valid number
|
||||||
|
if (nonBase10)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (number.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
Convert.ToInt64(number, 16);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Convert.ToInt64(number, 8);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
throw JsonReaderException.Create(this, "Input string '{0}' is not a valid number.".FormatWith(CultureInfo.InvariantCulture, number), ex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
double value;
|
||||||
|
if (!double.TryParse(number, NumberStyles.Float, CultureInfo.InvariantCulture, out value))
|
||||||
|
{
|
||||||
|
throw JsonReaderException.Create(this, "Input string '{0}' is not a valid number.".FormatWith(CultureInfo.InvariantCulture, _stringReference.ToString()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
numberType = JsonToken.String;
|
||||||
|
numberValue = number;
|
||||||
|
}
|
||||||
|
else if (readType == ReadType.ReadAsInt32)
|
||||||
{
|
{
|
||||||
if (singleDigit)
|
if (singleDigit)
|
||||||
{
|
{
|
||||||
@@ -2260,56 +2319,80 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ParseNumberNegativeInfinity()
|
private object ParseNumberNegativeInfinity(ReadType readType)
|
||||||
{
|
{
|
||||||
if (MatchValueWithTrailingSeparator(JsonConvert.NegativeInfinity))
|
if (MatchValueWithTrailingSeparator(JsonConvert.NegativeInfinity))
|
||||||
{
|
{
|
||||||
if (_floatParseHandling == FloatParseHandling.Decimal)
|
switch (readType)
|
||||||
|
{
|
||||||
|
case ReadType.Read:
|
||||||
|
case ReadType.ReadAsDouble:
|
||||||
|
if (_floatParseHandling == FloatParseHandling.Double)
|
||||||
{
|
{
|
||||||
throw new JsonReaderException("Cannot read -Infinity as a decimal.");
|
|
||||||
}
|
|
||||||
|
|
||||||
SetToken(JsonToken.Float, double.NegativeInfinity);
|
SetToken(JsonToken.Float, double.NegativeInfinity);
|
||||||
|
return double.NegativeInfinity;
|
||||||
}
|
}
|
||||||
else
|
break;
|
||||||
{
|
case ReadType.ReadAsString:
|
||||||
throw JsonReaderException.Create(this, "Error parsing negative infinity value.");
|
SetToken(JsonToken.String, JsonConvert.NegativeInfinity);
|
||||||
}
|
return JsonConvert.NegativeInfinity;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ParseNumberPositiveInfinity()
|
throw JsonReaderException.Create(this, "Cannot read -Infinity value.");
|
||||||
|
}
|
||||||
|
|
||||||
|
throw JsonReaderException.Create(this, "Error parsing -Infinity value.");
|
||||||
|
}
|
||||||
|
|
||||||
|
private object ParseNumberPositiveInfinity(ReadType readType)
|
||||||
{
|
{
|
||||||
if (MatchValueWithTrailingSeparator(JsonConvert.PositiveInfinity))
|
if (MatchValueWithTrailingSeparator(JsonConvert.PositiveInfinity))
|
||||||
{
|
{
|
||||||
if (_floatParseHandling == FloatParseHandling.Decimal)
|
switch (readType)
|
||||||
|
{
|
||||||
|
case ReadType.Read:
|
||||||
|
case ReadType.ReadAsDouble:
|
||||||
|
if (_floatParseHandling == FloatParseHandling.Double)
|
||||||
{
|
{
|
||||||
throw new JsonReaderException("Cannot read Infinity as a decimal.");
|
|
||||||
}
|
|
||||||
|
|
||||||
SetToken(JsonToken.Float, double.PositiveInfinity);
|
SetToken(JsonToken.Float, double.PositiveInfinity);
|
||||||
|
return double.PositiveInfinity;
|
||||||
}
|
}
|
||||||
else
|
break;
|
||||||
{
|
case ReadType.ReadAsString:
|
||||||
throw JsonReaderException.Create(this, "Error parsing positive infinity value.");
|
SetToken(JsonToken.String, JsonConvert.PositiveInfinity);
|
||||||
}
|
return JsonConvert.PositiveInfinity;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ParseNumberNaN()
|
throw JsonReaderException.Create(this, "Cannot read Infinity value.");
|
||||||
|
}
|
||||||
|
|
||||||
|
throw JsonReaderException.Create(this, "Error parsing Infinity value.");
|
||||||
|
}
|
||||||
|
|
||||||
|
private object ParseNumberNaN(ReadType readType)
|
||||||
{
|
{
|
||||||
if (MatchValueWithTrailingSeparator(JsonConvert.NaN))
|
if (MatchValueWithTrailingSeparator(JsonConvert.NaN))
|
||||||
{
|
{
|
||||||
if (_floatParseHandling == FloatParseHandling.Decimal)
|
switch (readType)
|
||||||
{
|
{
|
||||||
throw new JsonReaderException("Cannot read NaN as a decimal.");
|
case ReadType.Read:
|
||||||
|
case ReadType.ReadAsDouble:
|
||||||
|
if (_floatParseHandling == FloatParseHandling.Double)
|
||||||
|
{
|
||||||
|
SetToken(JsonToken.Float, double.NaN);
|
||||||
|
return double.NaN;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ReadType.ReadAsString:
|
||||||
|
SetToken(JsonToken.String, JsonConvert.NaN);
|
||||||
|
return JsonConvert.NaN;
|
||||||
}
|
}
|
||||||
|
|
||||||
SetToken(JsonToken.Float, double.NaN);
|
throw JsonReaderException.Create(this, "Cannot read NaN value.");
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
throw JsonReaderException.Create(this, "Error parsing NaN value.");
|
throw JsonReaderException.Create(this, "Error parsing NaN value.");
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Changes the state to closed.
|
/// Changes the state to closed.
|
||||||
|
|||||||
@@ -495,7 +495,7 @@ namespace Newtonsoft.Json
|
|||||||
/// Reads the next JSON token from the stream.
|
/// Reads the next JSON token from the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the next token was read successfully; false if there are no more tokens to read.
|
/// <c>true</c> if the next token was read successfully; <c>false</c> if there are no more tokens to read.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public override bool Read()
|
public override bool Read()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -626,7 +626,7 @@ namespace Newtonsoft.Json
|
|||||||
WriteToken(token, null);
|
WriteToken(token, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void WriteToken(JsonReader reader, bool writeChildren, bool writeDateConstructorAsDate, bool writeComments)
|
internal virtual void WriteToken(JsonReader reader, bool writeChildren, bool writeDateConstructorAsDate, bool writeComments)
|
||||||
{
|
{
|
||||||
int initialDepth;
|
int initialDepth;
|
||||||
|
|
||||||
@@ -643,11 +643,6 @@ namespace Newtonsoft.Json
|
|||||||
initialDepth = reader.Depth;
|
initialDepth = reader.Depth;
|
||||||
}
|
}
|
||||||
|
|
||||||
WriteToken(reader, initialDepth, writeChildren, writeDateConstructorAsDate, writeComments);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal void WriteToken(JsonReader reader, int initialDepth, bool writeChildren, bool writeDateConstructorAsDate, bool writeComments)
|
|
||||||
{
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
// write a JValue date when the constructor is for a date
|
// write a JValue date when the constructor is for a date
|
||||||
@@ -657,7 +652,7 @@ namespace Newtonsoft.Json
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (reader.TokenType != JsonToken.Comment || writeComments)
|
if (writeComments || reader.TokenType != JsonToken.Comment)
|
||||||
{
|
{
|
||||||
WriteToken(reader.TokenType, reader.Value);
|
WriteToken(reader.TokenType, reader.Value);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -270,6 +270,11 @@ namespace Newtonsoft.Json.Linq
|
|||||||
set { SetItem(index, value); }
|
set { SetItem(index, value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal override int IndexOfItem(JToken item)
|
||||||
|
{
|
||||||
|
return _values.IndexOfReference(item);
|
||||||
|
}
|
||||||
|
|
||||||
internal override void MergeItem(object content, JsonMergeSettings settings)
|
internal override void MergeItem(object content, JsonMergeSettings settings)
|
||||||
{
|
{
|
||||||
IEnumerable a = (IsMultiContent(content) || content is JArray)
|
IEnumerable a = (IsMultiContent(content) || content is JArray)
|
||||||
|
|||||||
@@ -48,6 +48,11 @@ namespace Newtonsoft.Json.Linq
|
|||||||
get { return _values; }
|
get { return _values; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal override int IndexOfItem(JToken item)
|
||||||
|
{
|
||||||
|
return _values.IndexOfReference(item);
|
||||||
|
}
|
||||||
|
|
||||||
internal override void MergeItem(object content, JsonMergeSettings settings)
|
internal override void MergeItem(object content, JsonMergeSettings settings)
|
||||||
{
|
{
|
||||||
JConstructor c = content as JConstructor;
|
JConstructor c = content as JConstructor;
|
||||||
|
|||||||
@@ -351,30 +351,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
private class JTokenReferenceEqualityComparer : IEqualityComparer<JToken>
|
internal abstract int IndexOfItem(JToken item);
|
||||||
{
|
|
||||||
public static readonly JTokenReferenceEqualityComparer Instance = new JTokenReferenceEqualityComparer();
|
|
||||||
|
|
||||||
public bool Equals(JToken x, JToken y)
|
|
||||||
{
|
|
||||||
return ReferenceEquals(x, y);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int GetHashCode(JToken obj)
|
|
||||||
{
|
|
||||||
if (obj == null)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return obj.GetHashCode();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal int IndexOfItem(JToken item)
|
|
||||||
{
|
|
||||||
return ChildrenTokens.IndexOf(item, JTokenReferenceEqualityComparer.Instance);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal virtual void InsertItem(int index, JToken item, bool skipParentCheck)
|
internal virtual void InsertItem(int index, JToken item, bool skipParentCheck)
|
||||||
{
|
{
|
||||||
@@ -698,9 +675,10 @@ namespace Newtonsoft.Json.Linq
|
|||||||
|
|
||||||
internal static JToken CreateFromContent(object content)
|
internal static JToken CreateFromContent(object content)
|
||||||
{
|
{
|
||||||
if (content is JToken)
|
JToken token = content as JToken;
|
||||||
|
if (token != null)
|
||||||
{
|
{
|
||||||
return (JToken)content;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new JValue(content);
|
return new JValue(content);
|
||||||
@@ -782,7 +760,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
|
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
if (parent is JProperty && ((JProperty)parent).Value != null)
|
if ((parent as JProperty)?.Value != null)
|
||||||
{
|
{
|
||||||
if (parent == this)
|
if (parent == this)
|
||||||
{
|
{
|
||||||
@@ -910,12 +888,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
PropertyDescriptorCollection ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors)
|
PropertyDescriptorCollection ITypedList.GetItemProperties(PropertyDescriptor[] listAccessors)
|
||||||
{
|
{
|
||||||
ICustomTypeDescriptor d = First as ICustomTypeDescriptor;
|
ICustomTypeDescriptor d = First as ICustomTypeDescriptor;
|
||||||
if (d != null)
|
return d?.GetProperties();
|
||||||
{
|
|
||||||
return d.GetProperties();
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -981,9 +954,10 @@ namespace Newtonsoft.Json.Linq
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (value is JToken)
|
JToken token = value as JToken;
|
||||||
|
if (token != null)
|
||||||
{
|
{
|
||||||
return (JToken)value;
|
return token;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw new ArgumentException("Argument is not a JToken.");
|
throw new ArgumentException("Argument is not a JToken.");
|
||||||
@@ -1192,7 +1166,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
IDictionary<JToken, bool> items = new Dictionary<JToken, bool>(EqualityComparer);
|
Dictionary<JToken, bool> items = new Dictionary<JToken, bool>(EqualityComparer);
|
||||||
foreach (JToken t in target)
|
foreach (JToken t in target)
|
||||||
{
|
{
|
||||||
items[t] = true;
|
items[t] = true;
|
||||||
|
|||||||
@@ -128,6 +128,11 @@ namespace Newtonsoft.Json.Linq
|
|||||||
return _properties.Compare(t._properties);
|
return _properties.Compare(t._properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal override int IndexOfItem(JToken item)
|
||||||
|
{
|
||||||
|
return _properties.IndexOfReference(item);
|
||||||
|
}
|
||||||
|
|
||||||
internal override void InsertItem(int index, JToken item, bool skipParentCheck)
|
internal override void InsertItem(int index, JToken item, bool skipParentCheck)
|
||||||
{
|
{
|
||||||
// don't add comments to JObject, no name to reference comment by
|
// don't add comments to JObject, no name to reference comment by
|
||||||
@@ -523,7 +528,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// <param name="propertyName">Name of the property.</param>
|
/// <param name="propertyName">Name of the property.</param>
|
||||||
/// <param name="value">The value.</param>
|
/// <param name="value">The value.</param>
|
||||||
/// <param name="comparison">One of the enumeration values that specifies how the strings will be compared.</param>
|
/// <param name="comparison">One of the enumeration values that specifies how the strings will be compared.</param>
|
||||||
/// <returns>true if a value was successfully retrieved; otherwise, false.</returns>
|
/// <returns><c>true</c> if a value was successfully retrieved; otherwise, <c>false</c>.</returns>
|
||||||
public bool TryGetValue(string propertyName, StringComparison comparison, out JToken value)
|
public bool TryGetValue(string propertyName, StringComparison comparison, out JToken value)
|
||||||
{
|
{
|
||||||
value = GetValue(propertyName, comparison);
|
value = GetValue(propertyName, comparison);
|
||||||
@@ -556,7 +561,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// Removes the property with the specified name.
|
/// Removes the property with the specified name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="propertyName">Name of the property.</param>
|
/// <param name="propertyName">Name of the property.</param>
|
||||||
/// <returns>true if item was successfully removed; otherwise, false.</returns>
|
/// <returns><c>true</c> if item was successfully removed; otherwise, <c>false</c>.</returns>
|
||||||
public bool Remove(string propertyName)
|
public bool Remove(string propertyName)
|
||||||
{
|
{
|
||||||
JProperty property = Property(propertyName);
|
JProperty property = Property(propertyName);
|
||||||
@@ -574,7 +579,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="propertyName">Name of the property.</param>
|
/// <param name="propertyName">Name of the property.</param>
|
||||||
/// <param name="value">The value.</param>
|
/// <param name="value">The value.</param>
|
||||||
/// <returns>true if a value was successfully retrieved; otherwise, false.</returns>
|
/// <returns><c>true</c> if a value was successfully retrieved; otherwise, <c>false</c>.</returns>
|
||||||
public bool TryGetValue(string propertyName, out JToken value)
|
public bool TryGetValue(string propertyName, out JToken value)
|
||||||
{
|
{
|
||||||
JProperty property = Property(propertyName);
|
JProperty property = Property(propertyName);
|
||||||
|
|||||||
@@ -235,6 +235,11 @@ namespace Newtonsoft.Json.Linq
|
|||||||
throw new JsonException("Cannot add or remove items from {0}.".FormatWith(CultureInfo.InvariantCulture, typeof(JProperty)));
|
throw new JsonException("Cannot add or remove items from {0}.".FormatWith(CultureInfo.InvariantCulture, typeof(JProperty)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal override int IndexOfItem(JToken item)
|
||||||
|
{
|
||||||
|
return _content.IndexOf(item);
|
||||||
|
}
|
||||||
|
|
||||||
internal override void InsertItem(int index, JToken item, bool skipParentCheck)
|
internal override void InsertItem(int index, JToken item, bool skipParentCheck)
|
||||||
{
|
{
|
||||||
// don't add comments to JProperty
|
// don't add comments to JProperty
|
||||||
|
|||||||
@@ -52,10 +52,9 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// When overridden in a derived class, returns whether resetting an object changes its value.
|
/// When overridden in a derived class, returns whether resetting an object changes its value.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if resetting the component changes its value; otherwise, false.
|
/// <c>true</c> if resetting the component changes its value; otherwise, <c>false</c>.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
/// <param name="component">The component to test for reset capability.
|
/// <param name="component">The component to test for reset capability.</param>
|
||||||
/// </param>
|
|
||||||
public override bool CanResetValue(object component)
|
public override bool CanResetValue(object component)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@@ -102,10 +101,9 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// When overridden in a derived class, determines a value indicating whether the value of this property needs to be persisted.
|
/// When overridden in a derived class, determines a value indicating whether the value of this property needs to be persisted.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the property should be persisted; otherwise, false.
|
/// <c>true</c> if the property should be persisted; otherwise, <c>false</c>.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
/// <param name="component">The component with the property to be examined for persistence.
|
/// <param name="component">The component with the property to be examined for persistence.</param>
|
||||||
/// </param>
|
|
||||||
public override bool ShouldSerializeValue(object component)
|
public override bool ShouldSerializeValue(object component)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
@@ -126,7 +124,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// When overridden in a derived class, gets a value indicating whether this property is read-only.
|
/// When overridden in a derived class, gets a value indicating whether this property is read-only.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the property is read-only; otherwise, false.
|
/// <c>true</c> if the property is read-only; otherwise, <c>false</c>.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public override bool IsReadOnly
|
public override bool IsReadOnly
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -26,6 +26,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
|
using Newtonsoft.Json.Utilities;
|
||||||
|
|
||||||
namespace Newtonsoft.Json.Linq
|
namespace Newtonsoft.Json.Linq
|
||||||
{
|
{
|
||||||
@@ -35,6 +36,10 @@ namespace Newtonsoft.Json.Linq
|
|||||||
|
|
||||||
private Dictionary<string, JToken> _dictionary;
|
private Dictionary<string, JToken> _dictionary;
|
||||||
|
|
||||||
|
public JPropertyKeyedCollection() : base(new List<JToken>())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
private void AddKey(string key, JToken item)
|
private void AddKey(string key, JToken item)
|
||||||
{
|
{
|
||||||
EnsureDictionary();
|
EnsureDictionary();
|
||||||
@@ -220,6 +225,11 @@ namespace Newtonsoft.Json.Linq
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int IndexOfReference(JToken t)
|
||||||
|
{
|
||||||
|
return ((List<JToken>)Items).IndexOfReference(t);
|
||||||
|
}
|
||||||
|
|
||||||
public bool Compare(JPropertyKeyedCollection other)
|
public bool Compare(JPropertyKeyedCollection other)
|
||||||
{
|
{
|
||||||
if (this == other)
|
if (this == other)
|
||||||
|
|||||||
@@ -152,7 +152,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="t1">The first <see cref="JToken"/> to compare.</param>
|
/// <param name="t1">The first <see cref="JToken"/> to compare.</param>
|
||||||
/// <param name="t2">The second <see cref="JToken"/> to compare.</param>
|
/// <param name="t2">The second <see cref="JToken"/> to compare.</param>
|
||||||
/// <returns>true if the tokens are equal; otherwise false.</returns>
|
/// <returns><c>true</c> if the tokens are equal; otherwise <c>false</c>.</returns>
|
||||||
public static bool DeepEquals(JToken t1, JToken t2)
|
public static bool DeepEquals(JToken t1, JToken t2)
|
||||||
{
|
{
|
||||||
return (t1 == t2 || (t1 != null && t2 != null && t1.DeepEquals(t2)));
|
return (t1 == t2 || (t1 != null && t2 != null && t1.DeepEquals(t2)));
|
||||||
@@ -190,23 +190,9 @@ namespace Newtonsoft.Json.Linq
|
|||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
|
|
||||||
IList<JToken> ancestors = AncestorsAndSelf().Reverse().ToList();
|
|
||||||
|
|
||||||
List<JsonPosition> positions = new List<JsonPosition>();
|
List<JsonPosition> positions = new List<JsonPosition>();
|
||||||
for (int i = 0; i < ancestors.Count; i++)
|
JToken previous = null;
|
||||||
{
|
for (JToken current = this; current != null; current = current.Parent)
|
||||||
JToken current = ancestors[i];
|
|
||||||
JToken next = null;
|
|
||||||
if (i + 1 < ancestors.Count)
|
|
||||||
{
|
|
||||||
next = ancestors[i + 1];
|
|
||||||
}
|
|
||||||
else if (ancestors[i].Type == JTokenType.Property)
|
|
||||||
{
|
|
||||||
next = ancestors[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
if (next != null)
|
|
||||||
{
|
{
|
||||||
switch (current.Type)
|
switch (current.Type)
|
||||||
{
|
{
|
||||||
@@ -216,13 +202,19 @@ namespace Newtonsoft.Json.Linq
|
|||||||
break;
|
break;
|
||||||
case JTokenType.Array:
|
case JTokenType.Array:
|
||||||
case JTokenType.Constructor:
|
case JTokenType.Constructor:
|
||||||
int index = ((IList<JToken>)current).IndexOf(next);
|
if (previous != null)
|
||||||
|
{
|
||||||
|
int index = ((IList<JToken>)current).IndexOf(previous);
|
||||||
|
|
||||||
positions.Add(new JsonPosition(JsonContainerType.Array) { Position = index });
|
positions.Add(new JsonPosition(JsonContainerType.Array) { Position = index });
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
previous = current;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
positions.Reverse();
|
||||||
|
|
||||||
return JsonPosition.BuildPath(positions, null);
|
return JsonPosition.BuildPath(positions, null);
|
||||||
}
|
}
|
||||||
@@ -1883,7 +1875,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// <returns>An <see cref="JsonReader"/> that can be used to read this token and its descendants.</returns>
|
/// <returns>An <see cref="JsonReader"/> that can be used to read this token and its descendants.</returns>
|
||||||
public JsonReader CreateReader()
|
public JsonReader CreateReader()
|
||||||
{
|
{
|
||||||
return new JTokenReader(this, Path);
|
return new JTokenReader(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static JToken FromObjectInternal(object o, JsonSerializer jsonSerializer)
|
internal static JToken FromObjectInternal(object o, JsonSerializer jsonSerializer)
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// <param name="x">The first object of type <see cref="JToken"/> to compare.</param>
|
/// <param name="x">The first object of type <see cref="JToken"/> to compare.</param>
|
||||||
/// <param name="y">The second object of type <see cref="JToken"/> to compare.</param>
|
/// <param name="y">The second object of type <see cref="JToken"/> to compare.</param>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the specified objects are equal; otherwise, false.
|
/// <c>true</c> if the specified objects are equal; otherwise, <c>false</c>.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public bool Equals(JToken x, JToken y)
|
public bool Equals(JToken x, JToken y)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -33,8 +33,8 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class JTokenReader : JsonReader, IJsonLineInfo
|
public class JTokenReader : JsonReader, IJsonLineInfo
|
||||||
{
|
{
|
||||||
private readonly string _initialPath;
|
|
||||||
private readonly JToken _root;
|
private readonly JToken _root;
|
||||||
|
private string _initialPath;
|
||||||
private JToken _parent;
|
private JToken _parent;
|
||||||
private JToken _current;
|
private JToken _current;
|
||||||
|
|
||||||
@@ -57,6 +57,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
_root = token;
|
_root = token;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// this is used by json.net schema
|
||||||
internal JTokenReader(JToken token, string initialPath)
|
internal JTokenReader(JToken token, string initialPath)
|
||||||
: this(token)
|
: this(token)
|
||||||
{
|
{
|
||||||
@@ -67,7 +68,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// Reads the next JSON token from the stream.
|
/// Reads the next JSON token from the stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the next token was read successfully; false if there are no more tokens to read.
|
/// <c>true</c> if the next token was read successfully; <c>false</c> if there are no more tokens to read.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
public override bool Read()
|
public override bool Read()
|
||||||
{
|
{
|
||||||
@@ -306,6 +307,11 @@ namespace Newtonsoft.Json.Linq
|
|||||||
{
|
{
|
||||||
string path = base.Path;
|
string path = base.Path;
|
||||||
|
|
||||||
|
if (_initialPath == null)
|
||||||
|
{
|
||||||
|
_initialPath = _root.Path;
|
||||||
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(_initialPath))
|
if (!string.IsNullOrEmpty(_initialPath))
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(path))
|
if (string.IsNullOrEmpty(path))
|
||||||
|
|||||||
@@ -485,5 +485,53 @@ namespace Newtonsoft.Json.Linq
|
|||||||
AddValue(value, JsonToken.String);
|
AddValue(value, JsonToken.String);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
internal override void WriteToken(JsonReader reader, bool writeChildren, bool writeDateConstructorAsDate, bool writeComments)
|
||||||
|
{
|
||||||
|
JTokenReader tokenReader = reader as JTokenReader;
|
||||||
|
|
||||||
|
// closing the token wrather than reading then writing it doesn't lose some type information, e.g. Guid, byte[], etc
|
||||||
|
if (tokenReader != null && writeChildren && writeDateConstructorAsDate && writeComments)
|
||||||
|
{
|
||||||
|
if (tokenReader.TokenType == JsonToken.None)
|
||||||
|
{
|
||||||
|
if (!tokenReader.Read())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
JToken value = tokenReader.CurrentToken.CloneToken();
|
||||||
|
|
||||||
|
if (_parent != null)
|
||||||
|
{
|
||||||
|
_parent.Add(value);
|
||||||
|
_current = _parent.Last;
|
||||||
|
|
||||||
|
// if the writer was in a property then move out of it and up to its parent object
|
||||||
|
if (_parent.Type == JTokenType.Property)
|
||||||
|
{
|
||||||
|
_parent = _parent.Parent;
|
||||||
|
InternalWriteValue(JsonToken.Null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_current = value;
|
||||||
|
|
||||||
|
if (_token == null && _value == null)
|
||||||
|
{
|
||||||
|
_token = value as JContainer;
|
||||||
|
_value = value as JValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tokenReader.Skip();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
base.WriteToken(reader, writeChildren, writeDateConstructorAsDate, writeComments);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -819,11 +819,13 @@ namespace Newtonsoft.Json.Linq
|
|||||||
writer.WriteValue((byte[])_value);
|
writer.WriteValue((byte[])_value);
|
||||||
return;
|
return;
|
||||||
case JTokenType.Guid:
|
case JTokenType.Guid:
|
||||||
|
writer.WriteValue((_value != null) ? (Guid?)_value : null);
|
||||||
|
return;
|
||||||
case JTokenType.TimeSpan:
|
case JTokenType.TimeSpan:
|
||||||
writer.WriteValue((_value != null) ? _value.ToString() : null);
|
writer.WriteValue((_value != null) ? (TimeSpan?)_value : null);
|
||||||
return;
|
return;
|
||||||
case JTokenType.Uri:
|
case JTokenType.Uri:
|
||||||
writer.WriteValue((_value != null) ? ((Uri)_value).OriginalString : null);
|
writer.WriteValue((Uri)_value);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -847,7 +849,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// Indicates whether the current object is equal to another object of the same type.
|
/// Indicates whether the current object is equal to another object of the same type.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the current object is equal to the <paramref name="other"/> parameter; otherwise, false.
|
/// <c>true</c> if the current object is equal to the <paramref name="other"/> parameter; otherwise, <c>false</c>.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
/// <param name="other">An object to compare with this object.</param>
|
/// <param name="other">An object to compare with this object.</param>
|
||||||
public bool Equals(JValue other)
|
public bool Equals(JValue other)
|
||||||
@@ -865,7 +867,7 @@ namespace Newtonsoft.Json.Linq
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>.</param>
|
/// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>.</param>
|
||||||
/// <returns>
|
/// <returns>
|
||||||
/// true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
|
/// <c>true</c> if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, <c>false</c>.
|
||||||
/// </returns>
|
/// </returns>
|
||||||
/// <exception cref="T:System.NullReferenceException">
|
/// <exception cref="T:System.NullReferenceException">
|
||||||
/// The <paramref name="obj"/> parameter is null.
|
/// The <paramref name="obj"/> parameter is null.
|
||||||
|
|||||||
@@ -76,48 +76,60 @@ namespace Newtonsoft.Json.Linq.JsonPath
|
|||||||
foreach (JToken r in pathResult)
|
foreach (JToken r in pathResult)
|
||||||
{
|
{
|
||||||
JValue v = r as JValue;
|
JValue v = r as JValue;
|
||||||
|
if (v != null)
|
||||||
|
{
|
||||||
switch (Operator)
|
switch (Operator)
|
||||||
{
|
{
|
||||||
case QueryOperator.Equals:
|
case QueryOperator.Equals:
|
||||||
if (v != null && EqualsWithStringCoercion(v, Value))
|
if (EqualsWithStringCoercion(v, Value))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QueryOperator.NotEquals:
|
case QueryOperator.NotEquals:
|
||||||
if (v != null && !EqualsWithStringCoercion(v, Value))
|
if (!EqualsWithStringCoercion(v, Value))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QueryOperator.GreaterThan:
|
case QueryOperator.GreaterThan:
|
||||||
if (v != null && v.CompareTo(Value) > 0)
|
if (v.CompareTo(Value) > 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QueryOperator.GreaterThanOrEquals:
|
case QueryOperator.GreaterThanOrEquals:
|
||||||
if (v != null && v.CompareTo(Value) >= 0)
|
if (v.CompareTo(Value) >= 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QueryOperator.LessThan:
|
case QueryOperator.LessThan:
|
||||||
if (v != null && v.CompareTo(Value) < 0)
|
if (v.CompareTo(Value) < 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QueryOperator.LessThanOrEquals:
|
case QueryOperator.LessThanOrEquals:
|
||||||
if (v != null && v.CompareTo(Value) <= 0)
|
if (v.CompareTo(Value) <= 0)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case QueryOperator.Exists:
|
case QueryOperator.Exists:
|
||||||
return true;
|
return true;
|
||||||
default:
|
}
|
||||||
throw new ArgumentOutOfRangeException();
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (Operator)
|
||||||
|
{
|
||||||
|
case QueryOperator.Exists:
|
||||||
|
// you can only specify primative types in a comparison
|
||||||
|
// notequals will always be true
|
||||||
|
case QueryOperator.NotEquals:
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,9 +9,8 @@
|
|||||||
<ProjectGuid>779e052e-7218-4da3-b419-ffb0f4c95081</ProjectGuid>
|
<ProjectGuid>779e052e-7218-4da3-b419-ffb0f4c95081</ProjectGuid>
|
||||||
<RootNamespace>Newtonsoft.Json</RootNamespace>
|
<RootNamespace>Newtonsoft.Json</RootNamespace>
|
||||||
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
|
||||||
<OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
|
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SchemaVersion>2.0</SchemaVersion>
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|||||||
@@ -32,7 +32,9 @@ using System.Security;
|
|||||||
// General Information about an assembly is controlled through the following
|
// General Information about an assembly is controlled through the following
|
||||||
// set of attributes. Change these attribute values to modify the information
|
// set of attributes. Change these attribute values to modify the information
|
||||||
// associated with an assembly.
|
// associated with an assembly.
|
||||||
#if PORTABLE40
|
#if NETSTANDARD10
|
||||||
|
[assembly: AssemblyTitle("Json.NET .NET Standard 1.0")]
|
||||||
|
#elif PORTABLE40
|
||||||
[assembly: AssemblyTitle("Json.NET Portable .NET 4.0")]
|
[assembly: AssemblyTitle("Json.NET Portable .NET 4.0")]
|
||||||
#elif PORTABLE
|
#elif PORTABLE
|
||||||
[assembly: AssemblyTitle("Json.NET Portable")]
|
[assembly: AssemblyTitle("Json.NET Portable")]
|
||||||
@@ -48,7 +50,6 @@ using System.Security;
|
|||||||
[assembly: AssemblyTitle("Json.NET .NET 4.0")]
|
[assembly: AssemblyTitle("Json.NET .NET 4.0")]
|
||||||
[assembly: AllowPartiallyTrustedCallers]
|
[assembly: AllowPartiallyTrustedCallers]
|
||||||
#else
|
#else
|
||||||
|
|
||||||
[assembly: AssemblyTitle("Json.NET")]
|
[assembly: AssemblyTitle("Json.NET")]
|
||||||
[assembly: AllowPartiallyTrustedCallers]
|
[assembly: AllowPartiallyTrustedCallers]
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -40,7 +40,6 @@ using System.Runtime.Serialization;
|
|||||||
#if !(DOTNET || PORTABLE || PORTABLE40)
|
#if !(DOTNET || PORTABLE || PORTABLE40)
|
||||||
using System.Security.Permissions;
|
using System.Security.Permissions;
|
||||||
#endif
|
#endif
|
||||||
using System.Xml.Serialization;
|
|
||||||
using Newtonsoft.Json.Converters;
|
using Newtonsoft.Json.Converters;
|
||||||
using Newtonsoft.Json.Utilities;
|
using Newtonsoft.Json.Utilities;
|
||||||
using Newtonsoft.Json.Linq;
|
using Newtonsoft.Json.Linq;
|
||||||
|
|||||||
@@ -172,7 +172,10 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
|
|
||||||
if (keyType != null && valueType != null)
|
if (keyType != null && valueType != null)
|
||||||
{
|
{
|
||||||
_parameterizedConstructor = CollectionUtils.ResolveEnumerableCollectionConstructor(CreatedType, typeof(KeyValuePair<,>).MakeGenericType(keyType, valueType));
|
_parameterizedConstructor = CollectionUtils.ResolveEnumerableCollectionConstructor(
|
||||||
|
CreatedType,
|
||||||
|
typeof(KeyValuePair<,>).MakeGenericType(keyType, valueType),
|
||||||
|
typeof(IDictionary<,>).MakeGenericType(keyType, valueType));
|
||||||
|
|
||||||
#if !(NET35 || NET20)
|
#if !(NET35 || NET20)
|
||||||
if (!HasParameterizedCreatorInternal && underlyingType.Name == FSharpUtils.FSharpMapTypeName)
|
if (!HasParameterizedCreatorInternal && underlyingType.Name == FSharpUtils.FSharpMapTypeName)
|
||||||
|
|||||||
@@ -2041,9 +2041,19 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
IDictionary targetDictionary = (dictionaryContract.ShouldCreateWrapper) ? dictionaryContract.CreateWrapper(createdObjectDictionary) : (IDictionary)createdObjectDictionary;
|
IDictionary targetDictionary = (dictionaryContract.ShouldCreateWrapper) ? dictionaryContract.CreateWrapper(createdObjectDictionary) : (IDictionary)createdObjectDictionary;
|
||||||
IDictionary newValues = (dictionaryContract.ShouldCreateWrapper) ? dictionaryContract.CreateWrapper(value) : (IDictionary)value;
|
IDictionary newValues = (dictionaryContract.ShouldCreateWrapper) ? dictionaryContract.CreateWrapper(value) : (IDictionary)value;
|
||||||
|
|
||||||
foreach (DictionaryEntry newValue in newValues)
|
// Manual use of IDictionaryEnumerator instead of foreach to avoid DictionaryEntry box allocations.
|
||||||
|
IDictionaryEnumerator e = newValues.GetEnumerator();
|
||||||
|
try
|
||||||
{
|
{
|
||||||
targetDictionary.Add(newValue.Key, newValue.Value);
|
while (e.MoveNext())
|
||||||
|
{
|
||||||
|
DictionaryEntry entry = e.Entry;
|
||||||
|
targetDictionary.Add(entry.Key, entry.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
(e as IDisposable)?.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1050,8 +1050,14 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
|
|
||||||
int initialDepth = writer.Top;
|
int initialDepth = writer.Top;
|
||||||
|
|
||||||
foreach (DictionaryEntry entry in values)
|
// Manual use of IDictionaryEnumerator instead of foreach to avoid DictionaryEntry box allocations.
|
||||||
|
IDictionaryEnumerator e = values.GetEnumerator();
|
||||||
|
try
|
||||||
{
|
{
|
||||||
|
while (e.MoveNext())
|
||||||
|
{
|
||||||
|
DictionaryEntry entry = e.Entry;
|
||||||
|
|
||||||
bool escape;
|
bool escape;
|
||||||
string propertyName = GetPropertyName(writer, entry.Key, contract.KeyContract, out escape);
|
string propertyName = GetPropertyName(writer, entry.Key, contract.KeyContract, out escape);
|
||||||
|
|
||||||
@@ -1093,6 +1099,11 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
(e as IDisposable)?.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
writer.WriteEndObject();
|
writer.WriteEndObject();
|
||||||
|
|
||||||
|
|||||||
@@ -113,6 +113,13 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static ConstructorInfo ResolveEnumerableCollectionConstructor(Type collectionType, Type collectionItemType)
|
public static ConstructorInfo ResolveEnumerableCollectionConstructor(Type collectionType, Type collectionItemType)
|
||||||
|
{
|
||||||
|
Type genericConstructorArgument = typeof(IList<>).MakeGenericType(collectionItemType);
|
||||||
|
|
||||||
|
return ResolveEnumerableCollectionConstructor(collectionType, collectionItemType, genericConstructorArgument);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ConstructorInfo ResolveEnumerableCollectionConstructor(Type collectionType, Type collectionItemType, Type constructorArgumentType)
|
||||||
{
|
{
|
||||||
Type genericEnumerable = typeof(IEnumerable<>).MakeGenericType(collectionItemType);
|
Type genericEnumerable = typeof(IEnumerable<>).MakeGenericType(collectionItemType);
|
||||||
ConstructorInfo match = null;
|
ConstructorInfo match = null;
|
||||||
@@ -123,7 +130,9 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
if (parameters.Count == 1)
|
if (parameters.Count == 1)
|
||||||
{
|
{
|
||||||
if (genericEnumerable == parameters[0].ParameterType)
|
Type parameterType = parameters[0].ParameterType;
|
||||||
|
|
||||||
|
if (genericEnumerable == parameterType)
|
||||||
{
|
{
|
||||||
// exact match
|
// exact match
|
||||||
match = constructor;
|
match = constructor;
|
||||||
@@ -133,7 +142,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
// incase we can't find an exact match, use first inexact
|
// incase we can't find an exact match, use first inexact
|
||||||
if (match == null)
|
if (match == null)
|
||||||
{
|
{
|
||||||
if (genericEnumerable.IsAssignableFrom(parameters[0].ParameterType))
|
if (parameterType.IsAssignableFrom(constructorArgumentType))
|
||||||
{
|
{
|
||||||
match = constructor;
|
match = constructor;
|
||||||
}
|
}
|
||||||
@@ -214,11 +223,11 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool Contains(this IEnumerable list, object value, IEqualityComparer comparer)
|
public static bool Contains<T>(this List<T> list, T value, IEqualityComparer comparer)
|
||||||
{
|
{
|
||||||
foreach (object item in list)
|
for (int i = 0; i < list.Count; i++)
|
||||||
{
|
{
|
||||||
if (comparer.Equals(item, value))
|
if (comparer.Equals(value, list[i]))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -226,24 +235,14 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
public static int IndexOfReference<T>(this List<T> list, T item)
|
||||||
/// Returns the index of the first occurrence in a sequence by using a specified IEqualityComparer{TSource}.
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TSource">The type of the elements of source.</typeparam>
|
|
||||||
/// <param name="list">A sequence in which to locate a value.</param>
|
|
||||||
/// <param name="value">The object to locate in the sequence</param>
|
|
||||||
/// <param name="comparer">An equality comparer to compare values.</param>
|
|
||||||
/// <returns>The zero-based index of the first occurrence of value within the entire sequence, if found; otherwise, –1.</returns>
|
|
||||||
public static int IndexOf<TSource>(this IEnumerable<TSource> list, TSource value, IEqualityComparer<TSource> comparer)
|
|
||||||
{
|
{
|
||||||
int index = 0;
|
for (int i = 0; i < list.Count; i++)
|
||||||
foreach (TSource item in list)
|
|
||||||
{
|
{
|
||||||
if (comparer.Equals(item, value))
|
if (ReferenceEquals(item, list[i]))
|
||||||
{
|
{
|
||||||
return index;
|
return i;
|
||||||
}
|
}
|
||||||
index++;
|
|
||||||
}
|
}
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -299,9 +299,19 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
{
|
{
|
||||||
if (_dictionary != null)
|
if (_dictionary != null)
|
||||||
{
|
{
|
||||||
foreach (DictionaryEntry item in _dictionary)
|
// Manual use of IDictionaryEnumerator instead of foreach to avoid DictionaryEntry box allocations.
|
||||||
|
IDictionaryEnumerator e = _dictionary.GetEnumerator();
|
||||||
|
try
|
||||||
{
|
{
|
||||||
array[arrayIndex++] = new KeyValuePair<TKey, TValue>((TKey)item.Key, (TValue)item.Value);
|
while (e.MoveNext())
|
||||||
|
{
|
||||||
|
DictionaryEntry entry = e.Entry;
|
||||||
|
array[arrayIndex++] = new KeyValuePair<TKey, TValue>((TKey)entry.Key, (TValue)entry.Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
(e as IDisposable)?.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
||||||
|
|||||||
@@ -240,7 +240,7 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
|
|
||||||
public override Func<T, object> CreateGet<T>(PropertyInfo propertyInfo)
|
public override Func<T, object> CreateGet<T>(PropertyInfo propertyInfo)
|
||||||
{
|
{
|
||||||
DynamicMethod dynamicMethod = CreateDynamicMethod("Get" + propertyInfo.Name, typeof(T), new[] { typeof(object) }, propertyInfo.DeclaringType);
|
DynamicMethod dynamicMethod = CreateDynamicMethod("Get" + propertyInfo.Name, typeof(object), new[] { typeof(T) }, propertyInfo.DeclaringType);
|
||||||
ILGenerator generator = dynamicMethod.GetILGenerator();
|
ILGenerator generator = dynamicMethod.GetILGenerator();
|
||||||
|
|
||||||
GenerateCreateGetPropertyIL(propertyInfo, generator);
|
GenerateCreateGetPropertyIL(propertyInfo, generator);
|
||||||
|
|||||||
@@ -771,7 +771,9 @@ namespace Newtonsoft.Json.Utilities
|
|||||||
#if (NET20 || NET35)
|
#if (NET20 || NET35)
|
||||||
// ye olde .NET GetCustomAttributes doesn't respect the inherit argument
|
// ye olde .NET GetCustomAttributes doesn't respect the inherit argument
|
||||||
if (inherit && t.BaseType != null)
|
if (inherit && t.BaseType != null)
|
||||||
|
{
|
||||||
attributes = attributes.Union(GetAttributes(t.BaseType, attributeType, inherit)).ToArray();
|
attributes = attributes.Union(GetAttributes(t.BaseType, attributeType, inherit)).ToArray();
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return attributes;
|
return attributes;
|
||||||
|
|||||||
@@ -1,14 +1,19 @@
|
|||||||
{
|
{
|
||||||
"version": "7.0.2-beta1",
|
"version": "1.0.0-*",
|
||||||
"title": "Json.NET",
|
"title": "Json.NET",
|
||||||
"description": "Json.NET is a popular high-performance JSON framework for .NET",
|
"description": "Json.NET is a popular high-performance JSON framework for .NET",
|
||||||
|
"language": "en-US",
|
||||||
"authors": [ "James Newton-King" ],
|
"authors": [ "James Newton-King" ],
|
||||||
"tags": [ "json" ],
|
"packOptions": {
|
||||||
"projectUrl": "http://www.newtonsoft.com/json",
|
"projectUrl": "http://www.newtonsoft.com/json",
|
||||||
|
"tags": [ "json" ],
|
||||||
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
|
"licenseUrl": "https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md",
|
||||||
"iconUrl": "http://www.newtonsoft.com/content/images/nugeticon.png",
|
"iconUrl": "http://www.newtonsoft.com/content/images/nugeticon.png",
|
||||||
"language": "en-US",
|
"repository": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "git://github.com/JamesNK/Newtonsoft.Json"
|
||||||
|
}
|
||||||
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"net45": {
|
"net45": {
|
||||||
"frameworkAssemblies": {
|
"frameworkAssemblies": {
|
||||||
@@ -44,8 +49,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
".NETPortable,Version=v4.5,Profile=Profile259": {
|
".NETPortable,Version=v4.5,Profile=Profile259": {
|
||||||
"compilationOptions": {
|
"buildOptions": {
|
||||||
"define": [ "PORTABLE" ]
|
"define": [
|
||||||
|
"PORTABLE"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"frameworkAssemblies": {
|
"frameworkAssemblies": {
|
||||||
"Microsoft.CSharp": "",
|
"Microsoft.CSharp": "",
|
||||||
@@ -61,6 +68,7 @@
|
|||||||
"System.ObjectModel": "",
|
"System.ObjectModel": "",
|
||||||
"System.Reflection": "",
|
"System.Reflection": "",
|
||||||
"System.Reflection.Extensions": "",
|
"System.Reflection.Extensions": "",
|
||||||
|
"System.Resources.ResourceManager": "",
|
||||||
"System.Runtime": "",
|
"System.Runtime": "",
|
||||||
"System.Runtime.Extensions": "",
|
"System.Runtime.Extensions": "",
|
||||||
"System.Runtime.Serialization": "",
|
"System.Runtime.Serialization": "",
|
||||||
@@ -77,8 +85,10 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
".NETPortable,Version=v4.0,Profile=Profile328": {
|
".NETPortable,Version=v4.0,Profile=Profile328": {
|
||||||
"compilationOptions": {
|
"buildOptions": {
|
||||||
"define": [ "PORTABLE40" ]
|
"define": [
|
||||||
|
"PORTABLE40"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"frameworkAssemblies": {
|
"frameworkAssemblies": {
|
||||||
"mscorlib": "",
|
"mscorlib": "",
|
||||||
@@ -88,32 +98,36 @@
|
|||||||
"System.Xml": ""
|
"System.Xml": ""
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dotnet": {
|
"netstandard1.0": {
|
||||||
|
"buildOptions": {
|
||||||
|
"define": [
|
||||||
|
"NETSTANDARD10",
|
||||||
|
"PORTABLE"
|
||||||
|
]
|
||||||
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CSharp": "4.0.0",
|
"Microsoft.CSharp": "4.0.1-rc2-24027",
|
||||||
"System.Collections": "4.0.10",
|
"System.Collections": "4.0.11-rc2-24027",
|
||||||
"System.Collections.Concurrent": "4.0.10",
|
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
|
||||||
"System.ComponentModel.TypeConverter": "4.0.0",
|
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
|
||||||
"System.Diagnostics.Debug": "4.0.10",
|
"System.Globalization": "4.0.11-rc2-24027",
|
||||||
"System.Dynamic.Runtime": "4.0.10",
|
"System.IO": "4.1.0-rc2-24027",
|
||||||
"System.Globalization": "4.0.10",
|
"System.Linq": "4.1.0-rc2-24027",
|
||||||
"System.IO": "4.0.10",
|
"System.Linq.Expressions": "4.0.11-rc2-24027",
|
||||||
"System.Linq": "4.0.0",
|
"System.ObjectModel": "4.0.12-rc2-24027",
|
||||||
"System.Linq.Expressions": "4.0.10",
|
"System.Reflection": "4.1.0-rc2-24027",
|
||||||
"System.ObjectModel": "4.0.10",
|
"System.Reflection.Extensions": "4.0.1-rc2-24027",
|
||||||
"System.Reflection": "4.0.10",
|
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
|
||||||
"System.Reflection.Extensions": "4.0.0",
|
"System.Runtime": "4.1.0-rc2-24027",
|
||||||
"System.Runtime": "4.0.20",
|
"System.Runtime.Extensions": "4.1.0-rc2-24027",
|
||||||
"System.Runtime.Extensions": "4.0.10",
|
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
|
||||||
"System.Runtime.Numerics": "4.0.0",
|
"System.Text.Encoding": "4.0.11-rc2-24027",
|
||||||
"System.Runtime.Serialization.Primitives": "4.0.10",
|
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
|
||||||
"System.Text.Encoding": "4.0.10",
|
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
|
||||||
"System.Text.Encoding.Extensions": "4.0.10",
|
"System.Threading": "4.0.11-rc2-24027",
|
||||||
"System.Text.RegularExpressions": "4.0.10",
|
"System.Threading.Tasks": "4.0.11-rc2-24027",
|
||||||
"System.Threading": "4.0.10",
|
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
|
||||||
"System.Threading.Tasks": "4.0.10",
|
"System.Xml.XDocument": "4.0.11-rc2-24027"
|
||||||
"System.Xml.ReaderWriter": "4.0.10",
|
|
||||||
"System.Xml.XDocument": "4.0.10"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-3
@@ -3,8 +3,8 @@
|
|||||||
<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="AspNet VNext (CI Builds)" value="https://www.myget.org/F/aspnetvnext/api/v2" />
|
<!--<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||||
<add key="xunit (CI Builds)" value="https://www.myget.org/F/xunit/api/v2" />
|
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />-->
|
||||||
<add key="NuGet.org (v2)" value="https://www.nuget.org/api/v2" />
|
<add key="NuGet.org (v3)" value="https://api.nuget.org/v3/index.json" />
|
||||||
</packageSources>
|
</packageSources>
|
||||||
</configuration>
|
</configuration>
|
||||||
+1
-4
@@ -1,6 +1,3 @@
|
|||||||
{
|
{
|
||||||
"projects": [ "src" ],
|
"projects": [ "src" ]
|
||||||
"sdk": {
|
|
||||||
"version": "1.0.0-rc1-update1"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,338 @@
|
|||||||
|
#
|
||||||
|
# Copyright (c) .NET Foundation and contributors. All rights reserved.
|
||||||
|
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
|
||||||
|
#
|
||||||
|
|
||||||
|
<#
|
||||||
|
.SYNOPSIS
|
||||||
|
Installs dotnet cli
|
||||||
|
.DESCRIPTION
|
||||||
|
Installs dotnet cli. If dotnet installation already exists in the given directory
|
||||||
|
it will update it only if the requested version differs from the one already installed.
|
||||||
|
.PARAMETER Channel
|
||||||
|
Default: preview
|
||||||
|
Channel is the way of reasoning about stability and quality of dotnet. This parameter takes one of the values:
|
||||||
|
- future - Possibly unstable, frequently changing, may contain new finished and unfinished features
|
||||||
|
- preview - Pre-release stable with known issues and feature gaps
|
||||||
|
- production - Most stable releases
|
||||||
|
.PARAMETER Version
|
||||||
|
Default: latest
|
||||||
|
Represents a build version on specific channel. Possible values:
|
||||||
|
- 4-part version in a format A.B.C.D - represents specific version of build
|
||||||
|
- latest - most latest build on specific channel
|
||||||
|
- lkg - last known good version on specific channel
|
||||||
|
Note: LKG work is in progress. Once the work is finished, this will become new default
|
||||||
|
.PARAMETER InstallDir
|
||||||
|
Default: %LocalAppData%\Microsoft\dotnet
|
||||||
|
Path to where to install dotnet. Note that binaries will be placed directly in a given directory.
|
||||||
|
.PARAMETER Architecture
|
||||||
|
Default: <auto> - this value represents currently running OS architecture
|
||||||
|
Architecture of dotnet binaries to be installed.
|
||||||
|
Possible values are: <auto>, x64 and x86
|
||||||
|
.PARAMETER DebugSymbols
|
||||||
|
If set the installer will include symbols in the installation.
|
||||||
|
.PARAMETER DryRun
|
||||||
|
If set it will not perform installation but instead display what command line to use to consistently install
|
||||||
|
currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link
|
||||||
|
with specific version so that this command can be used deterministicly in a build script.
|
||||||
|
It also displays binaries location if you prefer to install or download it yourself.
|
||||||
|
.PARAMETER NoPath
|
||||||
|
By default this script will set environment variable PATH for the current process to the binaries folder inside installation folder.
|
||||||
|
If set it will display binaries location but not set any environment variable.
|
||||||
|
.PARAMETER Verbose
|
||||||
|
Displays diagnostics information.
|
||||||
|
.PARAMETER AzureFeed
|
||||||
|
Default: https://dotnetcli.blob.core.windows.net/dotnet
|
||||||
|
This parameter should not be usually changed by user. It allows to change URL for the Azure feed used by this installer.
|
||||||
|
#>
|
||||||
|
[cmdletbinding()]
|
||||||
|
param(
|
||||||
|
[string]$Channel="preview",
|
||||||
|
[string]$Version="Latest",
|
||||||
|
[string]$InstallDir="<auto>",
|
||||||
|
[string]$Architecture="<auto>",
|
||||||
|
[switch]$DebugSymbols, # TODO: Switch does not work yet. Symbols zip is not being uploaded yet.
|
||||||
|
[switch]$DryRun,
|
||||||
|
[switch]$NoPath,
|
||||||
|
[string]$AzureFeed="https://dotnetcli.blob.core.windows.net/dotnet"
|
||||||
|
)
|
||||||
|
|
||||||
|
Set-StrictMode -Version Latest
|
||||||
|
$ErrorActionPreference="Stop"
|
||||||
|
$ProgressPreference="SilentlyContinue"
|
||||||
|
|
||||||
|
$BinFolderRelativePath=""
|
||||||
|
|
||||||
|
# example path with regex: shared/1.0.0-beta-12345/somepath
|
||||||
|
$VersionRegEx="/\d+\.\d+[^/]+/"
|
||||||
|
$OverrideNonVersionedFiles=$true
|
||||||
|
|
||||||
|
function Say($str) {
|
||||||
|
Write-Host "dotnet_install: $str"
|
||||||
|
}
|
||||||
|
|
||||||
|
function Say-Verbose($str) {
|
||||||
|
Write-Verbose "dotnet_install: $str"
|
||||||
|
}
|
||||||
|
|
||||||
|
function Say-Invocation($Invocation) {
|
||||||
|
$command = $Invocation.MyCommand;
|
||||||
|
$args = (($Invocation.BoundParameters.Keys | foreach { "-$_ `"$($Invocation.BoundParameters[$_])`"" }) -join " ")
|
||||||
|
Say-Verbose "$command $args"
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Machine-Architecture() {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
# possible values: AMD64, IA64, x86
|
||||||
|
return $ENV:PROCESSOR_ARCHITECTURE
|
||||||
|
}
|
||||||
|
|
||||||
|
# TODO: Architecture and CLIArchitecture should be unified
|
||||||
|
function Get-CLIArchitecture-From-Architecture([string]$Architecture) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
switch ($Architecture.ToLower()) {
|
||||||
|
{ $_ -eq "<auto>" } { return Get-CLIArchitecture-From-Architecture $(Get-Machine-Architecture) }
|
||||||
|
{ ($_ -eq "amd64") -or ($_ -eq "x64") } { return "x64" }
|
||||||
|
{ $_ -eq "x86" } { return "x86" }
|
||||||
|
default { throw "Architecture not supported. If you think this is a bug, please report it at https://github.com/dotnet/cli/issues" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Version-Info-From-Version-Text([string]$VersionText) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$Data = @($VersionText.Split([char[]]@(), [StringSplitOptions]::RemoveEmptyEntries));
|
||||||
|
|
||||||
|
$VersionInfo = @{}
|
||||||
|
$VersionInfo.CommitHash = $Data[0].Trim()
|
||||||
|
$VersionInfo.Version = $Data[1].Trim()
|
||||||
|
return $VersionInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Latest-Version-Info([string]$AzureFeed, [string]$AzureChannel, [string]$CLIArchitecture) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$VersionFileUrl = "$AzureFeed/$AzureChannel/dnvm/latest.win.$CLIArchitecture.version"
|
||||||
|
$Response = Invoke-WebRequest -UseBasicParsing $VersionFileUrl
|
||||||
|
$VersionText = [Text.Encoding]::UTF8.GetString($Response.Content)
|
||||||
|
|
||||||
|
$VersionInfo = Get-Version-Info-From-Version-Text $VersionText
|
||||||
|
|
||||||
|
return $VersionInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
# TODO: AzureChannel and Channel should be unified
|
||||||
|
function Get-Azure-Channel-From-Channel([string]$Channel) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
# For compatibility with build scripts accept also directly Azure channels names
|
||||||
|
switch ($Channel.ToLower()) {
|
||||||
|
{ ($_ -eq "future") -or ($_ -eq "dev") } { return "dev" }
|
||||||
|
{ ($_ -eq "preview") -or ($_ -eq "beta") } { return "beta" }
|
||||||
|
{ $_ -eq "production" } { throw "Production channel does not exist yet" }
|
||||||
|
default { throw "``$Channel`` is an invalid channel name. Use one of the following: ``future``, ``preview``, ``production``" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$AzureChannel, [string]$CLIArchitecture, [string]$Version) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
switch ($Version.ToLower()) {
|
||||||
|
{ $_ -eq "latest" } {
|
||||||
|
$LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -AzureChannel $AzureChannel -CLIArchitecture $CLIArchitecture
|
||||||
|
return $LatestVersionInfo.Version
|
||||||
|
}
|
||||||
|
{ $_ -eq "lkg" } { throw "``-Version LKG`` not supported yet." }
|
||||||
|
default { return $Version }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Download-Links([string]$AzureFeed, [string]$AzureChannel, [string]$SpecificVersion, [string]$CLIArchitecture) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$ret = @()
|
||||||
|
$files = @("dotnet-dev")
|
||||||
|
|
||||||
|
foreach ($file in $files) {
|
||||||
|
$PayloadURL = "$AzureFeed/$AzureChannel/Binaries/$SpecificVersion/$file-win-$CLIArchitecture.$SpecificVersion.zip"
|
||||||
|
Say-Verbose "Constructed payload URL: $PayloadURL"
|
||||||
|
$ret += $PayloadURL
|
||||||
|
}
|
||||||
|
|
||||||
|
return $ret
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-User-Share-Path() {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$InstallRoot = $env:DOTNET_INSTALL_DIR
|
||||||
|
if (!$InstallRoot) {
|
||||||
|
$InstallRoot = "$env:LocalAppData\Microsoft\dotnet"
|
||||||
|
}
|
||||||
|
return $InstallRoot
|
||||||
|
}
|
||||||
|
|
||||||
|
function Resolve-Installation-Path([string]$InstallDir) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
if ($InstallDir -eq "<auto>") {
|
||||||
|
return Get-User-Share-Path
|
||||||
|
}
|
||||||
|
return $InstallDir
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Version-Info-From-Version-File([string]$InstallRoot, [string]$RelativePathToVersionFile) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$VersionFile = Join-Path -Path $InstallRoot -ChildPath $RelativePathToVersionFile
|
||||||
|
Say-Verbose "Local version file: $VersionFile"
|
||||||
|
|
||||||
|
if (Test-Path $VersionFile) {
|
||||||
|
$VersionText = cat $VersionFile
|
||||||
|
Say-Verbose "Local version file text: $VersionText"
|
||||||
|
return Get-Version-Info-From-Version-Text $VersionText
|
||||||
|
}
|
||||||
|
|
||||||
|
Say-Verbose "Local version file not found."
|
||||||
|
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
function Is-Dotnet-Package-Installed([string]$InstallRoot, [string]$RelativePathToPackage, [string]$SpecificVersion) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$DotnetPackagePath = Join-Path -Path $InstallRoot -ChildPath $RelativePathToPackage | Join-Path -ChildPath $SpecificVersion
|
||||||
|
Say-Verbose "Is-Dotnet-Package-Installed: Path to a package: $DotnetPackagePath"
|
||||||
|
return Test-Path $DotnetPackagePath -PathType Container
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Absolute-Path([string]$RelativeOrAbsolutePath) {
|
||||||
|
# Too much spam
|
||||||
|
# Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
return $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($RelativeOrAbsolutePath)
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-Path-Prefix-With-Version($path) {
|
||||||
|
$match = [regex]::match($path, $VersionRegEx)
|
||||||
|
if ($match.Success) {
|
||||||
|
return $entry.FullName.Substring(0, $match.Index + $match.Length)
|
||||||
|
}
|
||||||
|
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package([System.IO.Compression.ZipArchive]$Zip, [string]$OutPath) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
$ret = @()
|
||||||
|
foreach ($entry in $Zip.Entries) {
|
||||||
|
$dir = Get-Path-Prefix-With-Version $entry.FullName
|
||||||
|
if ($dir -ne $null) {
|
||||||
|
$path = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $dir)
|
||||||
|
if (-Not (Test-Path $path -PathType Container)) {
|
||||||
|
$ret += $dir
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$ret = $ret | Sort-Object | Get-Unique
|
||||||
|
|
||||||
|
$values = ($ret | foreach { "$_" }) -join ";"
|
||||||
|
Say-Verbose "Directories to unpack: $values"
|
||||||
|
|
||||||
|
return $ret
|
||||||
|
}
|
||||||
|
|
||||||
|
# Example zip content and extraction algorithm:
|
||||||
|
# Rule: files if extracted are always being extracted to the same relative path locally
|
||||||
|
# .\
|
||||||
|
# a.exe # file does not exist locally, extract
|
||||||
|
# b.dll # file exists locally, override only if $OverrideFiles set
|
||||||
|
# aaa\ # same rules as for files
|
||||||
|
# ...
|
||||||
|
# abc\1.0.0\ # directory contains version and exists locally
|
||||||
|
# ... # do not extract content under versioned part
|
||||||
|
# abc\asd\ # same rules as for files
|
||||||
|
# ...
|
||||||
|
# def\ghi\1.0.1\ # directory contains version and does not exist locally
|
||||||
|
# ... # extract content
|
||||||
|
function Extract-Dotnet-Package([string]$ZipPath, [string]$OutPath) {
|
||||||
|
Say-Invocation $MyInvocation
|
||||||
|
|
||||||
|
Add-Type -Assembly System.IO.Compression.FileSystem | Out-Null
|
||||||
|
Set-Variable -Name Zip
|
||||||
|
try {
|
||||||
|
$Zip = [System.IO.Compression.ZipFile]::OpenRead($ZipPath)
|
||||||
|
|
||||||
|
$DirectoriesToUnpack = Get-List-Of-Directories-And-Versions-To-Unpack-From-Dotnet-Package -Zip $Zip -OutPath $OutPath
|
||||||
|
|
||||||
|
foreach ($entry in $Zip.Entries) {
|
||||||
|
$PathWithVersion = Get-Path-Prefix-With-Version $entry.FullName
|
||||||
|
if (($PathWithVersion -eq $null) -Or ($DirectoriesToUnpack -contains $PathWithVersion)) {
|
||||||
|
$DestinationPath = Get-Absolute-Path $(Join-Path -Path $OutPath -ChildPath $entry.FullName)
|
||||||
|
$DestinationDir = Split-Path -Parent $DestinationPath
|
||||||
|
$OverrideFiles=$OverrideNonVersionedFiles -Or (-Not (Test-Path $DestinationPath))
|
||||||
|
if ((-Not $DestinationPath.EndsWith("\")) -And $OverrideFiles) {
|
||||||
|
New-Item -ItemType Directory -Force -Path $DestinationDir | Out-Null
|
||||||
|
[System.IO.Compression.ZipFileExtensions]::ExtractToFile($entry, $DestinationPath, $OverrideNonVersionedFiles)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
finally {
|
||||||
|
if ($Zip -ne $null) {
|
||||||
|
$Zip.Dispose()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$AzureChannel = Get-Azure-Channel-From-Channel -Channel $Channel
|
||||||
|
$CLIArchitecture = Get-CLIArchitecture-From-Architecture $Architecture
|
||||||
|
$SpecificVersion = Get-Specific-Version-From-Version -AzureFeed $AzureFeed -AzureChannel $AzureChannel -CLIArchitecture $CLIArchitecture -Version $Version
|
||||||
|
$DownloadLinks = Get-Download-Links -AzureFeed $AzureFeed -AzureChannel $AzureChannel -SpecificVersion $SpecificVersion -CLIArchitecture $CLIArchitecture
|
||||||
|
|
||||||
|
if ($DryRun) {
|
||||||
|
Say "Payload URLs:"
|
||||||
|
foreach ($DownloadLink in $DownloadLinks) {
|
||||||
|
Say "- $DownloadLink"
|
||||||
|
}
|
||||||
|
Say "Repeatable invocation: .\$($MyInvocation.MyCommand) -Version $SpecificVersion -Channel $Channel -Architecture $CLIArchitecture -InstallDir $InstallDir"
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
$InstallRoot = Resolve-Installation-Path $InstallDir
|
||||||
|
Say-Verbose "InstallRoot: $InstallRoot"
|
||||||
|
|
||||||
|
$IsSdkInstalled = Is-Dotnet-Package-Installed -InstallRoot $InstallRoot -RelativePathToPackage "sdk" -SpecificVersion $SpecificVersion
|
||||||
|
Say-Verbose ".NET SDK installed? $IsSdkInstalled"
|
||||||
|
if ($IsSdkInstalled) {
|
||||||
|
Say ".NET SDK version $SpecificVersion is already installed."
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
New-Item -ItemType Directory -Force -Path $InstallRoot | Out-Null
|
||||||
|
|
||||||
|
foreach ($DownloadLink in $DownloadLinks) {
|
||||||
|
$ZipPath = [System.IO.Path]::GetTempFileName()
|
||||||
|
Say "Downloading $DownloadLink"
|
||||||
|
$resp = Invoke-WebRequest -UseBasicParsing $DownloadLink -OutFile $ZipPath
|
||||||
|
|
||||||
|
Say "Extracting zip from $DownloadLink"
|
||||||
|
Extract-Dotnet-Package -ZipPath $ZipPath -OutPath $InstallRoot
|
||||||
|
|
||||||
|
Remove-Item $ZipPath
|
||||||
|
}
|
||||||
|
|
||||||
|
$BinPath = Get-Absolute-Path $(Join-Path -Path $InstallRoot -ChildPath $BinFolderRelativePath)
|
||||||
|
if (-Not $NoPath) {
|
||||||
|
Say "Adding to current process PATH: `"$BinPath`". Note: This change will not be visible if PowerShell was run as a child process."
|
||||||
|
$env:path += ";$BinPath"
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
Say "Binaries of dotnet can be found in $BinPath"
|
||||||
|
}
|
||||||
|
|
||||||
|
Say "Installation finished"
|
||||||
Binary file not shown.
Reference in New Issue
Block a user