0.8.1-alpha

Stateflows · Feb 6, 2024 · d09eb07 · d09eb07
1 parent 2e50fd7
commit d09eb07
Show file tree

Hide file tree

Showing 22 changed files with 42 additions and 61 deletions.
diff --git a/Core/Stateflows.Common/Stateflows.Common.csproj b/Core/Stateflows.Common/Stateflows.Common.csproj
@@ -12,7 +12,7 @@
     <PackageTags>Stateflows;state-machine;activity;workflow</PackageTags>
     <AssemblyVersion></AssemblyVersion>
     <FileVersion></FileVersion>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageOutputPath>..\..\NuGet</PackageOutputPath>

diff --git a/Core/Stateflows.Testing/Stateflows.Testing.csproj b/Core/Stateflows.Testing/Stateflows.Testing.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Title>Stateflows framework testing utilities</Title>
     <Authors>Stateflows</Authors>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>

diff --git a/Core/Stateflows.Transport.Common/Stateflows.Common.Transport.csproj b/Core/Stateflows.Transport.Common/Stateflows.Common.Transport.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Title>Stateflows framework transport abstractions</Title>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Authors>Stateflows</Authors>
     <PackageProjectUrl>https://www.stateflows.net</PackageProjectUrl>
     <PackageIcon>stateflows-logo-1024.png</PackageIcon>

