diff --git a/.github/workflows/samples-dressca-admin-backend.ci.yml b/.github/workflows/samples-dressca-admin-backend.ci.yml index 989f6fcb4..38ad9b6a9 100644 --- a/.github/workflows/samples-dressca-admin-backend.ci.yml +++ b/.github/workflows/samples-dressca-admin-backend.ci.yml @@ -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 }} @@ -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 @@ -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: テスト結果ページの作成 diff --git a/.github/workflows/samples-dressca-consumer-backend.ci.yml b/.github/workflows/samples-dressca-consumer-backend.ci.yml index 5c61c088f..892ee292f 100644 --- a/.github/workflows/samples-dressca-consumer-backend.ci.yml +++ b/.github/workflows/samples-dressca-consumer-backend.ci.yml @@ -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 }} @@ -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 @@ -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: テスト結果ページの作成 diff --git a/samples/Dressca/dressca-backend/Directory.Build.props b/samples/Dressca/dressca-backend/Directory.Build.props index 0b2073086..df672fb8b 100644 --- a/samples/Dressca/dressca-backend/Directory.Build.props +++ b/samples/Dressca/dressca-backend/Directory.Build.props @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable Copyright © 2023 BIPROGY Inc. All rights reserved. diff --git a/samples/Dressca/dressca-backend/Directory.Packages.props b/samples/Dressca/dressca-backend/Directory.Packages.props index c4e38325c..8ec2af561 100644 --- a/samples/Dressca/dressca-backend/Directory.Packages.props +++ b/samples/Dressca/dressca-backend/Directory.Packages.props @@ -1,23 +1,23 @@ - - - - - - - - - - + + + + + + + + + + - - + + - + diff --git a/samples/Dressca/dressca-backend/Dressca.Web.Admin.slnf b/samples/Dressca/dressca-backend/Dressca.Web.Admin.slnf index 82b4ba3d1..36d364b1c 100644 --- a/samples/Dressca/dressca-backend/Dressca.Web.Admin.slnf +++ b/samples/Dressca/dressca-backend/Dressca.Web.Admin.slnf @@ -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" ] } } \ No newline at end of file diff --git a/samples/Dressca/dressca-backend/Dressca.Web.Consumer.slnf b/samples/Dressca/dressca-backend/Dressca.Web.Consumer.slnf index 473e46391..f3184b0bd 100644 --- a/samples/Dressca/dressca-backend/Dressca.Web.Consumer.slnf +++ b/samples/Dressca/dressca-backend/Dressca.Web.Consumer.slnf @@ -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" ] } } \ No newline at end of file diff --git a/samples/Dressca/dressca-backend/global.json b/samples/Dressca/dressca-backend/global.json index 51fb6bf99..0298d93e7 100644 --- a/samples/Dressca/dressca-backend/global.json +++ b/samples/Dressca/dressca-backend/global.json @@ -1,7 +1,10 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100", "allowPrerelease": false, "rollForward": "latestMajor" + }, + "test": { + "runner": "Microsoft.Testing.Platform" } } \ No newline at end of file diff --git a/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20250425023655_InitialCreate.Designer.cs b/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20251113124851_InitialCreate.Designer.cs similarity index 98% rename from samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20250425023655_InitialCreate.Designer.cs rename to samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20251113124851_InitialCreate.Designer.cs index 53061eccd..096b15316 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20250425023655_InitialCreate.Designer.cs +++ b/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20251113124851_InitialCreate.Designer.cs @@ -13,7 +13,7 @@ namespace Dressca.EfInfrastructure.Migrations { [DbContext(typeof(DresscaDbContext))] - [Migration("20250425023655_InitialCreate")] + [Migration("20251113124851_InitialCreate")] partial class InitialCreate { /// @@ -21,7 +21,7 @@ protected override void BuildTargetModel(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); @@ -565,7 +565,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Property("TotalPrice") .HasColumnType("decimal(18,6)"); - b.ComplexProperty>("ShipToAddress", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo", b1 => + b.ComplexProperty(typeof(Dictionary), "ShipToAddress", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo", b1 => { b1.IsRequired(); @@ -575,7 +575,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(64)") .HasColumnName("ShipToFullName"); - b1.ComplexProperty>("Address", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo.Address#Address", b2 => + b1.ComplexProperty(typeof(Dictionary), "Address", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo.Address#Address", b2 => { b2.IsRequired(); @@ -627,7 +627,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) b.Property("UnitPrice") .HasColumnType("decimal(18,6)"); - b.ComplexProperty>("ItemOrdered", "Dressca.ApplicationCore.Ordering.OrderItem.ItemOrdered#CatalogItemOrdered", b1 => + b.ComplexProperty(typeof(Dictionary), "ItemOrdered", "Dressca.ApplicationCore.Ordering.OrderItem.ItemOrdered#CatalogItemOrdered", b1 => { b1.IsRequired(); diff --git a/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20250425023655_InitialCreate.cs b/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20251113124851_InitialCreate.cs similarity index 100% rename from samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20250425023655_InitialCreate.cs rename to samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/20251113124851_InitialCreate.cs diff --git a/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/DresscaDbContextModelSnapshot.cs b/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/DresscaDbContextModelSnapshot.cs index 067895740..bd61cbd62 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/DresscaDbContextModelSnapshot.cs +++ b/samples/Dressca/dressca-backend/src/Dressca.EfInfrastructure/Migrations/DresscaDbContextModelSnapshot.cs @@ -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); @@ -562,7 +562,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("TotalPrice") .HasColumnType("decimal(18,6)"); - b.ComplexProperty>("ShipToAddress", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo", b1 => + b.ComplexProperty(typeof(Dictionary), "ShipToAddress", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo", b1 => { b1.IsRequired(); @@ -572,7 +572,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(64)") .HasColumnName("ShipToFullName"); - b1.ComplexProperty>("Address", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo.Address#Address", b2 => + b1.ComplexProperty(typeof(Dictionary), "Address", "Dressca.ApplicationCore.Ordering.Order.ShipToAddress#ShipTo.Address#Address", b2 => { b2.IsRequired(); @@ -624,7 +624,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) b.Property("UnitPrice") .HasColumnType("decimal(18,6)"); - b.ComplexProperty>("ItemOrdered", "Dressca.ApplicationCore.Ordering.OrderItem.ItemOrdered#CatalogItemOrdered", b1 => + b.ComplexProperty(typeof(Dictionary), "ItemOrdered", "Dressca.ApplicationCore.Ordering.OrderItem.ItemOrdered#CatalogItemOrdered", b1 => { b1.IsRequired(); diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/Program.cs b/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/Program.cs index fb77a28cb..89ba6a20f 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/Program.cs +++ b/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/Program.cs @@ -161,10 +161,3 @@ app.MapFallbackToFile("/index.html"); app.Run(); - -/// -/// 結合テストプロジェクトに公開するための部分クラスです。 -/// -public partial class Program -{ -} diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/dressca-admin-api.json b/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/dressca-admin-api.json index b7cea650d..f3727f2de 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/dressca-admin-api.json +++ b/samples/Dressca/dressca-backend/src/Dressca.Web.Admin/dressca-admin-api.json @@ -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", diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Configuration/CookieSettings.cs b/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Configuration/CookieSettings.cs index 63a7e099a..b9da0dbe8 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Configuration/CookieSettings.cs +++ b/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Configuration/CookieSettings.cs @@ -38,9 +38,14 @@ public class CookieSettings /// /// 日時のプロバイダ。通常はシステム日時。 /// アプリケーション構成設定を元に作成した のインスタンス。 + /// + /// + /// です。 + /// + /// public CookieOptions CreateCookieOptions(TimeProvider timeProvider) { - ArgumentNullException.ThrowIfNull(nameof(timeProvider)); + ArgumentNullException.ThrowIfNull(timeProvider); var options = new CookieOptions { diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Program.cs b/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Program.cs index 0196d3a01..202003a1f 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Program.cs +++ b/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/Program.cs @@ -141,10 +141,3 @@ app.MapFallbackToFile("/index.html"); app.Run(); - -/// -/// 結合テストプロジェクト用の部分クラス。 -/// -public partial class Program -{ -} diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/dressca-api.json b/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/dressca-api.json index 3dce2f017..d4077add1 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/dressca-api.json +++ b/samples/Dressca/dressca-backend/src/Dressca.Web.Consumer/dressca-api.json @@ -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", diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web/Configuration/CookieSettings.cs b/samples/Dressca/dressca-backend/src/Dressca.Web/Configuration/CookieSettings.cs index ec6b1e23d..fd9c1df80 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web/Configuration/CookieSettings.cs +++ b/samples/Dressca/dressca-backend/src/Dressca.Web/Configuration/CookieSettings.cs @@ -39,9 +39,14 @@ public class CookieSettings /// /// 日時のプロバイダ。通常はシステム日時。 /// アプリケーション構成設定を元に作成した のインスタンス。 + /// + /// + /// です。 + /// + /// public CookieOptions CreateCookieOptions(TimeProvider timeProvider) { - ArgumentNullException.ThrowIfNull(nameof(timeProvider)); + ArgumentNullException.ThrowIfNull(timeProvider); var options = new CookieOptions { diff --git a/samples/Dressca/dressca-backend/src/Dressca.Web/Dressca.Web.csproj b/samples/Dressca/dressca-backend/src/Dressca.Web/Dressca.Web.csproj index 8f6eccaaf..8abbfd8a1 100644 --- a/samples/Dressca/dressca-backend/src/Dressca.Web/Dressca.Web.csproj +++ b/samples/Dressca/dressca-backend/src/Dressca.Web/Dressca.Web.csproj @@ -6,7 +6,6 @@ - diff --git a/samples/Dressca/dressca-backend/tests/Directory.Build.props b/samples/Dressca/dressca-backend/tests/Directory.Build.props index bcb051d20..07cae5977 100644 --- a/samples/Dressca/dressca-backend/tests/Directory.Build.props +++ b/samples/Dressca/dressca-backend/tests/Directory.Build.props @@ -3,10 +3,10 @@ + Exe false true true - true