upgrade .net framework

asos-gurpreetsingh · asos-gurpreetsingh · commit 6a773a278422 · 2025-10-06T08:59:50.000+01:00
move to github actions
fix parallel tests failing
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,18 @@
+name: Build and Test
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build project
+        run: dotnet build --configuration Release
+
+      - name: Run tests
+        run: dotnet test --configuration Release
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ tools/Cake/
 tools/GitReleaseNotes/
 tools/gitversion.commandline/
 artifacts/
+*.code-workspace
diff --git a/src/NuGet.config b/src/NuGet.config
diff --git a/src/Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj b/src/Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj
@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+	<TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>TestStack.BDDfy.Samples</AssemblyName>
     <PackageId>TestStack.BDDfy.Samples</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -16,24 +15,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
-    <PackageReference Include="shouldly" Version="3.0.0-beta0003" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
+    <PackageReference Include="shouldly" Version="4.3.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="System.Linq" Version="4.3.0" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <DefineConstants>$(DefineConstants);Approvals;Culture;NSubstitute</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs b/src/TestStack.BDDfy.Tests/Configuration/ProcessorPipelineTests.cs
@@ -7,6 +7,7 @@
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
+    [Collection("ExclusiveAccessToConfigurator")]
     public class ProcessorPipelineTests
     {
         [Fact]
diff --git a/src/TestStack.BDDfy.Tests/Configuration/StepExecutorTests.cs b/src/TestStack.BDDfy.Tests/Configuration/StepExecutorTests.cs
@@ -5,6 +5,7 @@
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
+    [Collection("ExclusiveAccessToConfigurator")]
     public class StepExecutorTests
     {
         private class TestStepExecutor : StepExecutor
diff --git a/src/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs b/src/TestStack.BDDfy.Tests/Configuration/TestRunnerTests.cs
@@ -1,12 +1,12 @@
 ﻿using System;
 using System.Linq;
-using NUnit.Framework;
 using Shouldly;
 using TestStack.BDDfy.Configuration;
 using Xunit;
 
 namespace TestStack.BDDfy.Tests.Configuration
 {
+    [Collection("ExclusiveAccessToConfigurator")]
     public class TestRunnerTests
     {
         public class ScenarioWithFailingThen
@@ -104,6 +104,8 @@ public void FailingThenDoesNotStopThePipelineWithReflectiveAPI()
             [Fact]
             public void FailingThenDoesNotStopThePipelineWithFluentAPI()
             {
+                Configurator.Processors.TestRunner.StopExecutionOnFailingThen = false;
+
                 var testRun = new ScenarioWithFailingThen()
                     .Given(x => x.PassingGiven())
                     .When(x => x.PassingWhen())
diff --git a/src/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs b/src/TestStack.BDDfy.Tests/Exceptions/ExceptionThrowingTest.cs
@@ -6,9 +6,9 @@ namespace TestStack.BDDfy.Tests.Exceptions
 {
     public class ExceptionThrowingTest<T> where T : Exception, new()
     {
-        private static bool _givenShouldThrow;
-        private static bool _whenShouldThrow;
-        private static bool _thenShouldThrow;
+        private bool _givenShouldThrow;
+        private bool _whenShouldThrow;
+        private bool _thenShouldThrow;
         Scenario _scenario;
 
         void Given()
diff --git a/src/TestStack.BDDfy.Tests/ExclusiveAccessToConfiguratorFixture.cs b/src/TestStack.BDDfy.Tests/ExclusiveAccessToConfiguratorFixture.cs
@@ -0,0 +1,9 @@
+using Xunit;
+
+namespace TestStack.BDDfy.Tests
+{
+    [CollectionDefinition("ExclusiveAccessToConfigurator", DisableParallelization = true)]
+    public class ExclusiveAccessToConfiguratorFixture
+    {
+    }
+}
diff --git a/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ComplexStepsTests.cs b/src/TestStack.BDDfy.Tests/Scanner/FluentScanner/ComplexStepsTests.cs
@@ -13,7 +13,7 @@ public class ComplexStepsTests
         [Fact]
         public void ShouldBeAbleToChainComplexTestWithFluentApi()
         {
-            this.Given(_ => count.ShouldBe(0))
+            this.Given(_ => count.ShouldBe(0, "count should start with 0"))
                 .When(() => count++.ShouldBe(0), "When I do something")
                 .Given(() => count++.ShouldBe(1), "Given I am doing things in different order")
                 .Then(() => count++.ShouldBe(2), "Then they should run in defined order")
diff --git a/src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj b/src/TestStack.BDDfy.Tests/TestStack.BDDfy.Tests.csproj
@@ -1,11 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+	<TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>TestStack.BDDfy.Tests</AssemblyName>
     <PackageId>TestStack.BDDfy.Tests</PackageId>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
@@ -19,26 +18,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="dotnet-xunit" Version="2.3.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
-    <PackageReference Include="nsubstitute" Version="3.1.0" />
-    <PackageReference Include="shouldly" Version="3.0.0-beta0003" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
+    <PackageReference Include="nsubstitute" Version="5.3.0" />
+    <PackageReference Include="shouldly" Version="4.3.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="System.Linq" Version="4.3.0" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <DefineConstants>$(DefineConstants);Approvals;Culture</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/TestStack.BDDfy.sln b/src/TestStack.BDDfy.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11018.127 d18.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8F515887-AAB5-4873-8BE9-5AB10685EBCB}"
 	ProjectSection(SolutionItems) = preProject
@@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\GitVersion.yml = ..\GitVersion.yml
 		..\license.txt = ..\license.txt
 		..\logo.png = ..\logo.png
-		NuGet.config = NuGet.config
 		..\readme.md = ..\readme.md
 	EndProjectSection
 EndProject
diff --git a/src/TestStack.BDDfy/Configuration/Processors.cs b/src/TestStack.BDDfy/Configuration/Processors.cs
@@ -32,16 +32,13 @@ IEnumerable<IProcessor> _GetProcessors(Story story)
             }
         }
 
-        private readonly TestRunnerFactory _testRunnerFactory = new TestRunnerFactory(() => new TestRunner());
-        public TestRunnerFactory TestRunner { get { return _testRunnerFactory; } }
+        public TestRunnerFactory TestRunner { get; } = new(() => new TestRunner());
 
-        private readonly ProcessorFactory _consoleReportFactory = new ProcessorFactory(() => new ConsoleReporter());
-        public ProcessorFactory ConsoleReport { get { return _consoleReportFactory; } }
+        public ProcessorFactory ConsoleReport { get; } = new(() => new ConsoleReporter());
 
-        private readonly ProcessorFactory _storyCacheFactory = new ProcessorFactory(() => new StoryCache());
-        public ProcessorFactory StoryCache { get { return _storyCacheFactory; } }
+        public ProcessorFactory StoryCache { get; } = new(() => new StoryCache());
 
-        readonly List<Func<IProcessor>> _addedProcessors = new List<Func<IProcessor>>();
+        readonly List<Func<IProcessor>> _addedProcessors = [];
 
         public Processors Add(Func<IProcessor> processorFactory)
         {
diff --git a/src/TestStack.BDDfy/TestStack.BDDfy.csproj b/src/TestStack.BDDfy/TestStack.BDDfy.csproj
@@ -1,11 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net40;netstandard1.5</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <AssemblyName>TestStack.BDDfy</AssemblyName>
     <PackageId>TestStack.BDDfy</PackageId>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.5' ">1.6.0</NetStandardImplicitPackageVersion>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
@@ -19,29 +17,4 @@
   <ItemGroup>
     <EmbeddedResource Include="**\Scripts\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
-    <DefineConstants>$(DefineConstants);APPDOMAIN;STACKTRACE</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
-    <PackageReference Include="System.AppContext" Version="4.1.0" />
-    <PackageReference Include="System.Linq.Expressions" Version="4.1.0" />
-    <PackageReference Include="System.Reflection" Version="4.1.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.1.0" />
-    <PackageReference Include="System.Runtime.Loader" Version="4.0.0" />
-    <PackageReference Include="System.Runtime.Serialization.Json" Version="4.0.2" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.1.1" />
-    <PackageReference Include="System.Text.Encoding" Version="4.0.11" />
-    <PackageReference Include="System.Threading.ThreadPool" Version="4.0.10" />
-  </ItemGroup>
-
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`	`namespace TestStack.BDDfy.Tests.Configuration`
`9`	`9`	`{`
	`10`	`+ [Collection("ExclusiveAccessToConfigurator")]`
`10`	`11`	`public class ProcessorPipelineTests`
`11`	`12`	`{`
`12`	`13`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace TestStack.BDDfy.Tests.Configuration`
`7`	`7`	`{`
	`8`	`+ [Collection("ExclusiveAccessToConfigurator")]`
`8`	`9`	`public class StepExecutorTests`
`9`	`10`	`{`
`10`	`11`	`private class TestStepExecutor : StepExecutor`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ namespace TestStack.BDDfy.Tests.Exceptions`
`6`	`6`	`{`
`7`	`7`	`public class ExceptionThrowingTest<T> where T : Exception, new()`
`8`	`8`	`{`
`9`		`- private static bool _givenShouldThrow;`
`10`		`- private static bool _whenShouldThrow;`
`11`		`- private static bool _thenShouldThrow;`
	`9`	`+ private bool _givenShouldThrow;`
	`10`	`+ private bool _whenShouldThrow;`
	`11`	`+ private bool _thenShouldThrow;`
`12`	`12`	`Scenario _scenario;`
`13`	`13`
`14`	`14`	`void Given()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class ComplexStepsTests`
`13`	`13`	`[Fact]`
`14`	`14`	`public void ShouldBeAbleToChainComplexTestWithFluentApi()`
`15`	`15`	`{`
`16`		`- this.Given(_ => count.ShouldBe(0))`
	`16`	`+ this.Given(_ => count.ShouldBe(0, "count should start with 0"))`
`17`	`17`	`.When(() => count++.ShouldBe(0), "When I do something")`
`18`	`18`	`.Given(() => count++.ShouldBe(1), "Given I am doing things in different order")`
`19`	`19`	`.Then(() => count++.ShouldBe(2), "Then they should run in defined order")`