Containers support was moved higher to enable creating image of CLI apps

src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets

@@ -188,10 +188,9 @@
     </PublishContainerDependsOn>
   </PropertyGroup>
 
-  <!-- TODO: change this comparison to include $(EnableSdkContainerSupport) == true when console apps Import the Publish SDK -->
   <Target Name="PublishContainer"
     DependsOnTargets="$(PublishContainerDependsOn)"
-    Condition="'$(IsPublishable)' == 'true'">
+    Condition="'$(IsPublishable)' == 'true' AND '$(EnableSdkContainerSupport)' == 'true'">
 
     <PropertyGroup Condition="'$(DOTNET_HOST_PATH)' == ''">
       <DotNetHostDirectory>$(NetCoreRoot)</DotNetHostDirectory>

src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets

@@ -52,4 +52,15 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="$(NuGetBuildTasksPackTargets)"
           Condition="Exists('$(NuGetBuildTasksPackTargets)') AND '$(ImportNuGetBuildTasksPackTargetsFromSdk)' == 'true'"/>
+
+  <!-- Import targets from Microdoft.NET.Build.Container.targets -->
+  <PropertyGroup>
+    <_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\</_ContainersTargetsDir>
+  </PropertyGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props"
+          Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props')" />
+
+  <Import Project="$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets"
+    Condition="Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets') AND '$(TargetFramework)' != ''" />
 </Project>

src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -209,6 +209,87 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
         return publishDirectory;
     }
 
+    [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/36160")]
+    public async Task EndToEnd_MultiProjectSolution()
+    {
+        ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
+        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_EndToEnd_MultiProjectSolution"));
+
+        if (newSolutionDir.Exists)
+        {
+            newSolutionDir.Delete(recursive: true);
+        }
+
+        newSolutionDir.Create();
+
+        // Create solution with projects
+        new DotnetNewCommand(_testOutput, "sln", "-n", nameof(EndToEnd_MultiProjectSolution))
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetNewCommand(_testOutput, "console", "-n", "ConsoleApp")
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "sln", "add", "ConsoleApp\\ConsoleApp.csproj")
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetNewCommand(_testOutput, "web", "-n", "WebApp")
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "sln", "add", "WebApp\\WebApp.csproj")
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        // Add 'EnableSdkContainerSupport' property to the ConsoleApp and set TFM
+        using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "ConsoleApp", "ConsoleApp.csproj"), FileMode.Open, FileAccess.ReadWrite))
+        {
+            XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None);
+            document
+                .Descendants()
+                .First(e => e.Name.LocalName == "PropertyGroup")?
+                .Add(new XElement("EnableSdkContainerSupport", "true"));
+            document
+                .Descendants()
+                .First(e => e.Name.LocalName == "TargetFramework")
+                .Value = ToolsetInfo.CurrentTargetFramework;
+
+            stream.SetLength(0);
+            await document.SaveAsync(stream, SaveOptions.None, CancellationToken.None);
+        }
+
+        // Set TFM for WebApp
+        using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "WebApp", "WebApp.csproj"), FileMode.Open, FileAccess.ReadWrite))
+        {
+            XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None);
+            document
+                .Descendants()
+                .First(e => e.Name.LocalName == "TargetFramework")
+                .Value = ToolsetInfo.CurrentTargetFramework;
+
+            stream.SetLength(0);
+            await document.SaveAsync(stream, SaveOptions.None, CancellationToken.None);
+        }
+
+        // Publish
+        CommandResult commandResult = new DotnetCommand(_testOutput, "publish", "/t:PublishContainer")
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute();
+
+        commandResult.Should().Pass();
+        commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'");
+        commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'");
+    }
 
     [DockerAvailableTheory(Skip = "https://github.com/dotnet/sdk/issues/36160")]
     [InlineData("webapi", false)]

src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.props

@@ -15,7 +15,4 @@ Copyright (c) .NET Foundation. All rights reserved.
     <EnableSdkContainerSupport Condition="'$(EnableSdkContainerSupport)' == ''">true</EnableSdkContainerSupport>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props"
-          Condition="'$(EnableSdkContainerSupport)' == 'true' AND Exists('$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props')" />
-
 </Project>

src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets

@@ -29,7 +29,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <_PublishTargetsDir Condition=" '$(_PublishTargetsDir)'=='' ">$(MSBuildThisFileDirectory)PublishTargets\</_PublishTargetsDir>
     <_DotNetCLIToolTargetsDir Condition=" '$(_DotNetCLIToolTargetsDir)'=='' ">$(MSBuildThisFileDirectory)DotNetCLIToolTargets\</_DotNetCLIToolTargetsDir>
     <_PublishProfilesDir Condition=" '$(_PublishProfilesDir)'=='' ">$(MSBuildThisFileDirectory)PublishProfiles\</_PublishProfilesDir>
-    <_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\</_ContainersTargetsDir>
 
     <PublishIISAssets Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
              And '$(_TargetFrameworkVersionWithoutV)' != ''
@@ -151,18 +150,6 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   <Import Project="$(_DotNetCLIToolTargetsDir)Microsoft.NET.Sdk.DotNetCLITool.targets" Condition="Exists('$(_DotNetCLIToolTargetsDir)Microsoft.NET.Sdk.DotNetCLITool.targets')"/>
 
-<!--
-  ***********************************************************************************************
-  Import the Containers target
-  ***********************************************************************************************
- -->
-  <!-- Container publishing is only supported for a single TFM at a time at this point, so only import those targets in
-       'inner' builds  -->
-  <Import Project="$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets"
-    Condition="'$(EnableSdkContainerSupport)' == 'true'
-               AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets')
-               AND '$(TargetFramework)' != ''" />
-
   <!--
   ***********************************************************************************************
   TARGET : DotNetPublish