diff --git a/src/Microsoft.AspNetCore.JsonPatch/Adapters/ObjectAdapter.cs b/src/Microsoft.AspNetCore.JsonPatch/Adapters/ObjectAdapter.cs index aeae454fa9..b70ff697c3 100644 --- a/src/Microsoft.AspNetCore.JsonPatch/Adapters/ObjectAdapter.cs +++ b/src/Microsoft.AspNetCore.JsonPatch/Adapters/ObjectAdapter.cs @@ -1023,14 +1023,14 @@ namespace Microsoft.AspNetCore.JsonPatch.Adapters { if (IsGenericListType(type)) { - return type.GetGenericArguments()[0]; + return type.GetTypeInfo().GenericTypeArguments[0]; } foreach (Type interfaceType in type.GetTypeInfo().ImplementedInterfaces) { if (IsGenericListType(interfaceType)) { - return interfaceType.GetGenericArguments()[0]; + return interfaceType.GetTypeInfo().GenericTypeArguments[0]; } } diff --git a/src/Microsoft.AspNetCore.JsonPatch/Converters/TypedJsonPatchDocumentConverter.cs b/src/Microsoft.AspNetCore.JsonPatch/Converters/TypedJsonPatchDocumentConverter.cs index a150bd0478..292a3be556 100644 --- a/src/Microsoft.AspNetCore.JsonPatch/Converters/TypedJsonPatchDocumentConverter.cs +++ b/src/Microsoft.AspNetCore.JsonPatch/Converters/TypedJsonPatchDocumentConverter.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Converters return null; } - var genericType = objectType.GetGenericArguments()[0]; + var genericType = objectType.GetTypeInfo().GenericTypeArguments[0]; // load jObject var jObject = JArray.Load(reader); diff --git a/src/Microsoft.AspNetCore.JsonPatch/Helpers/ObjectTreeAnalyisResult.cs b/src/Microsoft.AspNetCore.JsonPatch/Helpers/ObjectTreeAnalyisResult.cs index 4d083bd073..782859ad5f 100644 --- a/src/Microsoft.AspNetCore.JsonPatch/Helpers/ObjectTreeAnalyisResult.cs +++ b/src/Microsoft.AspNetCore.JsonPatch/Helpers/ObjectTreeAnalyisResult.cs @@ -141,7 +141,6 @@ namespace Microsoft.AspNetCore.JsonPatch.Helpers } else if (targetObject is IList) { - System.Diagnostics.Debugger.Launch(); UseDynamicLogic = false; int index; diff --git a/src/Microsoft.AspNetCore.JsonPatch/project.json b/src/Microsoft.AspNetCore.JsonPatch/project.json index 6e66884725..abfc19cba3 100644 --- a/src/Microsoft.AspNetCore.JsonPatch/project.json +++ b/src/Microsoft.AspNetCore.JsonPatch/project.json @@ -16,13 +16,14 @@ "Newtonsoft.Json": "8.0.2" }, "frameworks": { - "net451": {}, - "netstandard1.3": { + "netstandard1.1": { "dependencies": { "Microsoft.CSharp": "4.0.1-*", "System.Collections.Concurrent": "4.0.12-*", "System.ComponentModel.TypeConverter": "4.0.1-*", + "System.Diagnostics.Debug": "4.0.11-*", "System.Globalization": "4.0.11-*", + "System.Linq": "4.1.0-*", "System.Reflection.Extensions": "4.0.1-*", "System.Resources.ResourceManager": "4.0.1-*", "System.Runtime.Extensions": "4.1.0-*", @@ -30,7 +31,7 @@ "System.Text.Encoding.Extensions": "4.0.11-*" }, "imports": [ - "dotnet5.4", + "dotnet5.2", "portable-net451+win8" ] } diff --git a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json index 6bfaeafb67..c8772f21fb 100644 --- a/test/Microsoft.AspNetCore.JsonPatch.Test/project.json +++ b/test/Microsoft.AspNetCore.JsonPatch.Test/project.json @@ -22,11 +22,12 @@ }, "net451": { "frameworkAssemblies": { - "System.Runtime": "", - "System.Threading.Tasks": "" + "System.Linq.Expressions": {"type": "build"}, + "System.Threading.Tasks": { "type": "build" } }, "dependencies": { "Moq": "4.2.1312.1622", + "System.Runtime": "4.1.0-*", "xunit.runner.console": "2.1.0" } }