From a54802adc581c238e043f707a22d22dd9b24b1d4 Mon Sep 17 00:00:00 2001 From: Edge-HH <871412436@qq.com> Date: Thu, 15 Oct 2026 16:03:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?chore(deps):=20=E6=89=B9=E9=87=8F=E5=90=88?= =?UTF-8?q?=E5=B9=B6=20Dependabot=20=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=B9=B6=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - actions/setup-node 4→7、actions/setup-java 4→6 - docker/setup-qemu-action 3→4、setup-buildx-action 3→4、build-push-action 6→7 - EF Core / ASP.NET Core 相关包统一 10.0.12→10.0.13，SQLitePCLRaw.bundle_e_sqlite3 2.1.12→2.1.13 - Dependabot 按生态分组，忽略需与宿主保持一致的 Lib.Harmony Co-Authored-By: Claude Opus 5.5 --- .github/dependabot.yml | 11 +++++++++++ .github/workflows/ci.yml | 6 +++--- .github/workflows/release.yml | 10 +++++----- server/RemoteCI.Server/RemoteCI.Server.csproj | 10 +++++----- .../RemoteCI.Server.Tests.csproj | 2 +- 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ccb4dd9..939a2ae 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,22 @@ version: 2 updates: # GitHub Actions 与 NuGet 依赖每周检查一次，自动开 PR。 + # 同一生态的更新合并为一个 PR，避免同族包（如 EF Core 各包）被拆开升级导致 CS1705。 - package-ecosystem: "github-actions" directory: "/" schedule: interval: "weekly" + groups: + github-actions: + patterns: ["*"] - package-ecosystem: "nuget" directory: "/" schedule: interval: "weekly" + groups: + nuget: + patterns: ["*"] + ignore: + # 插件只编译期引用 Harmony，运行时用宿主 ClassIsland 自带的 0Harmony 2.4.2.0； + # 引用更高版本会让运行时请求不存在的程序集版本。跟随宿主升级时再手动调整。 + - dependency-name: "Lib.Harmony" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5f2b945..a5519b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: run: dotnet build RemoteCI.slnx -c Release - name: 测试 run: dotnet test RemoteCI.slnx -c Release --no-build - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v7 with: node-version: "22" - name: 验证浏览器语音采集 @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: "17" @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: "17" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f22545f..b24cbc2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: "17" @@ -171,7 +171,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v7 - - uses: actions/setup-java@v4 + - uses: actions/setup-java@v6 with: distribution: temurin java-version: "17" @@ -231,8 +231,8 @@ jobs: echo "version=$version" >> "$GITHUB_OUTPUT" echo "channel=$channel" >> "$GITHUB_OUTPUT" echo "prerelease=$prerelease" >> "$GITHUB_OUTPUT" - - uses: docker/setup-qemu-action@v3 - - uses: docker/setup-buildx-action@v3 + - uses: docker/setup-qemu-action@v4 + - uses: docker/setup-buildx-action@v4 - name: 登录 GHCR uses: docker/login-action@v4 with: @@ -240,7 +240,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: 构建并推送多架构镜像 - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: context: . file: server/RemoteCI.Server/Dockerfile diff --git a/server/RemoteCI.Server/RemoteCI.Server.csproj b/server/RemoteCI.Server/RemoteCI.Server.csproj index 0edd200..8e5ab92 100644 --- a/server/RemoteCI.Server/RemoteCI.Server.csproj +++ b/server/RemoteCI.Server/RemoteCI.Server.csproj @@ -31,12 +31,12 @@ - - + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/server/tests/RemoteCI.Server.Tests/RemoteCI.Server.Tests.csproj b/server/tests/RemoteCI.Server.Tests/RemoteCI.Server.Tests.csproj index 8729802..7807e28 100644 --- a/server/tests/RemoteCI.Server.Tests/RemoteCI.Server.Tests.csproj +++ b/server/tests/RemoteCI.Server.Tests/RemoteCI.Server.Tests.csproj @@ -10,7 +10,7 @@ - + From 82355fe81f04b2a5b598f18ad8573701b345904a Mon Sep 17 00:00:00 2001 From: Edge-HH <871412436@qq.com> Date: Thu, 15 Oct 2026 16:17:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?test:=20=E4=B8=8B=E5=8F=91=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E5=89=8D=E7=AD=89=E5=BE=85=E6=8F=92=E4=BB=B6=E8=83=BD?= =?UTF-8?q?=E5=8A=9B=E4=B8=8A=E6=8A=A5=E5=A4=84=E7=90=86=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DirectCommand_IsSentToSelectedPluginConnection 只等插件注册，能力上报尚未处理时 命令会以 CapabilityUnsupported 被直接拒绝而不下发，导致测试偶发超时。 Co-Authored-By: Claude Opus 5.5 --- server/tests/RemoteCI.Server.Tests/WebSocketRelayTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/tests/RemoteCI.Server.Tests/WebSocketRelayTests.cs b/server/tests/RemoteCI.Server.Tests/WebSocketRelayTests.cs index dbefc25..d8e289a 100644 --- a/server/tests/RemoteCI.Server.Tests/WebSocketRelayTests.cs +++ b/server/tests/RemoteCI.Server.Tests/WebSocketRelayTests.cs @@ -301,7 +301,8 @@ await SendAsync(plugin, Envelope.PeerCapabilities(new PeerCapabilities })); var registry = _factory.Services.GetRequiredService(); - await WaitUntilAsync(() => registry.GetPluginDeviceSnapshots().Count == 1); + // 等能力上报处理完成，否则命令会因未声明 SoftwareInventory 能力被直接拒绝而不下发。 + await WaitUntilAsync(() => registry.GetPluginDeviceSnapshots() is [{ HasExplicitCapabilities: true }]); var target = registry.GetPluginDeviceSnapshots().Single(); var pending = registry.SendCommandAndWaitToConnectionAsync(new CommandMessage {