Skip to content

Commit fa584a8

Browse files
committed
fix(Solution): Updated solution packages
fix(UnitTests): Fixed all unit tests
1 parent b7d2505 commit fa584a8

34 files changed

+379
-408
lines changed

src/api/Synapse.Api.Client.Http/Synapse.Api.Client.Http.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.8" />
13-
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.8" />
13+
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.11" />
1414
<PackageReference Include="System.Reactive" Version="6.0.1" />
1515
</ItemGroup>
1616

src/api/Synapse.Api.Http/Synapse.Api.Http.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.14.0" />
14-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.0" />
13+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.14.1" />
14+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.1" />
1515
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.1" />
1616
</ItemGroup>
1717

src/cli/Synapse.Cli/Synapse.Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
1616
<PackageReference Include="moment.net" Version="1.3.4" />
1717
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
18-
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.8" />
18+
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.11" />
1919
<PackageReference Include="Spectre.Console" Version="0.49.1" />
2020
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
2121
</ItemGroup>

src/core/Synapse.Core.Infrastructure/Services/DatabaseInitializer.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ await this.Database.CreateResourceAsync(new ServiceAccount()
5050
}
5151
}
5252
}, false, cancellationToken).ConfigureAwait(false);
53+
await this.Database.InitializeAsync(cancellationToken);
5354
}
5455

5556
}

