Skip to content
This repository was archived by the owner on Nov 8, 2024. It is now read-only.

Commit 490ea8b

Browse files
craigfowlercraigfowler
committed
Merge branch 'release/0.4.0' into production
2 parents f2a7c73 + bf5a2d2 commit 490ea8b

40 files changed

+435
-275
lines changed

‎.appveyor.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ test: off
1212
artifacts:
1313
- path: CSF.Screenplay.WebTestWebsite
1414
name: TestWebsite
15-
type: WebDeployPackage
1615
deploy:
1716
- provider: Local
1817
TestWebsite.deploy_website: true
1918
TestWebsite.site_name: "Test Web Site"
2019
TestWebsite.port: 8080
2120
after_deploy:
22-
- cmd: Tools\Appveyor.after_deploy.bat
21+
- cmd: Tools\Appveyor.after_deploy.bat

‎CSF.Screenplay.Selenium.BrowserFlags.Tests/CSF.Screenplay.Selenium.BrowserFlags.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.Screenplay.Selenium.Tests</RootNamespace>
99
<AssemblyName>CSF.Screenplay.Selenium.BrowserFlags.Tests</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.3.2-beta</ReleaseVersion>
11+
<ReleaseVersion>0.4.0-beta</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -45,18 +45,18 @@
4545
<Reference Include="Moq">
4646
<HintPath>..\packages\Moq.4.7.25\lib\net45\Moq.dll</HintPath>
4747
</Reference>
48-
<Reference Include="CSF.Configuration">
49-
<HintPath>..\packages\CSF.Configuration.1.1.0\lib\net45\CSF.Configuration.dll</HintPath>
50-
</Reference>
5148
<Reference Include="Newtonsoft.Json">
5249
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5350
</Reference>
5451
<Reference Include="WebDriver">
5552
<HintPath>..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll</HintPath>
5653
</Reference>
5754
<Reference Include="System.Drawing" />
55+
<Reference Include="CSF.Configuration">
56+
<HintPath>..\packages\CSF.Configuration.1.1.2\lib\net45\CSF.Configuration.dll</HintPath>
57+
</Reference>
5858
<Reference Include="CSF.WebDriverExtras">
59-
<HintPath>..\packages\CSF.WebDriverExtras.1.0.0\lib\net45\CSF.WebDriverExtras.dll</HintPath>
59+
<HintPath>..\packages\CSF.WebDriverExtras.1.0.3\lib\net45\CSF.WebDriverExtras.dll</HintPath>
6060
</Reference>
6161
</ItemGroup>
6262
<ItemGroup>

‎CSF.Screenplay.Selenium.BrowserFlags.Tests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
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" />
8-
<package id="CSF.WebDriverExtras" version="1.0.0" targetFramework="net45" />
7+
<package id="CSF.Configuration" version="1.1.2" targetFramework="net45" />
8+
<package id="CSF.WebDriverExtras" version="1.0.3" targetFramework="net45" />
99
<package id="Moq" version="4.7.25" targetFramework="net45" />
1010
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
1111
<package id="NUnit" version="3.7.1" targetFramework="net45" />

‎CSF.Screenplay.Selenium.BrowserFlags/CSF.Screenplay.Selenium.BrowserFlags.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.Screenplay.Selenium</RootNamespace>
99
<AssemblyName>CSF.Screenplay.Selenium.BrowserFlags</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.3.2-beta</ReleaseVersion>
11+
<ReleaseVersion>0.4.0-beta</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -31,18 +31,18 @@
3131
</PropertyGroup>
3232
<ItemGroup>
3333
<Reference Include="System" />
34-
<Reference Include="CSF.Configuration">
35-
<HintPath>..\packages\CSF.Configuration.1.1.0\lib\net45\CSF.Configuration.dll</HintPath>
36-
</Reference>
3734
<Reference Include="Newtonsoft.Json">
3835
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
3936
</Reference>
4037
<Reference Include="WebDriver">
4138
<HintPath>..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll</HintPath>
4239
</Reference>
4340
<Reference Include="System.Drawing" />
41+
<Reference Include="CSF.Configuration">
42+
<HintPath>..\packages\CSF.Configuration.1.1.2\lib\net45\CSF.Configuration.dll</HintPath>
43+
</Reference>
4444
<Reference Include="CSF.WebDriverExtras">
45-
<HintPath>..\packages\CSF.WebDriverExtras.1.0.0\lib\net45\CSF.WebDriverExtras.dll</HintPath>
45+
<HintPath>..\packages\CSF.WebDriverExtras.1.0.3\lib\net45\CSF.WebDriverExtras.dll</HintPath>
4646
</Reference>
4747
</ItemGroup>
4848
<ItemGroup>

