Skip to content

Commit c23986d

Browse files
committed
Merge branch 'feature/38-Newtonsoft-JSON-support'
2 parents a1a2407 + d8b57ba commit c23986d

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

CSF.WebDriverExtras/CSF.WebDriverExtras.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
</Reference>
3939
<Reference Include="System.Drawing" />
4040
<Reference Include="System.Configuration" />
41-
<Reference Include="Newtonsoft.Json">
42-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
43-
</Reference>
4441
<Reference Include="CSF.Configuration">
4542
<HintPath>..\packages\CSF.Configuration.1.1.2\lib\net45\CSF.Configuration.dll</HintPath>
4643
</Reference>
44+
<Reference Include="Newtonsoft.Json">
45+
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
46+
</Reference>
4747
</ItemGroup>
4848
<ItemGroup>
4949
<Compile Include="Properties\AssemblyInfo.cs" />

CSF.WebDriverExtras/CSF.WebDriverExtras.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<copyright>Copyright 2017</copyright>
1313
<dependencies>
1414
<dependency id="CSF.Configuration" version="[1.1.2,2.0.0)" />
15-
<dependency id="Newtonsoft.Json" version="[10.0.3,11.0.0)" />
15+
<dependency id="Newtonsoft.Json" version="[10.0.3,13.0.0)" />
1616
<dependency id="Selenium.WebDriver" version="[3.4.0,4.0.0)" />
1717
</dependencies>
1818
</metadata>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CSF.Configuration" version="1.1.2" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
4+
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
55
<package id="Selenium.WebDriver" version="3.4.0" targetFramework="net45" />
66
</packages>

0 commit comments

Comments
 (0)