From 678dcb36ab1524bb2e342099d1361111a14d4f2b Mon Sep 17 00:00:00 2001
From: Shawn Yuan <128874481+shuaiyuanxx@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:57:41 +0800
Subject: [PATCH 1/3] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../build/Microsoft.WSL.Containers.common.targets               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets b/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets
index f03fe4fb..76bbdcdb 100644
--- a/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets
+++ b/nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets
@@ -60,7 +60,7 @@
              XML entities: &quot; = "  &lt; = <  &gt; = >  -->
         <Error Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(WslcImage.Identity)', '[/\\:*?&quot;&lt;&gt;|]'))"
                Code="WSLC0004"
-               Text="WslcImage '%(WslcImage.Identity)' contains characters not valid in file names. Use a simple name as the item identity and pass the full image reference via Tag metadata." />
+               Text="WslcImage '%(WslcImage.Identity)' contains characters not valid in file names. Use a simple, file-name-safe value for the item identity. If needed, specify only the image tag suffix via Tag metadata." />
     </Target>
 
     <!-- Dispatch each WslcImage via MSBuild task instead of batching directly because:

From 628d3551b87e09cb9aa3bd7402785ee35e434261 Mon Sep 17 00:00:00 2001
From: Shawn Yuan <128874481+shuaiyuanxx@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:59:29 +0800
Subject: [PATCH 2/3] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../cmake/Microsoft.WSL.ContainersConfig.cmake        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake b/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake
index 006b04fe..51012c27 100644
--- a/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake
+++ b/nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake
@@ -91,10 +91,13 @@ function(wslc_add_image _target_name)
     if(NOT ARG_IMAGE)
         message(FATAL_ERROR "wslc_add_image: IMAGE is required")
     endif()
-    # IMAGE must not contain a tag — use the TAG parameter instead
-    string(FIND "${ARG_IMAGE}" ":" _colon_pos)
-    if(NOT _colon_pos EQUAL -1)
-        message(FATAL_ERROR "wslc_add_image: IMAGE '${ARG_IMAGE}' contains ':'. Specify the tag separately with the TAG parameter.")
+    # IMAGE must not contain a tag — use the TAG parameter instead.
+    # Allow ':' in the registry host portion (for example, localhost:5000/myimg)
+    # and only reject ':' when it appears after the last '/'.
+    string(FIND "${ARG_IMAGE}" "/" _last_slash_pos REVERSE)
+    string(FIND "${ARG_IMAGE}" ":" _last_colon_pos REVERSE)
+    if(_last_colon_pos GREATER _last_slash_pos)
+        message(FATAL_ERROR "wslc_add_image: IMAGE '${ARG_IMAGE}' contains a tag. Specify the tag separately with the TAG parameter.")
     endif()
     if(NOT ARG_DOCKERFILE)
         message(FATAL_ERROR "wslc_add_image: DOCKERFILE is required")

From 235327250b24294f9b0971953b475edf3b91b7aa Mon Sep 17 00:00:00 2001
From: Shawn Yuan <128874481+shuaiyuanxx@users.noreply.github.com>
Date: Fri, 10 Apr 2026 11:52:06 +0800
Subject: [PATCH 3/3] Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../build/native/Microsoft.WSL.Containers.targets            | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets b/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets
index 929291e1..02d4dd05 100644
--- a/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets
+++ b/nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets
@@ -49,18 +49,19 @@
 
         <PropertyGroup>
             <_WslcDockerfileFullPath>$([System.IO.Path]::GetFullPath('$(_WslcDockerfile)'))</_WslcDockerfileFullPath>
+            <_WslcTlogToolPath>$([System.IO.Path]::GetFullPath('$(WslcCliPath)'))</_WslcTlogToolPath>
             <_WslcMarkerFullPath>$([System.IO.Path]::GetFullPath('$(_WslcIntDir)wslc_$(_WslcName).built'))</_WslcMarkerFullPath>
         </PropertyGroup>
 
         <WriteLinesToFile
             File="$(_WslcTlogDir)wslc.$(_WslcName).read.1.tlog"
-            Lines="^$(_WslcDockerfileFullPath);@(_WslcTlogInputs->'%(FullPath)')"
+            Lines="^$(_WslcTlogToolPath);@(_WslcTlogInputs->'%(FullPath)')"
             Overwrite="true"
             Encoding="Unicode" />
 
         <WriteLinesToFile
             File="$(_WslcTlogDir)wslc.$(_WslcName).write.1.tlog"
-            Lines="^$(_WslcDockerfileFullPath);$(_WslcMarkerFullPath)"
+            Lines="^$(_WslcTlogToolPath);$(_WslcMarkerFullPath)"
             Overwrite="true"
             Encoding="Unicode" />
     </Target>