Skip to content

Commit e175d56

Browse files
berviantoleoberviantoleo
committed
2 parents 7c8c829 + 42771c0 commit e175d56

78 files changed

Lines changed: 1903 additions & 1580 deletions

File tree

Some content is hidden

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

‎.config/dotnet-tools.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"dotnet-ef": {
6+
"version": "10.0.10",
7+
"commands": [
8+
"dotnet-ef"
9+
],
10+
"rollForward": false
11+
}
12+
}
13+
}

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ updates:
2020
nlog:
2121
patterns:
2222
- "NLog*"
23+
aspire:
24+
patterns:
25+
- "Aspire*"
26+
core:
27+
patterns:
28+
- "Microsoft*"
29+
- "Npgsql*"
30+
- "Swashbuckle*"
31+
- "Autofac*"
32+
- "System*"
33+
- "Newtonsoft*"
2334

2435
- package-ecosystem: github-actions
2536
directory: "/"

‎.github/workflows/build-and-dockerize.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# Label used to access the service container
1414
postgres:
1515
# Docker Hub image
16-
image: postgres:17-alpine
16+
image: postgres:18-alpine
1717
ports:
1818
- 5432:5432
1919
# Provide the password for postgres
@@ -34,11 +34,11 @@ jobs:
3434
- 10002:10002
3535
runs-on: ubuntu-24.04
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v7
3838
- name: Setup .NET Core
39-
uses: actions/setup-dotnet@v4
39+
uses: actions/setup-dotnet@v6
4040
with:
41-
dotnet-version: '9.0.x'
41+
dotnet-version: '10.0.x'
4242
- name: Install dependencies
4343
run: dotnet restore
4444
- name: Build
@@ -50,4 +50,4 @@ jobs:
5050
- name: Test
5151
run: dotnet test --configuration Release --no-restore --no-build --verbosity normal --collect:"XPlat Code Coverage"
5252
- name: Report Codecov
53-
uses: codecov/codecov-action@v5
53+
uses: codecov/codecov-action@v7

‎.github/workflows/codeql.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ jobs:
1616
security-events: write
1717
runs-on: ubuntu-24.04
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v7
2020
- name: Initialize CodeQL
21-
uses: github/codeql-action/init@v3
21+
uses: github/codeql-action/init@v4
2222
with:
2323
languages: csharp
2424
- name: Setup .NET Core
25-
uses: actions/setup-dotnet@v4
25+
uses: actions/setup-dotnet@v6
2626
with:
27-
dotnet-version: '9.0.x'
27+
dotnet-version: '10.0.x'
2828
dotnet-quality: 'preview'
2929
- name: Autobuild
30-
uses: github/codeql-action/autobuild@v3
30+
uses: github/codeql-action/autobuild@v4
3131
- name: Perform CodeQL Analysis
32-
uses: github/codeql-action/analyze@v3
32+
uses: github/codeql-action/analyze@v4

‎.github/workflows/docker.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
runs-on: ubuntu-24.04
1414
if: github.event_name == 'pull_request'
1515
steps:
16-
- uses: actions/checkout@v4
17-
- uses: hadolint/hadolint-action@v3.1.0
16+
- uses: actions/checkout@v7
17+
- uses: hadolint/hadolint-action@v3.3.0
1818
name: Lint Dockerfile
1919
with:
2020
dockerfile: Dockerfile
@@ -28,40 +28,40 @@ jobs:
2828
format: 'sarif'
2929
output: 'trivy-results.sarif'
3030
- name: Upload Trivy scan results to GitHub Security tab
31-
uses: github/codeql-action/upload-sarif@v3
31+
uses: github/codeql-action/upload-sarif@v4
3232
with:
3333
sarif_file: 'trivy-results.sarif'
3434
build-push-docker:
3535
runs-on: ubuntu-24.04
3636
if: github.event_name == 'push'
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v7
3939
- name: Set up QEMU
40-
uses: docker/setup-qemu-action@v3
40+
uses: docker/setup-qemu-action@v4
4141
- name: Set up Docker Buildx
42-
uses: docker/setup-buildx-action@v3
42+
uses: docker/setup-buildx-action@v4
4343
with:
4444
platforms: linux/amd64,linux/arm64
4545
- name: Log in to Docker Hub
46-
uses: docker/login-action@v3
46+
uses: docker/login-action@v4
4747
with:
4848
username: ${{ secrets.DOCKER_USERNAME }}
4949
password: ${{ secrets.DOCKER_TOKEN }}
5050
- name: Log in to the Container registry
51-
uses: docker/login-action@v3
51+
uses: docker/login-action@v4
5252
with:
5353
registry: ghcr.io
5454
username: ${{ github.actor }}
5555
password: ${{ secrets.GITHUB_TOKEN }}
5656
- name: Extract metadata (tags, labels) for Docker
5757
id: meta
58-
uses: docker/metadata-action@v5
58+
uses: docker/metadata-action@v6
5959
with:
6060
images: |
6161
bervproject/${{ env.IMAGE_NAME }}
6262
ghcr.io/${{ github.repository }}
6363
- name: Build and push Docker images
64-
uses: docker/build-push-action@v6
64+
uses: docker/build-push-action@v7
6565
with:
6666
context: .
6767
push: true

