From 71bfa7f74d6441d130118dd26482415867ef278e Mon Sep 17 00:00:00 2001 From: Pandy Knight Date: Sun, 28 May 2023 21:18:18 -0400 Subject: [PATCH 1/4] Use only netstandard2.0 --- Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj | 2 +- Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj | 2 +- Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj | 2 +- Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj | 2 +- Boa.Constrictor/Boa.Constrictor.csproj | 2 +- docs/pages/main-docs/tutorial/part-3-rest-api-testing.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj b/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj index 5f3bcf6..1c4cc8f 100644 --- a/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj +++ b/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj @@ -1,7 +1,7 @@ - net5.0;net7.0;netstandard2.0 + netstandard2.0 3.2.0 Pandy Knight and the PrecisionLender SETs Q2 diff --git a/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj b/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj index 4c297e4..b7e1b2f 100644 --- a/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj +++ b/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj @@ -1,7 +1,7 @@ - net5.0;net7.0;netstandard2.0 + netstandard2.0 3.1.0 Pandy Knight and the PrecisionLender SETs Q2 diff --git a/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj b/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj index 850b826..06646ae 100644 --- a/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj +++ b/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj @@ -1,7 +1,7 @@  - net5.0;net7.0;netstandard2.0 + netstandard2.0 3.1.0-alpha3 Pandy Knight and the PrecisionLender SETs Q2 diff --git a/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj b/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj index 0999962..7dfbbf1 100644 --- a/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj +++ b/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj @@ -1,7 +1,7 @@ - net5.0;net7.0;netstandard2.0 + netstandard2.0 3.1.0 Keith Tremorin, Pandy Knight, and the PrecisionLender SETs Q2 diff --git a/Boa.Constrictor/Boa.Constrictor.csproj b/Boa.Constrictor/Boa.Constrictor.csproj index 301e93b..930d991 100644 --- a/Boa.Constrictor/Boa.Constrictor.csproj +++ b/Boa.Constrictor/Boa.Constrictor.csproj @@ -1,7 +1,7 @@  - net5.0;net7.0;netstandard2.0 + netstandard2.0 3.2.0 Pandy Knight and the PrecisionLender SETs Q2 diff --git a/docs/pages/main-docs/tutorial/part-3-rest-api-testing.md b/docs/pages/main-docs/tutorial/part-3-rest-api-testing.md index 5dc7598..ac41f78 100644 --- a/docs/pages/main-docs/tutorial/part-3-rest-api-testing.md +++ b/docs/pages/main-docs/tutorial/part-3-rest-api-testing.md @@ -1006,7 +1006,7 @@ However, you should consider using a better output path when running tests in a Rerun the tests, and make sure they all pass. Then, check the assembly directory for the dumped files. (The assembly file is most likely located at -`boa-constrictor\Boa.Constrictor.Example\bin\Debug\net5.0`.) +`boa-constrictor\Boa.Constrictor.Example\bin\Debug\net7.0`.) It should contain the following directories: ``` From 111b7ccc623b04099c1d669f1358160cd06322d2 Mon Sep 17 00:00:00 2001 From: Pandy Knight Date: Mon, 29 May 2023 11:12:48 -0400 Subject: [PATCH 2/4] Updated requirements page --- docs/pages/main-docs/project/requirements.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/pages/main-docs/project/requirements.md b/docs/pages/main-docs/project/requirements.md index 34618aa..dec9203 100644 --- a/docs/pages/main-docs/project/requirements.md +++ b/docs/pages/main-docs/project/requirements.md @@ -10,13 +10,9 @@ Boa Constrictor is a .NET project written in C#. ## Target Frameworks -The `Boa.Constrictor` project targets the following frameworks: - -* .NET 5.0 -* .NET 7.0 -* .NET Standard 2.0 - -These targets make Boa Constrictor compatible with both .NET Framework and .NET Core projects. +The `Boa.Constrictor*` projects target **.NET Standard 2.0**. +These targets make Boa Constrictor compatible with .NET 5+, .NET Framework, and .NET Core projects. +The `*.UnitTests` projects target **.NET 7**. ## Dependencies From 57c9e8af43a85ad508d4a12d8fd49e5acd5f1466 Mon Sep 17 00:00:00 2001 From: Pandy Knight Date: Mon, 29 May 2023 14:46:50 -0400 Subject: [PATCH 3/4] Boa Constrictor 4.0.0 --- .../Boa.Constrictor.Example.csproj | 2 +- Boa.Constrictor.Example/CHANGELOG.md | 8 ++++++++ .../Boa.Constrictor.RestSharp.csproj | 4 ++-- Boa.Constrictor.RestSharp/CHANGELOG.md | 8 ++++++++ .../Boa.Constrictor.Screenplay.csproj | 2 +- Boa.Constrictor.Screenplay/CHANGELOG.md | 8 ++++++++ .../Boa.Constrictor.Selenium.csproj | 4 ++-- Boa.Constrictor.Selenium/CHANGELOG.md | 20 +++++-------------- .../Boa.Constrictor.Xunit.csproj | 4 ++-- Boa.Constrictor.Xunit/CHANGELOG.md | 8 ++++++++ Boa.Constrictor/Boa.Constrictor.csproj | 6 +++--- Boa.Constrictor/CHANGELOG.md | 8 ++++++++ 12 files changed, 56 insertions(+), 26 deletions(-) diff --git a/Boa.Constrictor.Example/Boa.Constrictor.Example.csproj b/Boa.Constrictor.Example/Boa.Constrictor.Example.csproj index 935cc37..be46964 100644 --- a/Boa.Constrictor.Example/Boa.Constrictor.Example.csproj +++ b/Boa.Constrictor.Example/Boa.Constrictor.Example.csproj @@ -2,7 +2,7 @@ net7.0 - 3.1.0 + 4.0.0 Pandy Knight and the PrecisionLender SETs Q2 Boa.Constrictor.Example diff --git a/Boa.Constrictor.Example/CHANGELOG.md b/Boa.Constrictor.Example/CHANGELOG.md index bf27f63..561a25e 100644 --- a/Boa.Constrictor.Example/CHANGELOG.md +++ b/Boa.Constrictor.Example/CHANGELOG.md @@ -21,6 +21,14 @@ Versioning is performed purely for tracking changes. (none) +## [4.0.0] - 2023-05-29 + +### Changed + +- Removed targets for `net5.0` and `net7.0` +- Now targets only `netstandard2.0` + + ## [3.1.0] - 2023-05-28 ### Changed diff --git a/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj b/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj index 1c4cc8f..1e945aa 100644 --- a/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj +++ b/Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.2.0 + 4.0.0 Pandy Knight and the PrecisionLender SETs Q2 Boa.Constrictor.RestSharp @@ -31,7 +31,7 @@ - + diff --git a/Boa.Constrictor.RestSharp/CHANGELOG.md b/Boa.Constrictor.RestSharp/CHANGELOG.md index 5b4f52b..afb06b0 100644 --- a/Boa.Constrictor.RestSharp/CHANGELOG.md +++ b/Boa.Constrictor.RestSharp/CHANGELOG.md @@ -20,6 +20,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 (none) +## [4.0.0] - 2023-05-29 + +### Changed + +- Removed targets for `net5.0` and `net7.0` +- Now targets only `netstandard2.0` + + ## [3.2.0] - 2023-05-25 - Updated RestSharp to 110.2.0 diff --git a/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj b/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj index b7e1b2f..664c5ba 100644 --- a/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj +++ b/Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.1.0 + 4.0.0 Pandy Knight and the PrecisionLender SETs Q2 Boa.Constrictor.Screenplay diff --git a/Boa.Constrictor.Screenplay/CHANGELOG.md b/Boa.Constrictor.Screenplay/CHANGELOG.md index 10ae6cf..04b10f6 100644 --- a/Boa.Constrictor.Screenplay/CHANGELOG.md +++ b/Boa.Constrictor.Screenplay/CHANGELOG.md @@ -20,6 +20,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 (none) +## [4.0.0] - 2023-05-29 + +### Changed + +- Removed targets for `net5.0` and `net7.0` +- Now targets only `netstandard2.0` + + ## [3.1.0] - 2023-05-24 ### Changed diff --git a/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj b/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj index 06646ae..b4e5272 100644 --- a/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj +++ b/Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.1.0-alpha3 + 4.0.0 Pandy Knight and the PrecisionLender SETs Q2 Boa.Constrictor.Selenium @@ -32,7 +32,7 @@ - + diff --git a/Boa.Constrictor.Selenium/CHANGELOG.md b/Boa.Constrictor.Selenium/CHANGELOG.md index 65e9f02..7a9e0ae 100644 --- a/Boa.Constrictor.Selenium/CHANGELOG.md +++ b/Boa.Constrictor.Selenium/CHANGELOG.md @@ -20,31 +20,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 (none) -## [3.1.0-alpha3] - 2023-05-25 - -### Changed - -- Added automatic waiting to `SwitchFrame` - - -## [3.1.0-alpha2] - 2023-05-24 - -### Changed - -- Updated `Boa.Constrictor.Screenplay` version to `3.1.0` - - -## [3.1.0-alpha1] - 2023-01-27 +## [4.0.0] - 2023-05-29 ### Added - Added `SwitchFrame` and `PerformInFrame` Tasks +- Added automatic waiting to `SwitchFrame` +- Warning: we are investigating some flaky behavior with these new Tasks ### Changed - Changed the internal strategy for finding elements with locators - Removed the `Query` property from `IWebLocator` - Added the `FindElement(s)` methods to `IWebLocator` +- Removed targets for `net5.0` and `net7.0` +- Now targets only `netstandard2.0` ## [3.0.3] - 2022-12-13 diff --git a/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj b/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj index 7dfbbf1..d62da67 100644 --- a/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj +++ b/Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.1.0 + 4.0.0 Keith Tremorin, Pandy Knight, and the PrecisionLender SETs Q2 Boa.Constrictor.Xunit @@ -31,7 +31,7 @@ - + diff --git a/Boa.Constrictor.Xunit/CHANGELOG.md b/Boa.Constrictor.Xunit/CHANGELOG.md index 3f787c1..74b589f 100644 --- a/Boa.Constrictor.Xunit/CHANGELOG.md +++ b/Boa.Constrictor.Xunit/CHANGELOG.md @@ -9,6 +9,14 @@ Its format is based on Keep a Changelog, and this project adheres to Semantic Ve (none) +## [4.0.0] - 2023-05-29 + +### Changed + +- Removed targets for `net5.0` and `net7.0` +- Now targets only `netstandard2.0` + + ## [3.1.0] - 2023-05-24 ### Changed diff --git a/Boa.Constrictor/Boa.Constrictor.csproj b/Boa.Constrictor/Boa.Constrictor.csproj index 930d991..e7df5cb 100644 --- a/Boa.Constrictor/Boa.Constrictor.csproj +++ b/Boa.Constrictor/Boa.Constrictor.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 3.2.0 + 4.0.0 Pandy Knight and the PrecisionLender SETs Q2 Boa.Constrictor @@ -27,8 +27,8 @@ - - + + diff --git a/Boa.Constrictor/CHANGELOG.md b/Boa.Constrictor/CHANGELOG.md index 129ee95..1e92cce 100644 --- a/Boa.Constrictor/CHANGELOG.md +++ b/Boa.Constrictor/CHANGELOG.md @@ -20,6 +20,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 (none) +## [4.0.0] - 2023-05-29 + +### Changed + +- Removed targets for `net5.0` and `net7.0` +- Now targets only `netstandard2.0` + + ## [3.2.0] - 2023-05-25 ### Changed From 5d420f47397f64612db020872d9bebf6a5199519 Mon Sep 17 00:00:00 2001 From: Pandy Knight Date: Thu, 1 Jun 2023 11:53:21 -0400 Subject: [PATCH 4/4] Commented out PerformInFrame until we can fix it --- Boa.Constrictor.Selenium/CHANGELOG.md | 7 +- .../Tasks/PerformInFrame.cs | 121 +++++++++--------- 2 files changed, 64 insertions(+), 64 deletions(-) diff --git a/Boa.Constrictor.Selenium/CHANGELOG.md b/Boa.Constrictor.Selenium/CHANGELOG.md index 7a9e0ae..b0cbc6b 100644 --- a/Boa.Constrictor.Selenium/CHANGELOG.md +++ b/Boa.Constrictor.Selenium/CHANGELOG.md @@ -24,9 +24,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Added `SwitchFrame` and `PerformInFrame` Tasks -- Added automatic waiting to `SwitchFrame` -- Warning: we are investigating some flaky behavior with these new Tasks +- Added `SwitchFrame` Task with automatic waiting +- Addd commented code for a potential `PerformInFrame` Task + - This one is currently exhibiting flaky errors + - We must investigate further before releasing it officially ### Changed diff --git a/Boa.Constrictor.Selenium/Tasks/PerformInFrame.cs b/Boa.Constrictor.Selenium/Tasks/PerformInFrame.cs index 0b2ec7d..4aaaf51 100644 --- a/Boa.Constrictor.Selenium/Tasks/PerformInFrame.cs +++ b/Boa.Constrictor.Selenium/Tasks/PerformInFrame.cs @@ -1,75 +1,74 @@ -using System; -using Boa.Constrictor.Screenplay; +// using Boa.Constrictor.Screenplay; -namespace Boa.Constrictor.Selenium -{ - /// - /// Performs a list of tasks within a frame then switches to DefaultContent. - /// - public class PerformInFrame : ITask - { - #region Constructors +// namespace Boa.Constrictor.Selenium +// { +// /// +// /// Performs a list of tasks within a frame then switches to DefaultContent. +// /// +// public class PerformInFrame : ITask +// { +// #region Constructors - /// - /// Private constructor. - /// (Use static builder methods to construct.) - /// - /// The locator. - /// The Task list. - private PerformInFrame(IWebLocator locator, ITask[] tasks) - { - Locator = locator; - Tasks = tasks; - } +// /// +// /// Private constructor. +// /// (Use static builder methods to construct.) +// /// +// /// The locator. +// /// The Task list. +// private PerformInFrame(IWebLocator locator, ITask[] tasks) +// { +// Locator = locator; +// Tasks = tasks; +// } - #endregion +// #endregion - #region Properties +// #region Properties - /// - /// The locator. - /// - private IWebLocator Locator { get; } +// /// +// /// The locator. +// /// +// private IWebLocator Locator { get; } - /// - /// The Task list. - /// - private ITask[] Tasks { get; } +// /// +// /// The Task list. +// /// +// private ITask[] Tasks { get; } - #endregion +// #endregion - #region Builder Methods +// #region Builder Methods - /// - /// Builder method. - /// - /// The locator. - /// The Task list. - public static PerformInFrame At(IWebLocator locator, params ITask[] tasks) => - new PerformInFrame(locator, tasks); +// /// +// /// Builder method. +// /// +// /// The locator. +// /// The Task list. +// public static PerformInFrame At(IWebLocator locator, params ITask[] tasks) => +// new PerformInFrame(locator, tasks); - #endregion +// #endregion - #region Methods +// #region Methods - /// - /// Runs the Tasks in the order given by the list. - /// - /// The Screenplay Actor. - public void PerformAs(IActor actor) - { - actor.AttemptsTo(SwitchFrame.To(Locator)); - actor.AttemptsTo(RunTasks.InOrder(Tasks)); - actor.AttemptsTo(SwitchFrame.ToDefaultContent()); - } +// /// +// /// Runs the Tasks in the order given by the list. +// /// +// /// The Screenplay Actor. +// public void PerformAs(IActor actor) +// { +// actor.AttemptsTo(SwitchFrame.To(Locator)); +// actor.AttemptsTo(RunTasks.InOrder(Tasks)); +// actor.AttemptsTo(SwitchFrame.ToDefaultContent()); +// } - /// - /// Returns a description of the Task. - /// - /// - public override string ToString() => - $"run Tasks within the frame '{Locator.Description}'"; +// /// +// /// Returns a description of the Task. +// /// +// /// +// public override string ToString() => +// $"run Tasks within the frame '{Locator.Description}'"; - #endregion - } -} \ No newline at end of file +// #endregion +// } +// } \ No newline at end of file