Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9a4b300
既知の脆弱性があるパッケージを修正版へ上げる
msmsrep Oct 22, 2026
9de7a7c
保全実績の登録を保全担当者に限る(E-40-30-01)
msmsrep Oct 22, 2026
547d5e1
依存パッケージの更新確認と脆弱性チェックを定期実行する
msmsrep Oct 22, 2026
c526b0e
アクセストークンを無効化・ロール変更で即時失効させ、CSV出力の数式インジェクションを防ぐ
msmsrep Oct 23, 2026
d2d6d1e
依存更新 Bump the actions group with 8 updates
dependabot[bot] Nov 2, 2026
22a3918
main を dev へ取り込む(PR #30〜#32 のマージ後)
msmsrep Nov 2, 2026
15e444e
依存更新 Bump the dotnet group with 16 updates
dependabot[bot] Nov 2, 2026
c3c157c
依存更新 Bump the others group with 3 updates
dependabot[bot] Nov 2, 2026
98d8c4b
依存更新 Bump Microsoft.NET.Test.Sdk from 17.14.1 to 18.11.0
dependabot[bot] Nov 2, 2026
4493cc1
Merge pull request #33 from msmsrep/dependabot/github_actions/dev/act…
msmsrep Nov 2, 2026
20f0fce
Merge pull request #34 from msmsrep/dependabot/nuget/src/MesApp.Api/d…
msmsrep Nov 2, 2026
4240331
Merge pull request #35 from msmsrep/dependabot/nuget/src/MesApp.Infra…
msmsrep Nov 2, 2026
00df534
依存更新 Bump coverlet.collector from 6.0.4 to 10.1.0
dependabot[bot] Nov 2, 2026
14dad1a
Merge pull request #36 from msmsrep/dependabot/nuget/tests/MesApp.Api…
msmsrep Nov 2, 2026
ab88137
dev を取り込み Microsoft.NET.Test.Sdk の更新との競合を解消する
msmsrep Nov 2, 2026
7679805
Merge pull request #37 from msmsrep/dependabot/nuget/tests/MesApp.Api…
msmsrep Nov 2, 2026
610c3b7
dotnet-ef を EF Core のパッケージと同じ 10.0.14 に揃える
msmsrep Nov 2, 2026
bc99ba5
Microsoft.OpenApi のメジャー更新を Dependabot の対象から外す
msmsrep Nov 3, 2026
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
5 changes: 5 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -35,7 +35,7 @@ jobs:

- name: テスト結果を保存
if: failure()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: test-results
path: TestResults
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/vulnerability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-ef": {
"version": "10.0.13",
"version": "10.0.14",
"commands": [
"dotnet-ef"
],
Expand Down
10 changes: 5 additions & 5 deletions src/MesApp.Api/MesApp.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.13" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.13">
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.14" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.14">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.OpenApi" Version="2.12.2" />
<PackageReference Include="Microsoft.OpenApi" Version="2.13.0" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/MesApp.Client.Web/MesApp.Client.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.13" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.13" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.14" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.14" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="10.0.14" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/MesApp.Core/MesApp.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="10.0.13" />
<PackageReference Include="Microsoft.Extensions.Identity.Stores" Version="10.0.14" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/MesApp.Desktop/MesApp.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4129.50" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.4314.35" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/MesApp.Infrastructure/MesApp.Infrastructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.13" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.14" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.3" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.4" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.5" />
<!-- SqlClient 6.1.1 が引く 9.0.4 に既知の脆弱性(GHSA-846f-f764-76mx)があるため、修正版を直接参照して上書きする -->
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.13" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.14" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions tests/MesApp.Api.Tests/MesApp.Api.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
Expand All @@ -8,11 +8,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.13" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="coverlet.collector" Version="10.1.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.14" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions tests/MesApp.Client.Web.Tests/MesApp.Client.Web.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="bunit" Version="2.9.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="bunit" Version="2.13.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading