DotNet7 (#8)

* Extracted state machine configuration from state machine implementation. * Added check for initial state configured * Fixed resolving the given state * Call OnExit() callbacks on ResetAsync() * Marked termination nodes with second eclipse * Improved performance * Fixed graph * Extended graph generating options * Call OnExit() callbacks on Dispose * All graph options are enabled by default * Fixed initial reported state transition * Increased version no * Change logging and transitioning order * Renamed graph formatting option All to Default * Added dotnet7 support * Updated copyright * Added support for netstandard2.0 * Updated nuget packages
dschreib42 · Dec 11, 2023 · ac7845f · ac7845f
1 parent 908230e
commit ac7845f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '6.x'
+          dotnet-version: '7.x'
           include-prerelease: false
 
       - name: Restore dependencies

diff --git a/README.md b/README.md
@@ -196,7 +196,7 @@ This string representation can then be rendered by tools that support the mermai
 
 ## Building
 
-AsyncStateMachine runs on .NET and .NetCore platforms targeting .NET Standard 2.0 and .NET Standard2.1. Visual Studio 2022 or later is required to build the solution, because .NET 6.0 is the default.
+AsyncStateMachine runs on .NET NetCore platforms targeting .NET 6.0 or 7.0. [Visual Studio 2022](https://visualstudio.microsoft.com/vs/) or [Visual Code](https://code.visualstudio.com/Download) is required to build the solution.
 
 ## Project Goals
 

diff --git a/samples/BugTrackerExample/BugTrackerExample.csproj b/samples/BugTrackerExample/BugTrackerExample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/ComplexExample/ComplexExample.csproj b/samples/ComplexExample/ComplexExample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/AsyncStateMachine/AsyncStateMachine.csproj b/src/AsyncStateMachine/AsyncStateMachine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <RootNamespace>AsyncStateMachine</RootNamespace>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -12,10 +12,10 @@
     <PackageProjectUrl>https://github.com/dschreib42/AsyncStateMachine</PackageProjectUrl>
     <LicenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</LicenseUrl>
     <ProjectUrl>https://github.com/dschreib42/AsyncStateMachine</ProjectUrl>
-    <Copyright>Copyright 2021 Dirk Schreiber</Copyright>
+    <Copyright>Copyright Dirk Schreiber 2021-$([System.DateTime]::Now.ToString(yyyy))</Copyright>
     <Authors>Dirk Schreiber</Authors>
     <Description>A lightweight state machine framework for .Net/.NetCore</Description>
-    <VersionPrefix>1.3.1</VersionPrefix>
+    <VersionPrefix>1.3.2</VersionPrefix>
     <Tags>state machine async</Tags>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <license>http://www.apache.org/licenses/LICENSE-2.0</license>
@@ -34,8 +34,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NeoSmart.AsyncLock" Version="3.2.0" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="NeoSmart.AsyncLock" Version="3.2.1" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/AsyncStateMachine.ComponentTests/AsyncStateMachine.ComponentTests.csproj b/tests/AsyncStateMachine.ComponentTests/AsyncStateMachine.ComponentTests.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.0">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -21,5 +21,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\AsyncStateMachine\AsyncStateMachine.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/tests/AsyncStateMachine.UnitTests/AsyncStateMachine.UnitTests.csproj b/tests/AsyncStateMachine.UnitTests/AsyncStateMachine.UnitTests.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
-    <PackageReference Include="Moq" Version="4.18.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="Verify.Xunit" Version="17.10.2" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -23,5 +23,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\AsyncStateMachine\AsyncStateMachine.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>