Add MSBuild and CMake build integration for WSLC container images

nuget/Microsoft.WSL.Containers/build/Microsoft.WSL.Containers.common.targets

@@ -7,4 +7,126 @@
     <ItemGroup>
         <ReferenceCopyLocalPaths Include="$(MSBuildThisFileDirectory)..\runtimes\win-$(WSLCSDK_Platform)\wslcsdk.dll" />
     </ItemGroup>
-</Project>
+
+    <!-- ================================================================== -->
+    <!-- Container Image Build Targets                                      -->
+    <!-- ================================================================== -->
+
+    <!-- Default properties -->
+    <PropertyGroup>
+        <!-- Auto-detect wslc CLI from MSI install path. Override with WslcCliPath property if needed. -->
+        <WslcCliPath Condition="'$(WslcCliPath)' == '' AND Exists('$(ProgramW6432)\WSL\wslc.exe')">$(ProgramW6432)\WSL\wslc.exe</WslcCliPath>
+        <!-- Unified intermediate directory: $(IntDir) for C++, $(IntermediateOutputPath) for .NET -->
+        <_WslcIntDir Condition="'$(IntDir)' != ''">$(IntDir)</_WslcIntDir>
+        <_WslcIntDir Condition="'$(_WslcIntDir)' == '' AND '$(IntermediateOutputPath)' != ''">$(IntermediateOutputPath)</_WslcIntDir>
+        <_WslcIntDir Condition="'$(_WslcIntDir)' == ''">obj\</_WslcIntDir>
+    </PropertyGroup>
+
+    <!-- Default metadata for WslcImage items -->
+    <ItemDefinitionGroup>
+        <WslcImage>
+            <Image></Image>
+            <Tag>latest</Tag>
+        </WslcImage>
+    </ItemDefinitionGroup>
+
+    <!-- Check that wslc CLI is installed (invoked via DependsOnTargets from WslcBuildAllImages) -->
+    <Target Name="WslcCheckDependencies">
+
+        <Exec Command="&quot;$(WslcCliPath)&quot; --version"
+              IgnoreExitCode="true"
+              ConsoleToMSBuild="true"
+              StandardOutputImportance="low"
+              StandardErrorImportance="low">
+            <Output TaskParameter="ExitCode" PropertyName="_WslcExitCode" />
+        </Exec>
+
+        <Error Condition="'$(_WslcExitCode)' != '0'"
+               Code="WSLC0001"
+               Text="The wslc CLI at '$(WslcCliPath)' could not be found or did not run successfully. Install WSL by running: wsl --install --no-distribution" />
+    </Target>
+
+    <!-- Validate required metadata on WslcImage items (invoked via DependsOnTargets from WslcBuildAllImages) -->
+    <Target Name="_WslcValidateItems">
+
+        <Error Condition="'%(WslcImage.Dockerfile)' == ''"
+               Code="WSLC0002"
+               Text="WslcImage '%(WslcImage.Identity)' is missing required Dockerfile metadata." />
+
+        <Error Condition="'%(WslcImage.Context)' == ''"
+               Code="WSLC0003"
+               Text="WslcImage '%(WslcImage.Identity)' is missing required Context metadata." />
+
+        <!-- Check for characters invalid in Windows file names: / \ : * ? " < > |
+             XML entities: &quot; = "  &lt; = <  &gt; = >  -->
+        <Error Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('%(WslcImage.Identity)', '[/\\:*?&quot;&lt;&gt;|]'))"
+               Code="WSLC0004"
+               Text="WslcImage The item value '%(WslcImage.Identity)' must be a valid file name." />
+    </Target>
+
+    <!-- Dispatch each WslcImage via MSBuild task instead of batching directly because:
+         1. Sources may contain semicolons (multi-directory) which conflict with Properties syntax
+         2. Wildcard expansion in Inputs requires an intermediate ItemGroup (_WslcCollectSources)
+            that must run per-image in a separate evaluation context -->
+    <Target Name="WslcBuildAllImages"
+            AfterTargets="Build"
+            DependsOnTargets="WslcCheckDependencies;_WslcValidateItems"
+            Condition="'@(WslcImage)' != '' AND '$(DesignTimeBuild)' != 'true'">
+
+        <MSBuild Projects="$(MSBuildProjectFullPath)"
+                 Targets="_WslcBuildSingleImage"
+                 Properties="Configuration=$(Configuration);Platform=$(Platform);_WslcName=%(WslcImage.Identity);_WslcImage=%(WslcImage.Image);_WslcTag=%(WslcImage.Tag);_WslcDockerfile=%(WslcImage.Dockerfile);_WslcContext=%(WslcImage.Context);_WslcSourceDir=$([MSBuild]::Escape('%(WslcImage.Sources)'));_WslcIntDir=$(_WslcIntDir)" />
+    </Target>
+
+    <!--
+        Collect source files for incremental check.
+        Wildcards are expanded here in ItemGroup Include (not in Inputs attribute or MSBuild task Properties,
+        where they get escaped). Sources can be semicolon separated directory paths;
+        each is expanded with **\* to collect all files recursively.
+        If Sources is omitted, fall back to tracking the full Context directory so changes to
+        .dockerignore and other Docker build inputs still invalidate the marker.
+    -->
+    <Target Name="_WslcCollectSources">
+        <ItemGroup>
+            <_WslcSourceDirs Include="$([MSBuild]::Unescape('$(_WslcSourceDir)').Split(';'))" Condition="'$(_WslcSourceDir)' != ''" />
+            <_WslcSourceFiles Include="$(_WslcDockerfile)" />
+            <_WslcSourceFiles Include="%(_WslcSourceDirs.Identity)\**\*" Condition="'%(_WslcSourceDirs.Identity)' != ''" />
+            <_WslcSourceFiles Include="$(_WslcContext)\**\*" Condition="'$(_WslcSourceDir)' == '' AND '$(_WslcContext)' != ''" />
+        </ItemGroup>
+    </Target>
+
+    <!-- Inner target: build a single image with incremental check -->
+    <Target Name="_WslcBuildSingleImage"
+            DependsOnTargets="_WslcCollectSources"
+            Inputs="@(_WslcSourceFiles)"
+            Outputs="$(_WslcIntDir)wslc_$(_WslcName).built">
+
+        <MakeDir Directories="$(_WslcIntDir)" />
+
+        <!-- Resolve image reference: use Image metadata if set, otherwise fall back to Identity -->
+        <PropertyGroup>
+            <_WslcImageRef Condition="'$(_WslcImage)' != ''">$(_WslcImage)</_WslcImageRef>
+            <_WslcImageRef Condition="'$(_WslcImageRef)' == ''">$(_WslcName)</_WslcImageRef>
+        </PropertyGroup>
+
+        <Message Importance="high"
+                 Text="WSLC: Building image '$(_WslcImageRef):$(_WslcTag)'..." />
+
+        <Exec Command="&quot;$(WslcCliPath)&quot; image build -t &quot;$(_WslcImageRef):$(_WslcTag)&quot; -f &quot;$(_WslcDockerfile)&quot; &quot;$(_WslcContext)&quot;"
+              ConsoleToMSBuild="true" />
+
+        <Touch Files="$(_WslcIntDir)wslc_$(_WslcName).built" AlwaysCreate="true" />
+
+        <Message Importance="high"
+                 Text="WSLC: Image '$(_WslcImageRef):$(_WslcTag)' built successfully." />
+    </Target>
+
+    <!-- Clean container artifacts -->
+    <Target Name="WslcClean"
+            AfterTargets="Clean"
+            Condition="'@(WslcImage)' != ''">
+
+        <Delete Files="$(_WslcIntDir)wslc_%(WslcImage.Identity).built" />
+    </Target>
+
+</Project>

