Skip to content

Commit 1c73d16

Browse files
committed
Merge branch 'release/1.0.1' into production
2 parents 34780ca + de627ab commit 1c73d16

File tree

8 files changed

+16
-14
lines changed

8 files changed

+16
-14
lines changed

CSF-Software-OSS.snk

596 Bytes
Binary file not shown.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.WebDriverExtras.Tests</RootNamespace>
99
<AssemblyName>CSF.WebDriverExtras.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.0</ReleaseVersion>
11+
<ReleaseVersion>1.0.1</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -46,9 +46,6 @@
4646
<Reference Include="Ploeh.AutoFixture.NUnit3">
4747
<HintPath>..\packages\AutoFixture.NUnit3.3.50.3\lib\net40\Ploeh.AutoFixture.NUnit3.dll</HintPath>
4848
</Reference>
49-
<Reference Include="CSF.Configuration">
50-
<HintPath>..\packages\CSF.Configuration.1.1.0\lib\net45\CSF.Configuration.dll</HintPath>
51-
</Reference>
5249
<Reference Include="System.Configuration" />
5350
<Reference Include="WebDriver">
5451
<HintPath>..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll</HintPath>
@@ -57,6 +54,9 @@
5754
<Reference Include="WebDriver.Support">
5855
<HintPath>..\packages\Selenium.Support.3.4.0\lib\net40\WebDriver.Support.dll</HintPath>
5956
</Reference>
57+
<Reference Include="CSF.Configuration">
58+
<HintPath>..\packages\CSF.Configuration.1.1.1\lib\net45\CSF.Configuration.dll</HintPath>
59+
</Reference>
6060
</ItemGroup>
6161
<ItemGroup>
6262
<Compile Include="AutoMoqDataAttribute.cs" />

CSF.WebDriverExtras.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="AutoFixture.AutoMoq" version="3.50.3" targetFramework="net45" />
55
<package id="AutoFixture.NUnit3" version="3.50.3" targetFramework="net45" />
66
<package id="Castle.Core" version="4.0.0" targetFramework="net45" />
7-
<package id="CSF.Configuration" version="1.1.0" targetFramework="net45" />
7+
<package id="CSF.Configuration" version="1.1.1" targetFramework="net45" />
88
<package id="Moq" version="4.7.25" targetFramework="net45" />
99
<package id="NUnit" version="3.7.1" targetFramework="net45" />
1010
<package id="Selenium.Support" version="3.4.0" targetFramework="net45" />

CSF.WebDriverExtras.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ Global
2323
GlobalSection(NestedProjects) = preSolution
2424
EndGlobalSection
2525
GlobalSection(MonoDevelopProperties) = preSolution
26-
version = 1.0.0
26+
version = 1.0.1
2727
EndGlobalSection
2828
EndGlobal

CSF.WebDriverExtras/CSF.WebDriverExtras.csproj

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
<RootNamespace>CSF.WebDriverExtras</RootNamespace>
99
<AssemblyName>CSF.WebDriverExtras</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>1.0.0</ReleaseVersion>
11+
<ReleaseVersion>1.0.1</ReleaseVersion>
12+
<SignAssembly>true</SignAssembly>
13+
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
1214
</PropertyGroup>
1315
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1416
<DebugSymbols>true</DebugSymbols>
@@ -36,13 +38,13 @@
3638
<HintPath>..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll</HintPath>
3739
</Reference>
3840
<Reference Include="System.Drawing" />
39-
<Reference Include="CSF.Configuration">
40-
<HintPath>..\packages\CSF.Configuration.1.1.0\lib\net45\CSF.Configuration.dll</HintPath>
41-
</Reference>
4241
<Reference Include="System.Configuration" />
4342
<Reference Include="Newtonsoft.Json">
4443
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4544
</Reference>
45+
<Reference Include="CSF.Configuration">
46+
<HintPath>..\packages\CSF.Configuration.1.1.1\lib\net45\CSF.Configuration.dll</HintPath>
47+
</Reference>
4648
</ItemGroup>
4749
<ItemGroup>
4850
<Compile Include="Properties\AssemblyInfo.cs" />

CSF.WebDriverExtras/CSF.WebDriverExtras.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>CSF.WebDriverExtras</id>
5-
<version>1.0.0</version>
5+
<version>1.0.1</version>
66
<title>CSF.WebDriverExtras</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
@@ -11,7 +11,7 @@
1111
<description>Types to support the usage of a Selenium IWebDriver, particularly in cross-browser testing.</description>
1212
<copyright>Copyright 2017</copyright>
1313
<dependencies>
14-
<dependency id="CSF.Configuration" version="[1.1.0,2.0.0)" />
14+
<dependency id="CSF.Configuration" version="[1.1.1,2.0.0)" />
1515
<dependency id="Newtonsoft.Json" version="[10.0.3,11.0.0)" />
1616
<dependency id="Selenium.WebDriver" version="[3.4.0,4.0.0)" />
1717
</dependencies>

CSF.WebDriverExtras/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
1818
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
1919

20-
[assembly: AssemblyVersion("1.0.0.0")]
20+
[assembly: AssemblyVersion("1.0.1.0")]
2121

2222
// The following attributes are used to specify the signing key for the assembly,
2323
// if desired. See the Mono documentation for more information about signing.
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>
3-
<package id="CSF.Configuration" version="1.1.0" targetFramework="net45" />
3+
<package id="CSF.Configuration" version="1.1.1" targetFramework="net45" />
44
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
55
<package id="Selenium.WebDriver" version="3.4.0" targetFramework="net45" />
66
</packages>

0 commit comments

Comments
 (0)