Merge branch 'release/1.0.4' into production

Author: craigfowler

CSF.WebDriverExtras.Tests/CSF.WebDriverExtras.Tests.csproj

@@ -8,7 +8,7 @@
     <RootNamespace>CSF.WebDriverExtras.Tests</RootNamespace>
     <AssemblyName>CSF.WebDriverExtras.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>1.0.3</ReleaseVersion>
+    <ReleaseVersion>1.0.4</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

CSF.WebDriverExtras.sln

@@ -23,6 +23,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 1.0.3
+		version = 1.0.4
 	EndGlobalSection
 EndGlobal

CSF.WebDriverExtras/CSF.WebDriverExtras.csproj

@@ -8,7 +8,7 @@
     <RootNamespace>CSF.WebDriverExtras</RootNamespace>
     <AssemblyName>CSF.WebDriverExtras</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>1.0.3</ReleaseVersion>
+    <ReleaseVersion>1.0.4</ReleaseVersion>
     <AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -38,12 +38,12 @@
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Configuration" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="CSF.Configuration">
       <HintPath>..\packages\CSF.Configuration.1.1.2\lib\net45\CSF.Configuration.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />

CSF.WebDriverExtras/CSF.WebDriverExtras.nuspec

@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>CSF.WebDriverExtras</id>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <title>CSF.WebDriverExtras</title>
     <authors>CSF Software Ltd</authors>
     <licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
@@ -12,7 +12,7 @@
     <copyright>Copyright 2017</copyright>
     <dependencies>
       <dependency id="CSF.Configuration" version="[1.1.2,2.0.0)" />
-      <dependency id="Newtonsoft.Json" version="[10.0.3,11.0.0)" />
+      <dependency id="Newtonsoft.Json" version="[10.0.3,13.0.0)" />
       <dependency id="Selenium.WebDriver" version="[3.4.0,4.0.0)" />
     </dependencies>
   </metadata>

CSF.WebDriverExtras/Properties/AssemblyInfo.cs

@@ -17,7 +17,7 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion("1.0.3")]
+[assembly: AssemblyVersion("1.0.4.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

CSF.WebDriverExtras/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CSF.Configuration" version="1.1.2" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net45" />
   <package id="Selenium.WebDriver" version="3.4.0" targetFramework="net45" />
 </packages>

Tools/Create-NuGet-packages.sh

@@ -7,8 +7,6 @@ then
   exit 1
 fi
 
-sn -R CSF.WebDriverExtras/bin/Release/CSF.WebDriverExtras.dll CSF-Software-OSS.snk
-
 find . \
   -type f \
   -name "*.nuspec" \