Skip to content

Commit

Permalink
Merge pull request #267 from q2ebanking/netstandard2.0
Browse files Browse the repository at this point in the history
Updated target framework for all packages to be .NET Standard 2.0 only
  • Loading branch information
AutomationPanda authored Jun 3, 2023
2 parents a681ae1 + 5d420f4 commit 7954b87
Show file tree
Hide file tree
Showing 15 changed files with 127 additions and 101 deletions.
2 changes: 1 addition & 1 deletion Boa.Constrictor.Example/Boa.Constrictor.Example.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Version>3.1.0</Version>
<Version>4.0.0</Version>
<Authors>Pandy Knight and the PrecisionLender SETs</Authors>
<Company>Q2</Company>
<Title>Boa.Constrictor.Example</Title>
Expand Down
8 changes: 8 additions & 0 deletions Boa.Constrictor.Example/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Boa.Constrictor.RestSharp/Boa.Constrictor.RestSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net7.0;netstandard2.0</TargetFrameworks>
<Version>3.2.0</Version>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Version>4.0.0</Version>
<Authors>Pandy Knight and the PrecisionLender SETs</Authors>
<Company>Q2</Company>
<Title>Boa.Constrictor.RestSharp</Title>
Expand Down Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="Boa.Constrictor.Screenplay" Version="3.1.0" />
<PackageReference Include="Boa.Constrictor.Screenplay" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug'">
Expand Down
8 changes: 8 additions & 0 deletions Boa.Constrictor.RestSharp/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Boa.Constrictor.Screenplay/Boa.Constrictor.Screenplay.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net7.0;netstandard2.0</TargetFrameworks>
<Version>3.1.0</Version>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Version>4.0.0</Version>
<Authors>Pandy Knight and the PrecisionLender SETs</Authors>
<Company>Q2</Company>
<Title>Boa.Constrictor.Screenplay</Title>
Expand Down
8 changes: 8 additions & 0 deletions Boa.Constrictor.Screenplay/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Boa.Constrictor.Selenium/Boa.Constrictor.Selenium.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net7.0;netstandard2.0</TargetFrameworks>
<Version>3.1.0-alpha3</Version>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Version>4.0.0</Version>
<Authors>Pandy Knight and the PrecisionLender SETs</Authors>
<Company>Q2</Company>
<Title>Boa.Constrictor.Selenium</Title>
Expand Down Expand Up @@ -32,7 +32,7 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="Boa.Constrictor.Screenplay" Version="3.1.0" />
<PackageReference Include="Boa.Constrictor.Screenplay" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug'">
Expand Down
23 changes: 7 additions & 16 deletions Boa.Constrictor.Selenium/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,22 @@ 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 `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

- 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
Expand Down
121 changes: 60 additions & 61 deletions Boa.Constrictor.Selenium/Tasks/PerformInFrame.cs
Original file line number Diff line number Diff line change
@@ -1,75 +1,74 @@
using System;
using Boa.Constrictor.Screenplay;
// using Boa.Constrictor.Screenplay;

namespace Boa.Constrictor.Selenium
{
/// <summary>
/// Performs a list of tasks within a frame then switches to DefaultContent.
/// </summary>
public class PerformInFrame : ITask
{
#region Constructors
// namespace Boa.Constrictor.Selenium
// {
// /// <summary>
// /// Performs a list of tasks within a frame then switches to DefaultContent.
// /// </summary>
// public class PerformInFrame : ITask
// {
// #region Constructors

/// <summary>
/// Private constructor.
/// (Use static builder methods to construct.)
/// </summary>
/// <param name="locator">The locator.</param>
/// <param name="tasks">The Task list.</param>
private PerformInFrame(IWebLocator locator, ITask[] tasks)
{
Locator = locator;
Tasks = tasks;
}
// /// <summary>
// /// Private constructor.
// /// (Use static builder methods to construct.)
// /// </summary>
// /// <param name="locator">The locator.</param>
// /// <param name="tasks">The Task list.</param>
// private PerformInFrame(IWebLocator locator, ITask[] tasks)
// {
// Locator = locator;
// Tasks = tasks;
// }

#endregion
// #endregion

#region Properties
// #region Properties

/// <summary>
/// The locator.
/// </summary>
private IWebLocator Locator { get; }
// /// <summary>
// /// The locator.
// /// </summary>
// private IWebLocator Locator { get; }

/// <summary>
/// The Task list.
/// </summary>
private ITask[] Tasks { get; }
// /// <summary>
// /// The Task list.
// /// </summary>
// private ITask[] Tasks { get; }

#endregion
// #endregion

#region Builder Methods
// #region Builder Methods

/// <summary>
/// Builder method.
/// </summary>
/// <param name="locator">The locator.</param>
/// <param name="tasks">The Task list.</param>
public static PerformInFrame At(IWebLocator locator, params ITask[] tasks) =>
new PerformInFrame(locator, tasks);
// /// <summary>
// /// Builder method.
// /// </summary>
// /// <param name="locator">The locator.</param>
// /// <param name="tasks">The Task list.</param>
// public static PerformInFrame At(IWebLocator locator, params ITask[] tasks) =>
// new PerformInFrame(locator, tasks);

#endregion
// #endregion

#region Methods
// #region Methods

/// <summary>
/// Runs the Tasks in the order given by the list.
/// </summary>
/// <param name="actor">The Screenplay Actor.</param>
public void PerformAs(IActor actor)
{
actor.AttemptsTo(SwitchFrame.To(Locator));
actor.AttemptsTo(RunTasks.InOrder(Tasks));
actor.AttemptsTo(SwitchFrame.ToDefaultContent());
}
// /// <summary>
// /// Runs the Tasks in the order given by the list.
// /// </summary>
// /// <param name="actor">The Screenplay Actor.</param>
// public void PerformAs(IActor actor)
// {
// actor.AttemptsTo(SwitchFrame.To(Locator));
// actor.AttemptsTo(RunTasks.InOrder(Tasks));
// actor.AttemptsTo(SwitchFrame.ToDefaultContent());
// }

/// <summary>
/// Returns a description of the Task.
/// </summary>
/// <returns></returns>
public override string ToString() =>
$"run Tasks within the frame '{Locator.Description}'";
// /// <summary>
// /// Returns a description of the Task.
// /// </summary>
// /// <returns></returns>
// public override string ToString() =>
// $"run Tasks within the frame '{Locator.Description}'";

#endregion
}
}
// #endregion
// }
// }
6 changes: 3 additions & 3 deletions Boa.Constrictor.Xunit/Boa.Constrictor.Xunit.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net7.0;netstandard2.0</TargetFrameworks>
<Version>3.1.0</Version>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Version>4.0.0</Version>
<Authors>Keith Tremorin, Pandy Knight, and the PrecisionLender SETs</Authors>
<Company>Q2</Company>
<Title>Boa.Constrictor.Xunit</Title>
Expand Down Expand Up @@ -31,7 +31,7 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="Boa.Constrictor.Screenplay" Version="3.1.0" />
<PackageReference Include="Boa.Constrictor.Screenplay" Version="4.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug'">
Expand Down
8 changes: 8 additions & 0 deletions Boa.Constrictor.Xunit/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Boa.Constrictor/Boa.Constrictor.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net5.0;net7.0;netstandard2.0</TargetFrameworks>
<Version>3.2.0</Version>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<Version>4.0.0</Version>
<Authors>Pandy Knight and the PrecisionLender SETs</Authors>
<Company>Q2</Company>
<Title>Boa.Constrictor</Title>
Expand All @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Release'">
<PackageReference Include="Boa.Constrictor.RestSharp" Version="3.2.0" />
<PackageReference Include="Boa.Constrictor.Selenium" Version="3.0.3" />
<PackageReference Include="Boa.Constrictor.RestSharp" Version="4.0.0" />
<PackageReference Include="Boa.Constrictor.Selenium" Version="4.0.0" />
</ItemGroup>

</Project>
8 changes: 8 additions & 0 deletions Boa.Constrictor/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions docs/pages/main-docs/project/requirements.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/pages/main-docs/tutorial/part-3-rest-api-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

```
Expand Down

0 comments on commit 7954b87

Please sign in to comment.