LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Fixed PR test

Browse Source
This commit is contained in:
James Newton-King
2015-04-03 12:10:23 +13:00
parent 5b392b54b8 780cd8bd18
commit daf32bf571
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json.Tests/Serialization/DependencyInjectionTests.cs
+1 -1
View File
@@ -234,7 +234,7 @@ namespace Newtonsoft.Json.Tests.Serialization
Assert.IsNotNull(o);
Assert.IsNotNull(o.Logger);
Assert.IsNotNull(o.Repository);
Assert.IsNotNull(o.Repository.CreatedOn);
Assert.AreEqual(o.Repository.CreatedOn, DateTime.Parse("2015-04-01 20:00"));
Assert.AreEqual(2, count);
Src/Newtonsoft.Json/Utilities/ReflectionUtils.cs
+7 -9
View File
@@ -883,17 +883,15 @@ namespace Newtonsoft.Json.Utilities
{
ValidationUtils.ArgumentNotNull(targetType, "targetType");
List<PropertyInfo> propertyInfos;
List<PropertyInfo> propertyInfos = new List<PropertyInfo>(targetType.GetProperties(bindingAttr));
if (!targetType.IsInterface())
// GetProperties on an interface doesn't return properties from its interfaces
if (targetType.IsInterface())
{
propertyInfos = new List<PropertyInfo>(targetType.GetProperties(bindingAttr));
}
else
{
propertyInfos = (new Type[] { targetType })
.Concat(targetType.GetInterfaces())
.SelectMany(i => i.GetProperties(bindingAttr)).ToList();
foreach (Type i in targetType.GetInterfaces())
{
propertyInfos.AddRange(i.GetProperties(bindingAttr));
}
}
GetChildPrivateProperties(propertyInfos, targetType, bindingAttr);