Skip to content

Commit d5d0cfc

Browse files
thomasduftthomasduft
committed
updated to latest nuget packages
1 parent 2e27268 commit d5d0cfc

File tree

14 files changed

+445
-416
lines changed

14 files changed

+445
-416
lines changed

‎.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ ARG INSTALL_NODE="true"
77
ARG NODE_VERSION="lts/*"
88
RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
99

10-
RUN dotnet dev-certs https
10+
RUN dotnet dev-certs https --trust

‎changelogs/.gitkeep

Whitespace-only changes.

‎changelogs/6e7b9ab3ba1d42c7886609e39508842e.cle

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"Id": "6e7b9ab3-ba1d-42c7-8866-09e39508842e",
3+
"IssueId": "",
4+
"Prefix": "Added",
5+
"Tag": "",
6+
"Message": "Addes support for net8.0",
7+
"CreatedAt": "2024-01-10T14:29:32.7290956+00:00",
8+
"CreatedBy": "vscode"
9+
}

‎samples/WebApi/STS/Domain/Data/20221026072538_Initial.cs

Lines changed: 0 additions & 363 deletions
This file was deleted.

‎samples/WebApi/STS/Domain/Data/20221026072538_Initial.Designer.cs renamed to ‎samples/WebApi/STS/Domain/Data/20240110144459_Initial.Designer.cs

Lines changed: 15 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/WebApi/STS/Domain/Data/20240110144459_Initial.cs

Lines changed: 369 additions & 0 deletions
Large diffs are not rendered by default.

‎samples/WebApi/STS/Domain/Data/STSDbContextModelSnapshot.cs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ partial class STSDbContextModelSnapshot : ModelSnapshot
1515
protected override void BuildModel(ModelBuilder modelBuilder)
1616
{
1717
#pragma warning disable 612, 618
18-
modelBuilder.HasAnnotation("ProductVersion", "6.0.10");
18+
modelBuilder.HasAnnotation("ProductVersion", "8.0.1");
1919

2020
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
2121
{
@@ -151,13 +151,21 @@ protected override void BuildModel(ModelBuilder modelBuilder)
151151
.ValueGeneratedOnAdd()
152152
.HasColumnType("TEXT");
153153

154+
b.Property<string>("ApplicationType")
155+
.HasMaxLength(50)
156+
.HasColumnType("TEXT");
157+
154158
b.Property<string>("ClientId")
155159
.HasMaxLength(100)
156160
.HasColumnType("TEXT");
157161

158162
b.Property<string>("ClientSecret")
159163
.HasColumnType("TEXT");
160164

165+
b.Property<string>("ClientType")
166+
.HasMaxLength(50)
167+
.HasColumnType("TEXT");
168+
161169
b.Property<string>("ConcurrencyToken")
162170
.IsConcurrencyToken()
163171
.HasMaxLength(50)
@@ -173,6 +181,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
173181
b.Property<string>("DisplayNames")
174182
.HasColumnType("TEXT");
175183

184+
b.Property<string>("JsonWebKeySet")
185+
.HasColumnType("TEXT");
186+
176187
b.Property<string>("Permissions")
177188
.HasColumnType("TEXT");
178189

@@ -188,8 +199,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
188199
b.Property<string>("Requirements")
189200
.HasColumnType("TEXT");
190201

191-
b.Property<string>("Type")
192-
.HasMaxLength(50)
202+
b.Property<string>("Settings")
193203
.HasColumnType("TEXT");
194204

195205
b.HasKey("Id");

‎samples/WebApi/WebApi.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.12" />
12-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.12" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.12" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.12">
11+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.1" />
12+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
1515
<PrivateAssets>all</PrivateAssets>
1616
</PackageReference>
1717

18-
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.7.0" />
19-
<PackageReference Include="OpenIddict.AspNetCore" Version="4.9.0" />
20-
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="4.9.0" />
21-
<PackageReference Include="OpenIddict.Quartz" Version="4.9.0" />
18+
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.8.0" />
19+
<PackageReference Include="OpenIddict.AspNetCore" Version="5.0.1" />
20+
<PackageReference Include="OpenIddict.EntityFrameworkCore" Version="5.0.1" />
21+
<PackageReference Include="OpenIddict.Quartz" Version="5.0.1" />
2222

23-
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
24-
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
23+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
24+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
2525
<PackageReference Include="Serilog.Sinks.ColoredConsole" Version="3.0.1" />
2626
<PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.1-dev-00771" />
2727
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />

‎samples/WebApi/appsettings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"Override": {
99
"Microsoft.Hosting.Lifetime": "Information",
1010
"Serilog.AspNetCore.RequestLoggingMiddleware": "Warning",
11+
"tomware.Microwf.Infrastructure.JobQueueService": "Information",
1112
"tomware.Microwf.Infrastructure.WorkflowEngineService": "Information"
1213
}
1314
},
@@ -31,7 +32,7 @@
3132
},
3233
"Worker": {
3334
"Enabled": true,
34-
"Interval": 500
35+
"Interval": 2000
3536
},
3637
"Workflows": {
3738
"Types": [

‎src/microwf.AspNetCoreEngine/microwf.AspNetCoreEngine.csproj

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

2424
<ItemGroup>
2525
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
26-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.0.12" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
31-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
26+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎src/microwf.Domain/microwf.Domain.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
25+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup>

‎src/microwf.Infrastructure/Services/JobQueueService.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ private ConcurrentQueue<WorkItem> Items
1919
{
2020
get
2121
{
22-
if (items == null)
23-
{
24-
items = new ConcurrentQueue<WorkItem>();
25-
}
26-
27-
return items;
22+
return this.items ??= new ConcurrentQueue<WorkItem>();
2823
}
2924
}
3025

@@ -44,14 +39,11 @@ public JobQueueService(ILogger<JobQueueService> logger)
4439

4540
public async Task Enqueue(WorkItem item)
4641
{
47-
this.logger.LogTrace("Enqueue work item", item);
42+
this.logger.LogTrace("Enqueue work item {@WorkItem}", item);
4843

4944
if (item.Retries > WorkItem.WORKITEM_RETRIES)
5045
{
51-
this.logger.LogInformation(
52-
"Amount of retries for work item {@WorkItem} exceeded!",
53-
item
54-
);
46+
this.logger.LogInformation("Amount of retries for work item {@WorkItem} exceeded!", item);
5547

5648
await this.PersistWorkItemsAsync(new List<WorkItem> { item });
5749
}
@@ -65,7 +57,7 @@ public async Task Enqueue(WorkItem item)
6557

6658
public async Task ProcessItemsAsync()
6759
{
68-
while (this.Items.Count > 0)
60+
while (!this.Items.IsEmpty)
6961
{
7062
var item = this.Dequeue();
7163
if (item == null) continue;

‎src/microwf.Infrastructure/microwf.Infrastructure.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
26-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.12" />
27-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
25+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
26+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.1" />
27+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.1" />
30+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎tests/microwf.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
17-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
19-
<PackageReference Include="xunit" Version="2.5.2" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.1" />
17+
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
19+
<PackageReference Include="xunit" Version="2.6.5" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

0 commit comments

Comments
 (0)