Skip to content

Add Aquality.Selenium.Images package to separate OpenCV dependency +semver: feature #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 9, 2024
Merged

Add Aquality.Selenium.Images package to separate OpenCV dependency +semver: feature #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a4bc63
Add Aquality.Selenium.Support package to separate OpenCV dependency
mialeska Oct 8, 2024
106f34f
Rename extension package to Aquality.Selenium.Images
mialeska Oct 9, 2024
c55717c
Rename namespace to match new package name
mialeska Oct 9, 2024
1bf0728
update the pipeline
mialeska Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Aquality.Selenium/Aquality.Selenium.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29009.5
# Visual Studio Version 17
VisualStudioVersion = 17.8.34309.116
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{43453468-EBA2-4800-B6CA-765FA722BA61}"
EndProject
Expand All @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aquality.Selenium.Tests", "
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{999ED05C-B034-45A1-8F11-2B519C308250}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aquality.Selenium.Support", "src\Aquality.Selenium.Support\Aquality.Selenium.Support.csproj", "{72EB3821-6AB9-465C-9B88-D878D677C754}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,13 +27,18 @@ Global
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8}.Release|Any CPU.Build.0 = Release|Any CPU
{72EB3821-6AB9-465C-9B88-D878D677C754}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72EB3821-6AB9-465C-9B88-D878D677C754}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72EB3821-6AB9-465C-9B88-D878D677C754}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72EB3821-6AB9-465C-9B88-D878D677C754}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B0E3FDB8-CF47-40D2-AC0E-FB12F66D1F26} = {43453468-EBA2-4800-B6CA-765FA722BA61}
{856AE8E1-31EF-49A1-B6EB-C72BF12432F8} = {999ED05C-B034-45A1-8F11-2B519C308250}
{72EB3821-6AB9-465C-9B88-D878D677C754} = {43453468-EBA2-4800-B6CA-765FA722BA61}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0AC8C847-FF57-4A72-8E22-F0947E17DFAF}
Expand Down
50 changes: 50 additions & 0 deletions Aquality.Selenium/src/Aquality.Selenium.Support/Aquality.Selenium.Support.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Authors>aquality automation committers</Authors>
<Company>aquality automation</Company>
<Description>Support classes for Aquality.Selenium, such as ByImage locator</Description>
<PackageDescription>Support classes for Aquality.Selenium, such as ByImage locator</PackageDescription>
<PackageLicenseExpression></PackageLicenseExpression>
<RepositoryUrl>https://github.com/aquality-automation/aquality-selenium-dotnet</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>selenium webdriver browser automation image locator</PackageTags>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Copyright>Copyright 2024 Aquality Automation</Copyright>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
<DocumentationFile>Aquality.Selenium.Support.xml</DocumentationFile>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Aquality.Selenium\Aquality.Selenium.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\README.md">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
<PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4.runtime.linux-arm" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4_.runtime.ubuntu.20.04-x64" Version="4.10.0.20240616" />
</ItemGroup>

</Project>
58 changes: 58 additions & 0 deletions Aquality.Selenium/src/Aquality.Selenium.Support/Aquality.Selenium.Support.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...y.Selenium/Elements/Interfaces/ByImage.cs → ...lity.Selenium.Support/Locators/ByImage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using System.IO;
using System.Linq;

namespace Aquality.Selenium.Elements.Interfaces
namespace Aquality.Selenium.Support.Locators
{
/// <summary>
/// Locator to search elements by image.
Expand Down
13 changes: 6 additions & 7 deletions Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<RepositoryType>git</RepositoryType>
<PackageTags>selenium webdriver browser automation</PackageTags>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Copyright>Copyright 2024 Aquality Automation</Copyright>
<IsPackable>true</IsPackable>
</PropertyGroup>
Expand Down Expand Up @@ -41,6 +42,10 @@
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
<None Include="..\..\..\README.md">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -86,14 +91,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aquality.Selenium.Core" Version="3.1.1" />
<PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
<PackageReference Include="Aquality.Selenium.Core" Version="3.1.2" />
<PackageReference Include="WebDriverManager" Version="2.17.4" />
<PackageReference Include="OpenCvSharp4" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4.runtime.linux-arm" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20240616" />
<PackageReference Include="OpenCvSharp4_.runtime.ubuntu.20.04-x64" Version="4.10.0.20240616" />
</ItemGroup>

</Project>
50 changes: 0 additions & 50 deletions Aquality.Selenium/src/Aquality.Selenium/Aquality.Selenium.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Aquality.Selenium/tests/Aquality.Selenium.Tests/Aquality.Selenium.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Aquality.Selenium.Support\Aquality.Selenium.Support.csproj" />
<ProjectReference Include="..\..\src\Aquality.Selenium\Aquality.Selenium.csproj" />
</ItemGroup>

Expand Down
1 change: 1 addition & 0 deletions Aquality.Selenium/tests/Aquality.Selenium.Tests/Integration/ImageLocatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Aquality.Selenium.Browsers;
using Aquality.Selenium.Elements.Interfaces;
using Aquality.Selenium.Support.Locators;
using Aquality.Selenium.Tests.Integration.TestApp.TheInternet.Forms;
using NUnit.Framework;
using OpenQA.Selenium;
Expand Down
1 change: 1 addition & 0 deletions ...m/tests/Aquality.Selenium.Tests/Integration/TestApp/TheInternet/Forms/BrokenImagesForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.IO;
using System;
using System.Collections.Generic;
using Aquality.Selenium.Support.Locators;

namespace Aquality.Selenium.Tests.Integration.TestApp.TheInternet.Forms
{
Expand Down
Loading