-Rename SpecialPropertyHandling to MetadataPropertyHandling

Src/Newtonsoft.Json.Tests/Converters/XmlNodeConverterTest.cs

@@ -1214,7 +1214,7 @@ public void DeserializeExample()
         }
 
         [Test]
-        public void SerializeDeserializeSpecialProperties()
+        public void SerializeDeserializeMetadataProperties()
         {
             PreserveReferencesHandlingTests.CircularDictionary circularDictionary = new PreserveReferencesHandlingTests.CircularDictionary();
             circularDictionary.Add("other", new PreserveReferencesHandlingTests.CircularDictionary { { "blah", null } });

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net20.csproj

@@ -103,10 +103,10 @@
     <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
     <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
     <Compile Include="Serialization\JsonSerializerCollectionsTests.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\NullValueHandlingTests.cs" />
     <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />
     <Compile Include="TestObjects\Aa.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net35.csproj

@@ -145,10 +145,10 @@
     <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
     <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
     <Compile Include="Serialization\JsonSerializerCollectionsTests.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\NullValueHandlingTests.cs" />
     <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />
     <Compile Include="TestObjects\Aa.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Net40.csproj

@@ -266,9 +266,9 @@
     <Compile Include="Serialization\FSharpTests.cs" />
     <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
     <Compile Include="Serialization\JsonSerializerCollectionsTests.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />
     <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable.csproj

@@ -149,9 +149,9 @@
     <Compile Include="Serialization\FSharpTests.cs" />
     <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
     <Compile Include="Serialization\JsonSerializerCollectionsTests.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />
     <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.Portable40.csproj

@@ -146,9 +146,9 @@
     <Compile Include="Serialization\FSharpTests.cs" />
     <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
     <Compile Include="Serialization\JsonSerializerCollectionsTests.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\ReferenceLoopHandlingTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />
     <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.WinRT.csproj

@@ -180,7 +180,7 @@
     <Compile Include="Serialization\SerializationErrorHandlingTests.cs" />
     <Compile Include="Serialization\SerializationEventAttributeTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\TypeNameHandlingTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj

@@ -242,6 +242,7 @@
     <Compile Include="Serialization\ImmutableCollectionsTests.cs" />
     <Compile Include="Serialization\JsonPropertyCollectionTests.cs" />
     <Compile Include="Serialization\JsonSerializerTest.cs" />
+    <Compile Include="Serialization\MetadataPropertyHandlingTests.cs" />
     <Compile Include="Serialization\MissingMemberHandlingTests.cs" />
     <Compile Include="Serialization\NullValueHandlingTests.cs" />
     <Compile Include="Serialization\PopulateTests.cs" />
@@ -251,7 +252,6 @@
     <Compile Include="Serialization\SerializationEventAttributeTests.cs" />
     <Compile Include="Serialization\JsonSerializerCollectionsTests.cs" />
     <Compile Include="Serialization\ShouldSerializeTests.cs" />
-    <Compile Include="Serialization\SpecialPropertyHandlingTests.cs" />
     <Compile Include="Serialization\TraceWriterTests.cs" />
     <Compile Include="Serialization\TypeNameHandlingTests.cs" />
     <Compile Include="Serialization\WebApiIntegrationTests.cs" />

Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs

@@ -75,4 +75,4 @@
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("6.0.0.0")]
-[assembly: AssemblyFileVersion("6.0.2.17226")]
+[assembly: AssemblyFileVersion("6.0.3.17227")]

Src/Newtonsoft.Json.Tests/Serialization/JsonSerializerTest.cs

@@ -3407,7 +3407,7 @@ public void DeserializeDictionaryWithNoDefaultConstructor_PreserveReferences()
                 () => JsonConvert.DeserializeObject<DictionaryWithNoDefaultConstructor>(json, new JsonSerializerSettings
                 {
                     PreserveReferencesHandling = PreserveReferencesHandling.All,
-                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                    MetadataPropertyHandling = MetadataPropertyHandling.Default
                 }));
         }
 
@@ -4978,7 +4978,7 @@ public void DeserializeMinValueDecimal()
         {
             var data = new DecimalTest(decimal.MinValue);
             var json = JsonConvert.SerializeObject(data);
-            var obj = JsonConvert.DeserializeObject<DecimalTest>(json, new JsonSerializerSettings { SpecialPropertyHandling = SpecialPropertyHandling.Default });
+            var obj = JsonConvert.DeserializeObject<DecimalTest>(json, new JsonSerializerSettings { MetadataPropertyHandling = MetadataPropertyHandling.Default });
 
             Assert.AreEqual(decimal.MinValue, obj.Value);
         }

