Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DotNet7 #8

Merged
merged 47 commits into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
8680fbe
Extracted state machine configuration from state machine implementation.
dschreib42 Sep 9, 2022
c0494f3
Removed obsolete field
dschreib42 Sep 9, 2022
63f54f2
Added check for initial state configured
dschreib42 Sep 9, 2022
eb22917
Fixed resolving the given state
dschreib42 Sep 9, 2022
08f9a26
Renamed some variables
dschreib42 Sep 9, 2022
d6bd46d
Renamed file
dschreib42 Sep 10, 2022
7baab93
Fixed docu
dschreib42 Sep 10, 2022
f4fa6ce
Call OnExit() callbacks on ResetAsync()
dschreib42 Sep 10, 2022
4136641
Minor changes
dschreib42 Sep 10, 2022
142aa62
Simplified types
dschreib42 Sep 10, 2022
724140a
Added missing initialize
dschreib42 Sep 10, 2022
5bd132e
Marked termination nodes with second eclipse
dschreib42 Sep 10, 2022
26c921f
Improved performance
dschreib42 Sep 10, 2022
f6c7860
Fixed graph
dschreib42 Sep 10, 2022
042d445
Disabled dumping graph
dschreib42 Sep 10, 2022
c0ffbbf
Added rendered graphs
dschreib42 Sep 10, 2022
56aaf94
Updated
dschreib42 Sep 10, 2022
e39e96b
Updated
dschreib42 Sep 10, 2022
d2060d1
Updated
dschreib42 Sep 10, 2022
d85ace7
Updated
dschreib42 Sep 10, 2022
e79a413
Sealed classes
dschreib42 Sep 10, 2022
9a1325e
Extended unit tests
dschreib42 Sep 10, 2022
f996e22
Merge remote-tracking branch 'origin/main' into develop
dschreib42 Sep 10, 2022
8a986e4
Extended graph generating options
dschreib42 Sep 11, 2022
3bbd531
Renamed unit tests
dschreib42 Sep 11, 2022
788e6dc
Updated
dschreib42 Sep 11, 2022
77a5e06
Updated
dschreib42 Sep 11, 2022
3095062
Call OnExit() callbacks on Dispose
dschreib42 Sep 11, 2022
79251f0
Updated docu
dschreib42 Sep 11, 2022
080e2b2
All graph options are enabled by default
dschreib42 Sep 11, 2022
f12a5c7
Adjusted docu
dschreib42 Sep 11, 2022
87dd58a
Fixed initial reported state transition
dschreib42 Sep 12, 2022
0dc4793
Increased version no
dschreib42 Sep 16, 2022
5ec00b1
Change logging and transitioning order
dschreib42 Sep 16, 2022
46fefe5
Renamed graph formatting option All to Default
dschreib42 Sep 16, 2022
61237da
Don't call OnExit() callbacks during Dispose
dschreib42 Sep 16, 2022
ad5cb1f
Added dotnet7 support
dschreib42 Jan 30, 2023
22369be
Updated copyright
dschreib42 Jan 30, 2023
a2db5c5
Updated to dotnet7
dschreib42 Jan 30, 2023
c301e5e
Removed netstandard
dschreib42 Jan 30, 2023
bb2fbeb
Updated to dotnet7
dschreib42 Jan 30, 2023
1689914
Updated
dschreib42 Jan 30, 2023
6115dcc
Updated tools
dschreib42 Jan 31, 2023
c074bc9
Updated to dotnet7
dschreib42 Jan 31, 2023
4cecf67
Added support for netstandard2.0
dschreib42 Jan 31, 2023
6c4d577
Updated nuget packages
dschreib42 Jul 3, 2023
2c65a90
Merge branch 'main' into develop
dschreib42 Dec 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion samples/BugTrackerExample/BugTrackerExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/ComplexExample/ComplexExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/AsyncStateMachine/AsyncStateMachine.csproj
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand All @@ -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>
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -21,5 +21,4 @@
<ItemGroup>
<ProjectReference Include="..\..\src\AsyncStateMachine\AsyncStateMachine.csproj" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -23,5 +23,4 @@
<ItemGroup>
<ProjectReference Include="..\..\src\AsyncStateMachine\AsyncStateMachine.csproj" />
</ItemGroup>

</Project>
</Project>
Loading