nuget/Microsoft.WSL.Containers/build/native/Microsoft.WSL.Containers.targets

@@ -23,4 +23,49 @@
     </ItemDefinitionGroup>
 
     <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.WSL.Containers.common.targets" />
-</Project>
+
+    <!-- ================================================================== -->
+    <!-- C++ specific: Write .tlog files for VS Fast Up-to-Date Check       -->
+    <!-- ================================================================== -->
+
+    <Target Name="_WslcWriteAllTlogs"
+            AfterTargets="WslcBuildAllImages"
+            Condition="'@(WslcImage)' != '' AND '$(TLogLocation)' != ''">
+
+        <MSBuild Projects="$(MSBuildProjectFullPath)"
+                 Targets="_WslcWriteSingleTlog"
+                 Properties="Configuration=$(Configuration);Platform=$(Platform);_WslcName=%(WslcImage.Identity);_WslcDockerfile=%(WslcImage.Dockerfile);_WslcContext=%(WslcImage.Context);_WslcSourceDir=$([MSBuild]::Escape('%(WslcImage.Sources)'));_WslcIntDir=$(_WslcIntDir);_WslcTlogDir=$([MSBuild]::EnsureTrailingSlash('$(TLogLocation)'))" />
+    </Target>
+
+    <!-- Reuses _WslcCollectSources from common.targets to get @(_WslcSourceFiles) -->
+    <Target Name="_WslcWriteSingleTlog" DependsOnTargets="_WslcCollectSources">
+        <PropertyGroup>
+            <_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="^$(_WslcTlogToolPath);@(_WslcSourceFiles->'%(FullPath)')"
+            Overwrite="true"
+            Encoding="Unicode" />
+
+        <WriteLinesToFile
+            File="$(_WslcTlogDir)wslc.$(_WslcName).write.1.tlog"
+            Lines="^$(_WslcTlogToolPath);$(_WslcMarkerFullPath)"
+            Overwrite="true"
+            Encoding="Unicode" />
+    </Target>
+
+    <!-- Clean tlog files -->
+    <Target Name="_WslcCleanTlogs"
+            AfterTargets="WslcClean"
+            Condition="'@(WslcImage)' != '' AND '$(TLogLocation)' != ''">
+        <PropertyGroup>
+            <_WslcTlogDir>$([MSBuild]::EnsureTrailingSlash('$(TLogLocation)'))</_WslcTlogDir>
+        </PropertyGroup>
+        <Delete Files="$(_WslcTlogDir)wslc.%(WslcImage.Identity).read.1.tlog" />
+        <Delete Files="$(_WslcTlogDir)wslc.%(WslcImage.Identity).write.1.tlog" />
+    </Target>
+
+</Project>

