diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0031fbc..58fc95c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,6 +14,11 @@ updates: - msmsrep commit-message: prefix: "依存更新" + ignore: + # Microsoft.AspNetCore.OpenApi 10.x は Microsoft.OpenApi 3.0 未満に制限している。.NET 11 へ移行するときに外す + - dependency-name: Microsoft.OpenApi + update-types: + - version-update:semver-major groups: # Microsoft.* / System.* は同じサービシングで揃えて上げる(版がずれると NU1605 の格下げエラーになる) dotnet: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7642810..f534916 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,9 @@ jobs: runs-on: windows-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x @@ -35,7 +35,7 @@ jobs: - name: テスト結果を保存 if: failure() - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: test-results path: TestResults diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aaec005..d9782c9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,9 +24,9 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x @@ -51,27 +51,27 @@ jobs: contents: read packages: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 # コンパイルはビルド段でクロス発行するが、実行段の RUN(mkdir/chown)は対象アーキテクチャで動くため QEMU が要る - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3 + - uses: docker/setup-qemu-action@v4 + - uses: docker/setup-buildx-action@v4 - - uses: docker/login-action@v3 + - uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ github.token }} - id: meta - uses: docker/metadata-action@v5 + uses: docker/metadata-action@v6 with: images: ghcr.io/${{ github.repository_owner }}/parallelfactorymes tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} - - uses: docker/build-push-action@v6 + - uses: docker/build-push-action@v7 with: context: . platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/vulnerability.yml b/.github/workflows/vulnerability.yml index eeec040..b3666fe 100644 --- a/.github/workflows/vulnerability.yml +++ b/.github/workflows/vulnerability.yml @@ -25,9 +25,9 @@ jobs: runs-on: windows-latest timeout-minutes: 15 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - - uses: actions/setup-dotnet@v4 + - uses: actions/setup-dotnet@v6 with: dotnet-version: 10.0.x diff --git a/dotnet-tools.json b/dotnet-tools.json index 39007e0..5e9fe39 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "dotnet-ef": { - "version": "10.0.13", + "version": "10.0.14", "commands": [ "dotnet-ef" ], diff --git a/src/MesApp.Api/MesApp.Api.csproj b/src/MesApp.Api/MesApp.Api.csproj index 228060b..7a794c6 100644 --- a/src/MesApp.Api/MesApp.Api.csproj +++ b/src/MesApp.Api/MesApp.Api.csproj @@ -12,14 +12,14 @@ - - - - + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/MesApp.Client.Web/MesApp.Client.Web.csproj b/src/MesApp.Client.Web/MesApp.Client.Web.csproj index 0f9138e..c19f00d 100644 --- a/src/MesApp.Client.Web/MesApp.Client.Web.csproj +++ b/src/MesApp.Client.Web/MesApp.Client.Web.csproj @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/src/MesApp.Core/MesApp.Core.csproj b/src/MesApp.Core/MesApp.Core.csproj index ee850e5..30e6a2b 100644 --- a/src/MesApp.Core/MesApp.Core.csproj +++ b/src/MesApp.Core/MesApp.Core.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/MesApp.Desktop/MesApp.Desktop.csproj b/src/MesApp.Desktop/MesApp.Desktop.csproj index 778c147..0c72645 100644 --- a/src/MesApp.Desktop/MesApp.Desktop.csproj +++ b/src/MesApp.Desktop/MesApp.Desktop.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/MesApp.Infrastructure/MesApp.Infrastructure.csproj b/src/MesApp.Infrastructure/MesApp.Infrastructure.csproj index 250f842..df36b1b 100644 --- a/src/MesApp.Infrastructure/MesApp.Infrastructure.csproj +++ b/src/MesApp.Infrastructure/MesApp.Infrastructure.csproj @@ -5,13 +5,13 @@ - - - + + + - + - + diff --git a/tests/MesApp.Api.Tests/MesApp.Api.Tests.csproj b/tests/MesApp.Api.Tests/MesApp.Api.Tests.csproj index bb1decf..a1b10fe 100644 --- a/tests/MesApp.Api.Tests/MesApp.Api.Tests.csproj +++ b/tests/MesApp.Api.Tests/MesApp.Api.Tests.csproj @@ -1,4 +1,4 @@ - + net10.0 @@ -8,11 +8,11 @@ - - - + + + - + diff --git a/tests/MesApp.Client.Web.Tests/MesApp.Client.Web.Tests.csproj b/tests/MesApp.Client.Web.Tests/MesApp.Client.Web.Tests.csproj index 9f37ced..0fc888c 100644 --- a/tests/MesApp.Client.Web.Tests/MesApp.Client.Web.Tests.csproj +++ b/tests/MesApp.Client.Web.Tests/MesApp.Client.Web.Tests.csproj @@ -6,10 +6,10 @@ - - + + - +