Merge master into

Author: rlovely

.github/workflows/deploy.yml

@@ -0,0 +1,35 @@
+# This workflow will build a .NET project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
+
+name: .NET Deploy
+
+on:
+  push:
+    branches: ["master"]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+        
+    - name: Restore dependencies
+      run: dotnet restore
+      
+    - name: Build
+      run: dotnet build --no-restore -c Release
+      
+    - name: Test
+      run: dotnet test --verbosity normal
+      
+    - name: Publish
+      env:
+        PUBLISH_KEY: ${{ secrets.PUBLISH_KEY }}
+      run: dotnet nuget push StateMachine/bin/Release/RoadieRichStateMachine*.nupkg -k $PUBLISH_KEY

.github/workflows/dotnet.yml renamed to .github/workflows/test.yml

@@ -1,13 +1,11 @@
 # This workflow will build a .NET project
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net
 
-name: .NET
+name: .NET Test
 
 on:
-  push:
-    branches: [ "master" ]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 jobs:
   build:
@@ -26,8 +24,3 @@ jobs:
       run: dotnet build --no-restore
     - name: Test
       run: dotnet test --no-build --verbosity normal
-    - name: Upload
-      uses: actions/upload-artifact@v4
-      with:
-        name: RoadieRichStateMachine
-        path: /home/runner/work/StateMachine/StateMachine/StateMachine/bin/Debug/net7.0/*

StateMachine/Delegates.cs

@@ -1,5 +1,15 @@
 namespace RoadieRichStateMachine
 {
+	/// <summary>
+	/// Determines whether to take a certain transition
+	/// </summary>
+	/// <param name="vars">A dictionary of variables shared between all states and transitions</param>
+	/// <returns>true if the transition should be taken</returns>
 	public delegate bool TransitionConditionDelegate(IDictionary<string, dynamic> vars);
+
+	/// <summary>
+	/// A function run by <see cref="FunctionState"/>
+	/// </summary>
+	/// <param name="vars">A dictionary of variables shared between all states and transitions</param>
 	public delegate void FunctionStateFunctionDelegate(IDictionary<string, dynamic> vars);
 }

StateMachine/README.md

@@ -2,6 +2,7 @@ A simple state machine library.  Can use states that are defined using delegates
 
 ```C#
 
+```
 using (StateMachine funcSm = new())
 {
 	var initFuncState = new FunctionState((vars) => vars["x"] = 0);
@@ -26,4 +27,4 @@ using (StateMachine funcSm = new())
 	funcSm.InitialState = initFuncState;
 	funcSm.Run();
 }
-```
+```

StateMachine/RoadieRichStateMachine.csproj

@@ -1,11 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-	<PackageReadmeFile>README.md</PackageReadmeFile>
+	  <PackageReadmeFile>README.md</PackageReadmeFile>
+	  <PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
+	  <Title>RoadieRich's State Machine</Title>
+	  <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+	  <RepositoryUrl>https://github.com/RoadieRich/StateMachine</RepositoryUrl>
+	  <RepositoryType>git</RepositoryType>
+	  <Authors>RoadieRich</Authors>
+	  <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+	  <Version>1.0.4</Version>
   </PropertyGroup>
 
-</Project>
+  <ItemGroup>
+	  <None Include="README.md" Pack="true" PackagePath="" />
+  </ItemGroup>
+
+</Project>

StateMachine/State.cs

@@ -19,14 +19,15 @@ public void AddTransitionTo(State to, TransitionConditionDelegate? condition)
 			transitions.Add(new Transition(to, condition));
 		}
 
-		internal State RunAndGetNextState(IDictionary<string, dynamic> vars)
+		internal State RunAndGetNextState(int delay, IDictionary<string, dynamic> vars)
 		{
 			Enter(vars);
 			State? next = null;
 			while (next == null)
 			{
 				Inner(vars);
 				next = GetNextState(vars);
+				Thread.Sleep(delay);
 			}
 			Exit(vars);
 			return next;

StateMachine/StateMachine.cs

@@ -12,6 +12,8 @@ public class StateMachine : IDisposable
 		/// </summary>
 		public State InitialState { get; set; } = ExitState;
 
+		public int Delay { get; set; } = 0;
+
 		/// <summary>
 		/// If a state's <see cref="Transition"/> points to this state, the state machine is terminated.
 		/// </summary>
@@ -28,7 +30,7 @@ public void Run(IDictionary<string, dynamic>? vars = null)
 
 			while (state != ExitState)
 			{
-				state = state.RunAndGetNextState(myVars);
+				state = state.RunAndGetNextState(Delay, myVars);
 			}
 		}
 

nuget.config

@@ -0,0 +1,5 @@
+<configuration>
+	<config>
+		<add key="DefaultPushSource" value="https://api.nuget.org/v3/index.json" protocolVersion="3"/>
+	</config>
+</configuration>