Merge remote-tracking branch 'origin/main' into fix-123-dispose-testt…

…hread-container

* origin/main:
  Extract cucumber expression detection heuristic to an interface
  fix test artifact folder calculation
  Restructure solution folders (#141)
  cleanup CHANGELOG.md
  ignore generated file
  remove generated file
  bump version
  Add Microsoft.Extensions.DependencyInjection integration plugin (#94)
  Fix #56 autofac ambiguous stepdef and hook required #127 issue (#139)
  Reduce target framework of Reqnroll to netstandard2.0 (#130)
  Fix StackOverflowException when using [StepArgumentTransformation] with same input and output type (#136)

# Conflicts:
#	CHANGELOG.md

.gitignore

@@ -375,7 +375,7 @@ GitExtensions.settings.backup
 *.AssemblyHooks.vb
 
 # Version for Specs
-Tests/Reqnroll.Specs/NuGetPackageVersion.cs
+Tests/**/NuGetPackageVersion.cs
 
 #Analytics
 AppInsightsInstrumentationKey.cs
@@ -385,3 +385,4 @@ docs/_build/*
 /docs/Lib/
 /docs/Scripts/
 /docs/pyvenv.cfg
+nCrunchTemp*.csproj

.ncrunch/Reqnroll.Autofac.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>

.ncrunch/Reqnroll.CustomPlugin.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
     <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.ExternalData.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>

.ncrunch/Reqnroll.Generator.v3.ncrunchproject

@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>

.ncrunch/Reqnroll.GeneratorTests.v3.ncrunchproject

@@ -1,6 +1,5 @@
 <ProjectConfiguration>
   <Settings>
     <ConsiderInconclusiveTestsAsPassing>True</ConsiderInconclusiveTestsAsPassing>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.MSTest.Generator.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.MSTest.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
     <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.NUnit.Generator.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <NUnit3Enabled>False</NUnit3Enabled>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.NUnit.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <NUnit3Enabled>False</NUnit3Enabled>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.PluginTests.v3.ncrunchproject

@@ -1,5 +1,18 @@
 <ProjectConfiguration>
   <Settings>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+    <AdditionalFilesToIncludeForProject>
+      <Value>ExternalData\SampleFiles\**.*</Value>
+    </AdditionalFilesToIncludeForProject>
+    <IgnoredTests>
+      <NamedTestSelector>
+        <TestName>Reqnroll.PluginTests.Generator.GeneratorPluginLoaderTests.LoadPlugin_LoadXUnitSuccessfully</TestName>
+      </NamedTestSelector>
+      <NamedTestSelector>
+        <TestName>Reqnroll.PluginTests.Infrastructure.WindsorPluginTests.Can_load_Windsor_plugin</TestName>
+      </NamedTestSelector>
+      <NamedTestSelector>
+        <TestName>Reqnroll.PluginTests.Infrastructure.MicrosoftExtensionsDependencyInjectionTests.LoadPlugin_MicrosoftExtensionsDependencyInjection_ShouldNotBeNull</TestName>
+      </NamedTestSelector>
+    </IgnoredTests>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.SpecFlowCompatibility.Generator.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.SpecFlowCompatibility.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.Templates.DotNet.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
     <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.Tools.MsBuild.Generation.v3.ncrunchproject

@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.Verify.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,7 @@
 <ProjectConfiguration>
   <Settings>
     <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
+      <Value>TargetFrameworks = netstandard2.0</Value>
     </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.Windsor.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>

.ncrunch/Reqnroll.v3.ncrunchproject

@@ -1,7 +1,3 @@
 <ProjectConfiguration>
-  <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = netstandard2.0</Value>
-    </CustomBuildProperties>
-  </Settings>
+  <Settings />
 </ProjectConfiguration>

.ncrunch/Reqnroll.xUnit.Generator.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <XUnit2Enabled>False</XUnit2Enabled>
   </Settings>
 </ProjectConfiguration>

.ncrunch/Reqnroll.xUnit.ReqnrollPlugin.v3.ncrunchproject

@@ -1,8 +1,5 @@
 <ProjectConfiguration>
   <Settings>
-    <CustomBuildProperties>
-      <Value>TargetFrameworks = net6.0</Value>
-    </CustomBuildProperties>
-    <IgnoreThisComponentCompletely>False</IgnoreThisComponentCompletely>
+    <XUnit2Enabled>False</XUnit2Enabled>
   </Settings>
 </ProjectConfiguration>

CHANGELOG.md

@@ -1,18 +1,22 @@
 # [vNext]
 
-* Fix for #44 in which user code namespaces that included "Reqnroll" within them caused the code generation to fail
-* Include built-in dependency injection framework (BoDi) to the main repository as "Reqnroll.BoDi" based on v1.5 of [BoDi](https://github.com/SpecFlowOSS/BoDi/)
-* Resolve dependencies of [BeforeTestRun] / [AfterTestRun] hooks from the 
-  test run (global) context instead of the test thread context.
-* Support for PriorityAttribute in MsTest adapter
-* Support for Scenario Outline / DataRowAttribute in MsTest adapter
-* Fix for #81 in which Cucumber Expressions fail when two enums or two custom types with the same short name (differing namespaces) are used as parameters
-* Fix: Adding @ignore to an Examples block generates invalid code for NUnit v3+ (#103)
-* Fix: #111 @ignore attribute is not inherited to the scenarios from Rule
-* Support for JSON files added to SpecFlow.ExternalData
-* Fix: #120 Capture ExecutionContext after every binding invoke
+* MsTest: Support for PriorityAttribute
+* MsTest: Support for `[DataRow]` attribute for scenario outlines (default behavior)
 * MsTest: Use ClassCleanupBehavior.EndOfClass instead of custom implementation (preparation for MsTest v4.0)
-* Fix: #123 Dispose objects registred in TestThread-Container correctly 
+* SpecFlow.ExternalData: Support for loading data from JSON files
+* Reqnroll.Microsoft.Extensions.DependencyInjection: Port [SolidToken.SpecFlow.DependencyInjection](https://github.com/solidtoken/SpecFlow.DependencyInjection) to Reqnroll. Thanks to @mbhoek (Solid Token) for the contribution! (#94)
+* Plugins: Allow creating single target (netstandard2.0) plugins
+* Dependencies: Include built-in dependency injection framework (BoDi) to the main repository as "Reqnroll.BoDi" based on v1.5 of [BoDi](https://github.com/SpecFlowOSS/BoDi/)
+* Fix: User code namespaces that included "Reqnroll" within them caused the code generation to fail (#44)
+* Fix: Dependencies of [BeforeTestRun] / [AfterTestRun] hooks are wonrly resolved from the test thread context instead of the test run (global) context instead (#58)
+* Fix: Cucumber Expressions fail when two enums or two custom types with the same short name (differing namespaces) are used as parameters (#81)
+* Fix: Adding `@ignore` to an Examples block generates invalid code for NUnit v3+ (#103)
+* Fix: `@ignore` attribute is not inherited to the scenarios from Rule (#111)
+* Fix: Capture ExecutionContext after every binding invoke (#120)
+* Fix: StackOverflowException when using `[StepArgumentTransformation]` with same input and output type, for example string (#71)
+* Fix: Autofac without hook does not run GlobalDependencies (#127)
+* Fix: Reqnroll.Autofac shows wrongly ambiguous step definition (#56)
+* Fix: Dispose objects registred in test thread container at the end of test execution (#123)
 
 # v1.0.1 - 2024-02-16
 

Directory.Build.props

@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.0.2</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <VersionSuffix>local</VersionSuffix>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
+    <AssemblyVersion>2.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,32 +36,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Reqnroll_FullFramework_TFM>net462</Reqnroll_FullFramework_TFM>
-
-    <Reqnroll_Net6_TFM>net6.0</Reqnroll_Net6_TFM>
-
-
-    <Reqnroll_FullFramework_Runtime_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Runtime_TFM>
-    <Reqnroll_Core_Runtime_TFM>netstandard2.0</Reqnroll_Core_Runtime_TFM>
-
-    <Reqnroll_FullFramework_Generator_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Generator_TFM>
-    <Reqnroll_Core_Generator_TFM>netcoreapp3.1</Reqnroll_Core_Generator_TFM>
-
-    <Reqnroll_FullFramework_Test_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Test_TFM>
-    <Reqnroll_Core_Test_TFM>netcoreapp3.1;net6.0</Reqnroll_Core_Test_TFM>
-
-    <Reqnroll_FullFramework_Specs_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Specs_TFM>
-    <Reqnroll_Net6_Specs_TFM>$(Reqnroll_Net6_TFM)</Reqnroll_Net6_Specs_TFM>
-
-    <Reqnroll_FullFramework_Tools_TFM>$(Reqnroll_FullFramework_TFM)</Reqnroll_FullFramework_Tools_TFM>
-    <Reqnroll_Core_Tools_TFM>netcoreapp3.1</Reqnroll_Core_Tools_TFM> 
-    <Reqnroll_Net6_Tools_TFM>$(Reqnroll_Net6_TFM)</Reqnroll_Net6_Tools_TFM>
-
-    <Reqnroll_Runtime_TFM>$(Reqnroll_FullFramework_Runtime_TFM);$(Reqnroll_Core_Runtime_TFM);$(Reqnroll_Net6_TFM)</Reqnroll_Runtime_TFM>
-    <Reqnroll_Generator_TFM>$(Reqnroll_FullFramework_Generator_TFM);$(Reqnroll_Core_Generator_TFM);$(Reqnroll_Net6_TFM)</Reqnroll_Generator_TFM>
-    <Reqnroll_Test_TFM>$(Reqnroll_FullFramework_Test_TFM);$(Reqnroll_Core_Test_TFM)</Reqnroll_Test_TFM>
-    <Reqnroll_Specs_TFM>$(Reqnroll_Net6_Specs_TFM)</Reqnroll_Specs_TFM>
-    <Reqnroll_Tools_TFM>$(Reqnroll_FullFramework_Tools_TFM);$(Reqnroll_Core_Tools_TFM);$(Reqnroll_Net6_Tools_TFM)</Reqnroll_Tools_TFM>
+    <!-- for Reqnroll.Tools.MsBuild.Generation -->
+    <Reqnroll_FullFramework_Tools_TFM>net462</Reqnroll_FullFramework_Tools_TFM>
+    <Reqnroll_Core_Tools_TFM>netstandard2.0</Reqnroll_Core_Tools_TFM> 
 
     <Reqnroll_EnableStrongNameSigning>true</Reqnroll_EnableStrongNameSigning>
   </PropertyGroup>

Directory.Build.targets

@@ -8,16 +8,8 @@
       <NuspecProperties>$(NuspecProperties);author=$(Reqnroll_Authors)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);owner=$(Reqnroll_Owners)</NuspecProperties>
 
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Net6_TFM=$(Reqnroll_Net6_TFM)</NuspecProperties>
-
-      <NuspecProperties>$(NuspecProperties);Reqnroll_FullFramework_Runtime_TFM=$(Reqnroll_FullFramework_Runtime_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Core_Runtime_TFM=$(Reqnroll_Core_Runtime_TFM)</NuspecProperties>
-
-      <NuspecProperties>$(NuspecProperties);Reqnroll_FullFramework_Generator_TFM=$(Reqnroll_FullFramework_Generator_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Core_Generator_TFM=$(Reqnroll_Core_Generator_TFM)</NuspecProperties>
-
+      <NuspecProperties>$(NuspecProperties);Reqnroll_FullFramework_Tools_TFM=$(Reqnroll_FullFramework_Tools_TFM)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);Reqnroll_Core_Tools_TFM=$(Reqnroll_Core_Tools_TFM)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);Reqnroll_Net6_Tools_TFM=$(Reqnroll_Net6_Tools_TFM)</NuspecProperties>
     </PropertyGroup>
   </Target>