‎CSF.Screenplay.Selenium.BrowserFlags/CSF.Screenplay.Selenium.BrowserFlags.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.Screenplay.Selenium.BrowserFlags</id>
5-
<version>0.3.2-beta</version>
5+
<version>0.4.0-beta</version>
66
<title>CSF.Screenplay.Selenium.BrowserFlags</title>
77
<authors>CSF Software Ltd</authors>
88
<licenseUrl>https://opensource.org/licenses/MIT</licenseUrl>
@@ -11,7 +11,7 @@
1111
<description>An assembly containing 'browser flags definitions' for CSF.Screenplay.Selenium. This indicates the quirks and behaviours of various popular web browsers which are compatible with Selenium WebDriver.</description>
1212
<copyright>Copyright 2018</copyright>
1313
<dependencies>
14-
<dependency id="CSF.WebDriverExtras" version="[1.0.0,2.0.0)" />
14+
<dependency id="CSF.WebDriverExtras" version="[1.0.3,2.0.0)" />
1515
</dependencies>
1616
</metadata>
1717
<files>

‎CSF.Screenplay.Selenium.BrowserFlags/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("0.3.2.0")]
20+
[assembly: AssemblyVersion("0.4.0.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.

‎CSF.Screenplay.Selenium.BrowserFlags/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CSF.Configuration" version="1.1.0" targetFramework="net45" />
4-
<package id="CSF.WebDriverExtras" version="1.0.0" targetFramework="net45" />
3+
<package id="CSF.Configuration" version="1.1.2" targetFramework="net45" />
4+
<package id="CSF.WebDriverExtras" version="1.0.3" targetFramework="net45" />
55
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
66
<package id="Selenium.WebDriver" version="3.4.0" targetFramework="net45" />
77
</packages>

‎CSF.Screenplay.Selenium.JavaScriptWorkarounds/CSF.Screenplay.Selenium.JavaScriptWorkarounds.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<RootNamespace>CSF.Screenplay.Selenium</RootNamespace>
99
<AssemblyName>CSF.Screenplay.Selenium.JavaScriptWorkarounds</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11-
<ReleaseVersion>0.3.2-beta</ReleaseVersion>
11+
<ReleaseVersion>0.4.0-beta</ReleaseVersion>
1212
</PropertyGroup>
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1414
<DebugSymbols>true</DebugSymbols>
@@ -37,7 +37,7 @@
3737
</Reference>
3838
<Reference Include="System.Drawing" />
3939
<Reference Include="CSF.Reflection">
40-
<HintPath>..\packages\CSF.Reflection.1.0.1\lib\net45\CSF.Reflection.dll</HintPath>
40+
<HintPath>..\packages\CSF.Reflection.1.0.3\lib\net45\CSF.Reflection.dll</HintPath>
4141
</Reference>
4242
</ItemGroup>
4343
<ItemGroup>

‎CSF.Screenplay.Selenium.JavaScriptWorkarounds/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("0.3.2.0")]
20+
[assembly: AssemblyVersion("0.4.0.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.

‎CSF.Screenplay.Selenium.JavaScriptWorkarounds/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CSF.Reflection" version="1.0.1" targetFramework="net45" />
3+
<package id="CSF.Reflection" version="1.0.3" targetFramework="net45" />
44
<package id="Selenium.WebDriver" version="3.4.0" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)