From b71e495270c9b56e7f06b5e01ee143745a171082 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 6 Mar 2026 10:32:52 -0800 Subject: [PATCH 1/4] Package ImageBuilder as dotnet tool --- eng/pipelines/docker-tools-packages-official.yml | 1 + eng/pipelines/docker-tools-packages-pr.yml | 1 + src/Dockerfile.linux | 2 +- src/Dockerfile.windows | 2 +- src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj | 9 +++++++++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/docker-tools-packages-official.yml b/eng/pipelines/docker-tools-packages-official.yml index 88a3462a7..09e1670d2 100644 --- a/eng/pipelines/docker-tools-packages-official.yml +++ b/eng/pipelines/docker-tools-packages-official.yml @@ -17,6 +17,7 @@ trigger: include: - eng/common/* - eng/pipelines/* + - src/ImageBuilder/* - src/ImageBuilder.Models/* - Directory.Build.props - Directory.Build.targets diff --git a/eng/pipelines/docker-tools-packages-pr.yml b/eng/pipelines/docker-tools-packages-pr.yml index c2c0848fa..c32bc0e5c 100644 --- a/eng/pipelines/docker-tools-packages-pr.yml +++ b/eng/pipelines/docker-tools-packages-pr.yml @@ -16,6 +16,7 @@ pr: include: - eng/common/* - eng/pipelines/* + - src/ImageBuilder/* - src/ImageBuilder.Models/* - Directory.Build.props - Directory.Build.targets diff --git a/src/Dockerfile.linux b/src/Dockerfile.linux index ae829141a..b938ee962 100644 --- a/src/Dockerfile.linux +++ b/src/Dockerfile.linux @@ -50,4 +50,4 @@ COPY ["notation-trust/policies/", "/notation-trust/policies/"] WORKDIR /image-builder COPY --from=build-env /image-builder/out ./ -ENTRYPOINT ["/image-builder/Microsoft.DotNet.ImageBuilder"] +ENTRYPOINT ["/image-builder/imagebuilder"] diff --git a/src/Dockerfile.windows b/src/Dockerfile.windows index ac395518e..e5578c4f8 100644 --- a/src/Dockerfile.windows +++ b/src/Dockerfile.windows @@ -26,4 +26,4 @@ FROM mcr.microsoft.com/windows/$WINDOWS_BASE WORKDIR /image-builder COPY --from=build-env /image-builder/out ./ -ENTRYPOINT ["/image-builder/Microsoft.DotNet.ImageBuilder"] +ENTRYPOINT ["/image-builder/imagebuilder"] diff --git a/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj b/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj index ff5df7d54..16bdb0ccf 100644 --- a/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj +++ b/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj @@ -2,6 +2,7 @@ Exe + imagebuilder False net9.0 Microsoft.DotNet.ImageBuilder @@ -12,6 +13,14 @@ enable + + true + true + imagebuilder + Microsoft.DotNet.ImageBuilder + CLI tool that orchestrates Docker image builds. + + false From ccef31d59d1e8f5a2aeed694427dd49b562248a4 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 6 Mar 2026 10:26:38 -0800 Subject: [PATCH 2/4] Bump version to 0.3.0 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9d4c88ef8..907af9025 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,7 +5,7 @@ 0 - 2 + 3 0 $(MajorVersion).$(MinorVersion).$(PatchVersion) beta From e39d61386465a5656bea077e27d1c36de0b3e03b Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 6 Mar 2026 10:30:46 -0800 Subject: [PATCH 3/4] Update CHANGELOG --- eng/docker-tools/CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/eng/docker-tools/CHANGELOG.md b/eng/docker-tools/CHANGELOG.md index aba13609e..87cc5b8a2 100644 --- a/eng/docker-tools/CHANGELOG.md +++ b/eng/docker-tools/CHANGELOG.md @@ -4,6 +4,22 @@ All breaking changes and new features in `eng/docker-tools` will be documented i --- +## 2026-03-06: ImageBuilder is now packaged as a .NET tool + +ImageBuilder is now packaged as a .NET tool. +The ImageBuilder executable has been renamed from `Microsoft.DotNet.ImageBuilder` to `imagebuilder`. + +**Changes:** +- ImageBuilder is now packaged as a .NET tool. +- The executable/assembly name has been changed from `Microsoft.DotNet.ImageBuilder` to `imagebuilder` +- The Windows staging folder name has been changed from `.Microsoft.DotNet.ImageBuilder` to `.imagebuilder` +- The ImageBuilder version has been updated to `0.3.0`. + +**Impact:** +- Any custom scripts referencing `Microsoft.DotNet.ImageBuilder.exe` or the `.Microsoft.DotNet.ImageBuilder/` folder must be updated to reference `imagebuilder.exe` and `.imagebuilder/` respectively. + +--- + ## 2026-03-04: Pre-build validation gated by `preBuildTestScriptPath` variable The `PreBuildValidation` job condition now checks the new `preBuildTestScriptPath` variable instead of `testScriptPath`. From 0a7dc1b9e0d7132628798efd98e75df3be50541c Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 10 Mar 2026 17:40:04 -0700 Subject: [PATCH 4/4] Un-set AssemblyName --- src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj b/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj index 16bdb0ccf..31a30e4a0 100644 --- a/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj +++ b/src/ImageBuilder/Microsoft.DotNet.ImageBuilder.csproj @@ -2,7 +2,6 @@ Exe - imagebuilder False net9.0 Microsoft.DotNet.ImageBuilder