src/core/Synapse.Core.Infrastructure/Services/ExternalResourceProvider.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public virtual async Task<Stream> ReadAsync(WorkflowDefinition workflow, Externa
3737
{
3838
ArgumentNullException.ThrowIfNull(workflow);
3939
ArgumentNullException.ThrowIfNull(resource);
40-
return resource.Uri.Scheme switch
40+
return resource.EndpointUri.Scheme switch
4141
{
42-
"file" => new FileStream(resource.Uri.LocalPath, FileMode.Open),
42+
"file" => new FileStream(resource.EndpointUri.LocalPath, FileMode.Open),
4343
"http" or "https" => await this.ReadOverHttpAsync(workflow, resource, cancellationToken).ConfigureAwait(false),
44-
_ => throw new NotSupportedException($"Cannot retrieve resource at uri '{resource.Uri}': the scheme '{resource.Uri.Scheme}' is not supported")
44+
_ => throw new NotSupportedException($"Cannot retrieve resource at uri '{resource.EndpointUri}': the scheme '{resource.EndpointUri.Scheme}' is not supported")
4545
};
4646
}
4747

@@ -55,8 +55,8 @@ public virtual async Task<Stream> ReadAsync(WorkflowDefinition workflow, Externa
5555
protected virtual async Task<Stream> ReadOverHttpAsync(WorkflowDefinition workflow, ExternalResourceDefinition resource, CancellationToken cancellationToken = default)
5656
{
5757
using var httpClient = this.HttpClientFactory.CreateClient();
58-
await httpClient.ConfigureAuthenticationAsync(resource.Authentication, this.ServiceProvider, cancellationToken).ConfigureAwait(false);
59-
return await httpClient.GetStreamAsync(resource.Uri, cancellationToken).ConfigureAwait(false);
58+
await httpClient.ConfigureAuthenticationAsync(resource.Endpoint.Authentication, this.ServiceProvider, cancellationToken).ConfigureAwait(false);
59+
return await httpClient.GetStreamAsync(resource.EndpointUri, cancellationToken).ConfigureAwait(false);
6060
}
6161

6262
}

src/core/Synapse.Core.Infrastructure/Synapse.Core.Infrastructure.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="IdentityModel" Version="7.0.0" />
13-
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.14.0" />
14-
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.14.0" />
15-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.14.0" />
16-
<PackageReference Include="Neuroglia.Mediation" Version="4.14.0" />
17-
<PackageReference Include="Neuroglia.Plugins" Version="4.14.0" />
18-
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.8" />
13+
<PackageReference Include="Neuroglia.Data.Expressions.Abstractions" Version="4.14.1" />
14+
<PackageReference Include="Neuroglia.Data.Infrastructure.Redis" Version="4.14.1" />
15+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented.Redis" Version="4.14.1" />
16+
<PackageReference Include="Neuroglia.Mediation" Version="4.14.1" />
17+
<PackageReference Include="Neuroglia.Plugins" Version="4.14.1" />
18+
<PackageReference Include="ServerlessWorkflow.Sdk.IO" Version="1.0.0-alpha2.11" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

src/core/Synapse.Core/Synapse.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.14.0" />
36-
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.14.0" />
35+
<PackageReference Include="Neuroglia.Data.Infrastructure.ResourceOriented" Version="4.14.1" />
36+
<PackageReference Include="Neuroglia.Eventing.CloudEvents" Version="4.14.1" />
3737
<PackageReference Include="Semver" Version="2.3.0" />
38-
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha2.8" />
38+
<PackageReference Include="ServerlessWorkflow.Sdk" Version="1.0.0-alpha2.11" />
3939
</ItemGroup>
4040

4141
</Project>

src/correlator/Synapse.Correlator/Synapse.Correlator.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<PackageReference Include="Microsoft.Extensions.Configuration.KeyPerFile" Version="8.0.8" />
1717
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
1818
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
19-
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.14.0" />
20-
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.14.0" />
21-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.14.0" />
22-
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.14.0" />
23-
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.14.0" />
24-
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.0" />
19+
<PackageReference Include="Neuroglia.Data.Expressions.JavaScript" Version="4.14.1" />
20+
<PackageReference Include="Neuroglia.Data.Expressions.JQ" Version="4.14.1" />
21+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.AspNetCore" Version="4.14.1" />
22+
<PackageReference Include="Neuroglia.Mediation.AspNetCore" Version="4.14.1" />
23+
<PackageReference Include="Neuroglia.Eventing.CloudEvents.Infrastructure" Version="4.14.1" />
24+
<PackageReference Include="Neuroglia.Security.AspNetCore" Version="4.14.1" />
2525
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.1" />
2626
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.1" />
2727
</ItemGroup>

src/dashboard/Synapse.Dashboard/Synapse.Dashboard.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.8" />
3535
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
3636
<PackageReference Include="moment.net" Version="1.3.4" />
37-
<PackageReference Include="Neuroglia.Blazor.Dagre" Version="4.14.0" />
37+
<PackageReference Include="Neuroglia.Blazor.Dagre" Version="4.14.1" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

src/runner/Synapse.Runner/Services/Executors/DoTaskExecutor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected override async Task DoExecuteAsync(CancellationToken cancellationToken
7171
}
7272
var nextDefinitionIndex = this.Task.Definition.Do.Keys.ToList().IndexOf(nextDefinition.Key);
7373
var input = last == null ? this.Task.Input : (await this.Task.Workflow.Documents.GetAsync(last.OutputReference!, cancellationToken).ConfigureAwait(false))!;
74-
var next = await this.Task.Workflow.CreateTaskAsync(nextDefinition.Value, this.GetPathFor(nextDefinitionIndex, nextDefinition.Key), input, null, this.Task, false, cancellationToken).ConfigureAwait(false);
74+
var next = await this.Task.Workflow.CreateTaskAsync(nextDefinition.Value, this.GetPathFor(nextDefinitionIndex, nextDefinition.Key), input, null, this.Task, this.Task.Instance.IsExtension, cancellationToken).ConfigureAwait(false);
7575
var executor = await this.CreateTaskExecutorAsync(next, nextDefinition.Value, this.Task.ContextData, this.Task.Arguments, cancellationToken).ConfigureAwait(false);
7676
await executor.ExecuteAsync(cancellationToken).ConfigureAwait(false);
7777
}
@@ -105,7 +105,7 @@ protected virtual async Task OnSubtaskCompletedAsync(ITaskExecutor executor, Can
105105
this.Executors.Remove(executor);
106106
if (nextDefinition == null || nextDefinition.Value == null)
107107
{
108-
await this.SetResultAsync(output, last.Next == FlowDirective.End || last.Next == FlowDirective.Exit ? FlowDirective.End : this.Task.Definition.Then, cancellationToken).ConfigureAwait(false);
108+
await this.SetResultAsync(output, last.Next == FlowDirective.End ? FlowDirective.End : this.Task.Definition.Then, cancellationToken).ConfigureAwait(false);
109109
return;
110110
}
111111
var nextDefinitionIndex = this.Task.Definition.Do.Keys.ToList().IndexOf(nextDefinition.Key);

0 commit comments

Comments
 (0)