-Various Metro fixes
This commit is contained in:
@@ -38,6 +38,9 @@ using System.Security;
|
||||
[assembly: AssemblyTitle("Json.NET Silverlight")]
|
||||
#elif PocketPC
|
||||
[assembly: AssemblyTitle("Json.NET Compact")]
|
||||
#elif NETFX_CORE
|
||||
[assembly: AssemblyTitle("Json.NET Metro")]
|
||||
[assembly: AllowPartiallyTrustedCallers]
|
||||
#elif NET20
|
||||
[assembly: AssemblyTitle("Json.NET .NET 2.0")]
|
||||
[assembly: AllowPartiallyTrustedCallers]
|
||||
|
||||
@@ -14,9 +14,15 @@ namespace Newtonsoft.Json
|
||||
/// </summary>
|
||||
/// <param name="assemblyName">Specifies the <see cref="Assembly"/> name of the serialized object.</param>
|
||||
/// <param name="typeName">Specifies the <see cref="Type"/> name of the serialized object</param>
|
||||
/// <returns></returns>
|
||||
/// <returns>The type of the object the formatter creates a new instance of.</returns>
|
||||
public abstract Type BindToType(string assemblyName, string typeName);
|
||||
|
||||
/// <summary>
|
||||
/// When overridden in a derived class, controls the binding of a serialized object to a type.
|
||||
/// </summary>
|
||||
/// <param name="serializedType">The type of the object the formatter creates a new instance of.</param>
|
||||
/// <param name="assemblyName">Specifies the <see cref="Assembly"/> name of the serialized object.</param>
|
||||
/// <param name="typeName">Specifies the <see cref="Type"/> name of the serialized object.</param>
|
||||
public virtual void BindToName(Type serializedType, out string assemblyName, out string typeName)
|
||||
{
|
||||
assemblyName = null;
|
||||
|
||||
@@ -18,14 +18,14 @@ namespace Newtonsoft.Json.Utilities
|
||||
new IDictionaryEnumerator GetEnumerator();
|
||||
}
|
||||
|
||||
public interface IDictionaryEnumerator : IEnumerator
|
||||
internal interface IDictionaryEnumerator : IEnumerator
|
||||
{
|
||||
DictionaryEntry Entry { get; }
|
||||
object Key { get; }
|
||||
object Value { get; }
|
||||
}
|
||||
|
||||
public struct DictionaryEntry
|
||||
internal struct DictionaryEntry
|
||||
{
|
||||
private readonly object _key;
|
||||
private readonly object _value;
|
||||
|
||||
Reference in New Issue
Block a user