use Timer.CancelAsync from polyfill (#3836)

Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
microsoft · Sep 21, 2024 · fdcd3b9 · fdcd3b9
1 parent 32c4e64
commit fdcd3b9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs
@@ -86,13 +86,7 @@ public async Task<int> RunAsyncAndReturnExitCodeAsync(
             var timedOut = Task.Delay(TimeSpan.FromSeconds(seconds), stopTheTimer.Token);
             if (await Task.WhenAny(exited, timedOut) == exited)
             {
-#if NET8_0_OR_GREATER
                 await stopTheTimer.CancelAsync();
-#else
-#pragma warning disable VSTHRD103 // Call async methods when in an async method
-                stopTheTimer.Cancel();
-#pragma warning restore VSTHRD103 // Call async methods when in an async method
-#endif
                 return await exited;
             }
             else

diff --git a/...tilities/Microsoft.Testing.TestInfrastructure/Microsoft.Testing.TestInfrastructure.csproj b/...tilities/Microsoft.Testing.TestInfrastructure/Microsoft.Testing.TestInfrastructure.csproj
@@ -18,4 +18,8 @@
     <ProjectCapability Remove="TestingPlatformServer" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="Polyfills" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs
@@ -3,10 +3,6 @@
 
 using System.Diagnostics;
 
-#if NETSTANDARD
-using Polyfills;
-#endif
-
 namespace Microsoft.Testing.TestInfrastructure;
 
 public sealed class ProcessHandle : IProcessHandle, IDisposable

diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs
@@ -5,8 +5,6 @@
 using System.Text;
 using System.Xml.Linq;
 
-using Polyfills;
-
 namespace Microsoft.Testing.TestInfrastructure;
 
 public class VSSolution : Folder