Convert tools\ to MSTest and traversal projects.

2 files changed, 15 insertions, 7 deletions

diff --git a/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs b/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs
index 4776e6f1..8f3fecd9 100644
--- a/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs
+++ b/src/internal/WixInternal.MSTestSupport/MsbuildUtilities.cs
@@ -16,7 +16,7 @@ namespace WixInternal.MSTestSupport
 
     public static class MsbuildUtilities
     {
-        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", string verbosityLevel = "normal", bool suppressValidation = true)
+        public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release", string verbosityLevel = "normal", bool suppressValidation = true, bool binlog = true)
         {
             var allArgs = new List<string>
             {
@@ -26,9 +26,13 @@ namespace WixInternal.MSTestSupport
                 // Node reuse means that child msbuild processes can stay around after the build completes.
                 // Under that scenario, the root msbuild does not reliably close its streams which causes us to hang.
                 "-nr:false",
-                MsbuildUtilities.GetQuotedSwitch(buildSystem, "bl", Path.ChangeExtension(projectPath, ".binlog"))
             };
 
+            if (binlog)
+            {
+                MsbuildUtilities.GetQuotedSwitch(buildSystem, "bl", Path.ChangeExtension(projectPath, ".binlog"));
+            }
+
             if (arguments != null)
             {
                 allArgs.AddRange(arguments);
diff --git a/src/internal/WixInternal.MSTestSupport/WixAssert.cs b/src/internal/WixInternal.MSTestSupport/WixAssert.cs
index 927ebee6..b4c59fa5 100644
--- a/src/internal/WixInternal.MSTestSupport/WixAssert.cs
+++ b/src/internal/WixInternal.MSTestSupport/WixAssert.cs
@@ -77,15 +77,19 @@ namespace WixInternal.MSTestSupport
             Assert.AreNotEqual(expected, actual, comparer);
         }
 
-        public static void Single<T>(IEnumerable<T> collection)
+        public static T Single<T>(IEnumerable<T> collection)
         {
-            Assert.AreEqual(1, collection.Count());
+            return collection.Single();
         }
 
-        public static void Single<T>(IEnumerable<T> collection, Func<T, bool> predicate)
+        public static T Single<T>(IEnumerable<T> collection, Func<T, bool> predicate)
         {
-            var results = collection.Where(predicate);
-            Assert.AreEqual(1, results.Count());
+            return collection.Where(predicate).Single();
+        }
+
+        public static void All<T>(IEnumerable<T> collection, Func<T, bool> predicate)
+        {
+            Assert.IsTrue(collection.All(predicate));
         }
 
         public static void Empty<T>(IEnumerable<T> collection)