[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#48271)

Author: v-wuzhai

.github/workflows/pr-analysis.yml

@@ -1,14 +1,14 @@
 name: PR Analysis
 on:
   pull_request:
-    types: [opened, synchronize, labeled, unlabeled]
+    types: [opened, labeled, unlabeled]
 permissions:
   contents: read
   pull-requests: read
 jobs:
   allowed-labels:
     runs-on: ubuntu-latest
     steps:
-      - name: Return error if branch is in lockdown or 'do not merge' label is present
+      - name: Return error if blocking labels are present in PR
         run: echo "Labels on this PR prevent it from being merged. Please contact the repo owners for more information." && exit 1
-        if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') }}
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'Branch Lockdown') || contains(github.event.pull_request.labels.*.name, 'DO NOT MERGE') || contains(github.event.pull_request.labels.*.name, 'Servicing-consider') || contains(github.event.pull_request.labels.*.name, 'Servicing-more-info') || contains(github.event.pull_request.labels.*.name, 'Servicing-rejected') }}

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

@@ -305,10 +305,16 @@
       <!--We don't want to skip publishing individual images in case of local daemon podman because podman loads multi-arch tarball differently - only individual image for the current platform.-->
       <_SkipContainerPublishing>false</_SkipContainerPublishing>
       <_SkipContainerPublishing Condition="$(ContainerArchiveOutputPath) != '' or ( $(ContainerRegistry) == '' and ( $(LocalRegistry) == '' or $(LocalRegistry) == 'Docker' ) )">true</_SkipContainerPublishing>
-    
+
       <!--We want to skip CreateImageIndex task in case of local daemon podman because it is not supported.-->
       <_SkipCreateImageIndex>false</_SkipCreateImageIndex>
       <_SkipCreateImageIndex Condition="$(ContainerArchiveOutputPath) == '' and $(ContainerRegistry) == '' and $(LocalRegistry) == 'Podman'">true</_SkipCreateImageIndex>
+
+      <!-- Figure out what format the inner images should be coerced to -->
+      <!-- If a user had an opinion, use that -->
+      <_SingleImageContainerFormat Condition="'$(ContainerImageFormat)' != ''">$(ContainerImageFormat)</_SingleImageContainerFormat>
+      <!-- If we are publishing to local tarball or to local Docker, force OCI to prevent mismatches between inner images and the outer manifest -->
+      <_SingleImageContainerFormat Condition="$(_SkipContainerPublishing) == 'true' ">OCI</_SingleImageContainerFormat>
     </PropertyGroup>
 
     <ItemGroup>
@@ -339,15 +345,16 @@
           ContainerUser=$(ContainerUser);
           ContainerGenerateLabels=$(ContainerGenerateLabels);
           ContainerGenerateLabelsImageBaseDigest=$(ContainerGenerateLabelsImageBaseDigest);
-          _SkipContainerPublishing=$(_SkipContainerPublishing)
+          _SkipContainerPublishing=$(_SkipContainerPublishing);
+          ContainerImageFormat=$(_SingleImageContainerFormat)
         "/>
       <_rids Remove ="$(_rids)" />
     </ItemGroup>
 
     <MSBuild
         Projects="@(_InnerBuild)"
         Targets="Publish;_ParseItemsForPublishingSingleContainer;_PublishSingleContainer"
-        BuildInParallel="true">
+        BuildInParallel="$([MSBuild]::ValueOrDefault('$(ContainerPublishInParallel)', 'true'))">
         <Output TaskParameter="TargetOutputs" ItemName="GeneratedContainers" />
     </MSBuild>
 

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

@@ -65,5 +65,5 @@ Copyright (c) .NET Foundation. All rights reserved.
           Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props')" />
 
   <Import Project="$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets"
-    Condition="$(_IsNotSetContainersTargetsDir) AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets') AND '$(TargetFramework)' != ''" />
+    Condition="$(_IsNotSetContainersTargetsDir) AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets')" />
 </Project>

test/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs

@@ -353,7 +353,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st
     public async Task EndToEnd_MultiProjectSolution()
     {
         ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution));
-        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_EndToEnd_MultiProjectSolution"));
+        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(EndToEnd_MultiProjectSolution)));
 
         if (newSolutionDir.Exists)
         {
@@ -431,6 +431,82 @@ public async Task EndToEnd_MultiProjectSolution()
         commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'");
     }
 
