Merge branch 'master' of github.com:JamesNK/Newtonsoft.Json
This commit is contained in:
@@ -41,6 +41,8 @@
|
|||||||
*.fs text
|
*.fs text
|
||||||
*.fsx text
|
*.fsx text
|
||||||
*.hs text
|
*.hs text
|
||||||
|
*.ps1 text
|
||||||
|
*.psm1 text
|
||||||
|
|
||||||
*.csproj text merge=union
|
*.csproj text merge=union
|
||||||
*.vbproj text merge=union
|
*.vbproj text merge=union
|
||||||
|
|||||||
+6
-4
@@ -1,5 +1,7 @@
|
|||||||
[Bb]in/
|
[Bb]in/
|
||||||
[Oo]bj/
|
[Oo]bj/
|
||||||
[Ww]orking/
|
[Ww]orking/
|
||||||
*.suo
|
TestResults/
|
||||||
|
AppPackages/
|
||||||
|
*.suo
|
||||||
*.user
|
*.user
|
||||||
+1
-1
@@ -17,7 +17,7 @@
|
|||||||
$workingDir = "$baseDir\Working"
|
$workingDir = "$baseDir\Working"
|
||||||
$builds = @(
|
$builds = @(
|
||||||
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
|
@{Name = "Newtonsoft.Json"; TestsName = "Newtonsoft.Json.Tests"; Constants=""; FinalDir="Net40"; NuGetDir = "net40"; Framework="net-4.0"; Sign=$true},
|
||||||
#@{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true},
|
@{Name = "Newtonsoft.Json.Metro"; TestsName = $null; Constants="NETFX_CORE"; FinalDir="Metro"; NuGetDir = "winrt45"; Framework="net-4.5"; Sign=$true},
|
||||||
|
|
||||||
# unsigned SL/WP
|
# unsigned SL/WP
|
||||||
@{Name = "Newtonsoft.Json.WindowsPhone"; TestsName = $null; Constants="SILVERLIGHT;WINDOWS_PHONE"; FinalDir="WindowsPhone"; NuGetDir = "sl3-wp,sl4-windowsphone71"; Framework="net-4.0"; Sign=$false},
|
@{Name = "Newtonsoft.Json.WindowsPhone"; TestsName = $null; Constants="SILVERLIGHT;WINDOWS_PHONE"; FinalDir="WindowsPhone"; NuGetDir = "sl3-wp,sl4-windowsphone71"; Framework="net-4.0"; Sign=$false},
|
||||||
|
|||||||
+16
-7
@@ -20,25 +20,34 @@ Versions:
|
|||||||
|
|
||||||
Json.NET comes in different versions for the various .NET frameworks.
|
Json.NET comes in different versions for the various .NET frameworks.
|
||||||
|
|
||||||
-DotNet:
|
-Net40:
|
||||||
.NET latest (4.0)
|
.NET latest (4.0 & 4.5)
|
||||||
|
|
||||||
-DotNet35:
|
-Net35:
|
||||||
.NET 3.5 SP1, Mono
|
.NET 3.5 SP1, Mono
|
||||||
|
|
||||||
-DotNet20:
|
-Net20:
|
||||||
.NET 2.0
|
.NET 2.0
|
||||||
|
|
||||||
-Silverlight:
|
-Silverlight:
|
||||||
Silverlight 4.0
|
Silverlight 4 & 5
|
||||||
|
|
||||||
-WindowsPhone:
|
-WindowsPhone:
|
||||||
Windows Phone 7
|
Windows Phone 7 & 7.1
|
||||||
|
|
||||||
|
-Metro
|
||||||
|
Windows 8 Metro, WinRT 4.5
|
||||||
|
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
|
||||||
|
The Silverlight and Windows Phone builds are not strong-named.
|
||||||
|
Use the assemblies in the Signed sub-directories for the strong-named versions.
|
||||||
|
|
||||||
Microsoft stopped support for the Compact Framework in Visual Studio 2010.
|
Microsoft stopped support for the Compact Framework in Visual Studio 2010.
|
||||||
For a Compact Framework 3.5 build download Json.NET 3.5.
|
For a Compact Framework 3.5 build download Json.NET 3.5.
|
||||||
|
|
||||||
For a Silverlight 3.0 build down download Json.NET 3.5.
|
For a Silverlight 3.0 build download Json.NET 3.5.
|
||||||
|
|
||||||
|
|
||||||
Instructions:
|
Instructions:
|
||||||
|
|||||||
@@ -172,6 +172,7 @@
|
|||||||
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
|
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
|
||||||
<Compile Include="Serialization\SerializationEventAttributeTests.cs" />
|
<Compile Include="Serialization\SerializationEventAttributeTests.cs" />
|
||||||
<Compile Include="Serialization\TypeNameHandlingTests.cs" />
|
<Compile Include="Serialization\TypeNameHandlingTests.cs" />
|
||||||
|
<Compile Include="Serialization\WebApiIntegrationTests.cs" />
|
||||||
<Compile Include="SilverlightTests.cs" />
|
<Compile Include="SilverlightTests.cs" />
|
||||||
<Compile Include="TestFixtureBase.cs" />
|
<Compile Include="TestFixtureBase.cs" />
|
||||||
<Compile Include="TestObjects\AbstractGenericBase.cs" />
|
<Compile Include="TestObjects\AbstractGenericBase.cs" />
|
||||||
|
|||||||
@@ -519,7 +519,7 @@ namespace Newtonsoft.Json.Tests.Schema
|
|||||||
}", json);
|
}", json);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !SILVERLIGHT
|
#if !(SILVERLIGHT || NETFX_CORE)
|
||||||
[Test]
|
[Test]
|
||||||
public void GenerateSchemaSerializable()
|
public void GenerateSchemaSerializable()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -5,7 +5,13 @@ using System.IO;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
#endif
|
#endif
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
#if !NETFX_CORE
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
|
#else
|
||||||
|
using Microsoft.VisualStudio.TestTools.UnitTesting;
|
||||||
|
using TestFixture = Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute;
|
||||||
|
using Test = Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute;
|
||||||
|
#endif
|
||||||
#if !(SILVERLIGHT || NETFX_CORE || NET20)
|
#if !(SILVERLIGHT || NETFX_CORE || NET20)
|
||||||
using System.Runtime.Serialization.Json;
|
using System.Runtime.Serialization.Json;
|
||||||
#endif
|
#endif
|
||||||
@@ -53,7 +59,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
Assert.AreEqual(expected, json);
|
Assert.AreEqual(expected, json);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !SILVERLIGHT
|
#if !(SILVERLIGHT || NETFX_CORE)
|
||||||
[Test]
|
[Test]
|
||||||
public void SerializeInheritedType()
|
public void SerializeInheritedType()
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user