Skip to content

Commit 624ba3c

Browse files
authored
Add Aquality.Selenium.Images package to separate OpenCV dependency (#264) +semver: feature
* Add Aquality.Selenium.Images package to separate OpenCV dependency +semver: feature Update to Selenium 4.25.0 * Rename namespace to match new package name * update the pipeline
1 parent 824634f commit 624ba3c

File tree

12 files changed

+133
-66
lines changed

12 files changed

+133
-66
lines changed

Aquality.Selenium/Aquality.Selenium.sln

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29009.5
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.8.34309.116
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{43453468-EBA2-4800-B6CA-765FA722BA61}"
77
EndProject
@@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aquality.Selenium.Tests", "
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{999ED05C-B034-45A1-8F11-2B519C308250}"
1313
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aquality.Selenium.Images", "src\Aquality.Selenium.Images\Aquality.Selenium.Images.csproj", "{72EB3821-6AB9-465C-9B88-D878D677C754}"
15+
EndProject
1416
Global
1517
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1618
Debug|Any CPU = Debug|Any CPU
@@ -25,13 +27,18 @@ Global
2527
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
2628
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
2729
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{72EB3821-6AB9-465C-9B88-D878D677C754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{72EB3821-6AB9-465C-9B88-D878D677C754}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{72EB3821-6AB9-465C-9B88-D878D677C754}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{72EB3821-6AB9-465C-9B88-D878D677C754}.Release|Any CPU.Build.0 = Release|Any CPU
2834
EndGlobalSection
2935
GlobalSection(SolutionProperties) = preSolution
3036
HideSolutionNode = FALSE
3137
EndGlobalSection
3238
GlobalSection(NestedProjects) = preSolution
3339
{B0E3FDB8-CF47-40D2-AC0E-FB12F66D1F26} = {43453468-EBA2-4800-B6CA-765FA722BA61}
3440
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8} = {999ED05C-B034-45A1-8F11-2B519C308250}
41+
{72EB3821-6AB9-465C-9B88-D878D677C754} = {43453468-EBA2-4800-B6CA-765FA722BA61}
3542
EndGlobalSection
3643
GlobalSection(ExtensibilityGlobals) = postSolution
3744
SolutionGuid = {0AC8C847-FF57-4A72-8E22-F0947E17DFAF}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
6+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
7+
<Authors>aquality automation committers</Authors>
8+
<Company>aquality automation</Company>
9+
<Description>Support classes to work with Images in Aquality.Selenium, such as ByImage locator</Description>
10+
<PackageDescription>Support classes to work with Images in Aquality.Selenium, such as ByImage locator</PackageDescription>
11+
<PackageLicenseExpression></PackageLicenseExpression>
12+
<RepositoryUrl>https://github.com/aquality-automation/aquality-selenium-dotnet</RepositoryUrl>
13+
<RepositoryType>git</RepositoryType>
14+
<PackageTags>selenium webdriver browser automation image locator</PackageTags>
15+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
16+
<PackageReadmeFile>README.md</PackageReadmeFile>
17+
<Copyright>Copyright 2024 Aquality Automation</Copyright>
18+
<IsPackable>true</IsPackable>
19+
</PropertyGroup>
20+
21+
<PropertyGroup>
22+
<DocumentationFile>Aquality.Selenium.Images.xml</DocumentationFile>
23+
<NoWarn>1591</NoWarn>
24+
</PropertyGroup>
25+
26+
<ItemGroup>
27+
<ProjectReference Include="..\Aquality.Selenium\Aquality.Selenium.csproj" />
28+
</ItemGroup>
29+
<ItemGroup>
30+
<None Include="..\..\..\LICENSE">
31+
<Pack>True</Pack>
32+
<PackagePath></PackagePath>
33+
</None>
34+
</ItemGroup>
35+
<ItemGroup>
36+
<None Include="..\..\..\README.md">
37+
<Pack>True</Pack>
38+
<PackagePath></PackagePath>
39+
</None>
40+
</ItemGroup>
41+
<ItemGroup>
42+
<PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
43+
<PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />
44+
<PackageReference Include="OpenCvSharp4.runtime.linux-arm" Version="4.10.0.20240616" />
45+
<PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
46+
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />
47+
<PackageReference Include="OpenCvSharp4_.runtime.ubuntu.20.04-x64" Version="4.10.0.20240616" />
48+
</ItemGroup>
49+
50+
</Project>

Aquality.Selenium/src/Aquality.Selenium.Images/Aquality.Selenium.Images.xml

Lines changed: 58 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Aquality.Selenium/src/Aquality.Selenium/Elements/Interfaces/ByImage.cs renamed to Aquality.Selenium/src/Aquality.Selenium.Images/Locators/ByImage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.IO;
99
using System.Linq;
1010

11-
namespace Aquality.Selenium.Elements.Interfaces
11+
namespace Aquality.Selenium.Images.Locators
1212
{
1313
/// <summary>
1414
/// Locator to search elements by image.

Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<RepositoryType>git</RepositoryType>
1515
<PackageTags>selenium webdriver browser automation</PackageTags>
1616
<PackageLicenseFile>LICENSE</PackageLicenseFile>
17+
<PackageReadmeFile>README.md</PackageReadmeFile>
1718
<Copyright>Copyright 2024 Aquality Automation</Copyright>
1819
<IsPackable>true</IsPackable>
1920
</PropertyGroup>
@@ -41,6 +42,10 @@
4142
<Pack>True</Pack>
4243
<PackagePath></PackagePath>
4344
</None>
45+
<None Include="..\..\..\README.md">
46+
<Pack>True</Pack>
47+
<PackagePath></PackagePath>
48+
</None>
4449
</ItemGroup>
4550

4651
<ItemGroup>
@@ -86,14 +91,8 @@
8691
</ItemGroup>
8792

8893
<ItemGroup>
89-
<PackageReference Include="Aquality.Selenium.Core" Version="3.1.1" />
90-
<PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
94+
<PackageReference Include="Aquality.Selenium.Core" Version="3.1.2" />
9195
<PackageReference Include="WebDriverManager" Version="2.17.4" />
92-
<PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />
93-
<PackageReference Include="OpenCvSharp4.runtime.linux-arm" Version="4.10.0.20240616" />
94-
<PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
95-
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />
96-
<PackageReference Include="OpenCvSharp4_.runtime.ubuntu.20.04-x64" Version="4.10.0.20240616" />
9796
</ItemGroup>
9897

9998
</Project>

Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml

Lines changed: 0 additions & 50 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@
3434
<PrivateAssets>all</PrivateAssets>
3535
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3636
</PackageReference>
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
3838
</ItemGroup>
3939

4040
<ItemGroup>
41+
<ProjectReference Include="..\..\src\Aquality.Selenium.Images\Aquality.Selenium.Images.csproj" />
4142
<ProjectReference Include="..\..\src\Aquality.Selenium\Aquality.Selenium.csproj" />
4243
</ItemGroup>
4344

Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/DevToolsEmulationTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ public void Should_BePossibleTo_SetAndClearDeviceMetricsOverride_WithVersionSpec
5959
{
6060
void setAction(long width, long height, bool isMobile, double scaleFactor)
6161
{
62-
var parameters = new OpenQA.Selenium.DevTools.V128.Emulation.SetDeviceMetricsOverrideCommandSettings
62+
var parameters = new OpenQA.Selenium.DevTools.V129.Emulation.SetDeviceMetricsOverrideCommandSettings
6363
{
64-
DisplayFeature = new OpenQA.Selenium.DevTools.V128.Emulation.DisplayFeature
64+
DisplayFeature = new OpenQA.Selenium.DevTools.V129.Emulation.DisplayFeature
6565
{
66-
Orientation = OpenQA.Selenium.DevTools.V128.Emulation.DisplayFeatureOrientationValues.Horizontal
66+
Orientation = OpenQA.Selenium.DevTools.V129.Emulation.DisplayFeatureOrientationValues.Horizontal
6767
},
6868
Width = width,
6969
Height = height,

Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/ImageLocatorTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Aquality.Selenium.Browsers;
22
using Aquality.Selenium.Elements.Interfaces;
3+
using Aquality.Selenium.Images.Locators;
34
using Aquality.Selenium.Tests.Integration.TestApp.TheInternet.Forms;
45
using NUnit.Framework;
56
using OpenQA.Selenium;

Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/Browser/ChromeDownloadsForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal class ChromeDownloadsForm : Form
1010
{
1111
private const string Address = "chrome://downloads/";
1212

13-
public static By NestedShadowRootLocator => By.Id("moreActionsMenu");
13+
public static By NestedShadowRootLocator => By.CssSelector("cr-toolbar");
1414
public ILabel DownloadsToolbarLabel => FormElement.FindElementInShadowRoot<ILabel>(By.CssSelector("downloads-toolbar"), "Downloads toolbar");
1515
public IList<ILabel> DivElementLabels => FormElement.FindElementsInShadowRoot<ILabel>(By.CssSelector("div"), "div");
1616
public IList<ILabel> MainContainerLabels => FormElement.FindElementsInShadowRoot<ILabel>(By.Id("mainContainer"), "main container");

Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/BrokenImagesForm.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using System.IO;
44
using System;
55
using System.Collections.Generic;
6+
using Aquality.Selenium.Images.Locators;
67

78
namespace Aquality.Selenium.Tests.Integration.TestApp.TheInternet.Forms
89
{

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ stages:
8080
useConfigFile: true
8181
configFilePath: 'GitVersion.yml'
8282

83-
- script: dotnet pack Aquality.Selenium\src\Aquality.Selenium\Aquality.Selenium.csproj -c $(buildConfiguration) -p:Version=$(GitVersion.NuGetVersion) -o $(Build.ArtifactStagingDirectory)
83+
- script: dotnet pack Aquality.Selenium\Aquality.Selenium.sln -c $(buildConfiguration) -p:Version=$(GitVersion.NuGetVersion) -o $(Build.ArtifactStagingDirectory)
8484
displayName: 'Pack to NuGet package'
8585

8686
- task: GitHubRelease@0

0 commit comments

Comments
 (0)