diff --git a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
index 46dfca86..7c31f9c7 100644
--- a/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
+++ b/Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
@@ -47,10 +47,10 @@ using NUnit.Framework;
namespace Newtonsoft.Json.Tests.Serialization
{
- public interface IBase
- {
- DateTime CreatedOn { get; set; }
- }
+ public interface IBase
+ {
+ DateTime CreatedOn { get; set; }
+ }
public interface ITaskRepository : IBase
{
@@ -63,10 +63,10 @@ namespace Newtonsoft.Json.Tests.Serialization
string Level { get; set; }
}
- public class Base : IBase
- {
- public DateTime CreatedOn { get; set; }
- }
+ public class Base : IBase
+ {
+ public DateTime CreatedOn { get; set; }
+ }
public class TaskRepository : Base, ITaskRepository
{
@@ -213,7 +213,7 @@ namespace Newtonsoft.Json.Tests.Serialization
},
'Repository': {
'ConnectionString': 'server=.',
- 'CreatedOn': '2015-04-01 20:00'
+ 'CreatedOn': '2015-04-01 20:00'
},
'People': [
{
@@ -227,14 +227,14 @@ namespace Newtonsoft.Json.Tests.Serialization
'Name': 'Name3!'
}
}", new JsonSerializerSettings
- {
- ContractResolver = contractResolver
- });
+ {
+ ContractResolver = contractResolver
+ });
Assert.IsNotNull(o);
Assert.IsNotNull(o.Logger);
Assert.IsNotNull(o.Repository);
- Assert.IsNotNull(o.Repository.CreatedOn);
+ Assert.IsNotNull(o.Repository.CreatedOn);
Assert.AreEqual(2, count);
diff --git a/Src/Newtonsoft.Json.sln.DotSettings b/Src/Newtonsoft.Json.sln.DotSettings
index 2c4af6be..6a89a056 100644
--- a/Src/Newtonsoft.Json.sln.DotSettings
+++ b/Src/Newtonsoft.Json.sln.DotSettings
@@ -2,7 +2,4 @@
False
True
False
- True
- True
- True
\ No newline at end of file
diff --git a/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs b/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs
index c378a8a4..ba73f174 100644
--- a/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs
+++ b/Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs
@@ -883,20 +883,20 @@ namespace Newtonsoft.Json.Utilities
{
ValidationUtils.ArgumentNotNull(targetType, "targetType");
- List propertyInfos;
+ List propertyInfos;
- if (!targetType.IsInterface())
- {
- propertyInfos = new List(targetType.GetProperties(bindingAttr));
- }
- else
- {
- propertyInfos = (new Type[] { targetType })
- .Concat(targetType.GetInterfaces())
- .SelectMany(i => i.GetProperties(bindingAttr)).ToList();
- }
+ if (!targetType.IsInterface())
+ {
+ propertyInfos = new List(targetType.GetProperties(bindingAttr));
+ }
+ else
+ {
+ propertyInfos = (new Type[] { targetType })
+ .Concat(targetType.GetInterfaces())
+ .SelectMany(i => i.GetProperties(bindingAttr)).ToList();
+ }
- GetChildPrivateProperties(propertyInfos, targetType, bindingAttr);
+ GetChildPrivateProperties(propertyInfos, targetType, bindingAttr);
// a base class private getter/setter will be inaccessable unless the property was gotten from the base class
for (int i = 0; i < propertyInfos.Count; i++)