Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use Timer.CancelAsync from polyfill #3836

Merged
merged 7 commits into from
Sep 21, 2024
Merged

use Timer.CancelAsync from polyfill #3836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1a1e3cc
use Timer.CancelAsync from polyfill
SimonCropp Sep 14, 2024
d29ea61
.
SimonCropp Sep 14, 2024
f940aa0
Merge branch 'main' into use-Timer.CancelAsync-from-polyfill
SimonCropp Sep 15, 2024
8cea0b7
Merge branch 'main' into use-Timer.CancelAsync-from-polyfill
SimonCropp Sep 17, 2024
e94abed
.
SimonCropp Sep 17, 2024
89135b0
Merge branch 'main' into use-Timer.CancelAsync-from-polyfill
SimonCropp Sep 18, 2024
8f66ab4
Remove using
Evangelink Sep 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions ...tilities/Microsoft.Testing.TestInfrastructure/Microsoft.Testing.TestInfrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@
<ProjectCapability Remove="TestingPlatformServer" />
</ItemGroup>

<ItemGroup>
<Using Include="Polyfills" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@

using System.Diagnostics;

#if NETSTANDARD
using Polyfills;
#endif

namespace Microsoft.Testing.TestInfrastructure;

public sealed class ProcessHandle : IProcessHandle, IDisposable
Expand Down
2 changes: 0 additions & 2 deletions test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
using System.Text;
using System.Xml.Linq;

using Polyfills;

namespace Microsoft.Testing.TestInfrastructure;

public class VSSolution : Folder
Expand Down