-Updated source code to VS2010
-Updated main project to .NET 4.0 -Updated to psake 4.0 -Changed assembly version to 4.0.0.0 -Added ICustomTypeDescriptor implementation to JObject, removed JTypeDescriptionProvider and JTypeDescriptor -Changed serialization of collections to use iterator rather than indexer -Removed Compact Framework project -Fixed XML documentation warnings
This commit is contained in:
+260
-185
@@ -1,116 +1,150 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.3074
|
||||
// This code was generated from a template.
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// Manual changes to this file may cause unexpected behavior in your application.
|
||||
// Manual changes to this file will be overwritten if the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
[assembly: global::System.Data.Objects.DataClasses.EdmSchemaAttribute()]
|
||||
[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("DataServicesTestDatabaseModel", "FK_File_Folder", "Folder", global::System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(Newtonsoft.Json.Tests.Folder), "File", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(Newtonsoft.Json.Tests.File))]
|
||||
[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("DataServicesTestDatabaseModel", "FK_Folder_Folder", "Folder", global::System.Data.Metadata.Edm.RelationshipMultiplicity.ZeroOrOne, typeof(Newtonsoft.Json.Tests.Folder), "Folder1", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(Newtonsoft.Json.Tests.Folder))]
|
||||
using System;
|
||||
using System.Data.Objects;
|
||||
using System.Data.Objects.DataClasses;
|
||||
using System.Data.EntityClient;
|
||||
using System.ComponentModel;
|
||||
using System.Xml.Serialization;
|
||||
using System.Runtime.Serialization;
|
||||
|
||||
[assembly: EdmSchemaAttribute()]
|
||||
#region EDM Relationship Metadata
|
||||
|
||||
[assembly: EdmRelationshipAttribute("DataServicesTestDatabaseModel", "FK_File_Folder", "Folder", System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(Newtonsoft.Json.Tests.Folder), "File", System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(Newtonsoft.Json.Tests.File))]
|
||||
[assembly: EdmRelationshipAttribute("DataServicesTestDatabaseModel", "FK_Folder_Folder", "Folder", System.Data.Metadata.Edm.RelationshipMultiplicity.ZeroOrOne, typeof(Newtonsoft.Json.Tests.Folder), "Folder1", System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(Newtonsoft.Json.Tests.Folder))]
|
||||
|
||||
#endregion
|
||||
|
||||
// Original file name:
|
||||
// Generation date: 26/07/2009 4:51:53 p.m.
|
||||
namespace Newtonsoft.Json.Tests
|
||||
{
|
||||
#region Contexts
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for DataServicesTestDatabaseEntities in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
public partial class DataServicesTestDatabaseEntities : global::System.Data.Objects.ObjectContext
|
||||
public partial class DataServicesTestDatabaseEntities : ObjectContext
|
||||
{
|
||||
#region Constructors
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new DataServicesTestDatabaseEntities object using the connection string found in the 'DataServicesTestDatabaseEntities' section of the application configuration file.
|
||||
/// </summary>
|
||||
public DataServicesTestDatabaseEntities() :
|
||||
base("name=DataServicesTestDatabaseEntities", "DataServicesTestDatabaseEntities")
|
||||
public DataServicesTestDatabaseEntities() : base("name=DataServicesTestDatabaseEntities", "DataServicesTestDatabaseEntities")
|
||||
{
|
||||
this.OnContextCreated();
|
||||
OnContextCreated();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initialize a new DataServicesTestDatabaseEntities object.
|
||||
/// </summary>
|
||||
public DataServicesTestDatabaseEntities(string connectionString) :
|
||||
base(connectionString, "DataServicesTestDatabaseEntities")
|
||||
public DataServicesTestDatabaseEntities(string connectionString) : base(connectionString, "DataServicesTestDatabaseEntities")
|
||||
{
|
||||
this.OnContextCreated();
|
||||
OnContextCreated();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initialize a new DataServicesTestDatabaseEntities object.
|
||||
/// </summary>
|
||||
public DataServicesTestDatabaseEntities(global::System.Data.EntityClient.EntityConnection connection) :
|
||||
base(connection, "DataServicesTestDatabaseEntities")
|
||||
public DataServicesTestDatabaseEntities(EntityConnection connection) : base(connection, "DataServicesTestDatabaseEntities")
|
||||
{
|
||||
this.OnContextCreated();
|
||||
OnContextCreated();
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Partial Methods
|
||||
|
||||
partial void OnContextCreated();
|
||||
|
||||
#endregion
|
||||
|
||||
#region ObjectSet Properties
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for File in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
public global::System.Data.Objects.ObjectQuery<File> File
|
||||
public ObjectSet<File> File
|
||||
{
|
||||
get
|
||||
{
|
||||
if ((this._File == null))
|
||||
if ((_File == null))
|
||||
{
|
||||
this._File = base.CreateQuery<File>("[File]");
|
||||
_File = base.CreateObjectSet<File>("File");
|
||||
}
|
||||
return this._File;
|
||||
return _File;
|
||||
}
|
||||
}
|
||||
private global::System.Data.Objects.ObjectQuery<File> _File;
|
||||
private ObjectSet<File> _File;
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Folder in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
public global::System.Data.Objects.ObjectQuery<Folder> Folder
|
||||
public ObjectSet<Folder> Folder
|
||||
{
|
||||
get
|
||||
{
|
||||
if ((this._Folder == null))
|
||||
if ((_Folder == null))
|
||||
{
|
||||
this._Folder = base.CreateQuery<Folder>("[Folder]");
|
||||
_Folder = base.CreateObjectSet<Folder>("Folder");
|
||||
}
|
||||
return this._Folder;
|
||||
return _Folder;
|
||||
}
|
||||
}
|
||||
private global::System.Data.Objects.ObjectQuery<Folder> _Folder;
|
||||
private ObjectSet<Folder> _Folder;
|
||||
|
||||
#endregion
|
||||
#region AddTo Methods
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for File in the schema.
|
||||
/// Deprecated Method for adding a new object to the File EntitySet. Consider using the .Add method of the associated ObjectSet<T> property instead.
|
||||
/// </summary>
|
||||
public void AddToFile(File file)
|
||||
{
|
||||
base.AddObject("File", file);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Folder in the schema.
|
||||
/// Deprecated Method for adding a new object to the Folder EntitySet. Consider using the .Add method of the associated ObjectSet<T> property instead.
|
||||
/// </summary>
|
||||
public void AddToFolder(Folder folder)
|
||||
{
|
||||
base.AddObject("Folder", folder);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
|
||||
#endregion
|
||||
|
||||
#region Entities
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for DataServicesTestDatabaseModel.File in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
/// <KeyProperties>
|
||||
/// FileId
|
||||
/// </KeyProperties>
|
||||
[global::System.Data.Objects.DataClasses.EdmEntityTypeAttribute(NamespaceName="DataServicesTestDatabaseModel", Name="File")]
|
||||
[global::System.Runtime.Serialization.DataContractAttribute(IsReference=true)]
|
||||
[global::System.Serializable()]
|
||||
public partial class File : global::System.Data.Objects.DataClasses.EntityObject
|
||||
[EdmEntityTypeAttribute(NamespaceName="DataServicesTestDatabaseModel", Name="File")]
|
||||
[Serializable()]
|
||||
[DataContractAttribute(IsReference=true)]
|
||||
public partial class File : EntityObject
|
||||
{
|
||||
#region Factory Method
|
||||
|
||||
/// <summary>
|
||||
/// Create a new File object.
|
||||
/// </summary>
|
||||
/// <param name="fileId">Initial value of FileId.</param>
|
||||
/// <param name="name">Initial value of Name.</param>
|
||||
/// <param name="description">Initial value of Description.</param>
|
||||
/// <param name="createdDate">Initial value of CreatedDate.</param>
|
||||
public static File CreateFile(global::System.Guid fileId, string name, string description, global::System.DateTime createdDate)
|
||||
/// <param name="fileId">Initial value of the FileId property.</param>
|
||||
/// <param name="name">Initial value of the Name property.</param>
|
||||
/// <param name="description">Initial value of the Description property.</param>
|
||||
/// <param name="createdDate">Initial value of the CreatedDate property.</param>
|
||||
public static File CreateFile(global::System.Guid fileId, global::System.String name, global::System.String description, global::System.DateTime createdDate)
|
||||
{
|
||||
File file = new File();
|
||||
file.FileId = fileId;
|
||||
@@ -119,331 +153,372 @@ namespace Newtonsoft.Json.Tests
|
||||
file.CreatedDate = createdDate;
|
||||
return file;
|
||||
}
|
||||
|
||||
#endregion
|
||||
#region Primitive Properties
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property FileId in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.Guid FileId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._FileId;
|
||||
return _FileId;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnFileIdChanging(value);
|
||||
this.ReportPropertyChanging("FileId");
|
||||
this._FileId = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value);
|
||||
this.ReportPropertyChanged("FileId");
|
||||
this.OnFileIdChanged();
|
||||
if (_FileId != value)
|
||||
{
|
||||
OnFileIdChanging(value);
|
||||
ReportPropertyChanging("FileId");
|
||||
_FileId = StructuralObject.SetValidValue(value);
|
||||
ReportPropertyChanged("FileId");
|
||||
OnFileIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
private global::System.Guid _FileId;
|
||||
partial void OnFileIdChanging(global::System.Guid value);
|
||||
partial void OnFileIdChanged();
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property Name in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public string Name
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.String Name
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Name;
|
||||
return _Name;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnNameChanging(value);
|
||||
this.ReportPropertyChanging("Name");
|
||||
this._Name = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value, false);
|
||||
this.ReportPropertyChanged("Name");
|
||||
this.OnNameChanged();
|
||||
OnNameChanging(value);
|
||||
ReportPropertyChanging("Name");
|
||||
_Name = StructuralObject.SetValidValue(value, false);
|
||||
ReportPropertyChanged("Name");
|
||||
OnNameChanged();
|
||||
}
|
||||
}
|
||||
private string _Name;
|
||||
partial void OnNameChanging(string value);
|
||||
private global::System.String _Name;
|
||||
partial void OnNameChanging(global::System.String value);
|
||||
partial void OnNameChanged();
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property Description in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public string Description
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.String Description
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Description;
|
||||
return _Description;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnDescriptionChanging(value);
|
||||
this.ReportPropertyChanging("Description");
|
||||
this._Description = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value, false);
|
||||
this.ReportPropertyChanged("Description");
|
||||
this.OnDescriptionChanged();
|
||||
OnDescriptionChanging(value);
|
||||
ReportPropertyChanging("Description");
|
||||
_Description = StructuralObject.SetValidValue(value, false);
|
||||
ReportPropertyChanged("Description");
|
||||
OnDescriptionChanged();
|
||||
}
|
||||
}
|
||||
private string _Description;
|
||||
partial void OnDescriptionChanging(string value);
|
||||
private global::System.String _Description;
|
||||
partial void OnDescriptionChanging(global::System.String value);
|
||||
partial void OnDescriptionChanged();
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property CreatedDate in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.DateTime CreatedDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._CreatedDate;
|
||||
return _CreatedDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnCreatedDateChanging(value);
|
||||
this.ReportPropertyChanging("CreatedDate");
|
||||
this._CreatedDate = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value);
|
||||
this.ReportPropertyChanged("CreatedDate");
|
||||
this.OnCreatedDateChanged();
|
||||
OnCreatedDateChanging(value);
|
||||
ReportPropertyChanging("CreatedDate");
|
||||
_CreatedDate = StructuralObject.SetValidValue(value);
|
||||
ReportPropertyChanged("CreatedDate");
|
||||
OnCreatedDateChanged();
|
||||
}
|
||||
}
|
||||
private global::System.DateTime _CreatedDate;
|
||||
partial void OnCreatedDateChanging(global::System.DateTime value);
|
||||
partial void OnCreatedDateChanged();
|
||||
|
||||
#endregion
|
||||
|
||||
#region Navigation Properties
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Folder in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_File_Folder", "Folder")]
|
||||
[global::System.Xml.Serialization.XmlIgnoreAttribute()]
|
||||
[global::System.Xml.Serialization.SoapIgnoreAttribute()]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
[XmlIgnoreAttribute()]
|
||||
[SoapIgnoreAttribute()]
|
||||
[DataMemberAttribute()]
|
||||
[EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_File_Folder", "Folder")]
|
||||
public Folder Folder
|
||||
{
|
||||
get
|
||||
{
|
||||
return ((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder").Value;
|
||||
return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder").Value;
|
||||
}
|
||||
set
|
||||
{
|
||||
((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder").Value = value;
|
||||
((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder").Value = value;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// There are no comments for Folder in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public global::System.Data.Objects.DataClasses.EntityReference<Folder> FolderReference
|
||||
[BrowsableAttribute(false)]
|
||||
[DataMemberAttribute()]
|
||||
public EntityReference<Folder> FolderReference
|
||||
{
|
||||
get
|
||||
{
|
||||
return ((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder");
|
||||
return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder");
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((value != null))
|
||||
{
|
||||
((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.InitializeRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder", value);
|
||||
((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_File_Folder", "Folder", value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for DataServicesTestDatabaseModel.Folder in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
/// <KeyProperties>
|
||||
/// FolderId
|
||||
/// </KeyProperties>
|
||||
[global::System.Data.Objects.DataClasses.EdmEntityTypeAttribute(NamespaceName="DataServicesTestDatabaseModel", Name="Folder")]
|
||||
[global::System.Runtime.Serialization.DataContractAttribute(IsReference=true)]
|
||||
[global::System.Serializable()]
|
||||
public partial class Folder : global::System.Data.Objects.DataClasses.EntityObject
|
||||
[EdmEntityTypeAttribute(NamespaceName="DataServicesTestDatabaseModel", Name="Folder")]
|
||||
[Serializable()]
|
||||
[DataContractAttribute(IsReference=true)]
|
||||
public partial class Folder : EntityObject
|
||||
{
|
||||
#region Factory Method
|
||||
|
||||
/// <summary>
|
||||
/// Create a new Folder object.
|
||||
/// </summary>
|
||||
/// <param name="folderId">Initial value of FolderId.</param>
|
||||
/// <param name="name">Initial value of Name.</param>
|
||||
/// <param name="createdDate">Initial value of CreatedDate.</param>
|
||||
public static Folder CreateFolder(global::System.Guid folderId, string name, global::System.DateTime createdDate)
|
||||
/// <param name="folderId">Initial value of the FolderId property.</param>
|
||||
/// <param name="name">Initial value of the Name property.</param>
|
||||
/// <param name="description">Initial value of the Description property.</param>
|
||||
/// <param name="createdDate">Initial value of the CreatedDate property.</param>
|
||||
public static Folder CreateFolder(global::System.Guid folderId, global::System.String name, global::System.String description, global::System.DateTime createdDate)
|
||||
{
|
||||
Folder folder = new Folder();
|
||||
folder.FolderId = folderId;
|
||||
folder.Name = name;
|
||||
folder.Description = description;
|
||||
folder.CreatedDate = createdDate;
|
||||
return folder;
|
||||
}
|
||||
|
||||
#endregion
|
||||
#region Primitive Properties
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property FolderId in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.Guid FolderId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._FolderId;
|
||||
return _FolderId;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnFolderIdChanging(value);
|
||||
this.ReportPropertyChanging("FolderId");
|
||||
this._FolderId = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value);
|
||||
this.ReportPropertyChanged("FolderId");
|
||||
this.OnFolderIdChanged();
|
||||
if (_FolderId != value)
|
||||
{
|
||||
OnFolderIdChanging(value);
|
||||
ReportPropertyChanging("FolderId");
|
||||
_FolderId = StructuralObject.SetValidValue(value);
|
||||
ReportPropertyChanged("FolderId");
|
||||
OnFolderIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
private global::System.Guid _FolderId;
|
||||
partial void OnFolderIdChanging(global::System.Guid value);
|
||||
partial void OnFolderIdChanged();
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property Name in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public string Name
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.String Name
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Name;
|
||||
return _Name;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnNameChanging(value);
|
||||
this.ReportPropertyChanging("Name");
|
||||
this._Name = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value, false);
|
||||
this.ReportPropertyChanged("Name");
|
||||
this.OnNameChanged();
|
||||
OnNameChanging(value);
|
||||
ReportPropertyChanging("Name");
|
||||
_Name = StructuralObject.SetValidValue(value, false);
|
||||
ReportPropertyChanged("Name");
|
||||
OnNameChanged();
|
||||
}
|
||||
}
|
||||
private string _Name;
|
||||
partial void OnNameChanging(string value);
|
||||
private global::System.String _Name;
|
||||
partial void OnNameChanging(global::System.String value);
|
||||
partial void OnNameChanged();
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property Description in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute()]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public string Description
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.String Description
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._Description;
|
||||
return _Description;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnDescriptionChanging(value);
|
||||
this.ReportPropertyChanging("Description");
|
||||
this._Description = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value, true);
|
||||
this.ReportPropertyChanged("Description");
|
||||
this.OnDescriptionChanged();
|
||||
OnDescriptionChanging(value);
|
||||
ReportPropertyChanging("Description");
|
||||
_Description = StructuralObject.SetValidValue(value, false);
|
||||
ReportPropertyChanged("Description");
|
||||
OnDescriptionChanged();
|
||||
}
|
||||
}
|
||||
private string _Description;
|
||||
partial void OnDescriptionChanging(string value);
|
||||
private global::System.String _Description;
|
||||
partial void OnDescriptionChanging(global::System.String value);
|
||||
partial void OnDescriptionChanged();
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Property CreatedDate in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(IsNullable=false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
[EdmScalarPropertyAttribute(EntityKeyProperty=false, IsNullable=false)]
|
||||
[DataMemberAttribute()]
|
||||
public global::System.DateTime CreatedDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._CreatedDate;
|
||||
return _CreatedDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
this.OnCreatedDateChanging(value);
|
||||
this.ReportPropertyChanging("CreatedDate");
|
||||
this._CreatedDate = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value);
|
||||
this.ReportPropertyChanged("CreatedDate");
|
||||
this.OnCreatedDateChanged();
|
||||
OnCreatedDateChanging(value);
|
||||
ReportPropertyChanging("CreatedDate");
|
||||
_CreatedDate = StructuralObject.SetValidValue(value);
|
||||
ReportPropertyChanged("CreatedDate");
|
||||
OnCreatedDateChanged();
|
||||
}
|
||||
}
|
||||
private global::System.DateTime _CreatedDate;
|
||||
partial void OnCreatedDateChanging(global::System.DateTime value);
|
||||
partial void OnCreatedDateChanged();
|
||||
|
||||
#endregion
|
||||
|
||||
#region Navigation Properties
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for Files in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_File_Folder", "File")]
|
||||
[global::System.Xml.Serialization.XmlIgnoreAttribute()]
|
||||
[global::System.Xml.Serialization.SoapIgnoreAttribute()]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public global::System.Data.Objects.DataClasses.EntityCollection<File> Files
|
||||
[XmlIgnoreAttribute()]
|
||||
[SoapIgnoreAttribute()]
|
||||
[DataMemberAttribute()]
|
||||
[EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_File_Folder", "File")]
|
||||
public EntityCollection<File> Files
|
||||
{
|
||||
get
|
||||
{
|
||||
return ((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedCollection<File>("DataServicesTestDatabaseModel.FK_File_Folder", "File");
|
||||
return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedCollection<File>("DataServicesTestDatabaseModel.FK_File_Folder", "File");
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((value != null))
|
||||
{
|
||||
((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.InitializeRelatedCollection<File>("DataServicesTestDatabaseModel.FK_File_Folder", "File", value);
|
||||
((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedCollection<File>("DataServicesTestDatabaseModel.FK_File_Folder", "File", value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for ChildFolders in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_Folder_Folder", "Folder1")]
|
||||
[global::System.Xml.Serialization.XmlIgnoreAttribute()]
|
||||
[global::System.Xml.Serialization.SoapIgnoreAttribute()]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public global::System.Data.Objects.DataClasses.EntityCollection<Folder> ChildFolders
|
||||
[XmlIgnoreAttribute()]
|
||||
[SoapIgnoreAttribute()]
|
||||
[DataMemberAttribute()]
|
||||
[EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_Folder_Folder", "Folder1")]
|
||||
public EntityCollection<Folder> ChildFolders
|
||||
{
|
||||
get
|
||||
{
|
||||
return ((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedCollection<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder1");
|
||||
return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedCollection<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder1");
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((value != null))
|
||||
{
|
||||
((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.InitializeRelatedCollection<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder1", value);
|
||||
((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedCollection<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder1", value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// There are no comments for ParentFolder in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.Data.Objects.DataClasses.EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_Folder_Folder", "Folder")]
|
||||
[global::System.Xml.Serialization.XmlIgnoreAttribute()]
|
||||
[global::System.Xml.Serialization.SoapIgnoreAttribute()]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
[XmlIgnoreAttribute()]
|
||||
[SoapIgnoreAttribute()]
|
||||
[DataMemberAttribute()]
|
||||
[EdmRelationshipNavigationPropertyAttribute("DataServicesTestDatabaseModel", "FK_Folder_Folder", "Folder")]
|
||||
public Folder ParentFolder
|
||||
{
|
||||
get
|
||||
{
|
||||
return ((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder").Value;
|
||||
return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder").Value;
|
||||
}
|
||||
set
|
||||
{
|
||||
((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder").Value = value;
|
||||
((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder").Value = value;
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// There are no comments for ParentFolder in the schema.
|
||||
/// No Metadata Documentation available.
|
||||
/// </summary>
|
||||
[global::System.ComponentModel.BrowsableAttribute(false)]
|
||||
[global::System.Runtime.Serialization.DataMemberAttribute()]
|
||||
public global::System.Data.Objects.DataClasses.EntityReference<Folder> ParentFolderReference
|
||||
[BrowsableAttribute(false)]
|
||||
[DataMemberAttribute()]
|
||||
public EntityReference<Folder> ParentFolderReference
|
||||
{
|
||||
get
|
||||
{
|
||||
return ((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder");
|
||||
return ((IEntityWithRelationships)this).RelationshipManager.GetRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder");
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((value != null))
|
||||
{
|
||||
((global::System.Data.Objects.DataClasses.IEntityWithRelationships)(this)).RelationshipManager.InitializeRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder", value);
|
||||
((IEntityWithRelationships)this).RelationshipManager.InitializeRelatedReference<Folder>("DataServicesTestDatabaseModel.FK_Folder_Folder", "Folder", value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<edmx:Edmx Version="1.0" xmlns:edmx="http://schemas.microsoft.com/ado/2007/06/edmx">
|
||||
<edmx:Edmx Version="2.0" xmlns:edmx="http://schemas.microsoft.com/ado/2008/10/edmx">
|
||||
<!-- EF Runtime content -->
|
||||
<edmx:Runtime>
|
||||
<!-- SSDL content -->
|
||||
<edmx:StorageModels>
|
||||
<Schema Namespace="DataServicesTestDatabaseModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2005" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" xmlns="http://schemas.microsoft.com/ado/2006/04/edm/ssdl">
|
||||
<Schema Namespace="DataServicesTestDatabaseModel.Store" Alias="Self" Provider="System.Data.SqlClient" ProviderManifestToken="2005" xmlns="http://schemas.microsoft.com/ado/2009/02/edm/ssdl">
|
||||
<EntityContainer Name="DataServicesTestDatabaseModelStoreContainer">
|
||||
<EntitySet Name="File" EntityType="DataServicesTestDatabaseModel.Store.File" store:Type="Tables" Schema="dbo" />
|
||||
<EntitySet Name="Folder" EntityType="DataServicesTestDatabaseModel.Store.Folder" store:Type="Tables" Schema="dbo" />
|
||||
<EntitySet Name="File" EntityType="DataServicesTestDatabaseModel.Store.File" store:Type="Tables" Schema="dbo" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
|
||||
<EntitySet Name="Folder" EntityType="DataServicesTestDatabaseModel.Store.Folder" store:Type="Tables" Schema="dbo" xmlns:store="http://schemas.microsoft.com/ado/2007/12/edm/EntityStoreSchemaGenerator" />
|
||||
<AssociationSet Name="FK_File_Folder" Association="DataServicesTestDatabaseModel.Store.FK_File_Folder">
|
||||
<End Role="Folder" EntitySet="Folder" />
|
||||
<End Role="File" EntitySet="File" />
|
||||
@@ -65,7 +65,7 @@
|
||||
</edmx:StorageModels>
|
||||
<!-- CSDL content -->
|
||||
<edmx:ConceptualModels>
|
||||
<Schema Namespace="DataServicesTestDatabaseModel" Alias="Self" xmlns="http://schemas.microsoft.com/ado/2006/04/edm">
|
||||
<Schema Namespace="DataServicesTestDatabaseModel" Alias="Self" xmlns="http://schemas.microsoft.com/ado/2008/09/edm">
|
||||
<EntityContainer Name="DataServicesTestDatabaseEntities">
|
||||
<EntitySet Name="File" EntityType="DataServicesTestDatabaseModel.File" />
|
||||
<EntitySet Name="Folder" EntityType="DataServicesTestDatabaseModel.Folder" />
|
||||
@@ -112,7 +112,7 @@
|
||||
</edmx:ConceptualModels>
|
||||
<!-- C-S mapping content -->
|
||||
<edmx:Mappings>
|
||||
<Mapping Space="C-S" xmlns="urn:schemas-microsoft-com:windows:storage:mapping:CS">
|
||||
<Mapping Space="C-S" xmlns="http://schemas.microsoft.com/ado/2008/09/mapping/cs">
|
||||
<EntityContainerMapping StorageEntityContainer="DataServicesTestDatabaseModelStoreContainer" CdmEntityContainer="DataServicesTestDatabaseEntities">
|
||||
<EntitySetMapping Name="File">
|
||||
<EntityTypeMapping TypeName="IsTypeOf(DataServicesTestDatabaseModel.File)">
|
||||
@@ -156,20 +156,20 @@
|
||||
</edmx:Mappings>
|
||||
</edmx:Runtime>
|
||||
<!-- EF Designer content (DO NOT EDIT MANUALLY BELOW HERE) -->
|
||||
<edmx:Designer xmlns="http://schemas.microsoft.com/ado/2007/06/edmx">
|
||||
<edmx:Designer>
|
||||
<edmx:Connection>
|
||||
<DesignerInfoPropertySet>
|
||||
<DesignerInfoPropertySet xmlns="http://schemas.microsoft.com/ado/2008/10/edmx">
|
||||
<DesignerProperty Name="MetadataArtifactProcessing" Value="EmbedInOutputAssembly" />
|
||||
</DesignerInfoPropertySet>
|
||||
</edmx:Connection>
|
||||
<edmx:Options>
|
||||
<DesignerInfoPropertySet>
|
||||
<DesignerInfoPropertySet xmlns="http://schemas.microsoft.com/ado/2008/10/edmx">
|
||||
<DesignerProperty Name="ValidateOnBuild" Value="true" />
|
||||
</DesignerInfoPropertySet>
|
||||
</edmx:Options>
|
||||
<!-- Diagram content (shape and connector positions) -->
|
||||
<edmx:Diagrams>
|
||||
<Diagram Name="FileSystemEntityModel">
|
||||
<Diagram Name="FileSystemEntityModel" xmlns="http://schemas.microsoft.com/ado/2008/10/edmx">
|
||||
<EntityTypeShape EntityType="DataServicesTestDatabaseModel.File" Width="1.5" PointX="3" PointY="1.125" Height="1.9802864583333335" IsExpanded="true" />
|
||||
<EntityTypeShape EntityType="DataServicesTestDatabaseModel.Folder" Width="1.5" PointX="0.75" PointY="1" Height="2.3648893229166665" IsExpanded="true" />
|
||||
<AssociationConnector Association="DataServicesTestDatabaseModel.FK_File_Folder" ManuallyRouted="false">
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
#region License
|
||||
// Copyright (c) 2007 James Newton-King
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the "Software"), to deal in the Software without
|
||||
// restriction, including without limitation the rights to use,
|
||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following
|
||||
// conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !PocketPC && !SILVERLIGHT
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.ComponentModel;
|
||||
using Newtonsoft.Json.Linq.ComponentModel;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq.ComponentModel
|
||||
{
|
||||
public class JTypeDescriptionProviderTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void GetTypeDescriptor()
|
||||
{
|
||||
JTypeDescriptionProvider provider = new JTypeDescriptionProvider();
|
||||
JTypeDescriptor descriptor = (JTypeDescriptor)provider.GetTypeDescriptor(typeof (JObject), new JObject());
|
||||
Assert.IsNotNull(descriptor);
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1,80 +0,0 @@
|
||||
#region License
|
||||
// Copyright (c) 2007 James Newton-King
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person
|
||||
// obtaining a copy of this software and associated documentation
|
||||
// files (the "Software"), to deal in the Software without
|
||||
// restriction, including without limitation the rights to use,
|
||||
// copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
// copies of the Software, and to permit persons to whom the
|
||||
// Software is furnished to do so, subject to the following
|
||||
// conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
#endregion
|
||||
|
||||
#if !SILVERLIGHT
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Newtonsoft.Json.Linq.ComponentModel;
|
||||
using NUnit.Framework;
|
||||
using Newtonsoft.Json.Linq;
|
||||
using System.ComponentModel;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.Linq.ComponentModel
|
||||
{
|
||||
public class JTypeDescriptorTests : TestFixtureBase
|
||||
{
|
||||
[Test]
|
||||
public void GetProperties()
|
||||
{
|
||||
JObject o = JObject.Parse("{'prop1':12,'prop2':'hi!','prop3':null,'prop4':[1,2,3]}");
|
||||
|
||||
JTypeDescriptor descriptor = new JTypeDescriptor(o);
|
||||
|
||||
PropertyDescriptorCollection properties = descriptor.GetProperties();
|
||||
Assert.AreEqual(4, properties.Count);
|
||||
|
||||
PropertyDescriptor prop1 = properties[0];
|
||||
Assert.AreEqual("prop1", prop1.Name);
|
||||
Assert.AreEqual(typeof(long), prop1.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop1.ComponentType);
|
||||
Assert.AreEqual(false, prop1.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop1.ShouldSerializeValue(o));
|
||||
|
||||
PropertyDescriptor prop2 = properties[1];
|
||||
Assert.AreEqual("prop2", prop2.Name);
|
||||
Assert.AreEqual(typeof(string), prop2.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop2.ComponentType);
|
||||
Assert.AreEqual(false, prop2.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop2.ShouldSerializeValue(o));
|
||||
|
||||
PropertyDescriptor prop3 = properties[2];
|
||||
Assert.AreEqual("prop3", prop3.Name);
|
||||
Assert.AreEqual(typeof(object), prop3.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop3.ComponentType);
|
||||
Assert.AreEqual(false, prop3.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop3.ShouldSerializeValue(o));
|
||||
|
||||
PropertyDescriptor prop4 = properties[3];
|
||||
Assert.AreEqual("prop4", prop4.Name);
|
||||
Assert.AreEqual(typeof(JArray), prop4.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop4.ComponentType);
|
||||
Assert.AreEqual(false, prop4.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop4.ShouldSerializeValue(o));
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1488,5 +1488,46 @@ Parameter name: arrayIndex")]
|
||||
|
||||
JObject.Parse(json);
|
||||
}
|
||||
|
||||
#if !SILVERLIGHT
|
||||
[Test]
|
||||
public void GetProperties()
|
||||
{
|
||||
JObject o = JObject.Parse("{'prop1':12,'prop2':'hi!','prop3':null,'prop4':[1,2,3]}");
|
||||
|
||||
ICustomTypeDescriptor descriptor = o;
|
||||
|
||||
PropertyDescriptorCollection properties = descriptor.GetProperties();
|
||||
Assert.AreEqual(4, properties.Count);
|
||||
|
||||
PropertyDescriptor prop1 = properties[0];
|
||||
Assert.AreEqual("prop1", prop1.Name);
|
||||
Assert.AreEqual(typeof(long), prop1.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop1.ComponentType);
|
||||
Assert.AreEqual(false, prop1.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop1.ShouldSerializeValue(o));
|
||||
|
||||
PropertyDescriptor prop2 = properties[1];
|
||||
Assert.AreEqual("prop2", prop2.Name);
|
||||
Assert.AreEqual(typeof(string), prop2.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop2.ComponentType);
|
||||
Assert.AreEqual(false, prop2.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop2.ShouldSerializeValue(o));
|
||||
|
||||
PropertyDescriptor prop3 = properties[2];
|
||||
Assert.AreEqual("prop3", prop3.Name);
|
||||
Assert.AreEqual(typeof(object), prop3.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop3.ComponentType);
|
||||
Assert.AreEqual(false, prop3.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop3.ShouldSerializeValue(o));
|
||||
|
||||
PropertyDescriptor prop4 = properties[3];
|
||||
Assert.AreEqual("prop4", prop4.Name);
|
||||
Assert.AreEqual(typeof(JArray), prop4.PropertyType);
|
||||
Assert.AreEqual(typeof(JObject), prop4.ComponentType);
|
||||
Assert.AreEqual(false, prop4.CanResetValue(o));
|
||||
Assert.AreEqual(false, prop4.ShouldSerializeValue(o));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
+22
-22
@@ -2,7 +2,7 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Runtime Version:2.0.50727.3074
|
||||
// Runtime Version:4.0.30319.1
|
||||
//
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
@@ -100,7 +100,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Table(Name="")]
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="")]
|
||||
public partial class Person : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[Column(Storage="_FirstName", CanBeNull=false)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FirstName", CanBeNull=false)]
|
||||
public string FirstName
|
||||
{
|
||||
get
|
||||
@@ -159,7 +159,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_LastName", CanBeNull=false)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_LastName", CanBeNull=false)]
|
||||
public string LastName
|
||||
{
|
||||
get
|
||||
@@ -179,7 +179,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_PersonId", IsPrimaryKey=true)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId", IsPrimaryKey=true)]
|
||||
public System.Guid PersonId
|
||||
{
|
||||
get
|
||||
@@ -199,7 +199,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_DepartmentId")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartmentId")]
|
||||
public System.Guid DepartmentId
|
||||
{
|
||||
get
|
||||
@@ -223,7 +223,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Association(Name="Person_PersonRole", Storage="_PersonRoles", ThisKey="PersonId", OtherKey="PersonId")]
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Person_PersonRole", Storage="_PersonRoles", ThisKey="PersonId", OtherKey="PersonId")]
|
||||
public EntitySet<PersonRole> PersonRoles
|
||||
{
|
||||
get
|
||||
@@ -236,7 +236,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Association(Name="Department_Person", Storage="_Department", ThisKey="DepartmentId", OtherKey="DepartmentId", IsForeignKey=true)]
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Department_Person", Storage="_Department", ThisKey="DepartmentId", OtherKey="DepartmentId", IsForeignKey=true)]
|
||||
public Department Department
|
||||
{
|
||||
get
|
||||
@@ -303,7 +303,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Table(Name="")]
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="")]
|
||||
public partial class Role : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
@@ -331,7 +331,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[Column(Storage="_Name", CanBeNull=false)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", CanBeNull=false)]
|
||||
public string Name
|
||||
{
|
||||
get
|
||||
@@ -351,7 +351,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_RoleId", IsPrimaryKey=true)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId", IsPrimaryKey=true)]
|
||||
public System.Guid RoleId
|
||||
{
|
||||
get
|
||||
@@ -371,7 +371,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Association(Name="Role_PersonRole", Storage="_PersonRoles", ThisKey="RoleId", OtherKey="RoleId")]
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Role_PersonRole", Storage="_PersonRoles", ThisKey="RoleId", OtherKey="RoleId")]
|
||||
public EntitySet<PersonRole> PersonRoles
|
||||
{
|
||||
get
|
||||
@@ -417,7 +417,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Table(Name="")]
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="")]
|
||||
public partial class PersonRole : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
@@ -452,7 +452,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[Column(Storage="_PersonId")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonId")]
|
||||
public System.Guid PersonId
|
||||
{
|
||||
get
|
||||
@@ -476,7 +476,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_RoleId")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RoleId")]
|
||||
public System.Guid RoleId
|
||||
{
|
||||
get
|
||||
@@ -500,7 +500,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_PersonRoleId", IsPrimaryKey=true)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonRoleId", IsPrimaryKey=true)]
|
||||
public System.Guid PersonRoleId
|
||||
{
|
||||
get
|
||||
@@ -520,7 +520,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Association(Name="Person_PersonRole", Storage="_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)]
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Person_PersonRole", Storage="_Person", ThisKey="PersonId", OtherKey="PersonId", IsForeignKey=true)]
|
||||
public Person Person
|
||||
{
|
||||
get
|
||||
@@ -554,7 +554,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Association(Name="Role_PersonRole", Storage="_Role", ThisKey="RoleId", OtherKey="RoleId", IsForeignKey=true)]
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Role_PersonRole", Storage="_Role", ThisKey="RoleId", OtherKey="RoleId", IsForeignKey=true)]
|
||||
public Role Role
|
||||
{
|
||||
get
|
||||
@@ -609,7 +609,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Table(Name="")]
|
||||
[global::System.Data.Linq.Mapping.TableAttribute(Name="")]
|
||||
public partial class Department : INotifyPropertyChanging, INotifyPropertyChanged
|
||||
{
|
||||
|
||||
@@ -637,7 +637,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
OnCreated();
|
||||
}
|
||||
|
||||
[Column(Storage="_DepartmentId", IsPrimaryKey=true)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartmentId", IsPrimaryKey=true)]
|
||||
public System.Guid DepartmentId
|
||||
{
|
||||
get
|
||||
@@ -657,7 +657,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Column(Storage="_Name", CanBeNull=false)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", CanBeNull=false)]
|
||||
public string Name
|
||||
{
|
||||
get
|
||||
@@ -677,7 +677,7 @@ namespace Newtonsoft.Json.Tests.LinqToSql
|
||||
}
|
||||
}
|
||||
|
||||
[Association(Name="Department_Person", Storage="_Persons", ThisKey="DepartmentId", OtherKey="DepartmentId")]
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="Department_Person", Storage="_Persons", ThisKey="DepartmentId", OtherKey="DepartmentId")]
|
||||
public EntitySet<Person> Persons
|
||||
{
|
||||
get
|
||||
|
||||
@@ -1,229 +0,0 @@
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{32EA9694-4FB3-43E9-A6AD-050F1D35EA0A}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Newtonsoft.Json.Tests</RootNamespace>
|
||||
<AssemblyName>Newtonsoft.Json.Tests.Compact</AssemblyName>
|
||||
<ProjectTypeGuids>{4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<PlatformFamilyName>PocketPC</PlatformFamilyName>
|
||||
<PlatformID>b2c48bd2-963d-4549-9169-1fa021dce484</PlatformID>
|
||||
<OSVersion>5.2</OSVersion>
|
||||
<DeployDirSuffix>Newtonsoft.Json.Tests.Compact</DeployDirSuffix>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<NativePlatformName>Windows Mobile 6 Professional SDK</NativePlatformName>
|
||||
<FormFactorID>
|
||||
</FormFactorID>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\Compact\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;PocketPC</DefineConstants>
|
||||
<NoStdLib>true</NoStdLib>
|
||||
<NoConfig>true</NoConfig>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\Compact\</OutputPath>
|
||||
<DefineConstants>TRACE;$(PlatformFamilyName)</DefineConstants>
|
||||
<NoStdLib>true</NoStdLib>
|
||||
<NoConfig>true</NoConfig>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="NUnitLite, Version=0.2.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>..\Lib\NUnit\Compact\NUnitLite.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Runtime.Serialization" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Bson\BsonReaderTests.cs" />
|
||||
<Compile Include="Bson\BsonWriterTests.cs" />
|
||||
<Compile Include="Converters\BinaryConverterTests.cs" />
|
||||
<Compile Include="Converters\CustomCreationConverterTests.cs" />
|
||||
<Compile Include="Converters\DataSetConverterTests.cs" />
|
||||
<Compile Include="Converters\DataTableConverterTests.cs" />
|
||||
<Compile Include="Converters\ObjectIdConverterTests.cs" />
|
||||
<Compile Include="Converters\RegexConverterTests.cs" />
|
||||
<Compile Include="Converters\StringEnumConverterTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Linq\JRawTests.cs" />
|
||||
<Compile Include="Linq\JTokenReaderTest.cs" />
|
||||
<Compile Include="Linq\JTokenWriterTest.cs" />
|
||||
<Compile Include="JsonValidatingReaderTests.cs" />
|
||||
<Compile Include="Schema\ExtensionsTests.cs" />
|
||||
<Compile Include="Schema\JsonSchemaModelBuilderTests.cs" />
|
||||
<Compile Include="Schema\JsonSchemaNodeTests.cs" />
|
||||
<Compile Include="Serialization\CamelCasePropertyNamesContractResolverTests.cs" />
|
||||
<Compile Include="Serialization\ConstructorHandlingTests.cs" />
|
||||
<Compile Include="Serialization\EntitiesSerializationTests.cs" />
|
||||
<Compile Include="Serialization\JsonSerializerTest.cs" />
|
||||
<Compile Include="Serialization\MissingMemberHandlingTests.cs" />
|
||||
<Compile Include="Serialization\PopulateTests.cs" />
|
||||
<Compile Include="Serialization\PreserveReferencesHandlingTests.cs" />
|
||||
<Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
|
||||
<Compile Include="Serialization\SerializationEventAttributeTests.cs" />
|
||||
<Compile Include="Serialization\TypeNameHandlingTests.cs" />
|
||||
<Compile Include="TestObjects\AbstractGenericBase.cs" />
|
||||
<Compile Include="TestObjects\ArgumentConverterPrecedenceClassConverter.cs" />
|
||||
<Compile Include="TestObjects\BadJsonPropertyClass.cs" />
|
||||
<Compile Include="TestObjects\Bar.cs" />
|
||||
<Compile Include="TestObjects\Car.cs" />
|
||||
<Compile Include="TestObjects\CircularReferenceClass.cs" />
|
||||
<Compile Include="TestObjects\ClassAndMemberConverterClass.cs" />
|
||||
<Compile Include="TestObjects\ClassConverterPrecedenceClassConverter.cs" />
|
||||
<Compile Include="TestObjects\Computer.cs" />
|
||||
<Compile Include="TestObjects\ConstructorCaseSensitivityClass.cs" />
|
||||
<Compile Include="TestObjects\ConstructorReadonlyFields.cs" />
|
||||
<Compile Include="TestObjects\Container.cs" />
|
||||
<Compile Include="TestObjects\Content.cs" />
|
||||
<Compile Include="TestObjects\ContentBaseClass.cs" />
|
||||
<Compile Include="TestObjects\ContentSubClass.cs" />
|
||||
<Compile Include="TestObjects\ConverterPrecedenceClass.cs" />
|
||||
<Compile Include="TestObjects\ConverterPrecedenceClassConverter.cs" />
|
||||
<Compile Include="TestObjects\CircularReferenceWithIdClass.cs" />
|
||||
<Compile Include="TestObjects\DateTimeErrorObjectCollection.cs" />
|
||||
<Compile Include="TestObjects\DefaultValueAttributeTestClass.cs" />
|
||||
<Compile Include="TestObjects\DictionaryInterfaceClass.cs" />
|
||||
<Compile Include="TestObjects\DoubleClass.cs" />
|
||||
<Compile Include="TestObjects\EmployeeReference.cs" />
|
||||
<Compile Include="TestObjects\Event.cs" />
|
||||
<Compile Include="TestObjects\Foo.cs" />
|
||||
<Compile Include="TestObjects\GenericImpl.cs" />
|
||||
<Compile Include="TestObjects\GenericListAndDictionaryInterfaceProperties.cs" />
|
||||
<Compile Include="TestObjects\GetOnlyPropertyClass.cs" />
|
||||
<Compile Include="TestObjects\GoogleMapGeocoderStructure.cs" />
|
||||
<Compile Include="TestObjects\HolderClass.cs" />
|
||||
<Compile Include="TestObjects\IncompatibleJsonAttributeClass.cs" />
|
||||
<Compile Include="TestObjects\InterfacePropertyTestClass.cs" />
|
||||
<Compile Include="TestObjects\Invoice.cs" />
|
||||
<Compile Include="TestObjects\JaggedArray.cs" />
|
||||
<Compile Include="TestObjects\JsonIgnoreAttributeTestClass.cs" />
|
||||
<Compile Include="TestObjects\JsonPropertyClass.cs" />
|
||||
<Compile Include="TestObjects\JsonPropertyWithHandlingValues.cs" />
|
||||
<Compile Include="TestObjects\ListErrorObject.cs" />
|
||||
<Compile Include="TestObjects\ListErrorObjectCollection.cs" />
|
||||
<Compile Include="TestObjects\ListOfIds.cs" />
|
||||
<Compile Include="TestObjects\ListTestClass.cs" />
|
||||
<Compile Include="TestObjects\LogEntry.cs" />
|
||||
<Compile Include="TestObjects\MemberConverterPrecedenceClassConverter.cs" />
|
||||
<Compile Include="TestObjects\MethodExecutorObject.cs" />
|
||||
<Compile Include="TestObjects\Movie.cs" />
|
||||
<Compile Include="TestObjects\MyClass.cs" />
|
||||
<Compile Include="TestObjects\Name.cs" />
|
||||
<Compile Include="TestObjects\NonRequest.cs" />
|
||||
<Compile Include="TestObjects\NullableDateTimeTestClass.cs" />
|
||||
<Compile Include="TestObjects\ObjectArrayPropertyTest.cs" />
|
||||
<Compile Include="TestObjects\PersonError.cs" />
|
||||
<Compile Include="TestObjects\PersonPropertyClass.cs" />
|
||||
<Compile Include="TestObjects\PersonRaw.cs" />
|
||||
<Compile Include="TestObjects\PhoneNumber.cs" />
|
||||
<Compile Include="TestObjects\PrivateConstructorTestClass.cs" />
|
||||
<Compile Include="TestObjects\PrivateConstructorWithPublicParametizedConstructorTestClass.cs" />
|
||||
<Compile Include="TestObjects\PrivateMembersClass.cs" />
|
||||
<Compile Include="TestObjects\PropertyCase.cs" />
|
||||
<Compile Include="TestObjects\RequestOnly.cs" />
|
||||
<Compile Include="TestObjects\RequiredMembersClass.cs" />
|
||||
<Compile Include="TestObjects\RoleTransfer.cs" />
|
||||
<Compile Include="TestObjects\SearchResult.cs" />
|
||||
<Compile Include="TestObjects\SerializationEventTestDictionary.cs" />
|
||||
<Compile Include="TestObjects\SerializationEventTestList.cs" />
|
||||
<Compile Include="TestObjects\SerializationEventTestObject.cs" />
|
||||
<Compile Include="TestObjects\SerializationEventTestObjectWithConstructor.cs" />
|
||||
<Compile Include="TestObjects\SetOnlyPropertyClass.cs" />
|
||||
<Compile Include="TestObjects\Article.cs" />
|
||||
<Compile Include="TestObjects\ArticleCollection.cs" />
|
||||
<Compile Include="TestObjects\ClassWithArray.cs" />
|
||||
<Compile Include="TestObjects\ClassWithGuid.cs" />
|
||||
<Compile Include="TestObjects\ConverableMembers.cs" />
|
||||
<Compile Include="TestObjects\JsonIgnoreAttributeOnClassTestClass.cs" />
|
||||
<Compile Include="Linq\JConstructorTests.cs" />
|
||||
<Compile Include="Linq\JPropertyTests.cs" />
|
||||
<Compile Include="TestObjects\MemberConverterClass.cs" />
|
||||
<Compile Include="TestObjects\Product.cs" />
|
||||
<Compile Include="TestObjects\ProductCollection.cs" />
|
||||
<Compile Include="TestObjects\ProductShort.cs" />
|
||||
<Compile Include="TestObjects\SetOnlyPropertyClass2.cs" />
|
||||
<Compile Include="TestObjects\Shortie.cs" />
|
||||
<Compile Include="TestObjects\Store.cs" />
|
||||
<Compile Include="TestObjects\StoreColor.cs" />
|
||||
<Compile Include="TestObjects\Person.cs" />
|
||||
<Compile Include="Schema\JsonSchemaBuilderTests.cs" />
|
||||
<Compile Include="Schema\JsonSchemaGeneratorTests.cs" />
|
||||
<Compile Include="Schema\JsonSchemaTests.cs" />
|
||||
<Compile Include="TestObjects\DateTimeTestClass.cs" />
|
||||
<Compile Include="Converters\IsoDateTimeConverterTests.cs" />
|
||||
<Compile Include="JsonConvertTest.cs" />
|
||||
<Compile Include="Converters\JavaScriptDateTimeConverterTests.cs" />
|
||||
<Compile Include="JsonTextReaderTest.cs" />
|
||||
<Compile Include="JsonTextWriterTest.cs" />
|
||||
<Compile Include="Linq\JArrayTests.cs" />
|
||||
<Compile Include="Linq\JObjectTests.cs" />
|
||||
<Compile Include="Linq\JTokenEqualityComparerTests.cs" />
|
||||
<Compile Include="Linq\JTokenTests.cs" />
|
||||
<Compile Include="Linq\JValueTests.cs" />
|
||||
<Compile Include="Linq\LinqToJsonTest.cs" />
|
||||
<Compile Include="PerformanceTests.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="SilverlightTests.cs" />
|
||||
<Compile Include="TestFixtureBase.cs" />
|
||||
<Compile Include="Converters\XmlNodeConverterTest.cs" />
|
||||
<Compile Include="TestObjects\StructTest.cs" />
|
||||
<Compile Include="TestObjects\SubKlass.cs" />
|
||||
<Compile Include="TestObjects\SuperKlass.cs" />
|
||||
<Compile Include="TestObjects\TypeClass.cs" />
|
||||
<Compile Include="TestObjects\TypedSubHashtable.cs" />
|
||||
<Compile Include="TestObjects\UserNullable.cs" />
|
||||
<Compile Include="TestObjects\VersionKeyedCollection.cs" />
|
||||
<Compile Include="TestObjects\WagePerson.cs" />
|
||||
<Compile Include="Utilities\DynamicReflectionDelegateFactoryTests.cs" />
|
||||
<Compile Include="Utilities\ReflectionUtilsTests.cs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Newtonsoft.Json\Newtonsoft.Json.Compact.csproj">
|
||||
<Project>{256AA604-F61B-4B6D-8D51-C8E6AB11E435}</Project>
|
||||
<Name>Newtonsoft.Json.Compact</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<FlavorProperties GUID="{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}">
|
||||
<HostingProcess disable="1" />
|
||||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
@@ -1,4 +1,5 @@
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
@@ -19,15 +20,28 @@
|
||||
</SccProvider>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>
|
||||
</AssemblyOriginatorKeyFile>
|
||||
<TargetFrameworkSubset>
|
||||
</TargetFrameworkSubset>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -37,6 +51,7 @@
|
||||
<DefineConstants>TRACE;DEBUG;NET20</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -45,6 +60,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="LinqBridge, Version=1.0.0.0, Culture=neutral, PublicKeyToken=c2b14eb747628076, processorArchitecture=MSIL">
|
||||
@@ -77,8 +93,6 @@
|
||||
<Compile Include="JsonValidatingReaderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Linq\JRawTests.cs" />
|
||||
<Compile Include="Serialization\ConstructorHandlingTests.cs" />
|
||||
@@ -220,6 +234,23 @@
|
||||
<Name>Newtonsoft.Json.Net20</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
@@ -10,13 +14,32 @@
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Newtonsoft.Json.Tests.Silverlight</RootNamespace>
|
||||
<AssemblyName>Newtonsoft.Json.Tests.Silverlight</AssemblyName>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v3.0</TargetFrameworkVersion>
|
||||
<SilverlightApplication>false</SilverlightApplication>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
|
||||
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkProfile />
|
||||
<SignManifests>false</SignManifests>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -28,6 +51,7 @@
|
||||
<NoConfig>true</NoConfig>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -38,6 +62,7 @@
|
||||
<NoConfig>true</NoConfig>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework, Version=2.4.7.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
|
||||
@@ -81,8 +106,6 @@
|
||||
<Compile Include="JsonArrayAttributeTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Linq\JRawTests.cs" />
|
||||
<Compile Include="Linq\JTokenReaderTest.cs" />
|
||||
@@ -222,7 +245,24 @@
|
||||
<Name>Newtonsoft.Json.Silverlight</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\v3.0\Microsoft.Silverlight.CSharp.targets" Condition="" />
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
@@ -19,13 +20,30 @@
|
||||
</SccProvider>
|
||||
<FileUpgradeFlags>
|
||||
</FileUpgradeFlags>
|
||||
<OldToolsVersion>2.0</OldToolsVersion>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
||||
<SignAssembly>false</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>
|
||||
</AssemblyOriginatorKeyFile>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<TargetFrameworkProfile>
|
||||
</TargetFrameworkProfile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
@@ -35,6 +53,7 @@
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -43,6 +62,7 @@
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
|
||||
@@ -114,8 +134,6 @@
|
||||
<Compile Include="LinqToSql\Person.cs" />
|
||||
<Compile Include="Linq\ComponentModel\BindingTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JPropertyDescriptorTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptionProviderTests.cs" />
|
||||
<Compile Include="Linq\ComponentModel\JTypeDescriptorTests.cs" />
|
||||
<Compile Include="Linq\JPathTests.cs" />
|
||||
<Compile Include="Linq\JRawTests.cs" />
|
||||
<Compile Include="Serialization\ConstructorHandlingTests.cs" />
|
||||
@@ -281,6 +299,23 @@
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
||||
@@ -60,55 +60,6 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
Assert.AreEqual("Error message for member 1 = An item with the same key has already been added.", c.Messages[0]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void ErrorSerializingListHandled()
|
||||
{
|
||||
VersionKeyedCollection c = new VersionKeyedCollection();
|
||||
c.Add(new Person
|
||||
{
|
||||
Name = "Jim",
|
||||
BirthDate = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc),
|
||||
LastModified = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc)
|
||||
});
|
||||
c.Add(new Person
|
||||
{
|
||||
Name = "Jimbo",
|
||||
BirthDate = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc),
|
||||
LastModified = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc)
|
||||
});
|
||||
c.Add(new Person
|
||||
{
|
||||
Name = "Jimmy",
|
||||
BirthDate = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc),
|
||||
LastModified = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc)
|
||||
});
|
||||
c.Add(new Person
|
||||
{
|
||||
Name = "Jim Bean",
|
||||
BirthDate = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc),
|
||||
LastModified = new DateTime(2000, 12, 29, 0, 0, 0, DateTimeKind.Utc)
|
||||
});
|
||||
|
||||
string json = JsonConvert.SerializeObject(c, Formatting.Indented);
|
||||
|
||||
Assert.AreEqual(@"[
|
||||
{
|
||||
""Name"": ""Jimbo"",
|
||||
""BirthDate"": ""\/Date(978048000000)\/"",
|
||||
""LastModified"": ""\/Date(978048000000)\/""
|
||||
},
|
||||
{
|
||||
""Name"": ""Jim Bean"",
|
||||
""BirthDate"": ""\/Date(978048000000)\/"",
|
||||
""LastModified"": ""\/Date(978048000000)\/""
|
||||
}
|
||||
]", json);
|
||||
|
||||
Assert.AreEqual(2, c.Messages.Count);
|
||||
Assert.AreEqual("Error message for member 0 = Index even: 0", c.Messages[0]);
|
||||
Assert.AreEqual("Error message for member 2 = Index even: 2", c.Messages[1]);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void DeserializingErrorInChildObject()
|
||||
{
|
||||
@@ -244,7 +195,11 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
Assert.AreEqual(new DateTime(2000, 12, 1, 0, 0, 0, DateTimeKind.Utc), c[2]);
|
||||
|
||||
Assert.AreEqual(3, errors.Count);
|
||||
#if !(NET20 || SILVERLIGHT)
|
||||
Assert.AreEqual("The string was not recognized as a valid DateTime. There is an unknown word starting at index 0.", errors[0]);
|
||||
#else
|
||||
Assert.AreEqual("The string was not recognized as a valid DateTime. There is a unknown word starting at index 0.", errors[0]);
|
||||
#endif
|
||||
Assert.AreEqual("Unexpected token parsing date. Expected String, got StartArray.", errors[1]);
|
||||
Assert.AreEqual("Cannot convert null value to System.DateTime.", errors[2]);
|
||||
}
|
||||
|
||||
@@ -319,7 +319,7 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
public void SerializeObjectWithMultipleGenericLists()
|
||||
{
|
||||
string containerTypeName = typeof(Container).AssemblyQualifiedName;
|
||||
string productTypeName = typeof(Product).AssemblyQualifiedName;
|
||||
string productListTypeName = typeof(List<Product>).AssemblyQualifiedName;
|
||||
|
||||
Container container = new Container
|
||||
{
|
||||
@@ -338,11 +338,11 @@ namespace Newtonsoft.Json.Tests.Serialization
|
||||
Assert.AreEqual(@"{
|
||||
""$type"": """ + containerTypeName + @""",
|
||||
""In"": {
|
||||
""$type"": ""System.Collections.Generic.List`1[[" + productTypeName + @"]], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"",
|
||||
""$type"": """ + productListTypeName + @""",
|
||||
""$values"": []
|
||||
},
|
||||
""Out"": {
|
||||
""$type"": ""System.Collections.Generic.List`1[[" + productTypeName + @"]], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"",
|
||||
""$type"": """ + productListTypeName + @""",
|
||||
""$values"": []
|
||||
}
|
||||
}", json);
|
||||
|
||||
@@ -33,7 +33,7 @@ using Newtonsoft.Json.Tests.TestObjects;
|
||||
|
||||
namespace Newtonsoft.Json.Tests.TestObjects
|
||||
{
|
||||
public class VersionKeyedCollection : KeyedCollection<string, Person>, IList
|
||||
public class VersionKeyedCollection : KeyedCollection<string, Person>, IEnumerable<Person>
|
||||
{
|
||||
public List<string> Messages { get; set; }
|
||||
|
||||
@@ -54,16 +54,20 @@ namespace Newtonsoft.Json.Tests.TestObjects
|
||||
errorContext.Handled = true;
|
||||
}
|
||||
|
||||
object IList.this[int index]
|
||||
IEnumerator<Person> IEnumerable<Person>.GetEnumerator()
|
||||
{
|
||||
get
|
||||
for (int i = 0; i < Count; i++)
|
||||
{
|
||||
if (index % 2 == 0)
|
||||
throw new Exception("Index even: " + index);
|
||||
if (i % 2 == 0)
|
||||
throw new Exception("Index even: " + i);
|
||||
|
||||
return this[index];
|
||||
yield return this[i];
|
||||
}
|
||||
set { this[index] = (Person)value; }
|
||||
}
|
||||
|
||||
IEnumerator IEnumerable.GetEnumerator()
|
||||
{
|
||||
return ((IEnumerable<Person>) this).GetEnumerator();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user