Merge pull request #463 from BlueDotBrigade/Features/191-GherkinScena…

…rios

Merge branch to `main` for: updating to .NET Core 9 & using the latest DatenLokator package

Doc/Notes/Notes.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	  <TargetFramework>net8.0</TargetFramework>
+	  <TargetFramework>net9.0</TargetFramework>
 	<Platforms>x64</Platforms>
     <RootNamespace>Notes</RootNamespace>
     <Version>2.10.0</Version>

Src/BlueDotBrigade.Weevil.Cli/BlueDotBrigade.Weevil.Cli.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<OutputType>Exe</OutputType>
 		<Platforms>x64</Platforms>
 		<AssemblyName>WeevilCli</AssemblyName>

Src/BlueDotBrigade.Weevil.Common/BlueDotBrigade.Weevil.Common.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 	<Platforms>x64</Platforms>
 	<PackageId>BlueDotBrigade.Weevil.Common</PackageId>
     <RootNamespace>BlueDotBrigade.Weevil</RootNamespace>

Src/BlueDotBrigade.Weevil.Core/BlueDotBrigade.Weevil.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Platforms>x64</Platforms>
     <PackageId>BlueDotBrigade.Weevil.Core</PackageId>
     <RootNamespace>BlueDotBrigade.Weevil</RootNamespace>

Src/BlueDotBrigade.Weevil.Gui/BlueDotBrigade.Weevil.Gui.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0-windows</TargetFramework>
+		<TargetFramework>net9.0-windows</TargetFramework>
 		<UseWPF>true</UseWPF>
 		<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
 		<!-- If `AssemblyName` is set to any other value (e.g. WeevilGui.exe) you may experience -->

Src/BlueDotBrigade.Weevil.Plugins/BlueDotBrigade.Weevil.Plugins.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Platforms>x64</Platforms>
 		<RootNamespace>BlueDotBrigade.Weevil.Plugins</RootNamespace>
 		<Version>2.11.0</Version>

Src/BlueDotBrigade.Weevil.PowerShell/BlueDotBrigade.Weevil.PowerShell.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace>BlueDotBrigade.Weevil.PowerShell</RootNamespace>
     <AssemblyName>BlueDotBrigade.Weevil.PowerShell</AssemblyName>
     <OutputType>Library</OutputType>

Src/BlueDotBrigade.Weevil.TestingTools/BlueDotBrigade.Weevil.TestingTools.csproj → Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 	<Platforms>x64</Platforms>
 	<PackageId>BlueDotBrigade.Weevil.TestingTools</PackageId>
-    <RootNamespace>BlueDotBrigade.Weevil.TestingTools</RootNamespace>
+    <RootNamespace>BlueDotBrigade.Weevil.TestTools</RootNamespace>
     <Version>2.11.0</Version>
     <Authors>BlueDotBrigade;</Authors>
 	<Copyright>© 2022 Blue Dot Brigade. All rights reserved.</Copyright>
 	<Owners>Blue Dot Brigade</Owners>
     <Description>Includes types, interfaces, and utilities that are shared by all of the Weevil assemblies.</Description>
 	<ApplicationIcon></ApplicationIcon>
-	<AssemblyName>BlueDotBrigade.Weevil.TestingTools</AssemblyName>
+	<AssemblyName>BlueDotBrigade.Weevil.TestTools</AssemblyName>
 	<Company>Blue Dot Brigade</Company>
   </PropertyGroup>
   <ItemGroup>

Src/BlueDotBrigade.Weevil.TestingTools/Configuration/Reqnroll/Constants.cs → Src/BlueDotBrigade.Weevil.TestTools/Configuration/Reqnroll/Constants.cs