+    /// <summary>
+    /// Tests that a multi-project solution with a library that targets multiple frameworks can be published.
+    /// This is interesting because before https://github.com/dotnet/sdk/pull/47693 the container targets
+    /// wouldn't be loaded for multi-TFM project evaluations, so any calls to the PublishContainer target
+    /// for libraries (which may be multi-targeted even when referenced from a single-target published app project) would fail.
+    /// It's safe to load the target for libraries in a multi-targeted context because libraries don't have EnableSdkContainerSupport
+    /// enabled by default, so the target will be skipped.
+    /// </summary>
+    [DockerAvailableFact]
+    public async Task EndToEnd_MultiProjectSolution_with_multitargeted_library()
+    {
+        ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library));
+        DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library)));
+
+        if (newSolutionDir.Exists)
+        {
+            newSolutionDir.Delete(recursive: true);
+        }
+
+        newSolutionDir.Create();
+
+        // Create solution with projects
+        new DotnetNewCommand(_testOutput, "sln", "-n", nameof(EndToEnd_MultiProjectSolution_with_multitargeted_library))
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetNewCommand(_testOutput, "web", "-n", "WebApp")
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "sln", "add", Path.Combine("WebApp", "WebApp.csproj"))
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetNewCommand(_testOutput, "classlib", "-n", "Library")
+            .WithVirtualHive()
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        new DotnetCommand(_testOutput, "sln", "add", Path.Combine("Library", "Library.csproj"))
+            .WithWorkingDirectory(newSolutionDir.FullName)
+            .Execute()
+            .Should().Pass();
+
+        // Set TFMs for Library - use current toolset + NS2.0 for compatibility
+        // also set IsPublishable to false
+        using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "Library", "Library.csproj"), FileMode.Open, FileAccess.ReadWrite))
+        {
+            XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None);
+            var tfmNode =
+                document
+                .Descendants()
+                .First(e => e.Name.LocalName == "TargetFramework");
+            var propertyGroupNode = tfmNode.Parent!;
+            tfmNode.Remove();
+            propertyGroupNode.Add(new XElement("TargetFrameworks", $"{ToolsetInfo.CurrentTargetFramework};netstandard2.0"));
+            propertyGroupNode.Add(new XElement("IsPublishable", "false"));
+            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'");
+    }
+
     [DockerAvailableTheory()]
     [InlineData("webapi", false)]
     [InlineData("webapi", true)]
@@ -1014,7 +1090,7 @@ public void EndToEndMultiArch_RemoteRegistry()
             .And.HaveStdOutContaining($"Pushed image '{imageX64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image '{imageArm64}' to registry '{registry}'.")
             .And.HaveStdOutContaining($"Pushed image index '{imageIndex}' to registry '{registry}'.");
-        
+
         // Check that the containers can be run
         // First pull the image from the registry for each platform
         ContainerCli.PullCommand(
@@ -1031,7 +1107,7 @@ public void EndToEndMultiArch_RemoteRegistry()
             imageFromRegistry)
             .Execute()
             .Should().Pass();
-        
+
         // Run the containers
         ContainerCli.RunCommand(
             _testOutput,
@@ -1353,4 +1429,45 @@ static string[] DecideEntrypoint(string rid, string appName, string workingDir)
             return new[] { $"{workingDir}/{binary}" };
         }
     }
+
+    [DockerAvailableFact(checkContainerdStoreAvailability: true)]
+    public void EnforcesOciSchemaForMultiRIDTarballOutput()
+    {
+        string imageName = NewImageName();
+        string tag = "1.0";
+
+        // Create new console app
+        DirectoryInfo newProjectDir = CreateNewProject("webapp");
+
+        // Run PublishContainer for multi-arch with ContainerGenerateLabels
+        var publishResult = new DotnetCommand(
+            _testOutput,
+            "publish",
+            "/t:PublishContainer",
+            "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
+            $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
+            $"/p:ContainerRepository={imageName}",
+            $"/p:ContainerImageTag={tag}",
+            "/p:EnableSdkContainerSupport=true",
+            "/p:ContainerArchiveOutputPath=archive.tar.gz",
+            "-getProperty:GeneratedImageIndex",
+            "-getItem:GeneratedContainers",
+            "/bl")
+            .WithWorkingDirectory(newProjectDir.FullName)
+            .Execute();
+
+        publishResult.Should().Pass();
+        var jsonDump = JsonDocument.Parse(publishResult.StdOut);
+        var index = JsonDocument.Parse(jsonDump.RootElement.GetProperty("Properties").GetProperty("GeneratedImageIndex").ToString());
+        var containers = jsonDump.RootElement.GetProperty("Items").GetProperty("GeneratedContainers").EnumerateArray().ToArray();
+
+        index.RootElement.GetProperty("mediaType").GetString().Should().Be("application/vnd.oci.image.index.v1+json");
+        containers.Should().HaveCount(2);
+        foreach (var container in containers)
+        {
+            container.GetProperty("ManifestMediaType").GetString().Should().Be("application/vnd.oci.image.manifest.v1+json");
+        }
+        // Cleanup
+        newProjectDir.Delete(true);
+    }
 }