green up tests

baronfel · baronfel · commit 17206e765d10 · 2022-12-22T13:36:47.000-06:00
diff --git a/Test.Microsoft.NET.Build.Containers.Filesystem/CreateNewImageTests.cs b/Test.Microsoft.NET.Build.Containers.Filesystem/CreateNewImageTests.cs
@@ -94,7 +94,7 @@ public void ParseContainerProperties_EndToEnd()
         pcp.FullyQualifiedBaseImageName = "mcr.microsoft.com/dotnet/runtime:7.0";
         pcp.ContainerRegistry = "localhost:5010";
         pcp.ContainerImageName = "dotnet/testimage";
-        pcp.ContainerImageTags = new [] {"5.0", "latest"};
+        pcp.ContainerImageTags = new [] { "5.0", "latest"};
 
         Assert.IsTrue(pcp.Execute());
         Assert.AreEqual("mcr.microsoft.com", pcp.ParsedContainerRegistry);
diff --git a/Test.Microsoft.NET.Build.Containers.Filesystem/EndToEnd.cs b/Test.Microsoft.NET.Build.Containers.Filesystem/EndToEnd.cs
@@ -147,7 +147,7 @@ public async Task EndToEnd_NoAPI()
         File.Copy(repoGlobalJson, Path.Combine(newProjectDir.FullName, "global.json"));
 
         // 🤢
-        DirectoryInfo nupkgPath = new DirectoryInfo(Assembly.GetAssembly(this.GetType()).Location).Parent.Parent.Parent.Parent;
+        DirectoryInfo nupkgPath = new DirectoryInfo(Assembly.GetAssembly(this.GetType()).Location).Parent.Parent.Parent;
         nupkgPath = nupkgPath.GetDirectories("package")[0];
         FileInfo[] nupkgs = nupkgPath.GetFiles("*.nupkg");
         if (nupkgs == null || nupkgs.Length == 0)
diff --git a/Test.Microsoft.NET.Build.Containers.Filesystem/Evaluator.cs b/Test.Microsoft.NET.Build.Containers.Filesystem/Evaluator.cs
@@ -36,7 +36,7 @@ public static void Cleanup()
         if (CombinedTargetsLocation != null) File.Delete(CombinedTargetsLocation);
     }
 
-    public static (Project, CapturingLogger) InitProject(Dictionary<string, string> bonusProps, bool captureLogs = false, [CallerMemberName]string projectName = "")
+    public static (Project, CapturingLogger) InitProject(Dictionary<string, string> bonusProps, [CallerMemberName]string projectName = "")
     {
         var props = new Dictionary<string, string>();
         // required parameters
@@ -49,9 +49,11 @@ public static (Project, CapturingLogger) InitProject(Dictionary<string, string>
         // test setup parameters so that we can load the props/targets/tasks 
         props["ContainerCustomTasksAssembly"] = Path.GetFullPath(Path.Combine(".", "Microsoft.NET.Build.Containers.dll"));
         props["_IsTest"] = "true";
+
+        var safeBinlogFileName = projectName.Replace(" ", "_").Replace(":", "_").Replace("/", "_").Replace("\\", "_").Replace("*", "_");
         var loggers = new List<ILogger>
         {
-            new global::Microsoft.Build.Logging.BinaryLogger() {CollectProjectImports = global::Microsoft.Build.Logging.BinaryLogger.ProjectImportsCollectionMode.Embed, Verbosity = LoggerVerbosity.Diagnostic, Parameters = $"LogFile={projectName}.binlog" },
+            new global::Microsoft.Build.Logging.BinaryLogger() {CollectProjectImports = global::Microsoft.Build.Logging.BinaryLogger.ProjectImportsCollectionMode.Embed, Verbosity = LoggerVerbosity.Diagnostic, Parameters = $"LogFile={safeBinlogFileName}.binlog" },
             new global::Microsoft.Build.Logging.ConsoleLogger(LoggerVerbosity.Detailed)
         };
         CapturingLogger logs = new CapturingLogger();
diff --git a/Test.Microsoft.NET.Build.Containers.Filesystem/ParseContainerPropertiesTests.cs b/Test.Microsoft.NET.Build.Containers.Filesystem/ParseContainerPropertiesTests.cs
@@ -23,7 +23,7 @@ public void Baseline()
             Assert.AreEqual("7.0", instance.GetPropertyValue(ContainerBaseTag));
 
             Assert.AreEqual("dotnet/testimage", instance.GetPropertyValue(ContainerImageName));
-            CollectionAssert.AreEquivalent(new[] { "7.0", "latest" }, instance.GetPropertyValue(ContainerImageTags).Split(':'));
+            CollectionAssert.AreEquivalent(new[] { "7.0", "latest" }, instance.GetItems(ContainerImageTags).Select(i => i.EvaluatedInclude).ToArray());
         }
 
         [TestMethod]
@@ -50,12 +50,11 @@ public void RegexCatchesInvalidContainerNames()
                 [ContainerRegistry] = "localhost:5010",
                 [ContainerImageName] = "dotnet testimage",
                 [ContainerImageTag] = "5.0"
-            }, captureLogs: true);
+            });
             
             var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
             Assert.IsTrue(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs));