Src/Newtonsoft.Json.Tests/Serialization/SpecialPropertyHandlingTests.cs → Src/Newtonsoft.Json.Tests/Serialization/MetadataPropertyHandlingTests.cs

@@ -41,7 +41,7 @@
 namespace Newtonsoft.Json.Tests.Serialization
 {
     [TestFixture]
-    public class SpecialPropertyHandlingTests : TestFixtureBase
+    public class MetadataPropertyHandlingTests : TestFixtureBase
     {
         [Test]
         public void DeserializeArraysWithPreserveObjectReferences()
@@ -80,7 +80,7 @@ public void DeserializeArraysWithPreserveObjectReferences()
                         new JsonSerializerSettings
                         {
                             PreserveReferencesHandling = PreserveReferencesHandling.All,
-                            SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                            MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
                         });
                 });
         }
@@ -99,7 +99,7 @@ public void SerializeDeserialize_DictionaryContextContainsGuid_DeserializesItemA
             {
                 Formatting = Formatting.Indented,
                 TypeNameHandling = TypeNameHandling.All,
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             };
             string serializedString = JsonConvert.SerializeObject(inputContext, jsonSerializerSettings);
 
@@ -140,7 +140,7 @@ public void DeserializeGuid()
 
             Item actual = JsonConvert.DeserializeObject<Item>(jsonString, new JsonSerializerSettings
             {
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             });
 
             Assert.AreEqual(new Guid("d8220a4b-75b1-4b7a-8112-b7bdae956a45"), actual.SourceTypeID);
@@ -182,7 +182,7 @@ public void DeserializeListsWithPreserveObjectReferences()
                 new JsonSerializerSettings
                 {
                     PreserveReferencesHandling = PreserveReferencesHandling.All,
-                    SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                    MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
                 });
 
             Assert.AreEqual(3, circularList.Count);
@@ -210,7 +210,7 @@ public void DeserializeTypeNameOnly()
                     JsonConvert.DeserializeObject(json, null, new JsonSerializerSettings
                     {
                         TypeNameHandling = TypeNameHandling.Objects,
-                        SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                        MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
                     });
                 });
         }
@@ -234,7 +234,7 @@ public void SerializeRefNull()
 
             Dictionary<string, object> result = JsonConvert.DeserializeObject<Dictionary<string, object>>(json, new JsonSerializerSettings
             {
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             });
 
             Assert.AreEqual(3, result.Count);
@@ -262,7 +262,7 @@ public void DeserializeEmployeeReference()
 
             List<EmployeeReference> employees = JsonConvert.DeserializeObject<List<EmployeeReference>>(json, new JsonSerializerSettings
             {
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             });
 
             Assert.AreEqual(2, employees.Count);
@@ -294,7 +294,7 @@ public void DeserializeFromJToken()
 
             List<EmployeeReference> employees = t1.ToObject<List<EmployeeReference>>(JsonSerializer.Create(new JsonSerializerSettings
             {
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             }));
 
             Assert.AreEqual(2, employees.Count);
@@ -338,7 +338,7 @@ public void DeserializeGenericObjectListWithTypeName()
             {
                 TypeNameHandling = TypeNameHandling.Objects,
                 TypeNameAssemblyFormat = FormatterAssemblyStyle.Full,
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             });
 
             Assert.AreEqual(4, values.Count);
@@ -386,7 +386,7 @@ public void WriteListTypeNameForProperty()
 
             TypeNameHandlingTests.TypeNameProperty deserialized = JsonConvert.DeserializeObject<TypeNameHandlingTests.TypeNameProperty>(json, new JsonSerializerSettings
             {
-                SpecialPropertyHandling = SpecialPropertyHandling.ReadAhead
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead
             });
             Assert.AreEqual("Name!", deserialized.Name);
             CustomAssert.IsInstanceOfType(typeof(List<int>), deserialized.Value);

Src/Newtonsoft.Json.Tests/Serialization/PreserveReferencesHandlingTests.cs

@@ -298,7 +298,7 @@ public void UnexpectedEnd()
                         new JsonSerializerSettings
                         {
                             PreserveReferencesHandling = PreserveReferencesHandling.All,
-                            SpecialPropertyHandling = SpecialPropertyHandling.Default
+                            MetadataPropertyHandling = MetadataPropertyHandling.Default
                         });
                 });
         }
@@ -1069,7 +1069,7 @@ public void DuplicateId()
                 "Error reading object reference '1'. Path 'Data.Prop2.MyProperty', line 9, position 20.",
                 () => JsonConvert.DeserializeObject<PropertyItemIsReferenceObject>(json, new JsonSerializerSettings
                 {
-                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                    MetadataPropertyHandling = MetadataPropertyHandling.Default
                 }));
         }
     }