nuget/Microsoft.WSL.Containers/build/net/Microsoft.WSL.Containers.targets

@@ -11,4 +11,21 @@
 
     <Import Project="$(MSBuildThisFileDirectory)..\Microsoft.WSL.Containers.common.targets" />
 
+    <!-- ================================================================== -->
+    <!-- C# specific: CPS Up-to-Date Check for container source files       -->
+    <!-- ================================================================== -->
+
+    <!-- Register build stamp and source files for CPS up-to-date check -->
+    <Target Name="_WslcRegisterUpToDateCheckInputs"
+            BeforeTargets="CollectUpToDateCheckBuiltDesignTime"
+            Condition="'$(UsingMicrosoftNETSdk)' == 'true' AND '@(WslcImage)' != ''">
+        <ItemGroup>
+            <UpToDateCheckBuilt Include="$(_WslcIntDir)wslc_%(WslcImage.Identity).built" />
+            <UpToDateCheckInput Include="%(WslcImage.Dockerfile)" Condition="'%(WslcImage.Dockerfile)' != ''" />
+            <_WslcUpToDateDirs Include="@(WslcImage->'%(Sources)')" Condition="'%(WslcImage.Sources)' != ''" />
+            <UpToDateCheckInput Include="%(_WslcUpToDateDirs.Identity)\**\*" Condition="'%(_WslcUpToDateDirs.Identity)' != ''" />
+            <UpToDateCheckInput Include="%(WslcImage.Context)\**\*" Condition="'%(WslcImage.Sources)' == '' AND '%(WslcImage.Context)' != ''" />
+        </ItemGroup>
+    </Target>
+
 </Project>