-            Assert.IsTrue(logs.Messages.Count > 0);
-            Assert.AreEqual(ErrorCodes.CONTAINER001, logs.Messages[0].Code);
+            Assert.IsTrue(logs.Messages.Any(m => m.Code == ErrorCodes.CONTAINER001 && m.Importance == global::Microsoft.Build.Framework.MessageImportance.High));
         }
 
         [TestMethod]
@@ -66,7 +65,7 @@ public void RegexCatchesInvalidContainerTags()
                 [ContainerRegistry] = "localhost:5010",
                 [ContainerImageName] = "dotnet/testimage",
                 [ContainerImageTag] = "5 0"
-            }, captureLogs: true);
+            });
 
             var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
             Assert.IsFalse(instance.Build(new[]{ComputeContainerConfig},  new [] { logs }, null, out var outputs));
@@ -84,7 +83,7 @@ public void CanOnlySupplyOneOfTagAndTags()
                 [ContainerImageName] = "dotnet/testimage",
                 [ContainerImageTag] = "5.0",
                 [ContainerImageTags] = "latest;oldest"
-            }, captureLogs: true);
+            });
 
             var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
             Assert.IsFalse(instance.Build(new[]{ComputeContainerConfig},  new [] { logs }, null, out var outputs));
diff --git a/Test.Microsoft.NET.Build.Containers.Filesystem/TargetsTests.cs b/Test.Microsoft.NET.Build.Containers.Filesystem/TargetsTests.cs
@@ -14,7 +14,7 @@ public void CanSetEntrypointArgsToUseAppHost(bool useAppHost, params string[] en
         var (project, _) = Evaluator.InitProject(new()
         {
             [UseAppHost] = useAppHost.ToString()
-        });
+        }, projectName: $"{nameof(CanSetEntrypointArgsToUseAppHost)}_{useAppHost}_{String.Join("_", entrypointArgs)}");
         Assert.IsTrue(project.Build(ComputeContainerConfig));
         var computedEntrypointArgs = project.GetItems(ContainerEntrypoint).Select(i => i.EvaluatedInclude).ToArray();
         foreach (var (First, Second) in entrypointArgs.Zip(computedEntrypointArgs))
@@ -34,7 +34,7 @@ public void CanNormalizeInputContainerNames(string projectName, string expectedC
         var (project, _) = Evaluator.InitProject(new()
         {
             [AssemblyName] = projectName
-        });
+        }, projectName: $"{nameof(CanNormalizeInputContainerNames)}_{projectName}_{expectedContainerImageName}_{shouldPass}");
         var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
         Assert.AreEqual(shouldPass, instance.Build(new[]{ComputeContainerConfig}, null, null, out var outputs), "Build should have succeeded");
         Assert.AreEqual(expectedContainerImageName, instance.GetPropertyValue(ContainerImageName));
@@ -52,7 +52,7 @@ public void CanWarnOnInvalidSDKVersions(string sdkVersion, bool isAllowed) {
         {
             ["NETCoreSdkVersion"] = sdkVersion,
             ["PublishProfile"] = "DefaultContainer"
-        });
+        }, projectName: $"{nameof(CanWarnOnInvalidSDKVersions)}_{sdkVersion}_{isAllowed}");
         var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None);
         var derivedIsAllowed = Boolean.Parse(project.GetProperty("_IsSDKContainerAllowedVersion").EvaluatedValue);
         // var buildResult = instance.Build(new[]{"_ContainerVerifySDKVersion"}, null, null, out var outputs);
diff --git a/packaging/build/Microsoft.NET.Build.Containers.targets b/packaging/build/Microsoft.NET.Build.Containers.targets
@@ -63,8 +63,8 @@
             <!-- Note: spaces will be replaced with '-' in ContainerImageName and ContainerImageTag -->
             <ContainerImageName Condition="'$(ContainerImageName)' == ''">$(AssemblyName)</ContainerImageName>
             <!-- Only default a tag name if no tag names at all are provided -->
-            <ContainerImageTag Condition="'$(ContainerImageTag)' == '' and @(ContainerImageTags->Count()) == 0">$(Version)</ContainerImageTag>
-            <ContainerImageTag Condition="'$(AutoGenerateImageTag)' == 'true' and @(ContainerImageTags->Count()) == 0">$([System.DateTime]::UtcNow.ToString('yyyyMMddhhmmss'))</ContainerImageTag>
+            <ContainerImageTag Condition="'$(ContainerImageTag)' == '' and '$(ContainerImageTags)' == ''">$(Version)</ContainerImageTag>
+            <ContainerImageTag Condition="'$(AutoGenerateImageTag)' == 'true' and '$(ContainerImageTags)' == ''">$([System.DateTime]::UtcNow.ToString('yyyyMMddhhmmss'))</ContainerImageTag>
             <ContainerWorkingDirectory Condition="'$(ContainerWorkingDirectory)' == ''">/app</ContainerWorkingDirectory>
             <!-- Could be semicolon-delimited -->
         </PropertyGroup>
@@ -92,7 +92,7 @@
                                   ContainerRegistry="$(ContainerRegistry)"
                                   ContainerImageName="$(ContainerImageName)"
                                   ContainerImageTag="$(ContainerImageTag)"
-                                  ContainerImageTags="@(ContainerImageTags)"
+                                  ContainerImageTags="$(ContainerImageTags)"
                                   ContainerEnvironmentVariables="@(ContainerEnvironmentVariable)">
 
             <Output TaskParameter="ParsedContainerRegistry" PropertyName="ContainerBaseRegistry" />
