Skip to content

Commit 3b685d6

Browse files
hangyhangy
committed
Merge remote-tracking branch 'origin/beta'
2 parents 9e44309 + f1be50b commit 3b685d6

17 files changed

Lines changed: 1205 additions & 779 deletions

File tree

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
// postCreateCommand.sh parameters: $1=SA password, $2=dacpac path, $3=sql script(s) path
5656
"postCreateCommand": "bash .devcontainer/mssql/postCreateCommand.sh 'P@ssw0rd' './bin/Debug/' './.devcontainer/mssql/'",
5757
"features": {
58-
"ghcr.io/devcontainers/features/node:1": {},
58+
"ghcr.io/devcontainers/features/node:2": {},
5959
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
6060
}
6161

‎.devcontainer/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
# (Adding the "ports" property to this file will not forward from a Codespace.)
2323

2424
db:
25-
image: mcr.microsoft.com/mssql/server:2022-latest
25+
image: mcr.microsoft.com/mssql/server:2025-latest
2626
restart: unless-stopped
2727
environment:
2828
SA_PASSWORD: P@ssw0rd

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
- name: "Checkout Repository"
1212
uses: actions/checkout@v6
1313
- name: "Dependency Review"
14-
uses: actions/dependency-review-action@v4.8.3
14+
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
@@ -31,9 +31,9 @@ jobs:
3131
- name: Build
3232
run: dotnet build --no-restore
3333
- name: Test
34-
run: dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage"
34+
run: dotnet test --no-build --verbosity normal --coverlet
3535
- name: Upload coverage reports to Codecov
36-
uses: codecov/codecov-action@v5.5.2
36+
uses: codecov/codecov-action@v6.0.0
3737
with:
3838
token: ${{ secrets.CODECOV_TOKEN }}
3939
slug: AlbusKavaliro/TempMaiSe

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<RepositoryBranch>main</RepositoryBranch>
21-
<RepositoryCommit>0e68d8d5cf1ddd33300b536743d2e03be95e5ae9</RepositoryCommit>
22-
<Version>3.1.2</Version>
21+
<RepositoryCommit>c6b4c188abd35c98cdb2c5e743b44ff4882942f9</RepositoryCommit>
22+
<Version>3.1.3-beta.1</Version>
2323
</PropertyGroup>
2424

2525
</Project>

‎Directory.Packages.props‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,51 +9,51 @@
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" />
1213
<!-- Bumped to satisfy Microsoft.VisualStudio.Web.CodeGeneration.Design dependency (>= 17.11.4) -->
1314
<PackageVersion Include="Microsoft.Build" Version="18.4.0" />
14-
<PackageVersion Include="MimeKit" Version="4.15.1" />
15+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
16+
<PackageVersion Include="MimeKit" Version="4.16.0" />
1517
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
1618
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
17-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.0" />
18-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.0" />
19-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.1" />
20-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.0" />
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" />
2123
<PackageVersion Include="Fluid.Core" Version="2.31.0" />
22-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
23-
<PackageVersion Include="xunit" Version="2.9.3" />
24+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
25+
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
2426
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
25-
<PackageVersion Include="coverlet.collector" Version="8.0.1" />
27+
<PackageVersion Include="coverlet.MTP" Version="10.0.0" />
2628
<PackageVersion Include="Moq" Version="4.20.72" />
2729
<PackageVersion Include="Testcontainers.Papercut" Version="4.11.0" />
2830
<PackageVersion Include="OneOf" Version="3.0.271" />
2931
</ItemGroup>
30-
3132
<!-- Framework-specific versions: keep 9.x for net9.0 and move to 10.0.0 for net10.0 -->
3233
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'" Label="Microsoft-net9">
33-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.14" />
34-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.14" />
35-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.14" />
36-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.14" />
34+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.15" />
35+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.15" />
36+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.15" />
37+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
3738
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.12" />
38-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.14" />
39-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.14" />
40-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.14" />
41-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.14" />
42-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.14" />
43-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.14" />
39+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.15" />
40+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.15" />
41+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.15" />
42+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.15" />
43+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.15" />
44+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.15" />
4445
</ItemGroup>
45-
4646
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'" Label="Microsoft-net10">
47-
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.5" />
48-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.5" />
49-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.5" />
50-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.5" />
47+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
48+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7" />
49+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.7" />
50+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.7" />
5151
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
52-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.5" />
53-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.5" />
54-
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.5" />
55-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.5" />
56-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.5" />
57-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.5" />
52+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
53+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.7" />
54+
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.7" />
55+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
56+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.7" />
57+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.7" />
5858
</ItemGroup>
5959
</Project>

0 commit comments

Comments
 (0)