nuget/Microsoft.WSL.Containers/cmake/Microsoft.WSL.ContainersConfig.cmake

@@ -55,3 +55,100 @@ unset(_wslcsdk_arch)
 unset(_wslcsdk_root)
 unset(_wslcsdk_include_dir)
 unset(_wslcsdk_lib_dir)
+
+# ============================================================================
+# Container Image Build Targets
+# ============================================================================
+#
+# Provides the wslc_add_image() function for declaring container image
+# build targets with incremental rebuild support.
+#
+# Usage:
+#   find_package(Microsoft.WSL.Containers REQUIRED)
+#
+#   wslc_add_image(my-server
+#       IMAGE       ghcr.io/myorg/my-server
+#       DOCKERFILE  container/Dockerfile
+#       CONTEXT     container/
+#       SOURCES     container/src/*.cpp container/src/*.h
+#       TAG         latest
+#   )
+#
+#   add_dependencies(my_app my-server)
+#
+# The first positional argument is the CMake target name.
+# IMAGE is the container image reference (required).
+
+function(wslc_add_image _target_name)
+    cmake_parse_arguments(
+        PARSE_ARGV 1 ARG
+        ""                                      # options (none)
+        "IMAGE;TAG;DOCKERFILE;CONTEXT"           # one-value keywords
+        "SOURCES"                                # multi-value keywords
+    )
+
+    # Validate required arguments
+    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.
+    # 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")
+    endif()
+    if(NOT ARG_CONTEXT)
+        message(FATAL_ERROR "wslc_add_image: CONTEXT is required")
+    endif()
+
+    # Defaults
+    if(NOT ARG_TAG)
+        set(ARG_TAG "latest")
+    endif()
+
+    # Find wslc CLI
+    if(NOT WSLC_CLI_PATH)
+        find_program(WSLC_CLI_PATH wslc PATHS "$ENV{ProgramW6432}/WSL" "$ENV{ProgramFiles}/WSL")
+        if(NOT WSLC_CLI_PATH)
+            message(FATAL_ERROR "wslc CLI not found. Install WSL by running: wsl --install --no-distribution")
+        endif()
+    endif()
+
+    # Validate target name
+    string(REGEX MATCH "[^a-zA-Z0-9_.+-]" _bad_char "${_target_name}")
+    if(_bad_char)
+        message(FATAL_ERROR "wslc_add_image: '${_target_name}' contains unsupported character '${_bad_char}'. Supported characters are letters, digits, '_', '.', '+', and '-'.")
+    endif()
+
+    # Normalize paths to be independent of the build directory
+    get_filename_component(_dockerfile_path "${ARG_DOCKERFILE}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+    get_filename_component(_context_path "${ARG_CONTEXT}" ABSOLUTE BASE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    set(_image_ref "${ARG_IMAGE}:${ARG_TAG}")
+    set(_stamp "${CMAKE_CURRENT_BINARY_DIR}/wslc_${_target_name}.built")
+
+    # Resolve source globs to file lists; default to CONTEXT contents if SOURCES omitted
+    if(ARG_SOURCES)
+        file(GLOB_RECURSE _resolved_sources CONFIGURE_DEPENDS ${ARG_SOURCES})
+    else()
+        file(GLOB_RECURSE _resolved_sources CONFIGURE_DEPENDS "${_context_path}/*")
+    endif()
+
+    add_custom_command(
+        OUTPUT "${_stamp}"
+        COMMAND "${WSLC_CLI_PATH}" image build -t "${_image_ref}" -f "${_dockerfile_path}" "${_context_path}"
+        COMMAND ${CMAKE_COMMAND} -E touch "${_stamp}"
+        DEPENDS ${_resolved_sources} "${_dockerfile_path}"
+        COMMENT "WSLC: Building image '${_image_ref}'..."
+        VERBATIM
+    )
+
+    add_custom_target(${_target_name} ALL
+        DEPENDS "${_stamp}"
+    )
+endfunction()