-Removed HtmlColorConverter to remove System.Drawing.dll dependency
-Fixed culture invariance -Fixed serialization attributes to work in .NET 2.0
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.TestObjects
|
||||
{
|
||||
public abstract class ContentBaseClass
|
||||
{
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.TestObjects
|
||||
{
|
||||
public class ContentSubClass : ContentBaseClass
|
||||
{
|
||||
public ContentSubClass() { }
|
||||
public ContentSubClass(string EasyIn)
|
||||
{
|
||||
SomeString = EasyIn;
|
||||
}
|
||||
|
||||
public string SomeString { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.TestObjects
|
||||
{
|
||||
public class HolderClass
|
||||
{
|
||||
public HolderClass() { }
|
||||
|
||||
[Newtonsoft.Json.JsonProperty(TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All)]
|
||||
public ContentBaseClass TestMember { get; set; }
|
||||
|
||||
[Newtonsoft.Json.JsonProperty(TypeNameHandling = Newtonsoft.Json.TypeNameHandling.All)]
|
||||
public Dictionary<int, List<ContentBaseClass>> AnotherTestMember { get; set; }
|
||||
|
||||
public ContentBaseClass AThirdTestMember { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
@@ -23,7 +23,7 @@
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !PocketPC && !NET20
|
||||
#if !PocketPC
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
Reference in New Issue
Block a user