Skip to content

[Dressca] .NET 10へアップデートする #3528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsuna-can-se merged 23 commits into from
Nov 14, 2025
Merged

[Dressca] .NET 10へアップデートする #3528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7b5abb2
一式 .NET 10 系にアップグレード
KentaHizume Oct 31, 2025
f7588a3
EF 10 系でマイグレーションを再作成
KentaHizume Oct 31, 2025
9a12a0c
CI パイプラインでセットアップする .NET バージョンを 10 系にアップデート
KentaHizume Oct 31, 2025
7a362d9
下記の WARNINGに対処
KentaHizume Oct 31, 2025
6f772db
パッケージ関連の警告に対処
KentaHizume Oct 31, 2025
79245db
下記のINFOレベルのコード分析に対処
KentaHizume Nov 4, 2025
d68e44a
Revert "パッケージ関連の警告に対処"
KentaHizume Nov 4, 2025
6bb8bac
脆弱性に関する警告は別途解消予定のため一旦戻し
KentaHizume Nov 4, 2025
a1ec2a4
global.jsonでテストランナーを指定
KentaHizume Nov 5, 2025
4881c33
ワークフローとテストプロジェクトの設定を修正
KentaHizume Nov 5, 2025
0f15099
ソリューションフィルターの末尾のカンマを除去
KentaHizume Nov 5, 2025
d259669
CI で使用する EF ツールを10系に修正
KentaHizume Nov 5, 2025
12a3ba5
ワイルドカードだとeftoolが取れなかったので一旦バージョン指定に変更
KentaHizume Nov 5, 2025
528403d
Revert "ワイルドカードだとeftoolが取れなかったので一旦バージョン指定に変更"
KentaHizume Nov 5, 2025
fdd2b77
Revert "CI で使用する EF ツールを10系に修正"
KentaHizume Nov 5, 2025
965bb55
dotne-ef のバージョンを10系に更新
KentaHizume Nov 5, 2025
c0649d7
.NET 10 正式版へバージョンを更新
KentaHizume Nov 13, 2025
6020e3f
Nswag のバージョンアップに伴うOpenAPI仕様書の更新
KentaHizume Nov 13, 2025
69afc1e
.NET 10 系正式版でマイグレーションを再作成
KentaHizume Nov 13, 2025
81ce69f
CIで用いるツールのバージョンを正式版に修正
KentaHizume Nov 13, 2025
28e646d
自動推論されているだけで、デフォルトで追加されているわけではないようなので、
KentaHizume Nov 13, 2025
83ec031
Revert "下記の WARNINGに対処"
KentaHizume Nov 14, 2025
f60b66d
NULL チェックの実装が誤っている箇所を修正
KentaHizume Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/samples-dressca-admin-backend.ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: .NET SDK のセットアップ
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
with:
dotnet-version: '8.*'
dotnet-version: '10.*'

- name: NuGet パッケージの復元
run: dotnet restore ${{ env.SOLUTION_FILE_NAME }}
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:

- name: EF Core ツールのインストール(結合テスト用)
shell: bash
run: dotnet tool install --global dotnet-ef --version 8.*
run: dotnet tool install --global dotnet-ef --version 10.*

- name: マイグレーション適用(結合テスト用)
working-directory: ${{ env.WORKING_DIRECTORY }}/src/Dressca.EfInfrastructure
Expand All @@ -92,7 +92,7 @@ jobs:
continue-on-error: true
run: |
export TEST_ENVIRONMENT=${{ env.TEST_ENVIRONMENT }}
dotnet test ${{ env.SOLUTION_FILE_NAME }} --no-build --verbosity normal --configuration ${{ env.BUILD_CONFIGURATION }} -- --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml --report-xunit-trx
dotnet test --solution ${{ env.SOLUTION_FILE_NAME }} --no-build --verbosity normal --configuration ${{ env.BUILD_CONFIGURATION }} --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml --report-xunit-trx

- id: create-test-result-report
name: テスト結果ページの作成
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/samples-dressca-consumer-backend.ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: .NET SDK のセットアップ
uses: actions/setup-dotnet@d4c94342e560b34958eacfc5d055d21461ed1c5d # v5.0.0
with:
dotnet-version: '8.*'
dotnet-version: '10.*'

- name: NuGet パッケージの復元
run: dotnet restore ${{ env.SOLUTION_FILE_NAME }}
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:

- name: EF Core ツールのインストール(結合テスト用)
shell: bash
run: dotnet tool install --global dotnet-ef --version 8.*
run: dotnet tool install --global dotnet-ef --version 10.*