diff --git a/Core/Stateflows/Activities/Classes/ForkNode.cs b/Core/Stateflows/Activities/Classes/ForkNode.cs
@@ -0,0 +1,7 @@
+namespace Stateflows.Activities
+{
+    public sealed class ForkNode : ActivityNode
+    {
+        public const string Name = "Stateflows.Activities.ForkNode";
+    }
+}
diff --git a/Core/Stateflows/Activities/Classes/JoinNode.cs b/Core/Stateflows/Activities/Classes/JoinNode.cs
@@ -0,0 +1,7 @@
+namespace Stateflows.Activities
+{
+    public sealed class JoinNode : ActivityNode
+    {
+        public const string Name = "Stateflows.Activities.JoinNode";
+    }
+}
diff --git a/Core/Stateflows/Activities/Engine/Executor.cs b/Core/Stateflows/Activities/Engine/Executor.cs
@@ -485,6 +485,7 @@ public async Task DoHandleNodeAsync(Node node, NodeScope nodeScope, IEnumerable<
 
                 var inputTokens = input ?? streams.SelectMany(stream => stream.Tokens).ToArray();
 
+                nodeScope = nodeScope.CreateChildScope();
                 lock (node.Graph)
                 {
                     Debug.WriteLine($">>> Executing node {node.Name}, threadId: {nodeScope.ThreadId}");

diff --git a/...s/Registration/Interfaces/Extensions/ActivityBuilder/ActivityBuilderSpecialsExtensions.cs b/...s/Registration/Interfaces/Extensions/ActivityBuilder/ActivityBuilderSpecialsExtensions.cs
@@ -22,6 +22,9 @@ public static IActivityBuilder AddJoin(this IActivityBuilder builder, string joi
                     b => joinBuildAction(b)
                 ) as IActivityBuilder;
 
+        public static IActivityBuilder AddJoin(this IActivityBuilder builder, JoinBuildAction joinBuildAction)
+            => builder.AddJoin(ActivityNodeInfo<JoinNode>.Name, joinBuildAction);
+
         public static IActivityBuilder AddFork(this IActivityBuilder builder, string forkNodeName, ForkBuildAction forkBuildAction)
             => (builder as BaseActivityBuilder)
                 .AddNode(
@@ -35,6 +38,9 @@ public static IActivityBuilder AddFork(this IActivityBuilder builder, string for
                     b => forkBuildAction(b)
                 ) as IActivityBuilder;
 
+        public static IActivityBuilder AddFork(this IActivityBuilder builder, ForkBuildAction forkBuildAction)
+            => builder.AddFork(ActivityNodeInfo<ForkNode>.Name, forkBuildAction);
+
         public static IActivityBuilder AddMerge(this IActivityBuilder builder, string mergeNodeName, MergeBuildAction mergeBuildAction)
             => (builder as BaseActivityBuilder)
                 .AddNode(

diff --git a/.../ReactiveStructuredActivityBuilder/ReactiveStructuredActivityBuilderSpecialsExtensions.cs b/.../ReactiveStructuredActivityBuilder/ReactiveStructuredActivityBuilderSpecialsExtensions.cs
@@ -21,6 +21,9 @@ public static IReactiveStructuredActivityBuilder AddJoin(this IReactiveStructure
                     b => buildAction(b)
                 ) as IReactiveStructuredActivityBuilder;
 
+        public static IReactiveStructuredActivityBuilder AddJoin(this IReactiveStructuredActivityBuilder builder, JoinBuildAction joinBuildAction)
+            => builder.AddJoin(ActivityNodeInfo<JoinNode>.Name, joinBuildAction);
+
         public static IReactiveStructuredActivityBuilder AddFork(this IReactiveStructuredActivityBuilder builder, string forkNodeName, ForkBuildAction buildAction)
             => (builder as BaseActivityBuilder)
                 .AddNode(
@@ -34,6 +37,9 @@ public static IReactiveStructuredActivityBuilder AddFork(this IReactiveStructure
                     b => buildAction(b)
                 ) as IReactiveStructuredActivityBuilder;
 
+        public static IReactiveStructuredActivityBuilder AddFork(this IReactiveStructuredActivityBuilder builder, ForkBuildAction forkBuildAction)
+            => builder.AddFork(ActivityNodeInfo<ForkNode>.Name, forkBuildAction);
+
         public static IReactiveStructuredActivityBuilder AddMerge(this IReactiveStructuredActivityBuilder builder, string mergeNodeName, MergeBuildAction buildAction)
             => (builder as BaseActivityBuilder)
                 .AddNode(

diff --git a/...faces/Extensions/StructuredActivityBuilder/StructuredActivityBuilderSpecialsExtensions.cs b/...faces/Extensions/StructuredActivityBuilder/StructuredActivityBuilderSpecialsExtensions.cs
@@ -21,6 +21,9 @@ public static IStructuredActivityBuilder AddJoin(this IStructuredActivityBuilder
                     b => joinBuildAction(b)
                 ) as IStructuredActivityBuilder;
 
+        public static IStructuredActivityBuilder AddJoin(this IStructuredActivityBuilder builder, JoinBuildAction joinBuildAction)
+            => builder.AddJoin(ActivityNodeInfo<JoinNode>.Name, joinBuildAction);
+
         public static IStructuredActivityBuilder AddFork(this IStructuredActivityBuilder builder, string forkNodeName, ForkBuildAction forkBuildAction)
             => (builder as BaseActivityBuilder)
                 .AddNode(
@@ -34,6 +37,9 @@ public static IStructuredActivityBuilder AddFork(this IStructuredActivityBuilder
                     b => forkBuildAction(b)
                 ) as IStructuredActivityBuilder;
 
+        public static IStructuredActivityBuilder AddFork(this IStructuredActivityBuilder builder, ForkBuildAction forkBuildAction)
+            => builder.AddFork(ActivityNodeInfo<ForkNode>.Name, forkBuildAction);
+
         public static IStructuredActivityBuilder AddMerge(this IStructuredActivityBuilder builder, string mergeNodeName, MergeBuildAction mergeBuildAction)
             => (builder as BaseActivityBuilder)
                 .AddNode(

diff --git a/Core/Stateflows/Stateflows.csproj b/Core/Stateflows/Stateflows.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Title>Stateflows framework core</Title>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Authors>Stateflows</Authors>
     <PackageProjectUrl>https://www.stateflows.net</PackageProjectUrl>
     <PackageIcon>stateflows-logo-1024.png</PackageIcon>

diff --git a/Extensions/Stateflows.Extensions.PlantUml/Stateflows.Extensions.PlantUml.csproj b/Extensions/Stateflows.Extensions.PlantUml/Stateflows.Extensions.PlantUml.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Title>PlantUML extension for Stateflows framework</Title>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Authors>Stateflows</Authors>
     <PackageProjectUrl>https://www.stateflows.net</PackageProjectUrl>
     <PackageIcon>stateflows-logo-1024.png</PackageIcon>

diff --git a/Locks/Stateflows.Locks.DistributedLock/Stateflows.Locks.DistributedLock.csproj b/Locks/Stateflows.Locks.DistributedLock/Stateflows.Locks.DistributedLock.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Nullable>enable</Nullable>
     <Title>DistributedLock locking for Stateflows framework</Title>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Authors>Stateflows</Authors>
     <PackageProjectUrl>https://www.stateflows.net</PackageProjectUrl>
     <PackageIcon>stateflows-logo-1024.png</PackageIcon>

diff --git a/...torage.EntityFrameworkCore.6.0/Stateflows - Backup.Storage.EntityFrameworkCore.6.0.csproj b/...torage.EntityFrameworkCore.6.0/Stateflows - Backup.Storage.EntityFrameworkCore.6.0.csproj
diff --git a/...yFrameworkCore.6.0/DependencyInjection.cs → ...ntityFrameworkCore/DependencyInjection.cs b/...yFrameworkCore.6.0/DependencyInjection.cs → ...ntityFrameworkCore/DependencyInjection.cs
diff --git a/...ntityFrameworkCore/Entities/Context_v1.cs → ...ntityFrameworkCore/Entities/Context_v1.cs b/...ntityFrameworkCore/Entities/Context_v1.cs → ...ntityFrameworkCore/Entities/Context_v1.cs
diff --git a/.../EntityFrameworkCore/Entities/Trace_v1.cs → .../EntityFrameworkCore/Entities/Trace_v1.cs b/.../EntityFrameworkCore/Entities/Trace_v1.cs → .../EntityFrameworkCore/Entities/Trace_v1.cs
diff --git a/...yFrameworkCore/IStateflowsDbContext_v1.cs → ...yFrameworkCore/IStateflowsDbContext_v1.cs b/...yFrameworkCore/IStateflowsDbContext_v1.cs → ...yFrameworkCore/IStateflowsDbContext_v1.cs
diff --git a/...ws.Storage.EntityFrameworkCore.6.0.csproj → ...eflows.Storage.EntityFrameworkCore.csproj b/...ws.Storage.EntityFrameworkCore.6.0.csproj → ...eflows.Storage.EntityFrameworkCore.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <Title>Entity Framework Core 6.0 storage for Stateflows framework</Title>
-    <Version>0.7.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Authors>Stateflows</Authors>
     <PackageProjectUrl>https://www.stateflows.net</PackageProjectUrl>
     <PackageIcon>stateflows-logo-1024.png</PackageIcon>

diff --git a/.../Stateflows/EntityFrameworkCoreStorage.cs → .../Stateflows/EntityFrameworkCoreStorage.cs b/.../Stateflows/EntityFrameworkCoreStorage.cs → .../Stateflows/EntityFrameworkCoreStorage.cs
diff --git a/...rameworkCore.6.0/Utils/DbSetExtensions.cs → ...ityFrameworkCore/Utils/DbSetExtensions.cs b/...rameworkCore.6.0/Utils/DbSetExtensions.cs → ...ityFrameworkCore/Utils/DbSetExtensions.cs
diff --git a/...Transport.AspNetCore.SignalR.Client/Stateflows.Transport.AspNetCore.SignalR.Client.csproj b/...Transport.AspNetCore.SignalR.Client/Stateflows.Transport.AspNetCore.SignalR.Client.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <PackageTags>Stateflows;state-machine;activity;workflow;SignalR;signal-r</PackageTags>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Title>SignalR transport client for Stateflows framework</Title>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <Authors>Stateflows</Authors>

diff --git a/...rt/Stateflows.Transport.AspNetCore.SignalR/Stateflows.Transport.AspNetCore.SignalR.csproj b/...rt/Stateflows.Transport.AspNetCore.SignalR/Stateflows.Transport.AspNetCore.SignalR.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.8.0-alpha</Version>
+    <Version>0.8.1-alpha</Version>
     <Title>SignalR transport for Stateflows framework</Title>
     <Authors>Stateflows</Authors>
     <PackageProjectUrl>https://www.stateflows.net</PackageProjectUrl>