From a4713f66a10b729b2d8eeda77abdf39110c2db32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 20 Oct 2026 16:08:46 +0000 Subject: [PATCH 1/2] Update dotnet monorepo --- global.json | 2 +- src/BlazorWebApp/BlazorWebApp.csproj | 4 ++-- src/FactorioTools.Cli/FactorioTools.Cli.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index 06a8772a..9b4b49b4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.401", + "version": "10.0.402", "rollForward": "latestMajor", "allowPrerelease": false } diff --git a/src/BlazorWebApp/BlazorWebApp.csproj b/src/BlazorWebApp/BlazorWebApp.csproj index 0ee52cc5..31422ea3 100644 --- a/src/BlazorWebApp/BlazorWebApp.csproj +++ b/src/BlazorWebApp/BlazorWebApp.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/FactorioTools.Cli/FactorioTools.Cli.csproj b/src/FactorioTools.Cli/FactorioTools.Cli.csproj index 0f87f1df..653a11c7 100644 --- a/src/FactorioTools.Cli/FactorioTools.Cli.csproj +++ b/src/FactorioTools.Cli/FactorioTools.Cli.csproj @@ -13,7 +13,7 @@ - + From 3b3bd5e1d19249b786d1fd634df8ea5d5436361e Mon Sep 17 00:00:00 2001 From: Eric J Date: Tue, 20 Oct 2026 20:42:50 -0700 Subject: [PATCH 2/2] Re-pin the devcontainer SDK to 10.0.402 with global.json The Devcontainer smoke job failed because global.json moved to 10.0.402 and .devcontainer/Dockerfile still built 10.0.401. Re-pinned by digest from `docker buildx imagetools inspect mcr.microsoft.com/dotnet/sdk:10.0.402`. Also updates the two CLAUDE.md lines that name the current SDK, and adds a Renovate rule that puts the devcontainer image in the dotnet monorepo group, so the next SDK bump carries both files. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01EdUbVVSnMbzGbAUT94sk5k --- .devcontainer/Dockerfile | 2 +- .github/renovate.json5 | 14 ++++++++++++++ CLAUDE.md | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 0dd414ca..561c89cb 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,7 +14,7 @@ # check rather than a container that silently disagrees with the repo. # Re-pin with: # docker buildx imagetools inspect mcr.microsoft.com/dotnet/sdk: -FROM mcr.microsoft.com/dotnet/sdk:10.0.401@sha256:2fa828c68761b1b8c23d7662dc134421b9d3b59fe1425fdbc80804e390cdb24d +FROM mcr.microsoft.com/dotnet/sdk:10.0.402@sha256:0d99ebf1ccad15037b5c98c9fe8979d6b8dbac23812feae2277a0b277b5c5ffa # The base image is Ubuntu 24.04 (noble) and already has a `ubuntu` user at uid # 1000, so there is no user to create - only sudo to add, for the postCreate diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 4b7e18df..8cc55349 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -394,5 +394,19 @@ matchUpdateTypes: ["major"], enabled: false, }, + { + // .devcontainer/Dockerfile pins the exact SDK from global.json by digest, and + // the Devcontainer CI job fails when the two disagree. Renovate saw both + // updates for 10.0.402 but put only global.json in the dotnet monorepo PR + // (#148), so the smoke job went red until the FROM line was re-pinned by + // hand. Sharing the group name puts both in the same PR. The rule above + // predates this Dockerfile, so it now covers this image's majors too. + description: + "Move the devcontainer SDK image with global.json, in the dotnet monorepo PR. The Devcontainer CI job fails when they disagree.", + matchManagers: ["dockerfile"], + matchFileNames: [".devcontainer/Dockerfile"], + matchPackageNames: ["mcr.microsoft.com/dotnet/sdk"], + groupName: "dotnet monorepo", + }, ], } diff --git a/CLAUDE.md b/CLAUDE.md index 180dc374..64024eb8 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -8,7 +8,7 @@ FactorioTools is a Factorio oil-field (outpost) blueprint planner. Given a bluep ## Prerequisites -- **.NET SDK 10.0.401** (pinned in `global.json`, `rollForward: latestMajor`). This is a floor, not an exact pin - `latestMajor` means any newer 10.x SDK works, but an *older* one now fails, so raising this number raises the bar for every contributor. Keep it in sync with `global.json`; CI installs exactly this version via `setup-dotnet`'s `global-json-file`. +- **.NET SDK 10.0.402** (pinned in `global.json`, `rollForward: latestMajor`). This is a floor, not an exact pin - `latestMajor` means any newer 10.x SDK works, but an *older* one now fails, so raising this number raises the bar for every contributor. Keep it in sync with `global.json`; CI installs exactly this version via `setup-dotnet`'s `global-json-file`. **Renovate bumps `global.json` and cannot see this line**, so the two drift apart silently every time it does. #103 raised the pin 10.0.400 -> 10.0.401 and left this paragraph reading 10.0.400. After any SDK bump, `grep -rn` the old version string and fix whatever the bot could not reach. @@ -72,7 +72,7 @@ A full-solution `dotnet build` also builds `BrowserWasm`/`BlazorWebApp`, which n ### Devcontainer -`.devcontainer/` builds a Linux container carrying every toolchain this repo needs, which is more than the SDK: **dotnet 10.0.401 plus wasm-tools, Node 24.21.0, PowerShell 7.6.5, Lua 5.2.4 and python3**. Before it, a full local loop meant five separate host installs, one of which (`tools/check-lua.sh`) started a second container of its own. +`.devcontainer/` builds a Linux container carrying every toolchain this repo needs, which is more than the SDK: **dotnet 10.0.402 plus wasm-tools, Node 24.21.0, PowerShell 7.6.5, Lua 5.2.4 and python3**. Before it, a full local loop meant five separate host installs, one of which (`tools/check-lua.sh`) started a second container of its own. It is not a replacement for `docker-build.sh`. That script is the quick way to run one `dotnet` command in the pinned SDK; this is the whole environment, with an editor attached.