Merge main to rel/4.0 (#6128)

Author: Youssef1313

eng/Version.Details.xml

@@ -17,13 +17,13 @@
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
       <Sha>005149fac82d93baa64fa87c3bae1004c9cd11e1</Sha>
     </Dependency>
-    <Dependency Name="MSTest" Version="3.10.0-preview.25369.5">
+    <Dependency Name="MSTest" Version="3.10.0-preview.25371.5">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>639e5cd9730d9642d93c2828b1e4686a164e040c</Sha>
+      <Sha>4a8fcdaacd6ff086be895fc4aaf9e5c7d49e9f24</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25369.5">
+    <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25371.5">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>639e5cd9730d9642d93c2828b1e4686a164e040c</Sha>
+      <Sha>4a8fcdaacd6ff086be895fc4aaf9e5c7d49e9f24</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -10,7 +10,7 @@
     <MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25367.5</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
     <MicrosoftTestingExtensionsCodeCoverageVersion>17.14.2</MicrosoftTestingExtensionsCodeCoverageVersion>
     <!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
-    <MSTestVersion>3.10.0-preview.25369.5</MSTestVersion>
-    <MicrosoftTestingPlatformVersion>1.8.0-preview.25369.5</MicrosoftTestingPlatformVersion>
+    <MSTestVersion>3.10.0-preview.25371.5</MSTestVersion>
+    <MicrosoftTestingPlatformVersion>1.8.0-preview.25371.5</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "10.0.100-preview.7.25359.101",
+    "dotnet": "10.0.100-preview.7.25368.105",
     "runtimes": {
       "dotnet": [
         "3.1.32",
@@ -23,7 +23,7 @@
     }
   },
   "sdk": {
-    "version": "10.0.100-preview.7.25359.101",
+    "version": "10.0.100-preview.7.25368.105",
     "paths": [
       ".dotnet",
       "$host$"

src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/OperatorKind.cs

@@ -55,4 +55,9 @@ internal enum OperatorKind
     /// Operator used for combining multiple filters with a logical AND.
     /// </summary>
     And,
+
+    /// <summary>
+    /// Operator used to negate an expression.
+    /// </summary>
+    UnaryNot,
 }

src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/TreeNodeFilter.cs

@@ -77,7 +77,7 @@ private static List<FilterExpression> ParseFilter(string filter)
         //       of an expression operators are not allowed.
         bool isOperatorAllowed = false;
         bool isPropAllowed = false;
-
+        bool lastWasOpenParen = false;
         OperatorKind topStackOperator;
 
         foreach (string token in TokenizeFilter(filter))
@@ -225,13 +225,19 @@ private static List<FilterExpression> ParseFilter(string filter)
                     isPropAllowed = false;
                     break;
 
+                case "!" when lastWasOpenParen:
+                    operatorStack.Push(OperatorKind.UnaryNot);
+                    break;
+
                 default:
                     expressionStack.Push(new ValueExpression(token));
 
                     isOperatorAllowed = true;
                     isPropAllowed = true;
                     break;
             }
+
+            lastWasOpenParen = token == "(";
         }
 
         // Note: What we should end with (as long as the expression is a valid filter)
@@ -350,6 +356,11 @@ private static void ProcessStackOperator(OperatorKind op, Stack<FilterExpression
                 expr.Push(filterExpression);
                 break;
 
+            case OperatorKind.UnaryNot:
+                FilterExpression notOperator = expr.Pop();
+                expr.Push(new OperatorExpression(FilterOperator.Not, [notOperator]));
+                break;
+
             default:
                 // Note: Handling of other operations in valid scenarios should be handled by the caller.
                 //       Reaching this code for instance means that we're trying to process / operator
@@ -438,6 +449,12 @@ private static IEnumerable<string> TokenizeFilter(string filter)
                         yield return "!=";
                         i++;
                     }
