Skip to content

Commit bfdaaa1

Browse files
zaruszzarusz
authored
Merge v2 to v3
Merge v2 to v3
2 parents c2cbd1f + 7f96abd commit bfdaaa1

File tree

52 files changed

+137
-210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+137
-210
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,21 @@ jobs:
2525
group: ${{ github.workflow }}-${{ github.ref }}
2626
cancel-in-progress: true
2727
steps:
28-
# - name: Dump GitHub context
29-
# env:
30-
# GITHUB_CONTEXT: ${{ toJson(github) }}
31-
# run: echo "$GITHUB_CONTEXT"
32-
3328
- name: PR - Checkout
3429
if: github.event_name == 'pull_request_target'
35-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3631
with:
3732
fetch-depth: 0
3833
ref: ${{ github.event.pull_request.head.sha }}
3934

4035
- name: Checkout
4136
if: github.event_name != 'pull_request_target'
42-
uses: actions/checkout@v3
37+
uses: actions/checkout@v4
4338
with:
4439
fetch-depth: 0
4540

4641
- name: Setup .NET
47-
uses: actions/setup-dotnet@v3
42+
uses: actions/setup-dotnet@v4
4843
with:
4944
dotnet-version: 8.0.x
5045
cache: false
@@ -53,14 +48,9 @@ jobs:
5348
run: dotnet restore $SOLUTION_NAME
5449
working-directory: ./src
5550

56-
- name: Install Coverlet
57-
#if: false
58-
run: find . -name "*.Test.csproj" | xargs -t -I {} dotnet add {} package coverlet.collector
59-
working-directory: ./src
60-
6151
- name: SonarCloud - Setup Java17
6252
#if: github.event_name == 'pull_request_target'
63-
uses: actions/setup-java@v3
53+
uses: actions/setup-java@v4
6454
with:
6555
distribution: "adopt"
6656
java-version: "17"
@@ -137,7 +127,7 @@ jobs:
137127

138128
_redis_connectionstring: ${{ secrets.redis_connectionstring }}
139129

140-
_sqlserver_connectionstring: ${{ secrets.sqlserver_connectionstring }}
130+
sqlserver_connectionstring: ${{ secrets.sqlserver_connectionstring }}
141131

142132
# Connects to the local Test Containers
143133
kafka_brokers: localhost:9092
@@ -155,7 +145,7 @@ jobs:
155145

156146
redis_connectionstring: localhost:6379
157147

158-
sqlserver_connectionstring: "Server=localhost;Initial Catalog=SlimMessageBus_Outbox;User ID=sa;Password=SuperSecretP@55word;TrustServerCertificate=true;MultipleActiveResultSets=true;"
148+
_sqlserver_connectionstring: "Server=localhost;Initial Catalog=SlimMessageBus_Outbox;User ID=sa;Password=SuperSecretP@55word;TrustServerCertificate=true;MultipleActiveResultSets=true;"
159149

160150
nats_endpoint: "nats://localhost:4222"
161151

‎src/Infrastructure/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- "9092:9092"
1717
environment:
1818
KAFKA_ADVERTISED_HOST_NAME: localhost
19-
KAFKA_CREATE_TOPICS: "user-test-ping:2:1,user-test-echo:2:1,user-test-echo-resp:2:1"
19+
KAFKA_CREATE_TOPICS: "test-ping:2:1,test-echo:2:1,test-echo-resp:2:1"
2020
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
2121
depends_on:
2222
- zookeeper

‎src/Samples/Sample.AsyncApi.Service/Sample.AsyncApi.Service.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
12+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
1313
<PackageReference Include="NSwag.AspNetCore" Version="14.1.0" />
1414
<ProjectReference Include="..\..\SlimMessageBus.Host.AsyncApi\SlimMessageBus.Host.AsyncApi.csproj" />
1515
<ProjectReference Include="..\..\SlimMessageBus.Host.AzureServiceBus\SlimMessageBus.Host.AzureServiceBus.csproj" />

‎src/Samples/Sample.DomainEvents.Application/Sample.DomainEvents.Application.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎src/Samples/Sample.DomainEvents.Domain/Sample.DomainEvents.Domain.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎src/Samples/Sample.DomainEvents.WebApi/Sample.DomainEvents.WebApi.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
18-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
19-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
18+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
19+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/Samples/Sample.Hybrid.ConsoleApp/Sample.Hybrid.ConsoleApp.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎src/Samples/Sample.Images.WebApi/Sample.Images.WebApi.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.1" />
20+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/Samples/Sample.Images.Worker/Sample.Images.Worker.csproj‎

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

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
15-
<PackageReference Include="System.Drawing.Common" Version="8.0.8" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
15+
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Samples/Sample.Nats.WebApi/Sample.Nats.WebApi.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
10+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
11+
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

0 commit comments

Comments
 (0)