diff --git a/OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj b/OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj index 7da4aa12..a2e34dcf 100644 --- a/OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj +++ b/OptimizelySDK.DemoApp/OptimizelySDK.DemoApp.csproj @@ -64,8 +64,8 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll True @@ -124,7 +124,7 @@ ..\packages\murmurhash-signed.1.0.2\lib\net45\MurmurHash.dll - ..\packages\NJsonSchema.8.30.6304.31883\lib\net45\NJsonSchema.dll + ..\packages\NJsonSchema.10.8.0\lib\net45\NJsonSchema.dll ..\packages\Optimizely.SDK.2.1.0\lib\net45\OptimizelySDK.dll diff --git a/OptimizelySDK.DemoApp/Web.config b/OptimizelySDK.DemoApp/Web.config index 126c7ed9..d485ed2a 100644 --- a/OptimizelySDK.DemoApp/Web.config +++ b/OptimizelySDK.DemoApp/Web.config @@ -34,7 +34,7 @@ - + diff --git a/OptimizelySDK.DemoApp/packages.config b/OptimizelySDK.DemoApp/packages.config index 003a2ba4..6ac654c9 100644 --- a/OptimizelySDK.DemoApp/packages.config +++ b/OptimizelySDK.DemoApp/packages.config @@ -16,7 +16,7 @@ - + diff --git a/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj b/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj index 9d3d441d..1e34d303 100644 --- a/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj +++ b/OptimizelySDK.Net35/OptimizelySDK.Net35.csproj @@ -32,8 +32,8 @@ 4 - - ..\packages\Newtonsoft.Json.9.0.1\lib\net35\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.2\lib\net35\Newtonsoft.Json.dll diff --git a/OptimizelySDK.Net35/packages.config b/OptimizelySDK.Net35/packages.config index 6655a9d2..fcf66c74 100644 --- a/OptimizelySDK.Net35/packages.config +++ b/OptimizelySDK.Net35/packages.config @@ -1,5 +1,5 @@  - + diff --git a/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj b/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj index 3dfdfbc9..cd28fdba 100644 --- a/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj +++ b/OptimizelySDK.Net40/OptimizelySDK.Net40.csproj @@ -32,8 +32,8 @@ 4 - - ..\packages\Newtonsoft.Json.9.0.1\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.2\lib\net40\Newtonsoft.Json.dll diff --git a/OptimizelySDK.Net40/packages.config b/OptimizelySDK.Net40/packages.config index 3c565723..719abd02 100644 --- a/OptimizelySDK.Net40/packages.config +++ b/OptimizelySDK.Net40/packages.config @@ -1,5 +1,5 @@  - + diff --git a/OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj b/OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj index 740e5d4d..d0262be3 100644 --- a/OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj +++ b/OptimizelySDK.NetStandard16/OptimizelySDK.NetStandard16.csproj @@ -155,8 +155,8 @@ - - + + diff --git a/OptimizelySDK.NetStandard20/OptimizelySDK.NetStandard20.csproj b/OptimizelySDK.NetStandard20/OptimizelySDK.NetStandard20.csproj index 0202fe84..952ea9de 100644 --- a/OptimizelySDK.NetStandard20/OptimizelySDK.NetStandard20.csproj +++ b/OptimizelySDK.NetStandard20/OptimizelySDK.NetStandard20.csproj @@ -324,8 +324,8 @@ - - + + diff --git a/OptimizelySDK.Package/OptimizelySDK.nuspec b/OptimizelySDK.Package/OptimizelySDK.nuspec index 891fba96..3cd70806 100644 --- a/OptimizelySDK.Package/OptimizelySDK.nuspec +++ b/OptimizelySDK.Package/OptimizelySDK.nuspec @@ -18,28 +18,28 @@ - - + + - + - + - - + + - - + + diff --git a/OptimizelySDK.Tests/App.config b/OptimizelySDK.Tests/App.config index 3c941480..41b1cad8 100644 --- a/OptimizelySDK.Tests/App.config +++ b/OptimizelySDK.Tests/App.config @@ -33,16 +33,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj b/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj index 2a776bcb..8ead9afd 100644 --- a/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj +++ b/OptimizelySDK.Tests/OptimizelySDK.Tests.csproj @@ -46,9 +46,8 @@ ..\packages\Moq.4.7.1\lib\net45\Moq.dll True - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll ..\packages\NUnit.2.6.4\lib\nunit.framework.dll diff --git a/OptimizelySDK/OptimizelySDK.csproj b/OptimizelySDK/OptimizelySDK.csproj index c8791237..55d93b0c 100644 --- a/OptimizelySDK/OptimizelySDK.csproj +++ b/OptimizelySDK/OptimizelySDK.csproj @@ -42,18 +42,22 @@ - - ..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True + + + ..\packages\Namotion.Reflection.2.1.0\lib\net45\Namotion.Reflection.dll - - ..\packages\NJsonSchema.8.30.6304.31883\lib\net45\NJsonSchema.dll - True + + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NJsonSchema.10.8.0\lib\net45\NJsonSchema.dll + + diff --git a/OptimizelySDK/Utils/Validator.cs b/OptimizelySDK/Utils/Validator.cs index fd79ca16..693cd0cd 100644 --- a/OptimizelySDK/Utils/Validator.cs +++ b/OptimizelySDK/Utils/Validator.cs @@ -37,11 +37,9 @@ public static bool ValidateJSONSchema(string configJson, string schemaJson = nul { try { - return !NJsonSchema.JsonSchema4 - .FromJsonAsync(schemaJson ?? Schema.GetSchemaJson()) - .Result - .Validate(configJson) - .Any(); + return !NJsonSchema.JsonSchema.FromJsonAsync(schemaJson ?? Schema.GetSchemaJson()). + Result.Validate(configJson). + Any(); } catch (Newtonsoft.Json.JsonReaderException) { diff --git a/OptimizelySDK/packages.config b/OptimizelySDK/packages.config index c8732913..c69d44e8 100644 --- a/OptimizelySDK/packages.config +++ b/OptimizelySDK/packages.config @@ -1,6 +1,7 @@  - - - \ No newline at end of file + + + +