Green up one of the two tests by making the _IsMultiRIDBuild condition more correct

Author: baronfel

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

@@ -298,9 +298,9 @@
 
   <Target Name="_PublishMultiArchContainers" DependsOnTargets="$(PublishContainerDependsOn)" >
     <Error Text="ContainerArchiveOutputPath is invalid. It can only be a directory in multi-arch scenario because the runtime identifier is appended in the end of the filename."
-      Condition="'$(ContainerArchiveOutputPath)' != '' and 
-                 !$(ContainerArchiveOutputPath.EndsWith('/')) and 
-                 !$(ContainerArchiveOutputPath.EndsWith('\\')) and 
+      Condition="'$(ContainerArchiveOutputPath)' != '' and
+                 !$(ContainerArchiveOutputPath.EndsWith('/')) and
+                 !$(ContainerArchiveOutputPath.EndsWith('\\')) and
                  $(ContainerArchiveOutputPath.EndsWith('.tar.gz'))" />
 
     <ItemGroup>
@@ -400,7 +400,14 @@
   Condition="'$(IsPublishable)' == 'true' AND '$(EnableSdkContainerSupport)' == 'true'">
     <PropertyGroup>
       <_IsMultiTFMBuild Condition="'$(TargetFrameworks)' != '' and '$(TargetFramework)' == ''">true</_IsMultiTFMBuild>
-      <_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and (('$(RuntimeIdentifiers)' != '' and '$(RuntimeIdentifier)' == '') or ('$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentifier)' == ''))">true</_IsMultiRIDBuild>
+      <!-- we are multi-RID if:
+          * we have CRIDs and no CRID
+          * we have RIDs and no (CRIDs or CRID or RID)
+      -->
+      <_HasCRIDsAndNoCRID Condition="'$(ContainerRuntimeIdentifiers)' != '' and '$(ContainerRuntimeIdentifier)' == ''">true</_HasCRIDsAndNoCRID>
+      <_HasRIDs Condition="'$(RuntimeIdentifiers)' != ''">true</_HasRIDs>
+      <_NoCRIDsOrCRIDorRID Condition="'$(ContainerRuntimeIdentifiers)' == '' and '$(ContainerRuntimeIdentifier)' == '' and '$(RuntimeIdentifier)' == ''">true</_NoCRIDsOrCRIDorRID>
+      <_IsMultiRIDBuild Condition="'$(BuildingInsideVisualStudio)' != 'true' and ('$(_HasCRIDsAndNoCRID)' == true or ('$(_HasRIDs)' == 'true' and '$(_NoCRIDsOrCRIDorRID)' == 'true'))">true</_IsMultiRIDBuild>
       <_IsSingleRIDBuild Condition="'$(_IsMultiRIDBuild)' == ''">true</_IsSingleRIDBuild>
     </PropertyGroup>
 

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

@@ -785,8 +785,7 @@ public void MultiArchStillAllowsSingleRID()
     {
         string imageName = NewImageName();
         string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string qualifiedImageName = $"{imageName}:{imageTag}";
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -814,19 +813,18 @@ public void MultiArchStillAllowsSingleRID()
         // images were created locally for each RID
         // and image index was NOT created
         commandResult.Should().Pass()
-            .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
-            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
-            .And.NotHaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
+            // no rid-specific path because we didn't pass RuntimeIdentifier
+            .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
+            .And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
             .And.NotHaveStdOutContaining("Pushed image index");
 
         // Check that the containers can be run
         CommandResult processResultX64 = ContainerCli.RunCommand(
             _testOutput,
             "--rm",
             "--name",
-            $"test-container-{imageName}-x64",
-            imageX64)
+            $"test-container-{imageName}",
+            qualifiedImageName)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");
 
@@ -839,8 +837,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
     {
         string imageName = NewImageName();
         string imageTag = "1.0";
-        string imageX64 = $"{imageName}:{imageTag}-linux-x64";
-        string imageArm64 = $"{imageName}:{imageTag}-linux-arm64";
+        string qualifiedImageName = $"{imageName}:{imageTag}";
 
         // Create a new console project
         DirectoryInfo newProjectDir = CreateNewProject("console");
@@ -853,7 +850,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
             // make it so the app is _able_ to target both linux TFMs
             "/p:RuntimeIdentifiers=\"linux-x64;linux-arm64\"",
             // but then only actually publishes for one of them
-            "-r linux-x64",
+            "-r", "linux-x64",
             $"/p:ContainerBaseImage={DockerRegistryManager.FullyQualifiedBaseImageAspNet}",
             $"/p:ContainerRepository={imageName}",
             $"/p:ContainerImageTag={imageTag}",
@@ -868,8 +865,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
         commandResult.Should().Pass()
             .And.HaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-x64"))
             .And.NotHaveStdOutContaining(GetPublishArtifactsPath(newProjectDir.FullName, "linux-arm64"))
-            .And.HaveStdOutContaining($"Pushed image '{imageX64}' to local registry")
-            .And.NotHaveStdOutContaining($"Pushed image '{imageArm64}' to local registry")
+            .And.HaveStdOutContaining($"Pushed image '{qualifiedImageName}' to local registry")
             .And.NotHaveStdOutContaining("Pushed image index");
 
         // Check that the containers can be run
@@ -878,7 +874,7 @@ public void MultiArchStillAllowsSingleRIDUsingJustRIDProperties()
             "--rm",
             "--name",
             $"test-container-{imageName}-x64",
-            imageX64)
+            qualifiedImageName)
         .Execute();
         processResultX64.Should().Pass().And.HaveStdOut("Hello, World!");