[automated] Merge branch 'release/9.0.2xx' => 'release/9.0.3xx' (#47335)

Author: v-wuzhai

src/Containers/Microsoft.NET.Build.Containers/Resources/Strings.Designer.cs

@@ -143,6 +143,24 @@ internal async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
             }
         }
 
+        // forcibly change the media type if required
+        if (ImageFormat is not null)
+        {
+            if (Enum.TryParse<KnownImageFormats>(ImageFormat, out var imageFormat))
+            {
+                imageBuilder.ManifestMediaType = imageFormat switch
+                {
+                    KnownImageFormats.Docker => SchemaTypes.DockerManifestV2,
+                    KnownImageFormats.OCI => SchemaTypes.OciManifestV1,
+                    _ => imageBuilder.ManifestMediaType // should be impossible unless we add to the enum
+                };
+            }
+            else
+            {
+                Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidContainerImageFormat), ImageFormat, string.Join(",", Enum.GetValues<KnownImageFormats>()));
+            }
+        }
+
         Layer newLayer = Layer.FromDirectory(PublishDirectory, WorkingDirectory, imageBuilder.IsWindows, imageBuilder.ManifestMediaType);
         imageBuilder.AddLayer(newLayer);
         imageBuilder.SetWorkingDirectory(WorkingDirectory);

src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs

@@ -255,8 +255,8 @@
                     BaseRegistry="$(ContainerBaseRegistry)"
                     BaseImageName="$(ContainerBaseName)"
                     BaseImageTag="$(ContainerBaseTag)"
-                    ImageFormat="$(ContainerImageFormat)"
                     BaseImageDigest="$(ContainerBaseDigest)"
+                    ImageFormat="$(ContainerImageFormat)"
                     LocalRegistry="$(LocalRegistry)"
                     OutputRegistry="$(ContainerRegistry)"
                     ArchiveOutputPath="$(ContainerArchiveOutputPath)"

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

@@ -244,10 +244,11 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreated(string solutionCom
         }
 
         [Theory]
-        //[InlineData("sln", true, ".sln")]
-        //[InlineData("sln", false, ".sln")]
-        //[InlineData("solution", true, ".sln")]
-        //[InlineData("solution", false, ".sln")]
+        // needs https://github.com/microsoft/vs-solutionpersistence/pull/101
+        // [InlineData("sln", true, ".sln")]
+        // [InlineData("sln", false, ".sln")]
+        // [InlineData("solution", true, ".sln")]
+        // [InlineData("solution", false, ".sln")]
         [InlineData("sln", true, ".slnx")]
         [InlineData("solution", false, ".slnx")]
         public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(string solutionCommand, bool fooFirst, string solutionExtension)