Skip to content

Commit b17c211

Browse files
hangyhangy
committed
Merge branch 'dev' into beta
2 parents 62f77af + 3f8f1c1 commit b17c211

16 files changed

Lines changed: 643 additions & 4078 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"postCreateCommand": "bash .devcontainer/mssql/postCreateCommand.sh 'P@ssw0rd' './bin/Debug/' './.devcontainer/mssql/'",
5757
"features": {
5858
"ghcr.io/devcontainers/features/node:2": {},
59-
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
59+
"ghcr.io/devcontainers/features/docker-in-docker:4": {}
6060
}
6161

6262
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v6
39+
uses: actions/checkout@v7
4040
with:
4141
fetch-depth: 0
4242

‎.github/workflows/component-detection.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
dependency-submission:
1313
runs-on: ubuntu-slim
1414
steps:
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@v7
1616
- name: Component detection
17-
uses: advanced-security/component-detection-dependency-submission-action@v0.1.1
17+
uses: advanced-security/component-detection-dependency-submission-action@v0.1.4

‎.github/workflows/dependency-review.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-slim
1010
steps:
1111
- name: "Checkout Repository"
12-
uses: actions/checkout@v6
12+
uses: actions/checkout@v7
1313
- name: "Dependency Review"
1414
uses: actions/dependency-review-action@v5.0.0

‎.github/workflows/dotnet.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@v7
2525
- name: Setup .NET
2626
uses: actions/setup-dotnet@v5
2727
with:
@@ -33,7 +33,7 @@ jobs:
3333
- name: Test
3434
run: dotnet test --no-build --verbosity normal --coverlet
3535
- name: Upload coverage reports to Codecov
36-
uses: codecov/codecov-action@v6.0.0
36+
uses: codecov/codecov-action@v7.0.0
3737
with:
3838
token: ${{ secrets.CODECOV_TOKEN }}
3939
slug: AlbusKavaliro/TempMaiSe

‎.github/workflows/linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# Checkout the code base #
4848
##########################
4949
- name: Checkout Code
50-
uses: actions/checkout@v6
50+
uses: actions/checkout@v7
5151
with:
5252
# Full git history is needed to get a proper
5353
# list of changed files within `super-linter`

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
packages: write # to be able to publish to GitHub Packages
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v6
26+
uses: actions/checkout@v7
2727
with:
2828
fetch-depth: 0
2929
- name: Setup .NET
@@ -33,7 +33,7 @@ jobs:
3333
- name: Restore dependencies
3434
run: dotnet restore --locked-mode
3535
- name: Setup Node.js
36-
uses: actions/setup-node@v6
36+
uses: actions/setup-node@v7
3737
with:
3838
node-version: "lts/*"
3939
check-latest: true

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<LangVersion>preview</LangVersion>
4-
<TargetFrameworks>net9.0;net10.0</TargetFrameworks>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>

‎Directory.Packages.props‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,36 @@
99
<PackageVersion Include="jcamp.FluentEmail.Core" Version="4.0.0" />
1010
<PackageVersion Include="jcamp.FluentEmail.MailKit" Version="4.0.0" />
1111
<PackageVersion Include="jcamp.FluentEmail.Smtp" Version="4.0.0" />
12-
<PackageVersion Include="MailKit" Version="4.16.0" />
12+
<PackageVersion Include="MailKit" Version="4.17.0" />
1313
<!-- Bumped to satisfy Microsoft.VisualStudio.Web.CodeGeneration.Design dependency (>= 17.11.4) -->
14-
<PackageVersion Include="Microsoft.Build" Version="18.4.0" />
15-
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
16-
<PackageVersion Include="MimeKit" Version="4.16.0" />
14+
<PackageVersion Include="Microsoft.Build" Version="18.7.1" />
15+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.7.1" />
16+
<PackageVersion Include="MimeKit" Version="4.17.0" />
1717
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1818
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
19-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
20-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
21-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
22-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
19+
<PackageVersion Include="NuGet.Packaging" Version="7.6.0" />
20+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
21+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.16.0" />
22+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.16.0" />
23+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.16.0" />
2324
<PackageVersion Include="Fluid.Core" Version="2.31.0" />
24-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
25+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
2526
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
2627
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
27-
<PackageVersion Include="coverlet.MTP" Version="10.0.0" />
28+
<PackageVersion Include="coverlet.MTP" Version="10.0.1" />
2829
<PackageVersion Include="Moq" Version="4.20.72" />
29-
<PackageVersion Include="Testcontainers.Papercut" Version="4.11.0" />
30+
<PackageVersion Include="Testcontainers.Papercut" Version="4.13.0" />
3031
<PackageVersion Include="OneOf" Version="3.0.271" />
31-
</ItemGroup>
32-
<!-- Framework-specific versions: keep 9.x for net9.0 and move to 10.0.0 for net10.0 -->
33-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'" Label="Microsoft-net9">
34-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.16" />
35-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.16" />
36-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.16" />
37-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8" />
38-
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.12" />
39-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.16" />
40-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.16" />
41-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.16" />
42-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.16" />
43-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.16" />
44-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.16" />
45-
</ItemGroup>
46-
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'" Label="Microsoft-net10">
47-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.8" />
48-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8" />
49-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.8" />
50-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.8" />
32+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.10" />
33+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.10" />
34+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.10" />
35+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.10" />
5136
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
52-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.8" />
53-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.8" />
54-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.8" />
55-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.8" />
56-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.8" />
57-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.8" />
37+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.10" />
38+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.10" />
39+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.10" />
40+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.10" />
41+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.10" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.10" />
5843
</ItemGroup>
5944
</Project>

0 commit comments

Comments
 (0)