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: 2 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM mcr.microsoft.com/devcontainers/javascript-node:24-bookworm

RUN npm install --global pnpm@latest-10

RUN mkdir /usr/share/dotnet && chmod a+w /usr/share/dotnet
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"ghcr.io/devcontainer-config/features/user-init:2": {},
"ghcr.io/devcontainer-config/features/dot-config:3": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/dotnet:2": { "version": "8.0" }
"ghcr.io/devcontainers/features/dotnet:2": { "version": "10.0" }
},
"customizations": {
"vscode": {
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
},
"dependencies": {
"@commander-js/extra-typings": "^14.0.0",
"@devcontainers/cli": "^0.80.1",
"@devcontainers/cli": "^0.80.2",
"@eslint/js": "^9.39.1",
"@prettier/plugin-xml": "^3.4.2",
"@tsconfig/node24": "^24.0.1",
"@tsconfig/node24": "^24.0.2",
"@vitest/eslint-plugin": "^1.4.2",
"commander": "~14.0.2",
"cspell": "^9.3.1",
"cspell": "^9.3.2",
"eslint": "^9.39.1",
"eslint-config-prettier": "^10.1.8",
"eslint-flat-config-gitignore": "^3.0.1",
Expand All @@ -45,9 +45,9 @@
"typescript": "~5.9.3",
"typescript-eslint": "^8.46.4",
"vite": "^7.2.2",
"vite-node": "^5.0.0",
"vite-node": "^5.1.0",
"vite-tsconfig-paths": "^5.1.4",
"vitest": "^4.0.8"
"vitest": "^4.0.9"
},
"devDependencies": {
"@types/eslint": "^9.6.1",
Expand Down
4 changes: 2 additions & 2 deletions scripts/buildx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import path from "node:path";

import { $ } from "execa";

import { projectRoot } from "@/scripts/project.js";
import { projectRoot, workspaces } from "@/scripts/project.js";
import { $$ } from "@/scripts/shell.js";
import { getVersionTag } from "@/scripts/tasks/build.js";
import { deploy } from "@/scripts/tasks/deploy.js";

const platforms: string[] = ["linux/amd64", "linux/arm64"];

const packagePath = path.resolve(projectRoot, ".local/docker");
const packagePath = path.resolve(workspaces, "artifacts/package");

async function buildImage(registry: string, imageName: string, tags: string[], publish: boolean) {
console.log("Building multi-arch Docker image...");
Expand Down
8 changes: 8 additions & 0 deletions setup/configs/csharp/devcontainer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { loadTemplates } from "../templates.js";
export interface CSharpDevContainerConfigs {
".devcontainer/.env": string;
".devcontainer/devcontainer.json": string;
".devcontainer/Dockerfile": string;
".devcontainer/dot-config.json": string;
}

Expand Down Expand Up @@ -62,12 +63,19 @@ export const createCSharpDevContainerConfigs = async (
].join("\n");
})();

const dockerFilaPath = ".devcontainer/Dockerfile" satisfies keyof BaseConfigs;
const dockerFileConfig = [
baseConfig[dockerFilaPath],
"RUN mkdir /usr/share/dotnet && chmod a+w /usr/share/dotnet",
].join("\n");

return {
".devcontainer/.env": propertiesComposer(
baseConfig[".devcontainer/.env"],
fillTemplate(templates[".devcontainer/.env"], { remoteUser }),
),
".devcontainer/devcontainer.json": devContainerConfig,
".devcontainer/Dockerfile": dockerFileConfig,
".devcontainer/dot-config.json": JSON.stringify(
defaultComposer(
jsonc.parse(baseConfig[".devcontainer/dot-config.json"]) as object,
Expand Down
1 change: 1 addition & 0 deletions setup/formatting.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const prettierConfig: prettier.Config = {
import.meta.resolve("prettier-plugin-packagejson"),
import.meta.resolve("@prettier/plugin-xml"),
import.meta.resolve("prettier-plugin-ini"),
import.meta.resolve("prettier-plugin-sh"),
],
xmlWhitespaceSensitivity: "ignore",
overrides: [
Expand Down
7 changes: 4 additions & 3 deletions setup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,18 @@
"@commander-js/extra-typings": "^14.0.0",
"@prettier/plugin-xml": "^3.4.2",
"commander": "~14.0.2",
"cspell-lib": "^9.3.1",
"cspell-lib": "^9.3.2",
"dedent": "^1.7.0",
"default-composer": "^0.6.0",
"fast-xml-parser": "^5.3.1",
"fast-xml-parser": "^5.3.2",
"jsonc-parser": "^3.3.1",
"lodash-es": "^4.17.21",
"oci-registry-client": "^0.2.0",
"pacote": "^21.0.3",
"pacote": "^21.0.4",
"prettier": "^3.6.2",
"prettier-plugin-ini": "^1.3.0",
"prettier-plugin-packagejson": "^2.5.19",
"prettier-plugin-sh": "^0.18.0",
"semver": "^7.7.3",
"type-fest": "^5.2.0",
"write-file-atomic": "^7.0.0"
Expand Down
2 changes: 1 addition & 1 deletion setup/templates/csharp/.config/dotnet/Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Cake.Frosting" Version="4.0.0" />
<PackageVersion Include="Cake.Frosting" Version="6.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion setup/templates/csharp/Automation/Automation.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions setup/templates/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"type": "module",
"dependencies": {
"@eslint/js": "^9.39.1",
"@tsconfig/node24": "^24.0.1",
"cspell": "^9.3.1",
"@tsconfig/node24": "^24.0.2",
"cspell": "^9.3.2",
"eslint": "^9.39.1",
"eslint-config-prettier": "^10.1.8",
"eslint-flat-config-gitignore": "^3.0.1",
Expand All @@ -18,7 +18,7 @@
"typescript": "~5.9.3",
"typescript-eslint": "^8.46.4",
"vite": "^7.2.2",
"vite-node": "^5.0.0",
"vite-node": "^5.1.0",
"vite-tsconfig-paths": "^5.1.4"
},
"devDependencies": {
Expand Down