Src/Newtonsoft.Json.Tests/Serialization/SerializationErrorHandlingTests.cs

@@ -407,7 +407,7 @@ public void MultipleRequiredPropertyErrors()
             string json = "{}";
             List<string> errors = new List<string>();
             JsonSerializer serializer = new JsonSerializer();
-            serializer.SpecialPropertyHandling = SpecialPropertyHandling.Default;
+            serializer.MetadataPropertyHandling = MetadataPropertyHandling.Default;
             serializer.Error += delegate(object sender, ErrorEventArgs args)
             {
                 errors.Add(args.ErrorContext.Path + " - " + args.ErrorContext.Member + " - " + args.ErrorContext.Error.Message);
@@ -540,7 +540,7 @@ public void InfiniteLoopArrayHandlingInObject()
                 "{'badarray':[0,x,2],'goodarray':[0,1,2]}",
                 new JsonSerializerSettings
                 {
-                    SpecialPropertyHandling = SpecialPropertyHandling.Default,
+                    MetadataPropertyHandling = MetadataPropertyHandling.Default,
                     Error = (sender, arg) =>
                     {
                         errors.Add(arg.ErrorContext.Error.Message);
@@ -570,7 +570,7 @@ public void ErrorHandlingEndOfContent()
                 JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings
                 {
                     MaxDepth = maxDepth,
-                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                    MetadataPropertyHandling = MetadataPropertyHandling.Default
                 });
                 jsonSerializer.Error += (sender, e) =>
                 {
@@ -601,7 +601,7 @@ public void ErrorHandlingEndOfContentDictionary()
             const int maxDepth = 256;
             using (var jsonTextReader = new JsonTextReader(new StringReader(input)) { MaxDepth = maxDepth })
             {
-                JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings { MaxDepth = maxDepth, SpecialPropertyHandling = SpecialPropertyHandling.Default });
+                JsonSerializer jsonSerializer = JsonSerializer.Create(new JsonSerializerSettings { MaxDepth = maxDepth, MetadataPropertyHandling = MetadataPropertyHandling.Default });
                 jsonSerializer.Error += (sender, e) =>
                 {
                     errors.Add(e.ErrorContext.Error.Message);
@@ -641,7 +641,7 @@ public void ErrorHandlingEndOfContentDynamic()
                     errors.Add(e.ErrorContext.Error.Message);
                     e.ErrorContext.Handled = true;
                 },
-                SpecialPropertyHandling = SpecialPropertyHandling.Default
+                MetadataPropertyHandling = MetadataPropertyHandling.Default
             });
             Assert.AreEqual(true, newDynamicObject.Explicit);
 

Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs

@@ -140,7 +140,7 @@ public void MemoryTraceWriterDeserializeTest()
                 {
                     TraceWriter = traceWriter,
                     Converters = { new JavaScriptDateTimeConverter() },
-                    SpecialPropertyHandling = SpecialPropertyHandling.Default
+                    MetadataPropertyHandling = MetadataPropertyHandling.Default
                 });
 
             Console.WriteLine(traceWriter);
@@ -403,7 +403,7 @@ public void DeserializeDictionarysWithPreserveObjectReferences()
                 new JsonSerializerSettings
                 {
                     PreserveReferencesHandling = PreserveReferencesHandling.All,
-                    SpecialPropertyHandling = SpecialPropertyHandling.Default,
+                    MetadataPropertyHandling = MetadataPropertyHandling.Default,
                     TraceWriter = traceWriter
                 });
 
@@ -523,7 +523,7 @@ public void DeserializeTypeName()
             JsonConvert.DeserializeObject(json, null, new JsonSerializerSettings
             {
                 TypeNameHandling = TypeNameHandling.All,
-                SpecialPropertyHandling = SpecialPropertyHandling.Default,
+                MetadataPropertyHandling = MetadataPropertyHandling.Default,
                 TraceWriter = traceWriter
             });
 

Src/Newtonsoft.Json.Tests/Serialization/TypeNameHandlingTests.cs

@@ -122,7 +122,7 @@ public void NestedValueObjects()
             {
                 var reader = new JsonTextReader(new StringReader(sb.ToString()));
                 var ser = new JsonSerializer();
-                ser.SpecialPropertyHandling = SpecialPropertyHandling.Default;
+                ser.MetadataPropertyHandling = MetadataPropertyHandling.Default;
                 ser.Deserialize<bool>(reader);
             });
         }