‎BervProject.WebApi.Boilerplate.AppHost/BervProject.WebApi.Boilerplate.AppHost.csproj‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,21 @@
33

44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net9.0</TargetFramework>
6+
<TargetFramework>net10.0</TargetFramework>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<IsAspireHost>true</IsAspireHost>
1010
<UserSecretsId>0f1966e4-7b2b-4a28-a9b6-8198aab433ec</UserSecretsId>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.1" />
15-
<PackageReference Include="Aspire.Hosting.Azure.ServiceBus" Version="9.3.1" />
16-
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.3.1" />
17-
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.3.1" />
18-
<PackageReference Include="Aspire.Hosting.Redis" Version="9.3.1" />
19-
</ItemGroup>
20-
21-
<ItemGroup>
14+
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.6" />
15+
<PackageReference Include="Aspire.Hosting.Azure.ServiceBus" Version="13.4.6" />
16+
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="13.4.6" />
17+
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="13.4.6" />
18+
<PackageReference Include="Aspire.Hosting.Redis" Version="13.4.6" />
19+
<PackageReference Include="KubernetesClient" Version="19.0.2" />
20+
<PackageReference Include="MessagePack" Version="3.1.8" />
2221
<ProjectReference Include="..\BervProject.WebApi.Boilerplate\BervProject.WebApi.Boilerplate.csproj" />
2322
<ProjectReference Include="..\BervProject.WebApi.Boilerplate.MigrationService\BervProject.WebApi.Boilerplate.MigrationService.csproj" />
2423
</ItemGroup>

‎BervProject.WebApi.Boilerplate.MigrationService/BervProject.WebApi.Boilerplate.MigrationService.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>dotnet-BervProject.WebApi.Boilerplate.MigrationService-02d1add9-9cd8-4b0e-96ab-9dedc82c871c</UserSecretsId>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.3.1" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.6" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
11+
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="13.4.6" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.11" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎BervProject.WebApi.Boilerplate.MigrationService/Worker.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1+
namespace BervProject.WebApi.Boilerplate.MigrationService;
2+
13
using System.Diagnostics;
2-
using BervProject.WebApi.Boilerplate.EntityFramework;
4+
using EntityFramework;
35
using Microsoft.EntityFrameworkCore;
46

5-
namespace BervProject.WebApi.Boilerplate.MigrationService;
6-
77
public class Worker : BackgroundService
88
{
99
public const string ActivitySourceName = "Migrations";

‎BervProject.WebApi.Boilerplate.ServiceDefaults/BervProject.WebApi.Boilerplate.ServiceDefaults.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsAspireSharedProject>true</IsAspireSharedProject>
@@ -10,13 +10,13 @@
1010
<ItemGroup>
1111
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1212

13-
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.6.0" />
14-
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.1" />
15-
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
16-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
13+
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.9.0" />
14+
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.9.0" />
15+
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.17.0" />
16+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.17.0" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.17.0" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.17.0" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.17.0" />
2020
</ItemGroup>
2121

2222
</Project>

‎BervProject.WebApi.Boilerplate.ServiceDefaults/Extensions.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.Extensions.DependencyInjection;
44
using Microsoft.Extensions.Diagnostics.HealthChecks;
55
using Microsoft.Extensions.Logging;
6-
using Microsoft.Extensions.ServiceDiscovery;
76
using OpenTelemetry;
87
using OpenTelemetry.Metrics;
98
using OpenTelemetry.Trace;

0 commit comments

Comments
 (0)