Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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:<version>
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
Expand Down
14 changes: 14 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
],
}
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "10.0.401",
"version": "10.0.402",
"rollForward": "latestMajor",
"allowPrerelease": false
}
Expand Down
4 changes: 2 additions & 2 deletions src/BlazorWebApp/BlazorWebApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.12" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.13" PrivateAssets="all" />
</ItemGroup>

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

<ItemGroup>
<PackageReference Include="System.CommandLine" Version="2.0.12" />
<PackageReference Include="System.CommandLine" Version="2.0.13" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading