Merge pull request #6 from EAVFW/dev

Release 6.0
EAVFW · Nov 21, 2022 · e0574b5 · e0574b5
2 parents 96d0ea9 + fc023e9
commit e0574b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.github/workflows/.releaserc b/.github/workflows/.releaserc
@@ -13,10 +13,7 @@ plugins:
   - - "@semantic-release/github"
     - assets:
         - path: ../../artifacts/EAVFW.Extensions.WorkflowEngine.*.nupkg
-          label: Parser DLL
-
-  - - "@semantic-release/exec"
-    - publishCmd: "dotnet nuget push ..\\..\\artifacts\\EAVFW.Extensions.WorkflowEngine.*.nupkg --source https://nuget.pkg.github.com/eavfw/index.json --api-key ${process.env.GITHUB_TOKEN}"
+          label: Binaries
 
   - - "@semantic-release/exec"
     - publishCmd: "dotnet nuget push ..\\..\\artifacts\\EAVFW.Extensions.WorkflowEngine.*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${process.env.CI_NUGET_API_KEY}"
diff --git a/src/EAVFW.Extensions.WorkflowEngine/DependencyInjectionExtensions.cs b/src/EAVFW.Extensions.WorkflowEngine/DependencyInjectionExtensions.cs
@@ -267,7 +267,7 @@ private static void SetupConnection(IGlobalConfiguration globalConfiguration, IC
                 QueuePollInterval = TimeSpan.Zero,
                 UseRecommendedIsolationLevel = true,
                 DisableGlobalLocks = true,
-                SchemaName = configuration.GetValue<string>("DBSchema") ?? "hangfire",
+                SchemaName = configuration.GetValue<string>("Hangfire:DBSchema") ?? "hangfire",
 
             };
 

diff --git a/src/EAVFW.Extensions.WorkflowEngine/EAVFW.Extensions.WorkflowEngine.csproj b/src/EAVFW.Extensions.WorkflowEngine/EAVFW.Extensions.WorkflowEngine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
 
 		<Nullable>disable</Nullable>
 		<Title>EAVFW.Extensions.WorkflowEngine</Title>
@@ -21,9 +21,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="EAVFramework" Version="2.0.0" />
-		<PackageReference Include="Delegate.WorkflowEngine.Hangfire" Version="3.0.0-dev.12" />
-		<PackageReference Include="EAVFW.Extensions.Documents" Version="2.0.0" />
+		<PackageReference Include="EAVFramework" Version="2.2.0-dev.8" />
+		<PackageReference Include="Delegate.WorkflowEngine.Hangfire" Version="3.0.0" />
+		<PackageReference Include="EAVFW.Extensions.Documents" Version="2.1.0" />
 		<PackageReference Include="Hangfire.AspNetCore" Version="1.7.31" />
 		<PackageReference Include="Hangfire.Core" Version="1.7.31" />
 		<PackageReference Include="Hangfire.SqlServer" Version="1.7.31" />

diff --git a/src/EAVFW.Extensions.WorkflowEngine/Plugins/HangFirePluginJobRunnerContext.cs b/src/EAVFW.Extensions.WorkflowEngine/Plugins/HangFirePluginJobRunnerContext.cs
@@ -41,7 +41,7 @@ public async Task<PluginContext> ExecuteAsync<TContext, T>(IServiceProvider serv
         where T : DynamicEntity
 
         {
-            var pluginContext = PluginContextFactory.CreateContext<TContext, T>(context, entry, new System.Security.Claims.ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim("sub", IdentityId) }, "eavfw")));
+            var pluginContext = PluginContextFactory.CreateContext<TContext, T>(serviceProvider,context, entry, new System.Security.Claims.ClaimsPrincipal(new ClaimsIdentity(new[] { new Claim("sub", IdentityId) }, "eavfw")));
 
             var handler = serviceProvider.GetService(Handler) as IPlugin<TContext, T>;
             //TODO mix of context types;