-Various Metro fixes

This commit is contained in:
James Newton-King
2012-03-19 21:17:12 +13:00
parent e05499bfb2
commit 10aee582bc
4 changed files with 13 additions and 4 deletions
+1 -1
View File
@@ -119,7 +119,7 @@ task Package -depends Build {
Copy-Item -Path $docDir\readme.txt -Destination $workingDir\Package\ Copy-Item -Path $docDir\readme.txt -Destination $workingDir\Package\
Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\ Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\
robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj TestResults /XF *.suo *.user robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj TestResults AppPackage /XF *.suo *.user *.pri
robocopy $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn robocopy $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn
robocopy $docDir $workingDir\Package\Source\Doc /MIR /NP /XD .svn robocopy $docDir $workingDir\Package\Source\Doc /MIR /NP /XD .svn
robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NP /XD .svn robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NP /XD .svn
@@ -38,6 +38,9 @@ using System.Security;
[assembly: AssemblyTitle("Json.NET Silverlight")] [assembly: AssemblyTitle("Json.NET Silverlight")]
#elif PocketPC #elif PocketPC
[assembly: AssemblyTitle("Json.NET Compact")] [assembly: AssemblyTitle("Json.NET Compact")]
#elif NETFX_CORE
[assembly: AssemblyTitle("Json.NET Metro")]
[assembly: AllowPartiallyTrustedCallers]
#elif NET20 #elif NET20
[assembly: AssemblyTitle("Json.NET .NET 2.0")] [assembly: AssemblyTitle("Json.NET .NET 2.0")]
[assembly: AllowPartiallyTrustedCallers] [assembly: AllowPartiallyTrustedCallers]
+7 -1
View File
@@ -14,9 +14,15 @@ namespace Newtonsoft.Json
/// </summary> /// </summary>
/// <param name="assemblyName">Specifies the <see cref="Assembly"/> name of the serialized object.</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> /// <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); 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) public virtual void BindToName(Type serializedType, out string assemblyName, out string typeName)
{ {
assemblyName = null; assemblyName = null;
@@ -18,14 +18,14 @@ namespace Newtonsoft.Json.Utilities
new IDictionaryEnumerator GetEnumerator(); new IDictionaryEnumerator GetEnumerator();
} }
public interface IDictionaryEnumerator : IEnumerator internal interface IDictionaryEnumerator : IEnumerator
{ {
DictionaryEntry Entry { get; } DictionaryEntry Entry { get; }
object Key { get; } object Key { get; }
object Value { get; } object Value { get; }
} }
public struct DictionaryEntry internal struct DictionaryEntry
{ {
private readonly object _key; private readonly object _key;
private readonly object _value; private readonly object _value;