diff --git a/XenModel/XenAPI/JsonRpc.cs b/XenModel/XenAPI/JsonRpc.cs index 5080ecc0a..3b1dec986 100644 --- a/XenModel/XenAPI/JsonRpc.cs +++ b/XenModel/XenAPI/JsonRpc.cs @@ -126,7 +126,7 @@ namespace XenAPI internal class JsonResponseV1 : JsonResponse { - [JsonProperty("error", Required = Required.AllowNull)] public object Error = null; + [JsonProperty("error", Required = Required.AllowNull)] public JToken Error = null; } internal class JsonResponseV2 : JsonResponse @@ -267,7 +267,11 @@ namespace XenAPI var res1 = (JsonResponseV1)serializer.Deserialize(responseReader, typeof(JsonResponseV1)); #endif if (res1.Error != null) - throw new Failure(res1.Error as string[]); + { + var errorArray = res1.Error.ToObject(); + if (errorArray != null) + throw new Failure(errorArray); + } return res1.Result; } } diff --git a/packages/DOTNET_BUILD_LOCATION b/packages/DOTNET_BUILD_LOCATION index be92dd43a..7d0321ddd 100644 --- a/packages/DOTNET_BUILD_LOCATION +++ b/packages/DOTNET_BUILD_LOCATION @@ -1 +1 @@ -xc-local-release/dotnet-packages/master/18 +xc-local-release/dotnet-packages/master/20