@@ -1,4 +1,4 @@
-namespace BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll
+namespace BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll
 {
 	using System;
 

Src/BlueDotBrigade.Weevil.TestingTools/Data/R.cs → Src/BlueDotBrigade.Weevil.TestTools/Data/R.cs

@@ -1,4 +1,4 @@
-namespace BlueDotBrigade.Weevil.TestingTools.Data
+namespace BlueDotBrigade.Weevil.TestTools.Data
 {
 	using System;
 	using System.Collections.Generic;

Src/BlueDotBrigade.Weevil.TestingTools/Text/RegexHelper.cs → Src/BlueDotBrigade.Weevil.TestTools/Text/RegexHelper.cs

@@ -1,4 +1,4 @@
-namespace BlueDotBrigade.Weevil.TestingTools.Text
+namespace BlueDotBrigade.Weevil.TestTools.Text
 {
 	public class RegexHelper
 	{

Tst/BlueDotBrigade.Weevil.Core-FeatureTests/X.cs → Src/BlueDotBrigade.Weevil.TestTools/X.cs

@@ -1,30 +1,27 @@
-namespace BlueDotBrigade.Weevil
+namespace BlueDotBrigade.Weevil.TestTools
 {
 	/// <summary>
 	/// Represents commonly used parameters in Reqnroll <see href="https://docs.reqnroll.net/latest/automation/step-definitions.html">step definitions</see>.
 	/// </summary>
 	/// <seealso href="https://docs.reqnroll.net/latest/automation/step-definitions.html">Reqnroll: Step Definitions</seealso>
 	/// <seealso href="https://docs.reqnroll.net/latest/automation/cucumber-expressions.html">Reqnroll: Gherkin Expressions</seealso>
 	/// <seealso href="https://regex101.com">Regular Expressions</seealso>
-	internal sealed class X
+	public sealed class X
 	{
-		public const string FileName = @"""([a-zA-Z0-9]+\.[a-zA-Z0-9]{1,4})""";
-
-		public const string FilePath = @"((?:(?<Drv>[A-Za-z]:\\))(?<Dir>([a-zA-Z0-9._-]+\\)*)(?<File>[a-zA-Z0-9._-]+)\.(?<Ext>[a-zA-Z]{1,4}))";
-
-		//public const string TextExpression = @"(plain text|regular expression)"; <<< The Renroll Gherkin statement does not recognize this at compile time
-		public const string TextExpression ="(.*)";
+		public const string AnyText = @"(.*)";
 
 		public const string WholeNumber = @"(\d+)";
 
-		public const string AnyText = @"(.*)";
+		public const string FileName = @"""([a-zA-Z0-9]+\.[a-zA-Z0-9]{1,4})""";
+
+		public const string FilePath = @"((?:(?<Drv>[A-Za-z]:\\))(?<Dir>([a-zA-Z0-9._-]+\\)*)(?<File>[a-zA-Z0-9._-]+)\.(?<Ext>[a-zA-Z]{1,4}))";
 
-		public const string Integer = @"(\d+)";
+		public const string TimePeriod = @"((?:\d+) (?:min|sec))";
 
 		public const string OnOff = @"(on|off)";
 
 		public const string ShowSeverityOption = @"(Show Debug|Show Trace)";
 
 		public const string FilterMode = @"(Plain Text|Regular Expression)";
 	}
-}
+}

Src/BlueDotBrigade.Weevil.Windows/BlueDotBrigade.Weevil.Windows.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <Platforms>x64</Platforms>
     <PackageId>BlueDotBrigade.Weevil.Windows</PackageId>
     <RootNamespace>BlueDotBrigade.Weevil.Windows</RootNamespace>

Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyAnalyzerTests.cs

@@ -4,7 +4,6 @@
 	using global::BlueDotBrigade.Weevil.Analysis;
 	using global::BlueDotBrigade.Weevil.Data;
 	using global::BlueDotBrigade.Weevil.IO;
-	using global::BlueDotBrigade.Weevil.TestingTools.Data;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
 	using NSubstitute;
 

Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyMetricsTests.cs

@@ -5,7 +5,7 @@
 	using global::BlueDotBrigade.Weevil.Analysis;
 	using global::BlueDotBrigade.Weevil.Data; 
 	using global::BlueDotBrigade.Weevil.Linq;
-	using global::BlueDotBrigade.Weevil.TestingTools.Data;
+
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 	[TestClass]

Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <OutputType>Library</OutputType>
     <RootNamespace>BlueDotBrigade.Weevil.Common</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -22,7 +22,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BlueDotBrigade.DatenLokator">
-      <Version>2.0.0</Version>
+      <Version>2.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="MSTest.TestAdapter">
@@ -35,7 +35,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.Common\BlueDotBrigade.Weevil.Common.csproj" />
-    <ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.TestingTools\BlueDotBrigade.Weevil.TestingTools.csproj" />
+    <ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.TestTools\BlueDotBrigade.Weevil.TestTools.csproj" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="..\..\DomainSpecificTerminology.xml">

Tst/BlueDotBrigade.Weevil.Common-UnitTests/Data/RecordCollectionExtensionsTests.cs

@@ -6,7 +6,6 @@
 	using System.Linq;
 	using BlueDotBrigade.Weevil.Data;
 	using BlueDotBrigade.Weevil.Navigation;
-	using BlueDotBrigade.Weevil.TestingTools.Data;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 	[TestClass]

Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs

@@ -0,0 +1,4 @@
+global using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+global using BlueDotBrigade.DatenLokator.TestTools;
+global using BlueDotBrigade.Weevil.TestTools.Data;

Tst/BlueDotBrigade.Weevil.Common-UnitTests/Navigation/RecordSearchTests.cs

@@ -5,7 +5,7 @@
 	using System.Collections.Immutable;
 	using BlueDotBrigade.Weevil.Data;
 	using BlueDotBrigade.Weevil.Navigation;
-	using BlueDotBrigade.Weevil.TestingTools.Data;
+
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 	[TestClass]

Tst/BlueDotBrigade.Weevil.Common-UnitTests/Runtime/Serialization/TypeFactoryTest.cs

@@ -2,8 +2,6 @@
 {
 	using System.Collections.Generic;
 	using System.IO;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
-	using BlueDotBrigade.DatenLokator.TestsTools;
 	using Weevil.Runtime.Serialization;
 
 	[TestClass]

Tst/BlueDotBrigade.Weevil.Common-UnitTests/SimpleCallStackFormatterTests.cs

@@ -1,7 +1,6 @@
 namespace BlueDotBrigade.Weevil.Common
 {
 	using System;
-	using BlueDotBrigade.DatenLokator.TestsTools;
 	using BlueDotBrigade.Weevil.Data;
 	using Microsoft.VisualStudio.TestTools.UnitTesting;
 

Tst/BlueDotBrigade.Weevil.Common-UnitTests/TestEnvironment.cs

@@ -1,8 +1,7 @@
 namespace BlueDotBrigade.Weevil.Common
 {
 	using System;
-	using BlueDotBrigade.DatenLokator.TestsTools.Configuration;
-	using Microsoft.VisualStudio.TestTools.UnitTesting;
+	using BlueDotBrigade.DatenLokator.TestTools.Configuration;
 
 	[TestClass]
 	public class TestEnvironment

Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<OutputType>Library</OutputType>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
@@ -23,7 +23,7 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
-		<PackageReference Include="BlueDotBrigade.DatenLokator" Version="2.0.0" />
+		<PackageReference Include="BlueDotBrigade.DatenLokator" Version="2.1.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="NSubstitute" Version="5.3.0" />
 		<PackageReference Include="Reqnroll.MsTest" Version="2.2.1" />
@@ -35,7 +35,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.Common\BlueDotBrigade.Weevil.Common.csproj" />
 		<ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.Core\BlueDotBrigade.Weevil.Core.csproj" />
-		<ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.TestingTools\BlueDotBrigade.Weevil.TestingTools.csproj" />
+		<ProjectReference Include="..\..\Src\BlueDotBrigade.Weevil.TestTools\BlueDotBrigade.Weevil.TestTools.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 		<Content Include="..\..\DomainSpecificTerminology.xml">

Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs

@@ -1,6 +1,6 @@
 namespace BlueDotBrigade.Weevil.Configuration.Reqnroll
 {
-	using BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll;
+	using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll;
 
 	/// <summary>
 	/// Represents Reqnroll events that execute before & after every Gherkin scenario.

Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs

@@ -1,8 +1,8 @@
 namespace BlueDotBrigade.Weevil.Configuration.Reqnroll
 {
-	using BlueDotBrigade.DatenLokator.TestsTools.Configuration;
+	using BlueDotBrigade.DatenLokator.TestTools.Configuration;
 	using BlueDotBrigade.Weevil.Diagnostics;
-	using BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll;
+	using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll;
 
 	/// <summary>
 	/// Represents Reqnroll events that execute before & after every test run.