- name: マイグレーション適用(結合テスト用)
working-directory: ${{ env.WORKING_DIRECTORY }}/src/Dressca.EfInfrastructure
Expand All @@ -92,7 +92,7 @@ jobs:
continue-on-error: true
run: |
export TEST_ENVIRONMENT=${{ env.TEST_ENVIRONMENT }}
dotnet test ${{ env.SOLUTION_FILE_NAME }} --no-build --verbosity normal --configuration ${{ env.BUILD_CONFIGURATION }} -- --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml --report-xunit-trx
dotnet test --solution ${{ env.SOLUTION_FILE_NAME }} --no-build --verbosity normal --configuration ${{ env.BUILD_CONFIGURATION }} --coverage --coverage-output-format cobertura --coverage-output coverage.cobertura.xml --report-xunit-trx

- id: create-test-result-report
name: テスト結果ページの作成
Expand Down
2 changes: 1 addition & 1 deletion samples/Dressca/dressca-backend/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Copyright>Copyright © 2023 BIPROGY Inc. All rights reserved.</Copyright>
Expand Down
26 changes: 13 additions & 13 deletions samples/Dressca/dressca-backend/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<Project>
<ItemGroup>
<PackageVersion Include="Maris.Logging.Testing" Version="1.1.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.21" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.21" />
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.21" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.21" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.21" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="8.0.21" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.1" />
<PackageVersion Include="NSwag.MSBuild" Version="14.6.1" />
<PackageVersion Include="NSwag.AspNetCore" Version="14.6.2" />
<PackageVersion Include="NSwag.MSBuild" Version="14.6.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="xunit.v3" Version="3.1.0" />
<PackageVersion Include="xunit.v3" Version="3.2.0" />
</ItemGroup>
<ItemGroup>
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
Expand Down
2 changes: 1 addition & 1 deletion samples/Dressca/dressca-backend/Dressca.Web.Admin.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"tests\\Dressca.UnitTests.SystemCommon\\Dressca.UnitTests.SystemCommon.csproj",
"tests\\Dressca.UnitTests.Web.Admin\\Dressca.UnitTests.Web.Admin.csproj",
"tests\\Dressca.UnitTests.Web\\Dressca.UnitTests.Web.csproj",
"tests\\Dressca.Web.Admin.IntegrationTest\\Dressca.Web.Admin.IntegrationTest.csproj",
"tests\\Dressca.Web.Admin.IntegrationTest\\Dressca.Web.Admin.IntegrationTest.csproj"
]
}
}
2 changes: 1 addition & 1 deletion samples/Dressca/dressca-backend/Dressca.Web.Consumer.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"tests\\Dressca.UnitTests.ApplicationCore\\Dressca.UnitTests.ApplicationCore.csproj",
"tests\\Dressca.UnitTests.SystemCommon\\Dressca.UnitTests.SystemCommon.csproj",
"tests\\Dressca.UnitTests.Web.Consumer\\Dressca.UnitTests.Web.Consumer.csproj",
"tests\\Dressca.UnitTests.Web\\Dressca.UnitTests.Web.csproj",
"tests\\Dressca.UnitTests.Web\\Dressca.UnitTests.Web.csproj"
]
}
}
5 changes: 4 additions & 1 deletion samples/Dressca/dressca-backend/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"sdk": {
"version": "8.0.100",
"version": "10.0.100",
"allowPrerelease": false,
"rollForward": "latestMajor"
},
"test": {
"runner": "Microsoft.Testing.Platform"
Comment thread
tsuna-can-se marked this conversation as resolved.
}
}
10 changes: 5 additions & 5 deletions .../20250425023655_InitialCreate.Designer.cs → .../20251113124851_InitialCreate.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...igrations/20250425023655_InitialCreate.cs → ...igrations/20251113124851_InitialCreate.cs
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions .../dressca-backend/src/Dressca.EfInfrastructure/Migrations/DresscaDbContextModelSnapshot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.12")
.HasAnnotation("ProductVersion", "10.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128);

SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
Expand Down Expand Up @@ -562,7 +562,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<decimal>("TotalPrice")
.HasColumnType("decimal(18,6)");

b.ComplexProperty<Dictionary<string, object>>("ShipToAddress", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo", b1 =>
b.ComplexProperty(typeof(Dictionary<string, object>), "ShipToAddress", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo", b1 =>
{
b1.IsRequired();

Expand All @@ -572,7 +572,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
.HasColumnType("nvarchar(64)")
.HasColumnName("ShipToFullName");

b1.ComplexProperty<Dictionary<string, object>>("Address", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo.Address#Address", b2 =>
b1.ComplexProperty(typeof(Dictionary<string, object>), "Address", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo.Address#Address", b2 =>
{
b2.IsRequired();

Expand Down Expand Up @@ -624,7 +624,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
b.Property<decimal>("UnitPrice")
.HasColumnType("decimal(18,6)");

b.ComplexProperty<Dictionary<string, object>>("ItemOrdered", "Dressca.ApplicationCore.Ordering.OrderItem.ItemOrdered#CatalogItemOrdered", b1 =>
b.ComplexProperty(typeof(Dictionary<string, object>), "ItemOrdered", "Dressca.ApplicationCore.Ordering.OrderItem.ItemOrdered#CatalogItemOrdered", b1 =>
{
b1.IsRequired();

Expand Down
7 changes: 0 additions & 7 deletions samples/Dressca/dressca-backend/src/Dressca.Web.Admin/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,3 @@
app.MapFallbackToFile("/index.html");

app.Run();

/// <summary>
/// 結合テストプロジェクトに公開するための部分クラスです。
/// </summary>
public partial class Program
{
}
2 changes: 1 addition & 1 deletion samples/Dressca/dressca-backend/src/Dressca.Web.Admin/dressca-admin-api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"x-generator": "NSwag v14.6.1.0 (NJsonSchema v11.5.1.0 (Newtonsoft.Json v13.0.0.0))",
"x-generator": "NSwag v14.6.2.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))",
"openapi": "3.0.0",
"info": {
"title": "Dressca Admin Web API",
Expand Down
7 changes: 6 additions & 1 deletion samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Configuration/CookieSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,14 @@ public class CookieSettings
/// </summary>
/// <param name="timeProvider">日時のプロバイダ。通常はシステム日時。</param>
/// <returns>アプリケーション構成設定を元に作成した <see cref="CookieOptions"/> のインスタンス。</returns>
/// <exception cref="ArgumentNullException">
/// <list type="bullet">
/// <item><paramref name="timeProvider"/> が <see langword="null"/> です。</item>
/// </list>
/// </exception>
public CookieOptions CreateCookieOptions(TimeProvider timeProvider)
{
Comment thread
tsuna-can-se marked this conversation as resolved.
ArgumentNullException.ThrowIfNull(nameof(timeProvider));
Comment thread
tsuna-can-se marked this conversation as resolved.
ArgumentNullException.ThrowIfNull(timeProvider);

var options = new CookieOptions
{
Expand Down
7 changes: 0 additions & 7 deletions samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,3 @@
app.MapFallbackToFile("/index.html");

app.Run();

/// <summary>
/// 結合テストプロジェクト用の部分クラス。
/// </summary>
public partial class Program
{
}
2 changes: 1 addition & 1 deletion samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/dressca-api.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"x-generator": "NSwag v14.6.1.0 (NJsonSchema v11.5.1.0 (Newtonsoft.Json v13.0.0.0))",
"x-generator": "NSwag v14.6.2.0 (NJsonSchema v11.5.2.0 (Newtonsoft.Json v13.0.0.0))",
"openapi": "3.0.0",
"info": {
"title": "Dressca Consumer Web API",
Expand Down
7 changes: 6 additions & 1 deletion samples/Dressca/dressca-backend/src/Dressca.Web/Configuration/CookieSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,14 @@ public class CookieSettings
/// </summary>
/// <param name="timeProvider">日時のプロバイダ。通常はシステム日時。</param>
/// <returns>アプリケーション構成設定を元に作成した <see cref="CookieOptions"/> のインスタンス。</returns>
/// <exception cref="ArgumentNullException">
/// <list type="bullet">
/// <item><paramref name="timeProvider"/> が <see langword="null"/> です。</item>
/// </list>
/// </exception>
public CookieOptions CreateCookieOptions(TimeProvider timeProvider)
{
Comment thread
tsuna-can-se marked this conversation as resolved.
ArgumentNullException.ThrowIfNull(nameof(timeProvider));
ArgumentNullException.ThrowIfNull(timeProvider);

var options = new CookieOptions
{
Expand Down
1 change: 0 additions & 1 deletion samples/Dressca/dressca-backend/src/Dressca.Web/Dressca.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
Comment thread
tsuna-can-se marked this conversation as resolved.
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Dressca/dressca-backend/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
</PropertyGroup>

<ItemGroup>
Expand Down
Loading