+                    else if (i - 1 >= 0 && filter[i - 1] == '(')
+                    {
+                        // Note: If we have a ! at the start of an expression, we should
+                        //       treat it as a NOT operator.
+                        yield return "!";
+                    }
                     else
                     {
                         goto default;

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MaxFailedTestsExtensionTests.cs

@@ -26,8 +26,8 @@ public async Task SimpleMaxFailedTestsScenario(string tfm)
         // We can't know the number of tests that will be executed exactly due to the async
         // nature of publish/consume on the platform side. But we expect the cancellation to
         // happen "fast" enough that we don't execute all tests.
-        Assert.IsTrue(total < 12);
-        Assert.IsTrue(total >= 5);
+        Assert.IsLessThan(12, total);
+        Assert.IsGreaterThanOrEqualTo(5, total);
 
         testHostResult = await testHost.ExecuteAsync();
         testHostResult.AssertExitCodeIs(ExitCodes.AtLeastOneTestFailed);

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/RunnerTests.cs

@@ -102,7 +102,7 @@ public async SystemTask EnableMSTestRunner_False_Will_Run_Empty_Program_EntryPoi
         {
             if (TargetFrameworks.NetFramework.Any(x => x == tfm))
             {
-                Assert.IsTrue(ex.Message.Contains("Program does not contain a static 'Main' method suitable for an entry point"), ex.Message);
+                Assert.Contains("Program does not contain a static 'Main' method suitable for an entry point", ex.Message, ex.Message);
                 // .NET Framework does not insert the entry point for empty program.
             }
         }

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerModeTests.cs

@@ -35,7 +35,7 @@ public async Task DiscoverAndRun(string tfm)
 
         await Task.WhenAll(discoveryListener.WaitCompletion(), runListener.WaitCompletion());
         Assert.AreEqual(1, discoveryCollector.TestNodeUpdates.Count(x => x.Node.NodeType == "action"), "Wrong number of discovery");
-        Assert.AreEqual(2, runCollector.TestNodeUpdates.Count, "Wrong number of updates");
+        Assert.HasCount(2, runCollector.TestNodeUpdates);
         Assert.AreNotEqual(0, logs.Count, "Logs are empty");
         Assert.IsFalse(telemetry.IsEmpty, "telemetry is empty");
         await jsonClient.Exit();

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/TimeoutTests.cs

@@ -406,7 +406,7 @@ private static async Task RunAndAssertWithRunSettingsAsync(string tfm, int timeo
 
         if (assertAttributePrecedence)
         {
-            Assert.IsTrue(stopwatch.Elapsed.TotalSeconds < 25);
+            Assert.IsLessThan(25, stopwatch.Elapsed.TotalSeconds);
         }
 
         testHostResult.AssertOutputContains($"{InfoByKind[entryKind].Prefix} method '{InfoByKind[entryKind].MethodFullName}' timed out after {timeoutValue}ms");

test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/CrashPlusHangDumpTests.cs

@@ -30,8 +30,8 @@ public async Task CrashPlusHangDump_InCaseOfCrash_CreateCrashDump()
         testHostResult.AssertOutputMatchesRegex(@"Test host process with PID \'.+\' crashed, a dump file was generated");
         testHostResult.AssertOutputDoesNotContain(@"Hang dump timeout '00:00:08' expired");
 
-        Assert.IsTrue(Directory.GetFiles(resultDirectory, "CrashPlusHangDump*_crash.dmp", SearchOption.AllDirectories).Length > 0, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
-        Assert.IsFalse(Directory.GetFiles(resultDirectory, "CrashPlusHangDump*_hang.dmp", SearchOption.AllDirectories).Length > 0, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
+        Assert.IsGreaterThan(0, Directory.GetFiles(resultDirectory, "CrashPlusHangDump*_crash.dmp", SearchOption.AllDirectories).Length, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
+        Assert.IsLessThanOrEqualTo(0, Directory.GetFiles(resultDirectory, "CrashPlusHangDump*_hang.dmp", SearchOption.AllDirectories).Length, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
     }
 
     [TestMethod]
@@ -58,8 +58,8 @@ public async Task CrashPlusHangDump_InCaseOfHang_CreateHangDump()
         testHostResult.AssertOutputDoesNotMatchRegex(@"Test host process with PID '.+' crashed, a dump file was generated");
         testHostResult.AssertOutputContains(@"Hang dump timeout of '00:00:08' expired");
 
-        Assert.IsFalse(Directory.GetFiles(resultDirectory, "CrashPlusHangDump.dll*_crash.dmp", SearchOption.AllDirectories).Length > 0, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
-        Assert.IsTrue(Directory.GetFiles(resultDirectory, "CrashPlusHangDump*_hang.dmp", SearchOption.AllDirectories).Length > 0, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
+        Assert.IsLessThanOrEqualTo(0, Directory.GetFiles(resultDirectory, "CrashPlusHangDump.dll*_crash.dmp", SearchOption.AllDirectories).Length, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
+        Assert.IsGreaterThan(0, Directory.GetFiles(resultDirectory, "CrashPlusHangDump*_hang.dmp", SearchOption.AllDirectories).Length, $"Dump file not found '{TargetFrameworks.NetCurrent}'\n{testHostResult}'");
     }
 
     public sealed class TestAssetFixture() : TestAssetFixtureBase(AcceptanceFixture.NuGetGlobalPackagesFolder)