diff --git a/global.json b/global.json
new file mode 100644
index 00000000000..544bb8ae47c
--- /dev/null
+++ b/global.json
@@ -0,0 +1,8 @@
+{
+  "sdk": {
+    "version": "10.0.101"
+  },
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 9c069b12f6f..3d97dabf9ec 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -65,5 +65,7 @@
     <NuGetAuditMode>all</NuGetAuditMode>
     <!-- Report low, moderate, high and critical advisories -->
     <NuGetAuditLevel>moderate</NuGetAuditLevel>
+
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
   </PropertyGroup>
 </Project>
diff --git a/src/Test/L0/Listener/ErrorThrottlerL0.cs b/src/Test/L0/Listener/ErrorThrottlerL0.cs
index e4118b181f0..43afec056c0 100644
--- a/src/Test/L0/Listener/ErrorThrottlerL0.cs
+++ b/src/Test/L0/Listener/ErrorThrottlerL0.cs
@@ -24,7 +24,7 @@ public sealed class ErrorThrottlerL0
         [InlineData(6)]
         [InlineData(7)]
         [InlineData(8)]
-        public async void TestIncrementAndWait(int totalAttempts)
+        public async Task TestIncrementAndWait(int totalAttempts)
         {
             using (TestHostContext hc = CreateTestContext())
             {
@@ -97,7 +97,7 @@ public async void TestIncrementAndWait(int totalAttempts)
         }
 
         [Fact]
-        public async void TestReset()
+        public async Task TestReset()
         {
             using (TestHostContext hc = CreateTestContext())
             {
@@ -151,7 +151,7 @@ public async void TestReset()
         }
 
         [Fact]
-        public async void TestReceivesCancellationToken()
+        public async Task TestReceivesCancellationToken()
         {
             using (TestHostContext hc = CreateTestContext())
             {
@@ -180,7 +180,7 @@ public async void TestReceivesCancellationToken()
         }
 
         [Fact]
-        public async void TestReceivesSender()
+        public async Task TestReceivesSender()
         {
             using (TestHostContext hc = CreateTestContext())
             {
diff --git a/src/Test/L0/Listener/JobDispatcherL0.cs b/src/Test/L0/Listener/JobDispatcherL0.cs
index 3b26233a456..163ca53c30c 100644
--- a/src/Test/L0/Listener/JobDispatcherL0.cs
+++ b/src/Test/L0/Listener/JobDispatcherL0.cs
@@ -52,7 +52,7 @@ private Pipelines.AgentJobRequestMessage CreateJobRequestMessage(string billingO
         [Trait("Category", "Runner")]
         [InlineData(null)]
         [InlineData("billingOwnerId")]
-        public async void DispatchesJobRequest(string billingOwnerId)
+        public async Task DispatchesJobRequest(string billingOwnerId)
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -102,7 +102,7 @@ public async void DispatchesJobRequest(string billingOwnerId)
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobRequest()
+        public async Task DispatcherRenewJobRequest()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -160,7 +160,7 @@ public async void DispatcherRenewJobRequest()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobRequestStopOnJobNotFoundExceptions()
+        public async Task DispatcherRenewJobRequestStopOnJobNotFoundExceptions()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -219,7 +219,7 @@ public async void DispatcherRenewJobRequestStopOnJobNotFoundExceptions()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobOnRunServiceStopOnJobNotFoundExceptions()
+        public async Task DispatcherRenewJobOnRunServiceStopOnJobNotFoundExceptions()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -288,7 +288,7 @@ public async void DispatcherRenewJobOnRunServiceStopOnJobNotFoundExceptions()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobRequestStopOnJobTokenExpiredExceptions()
+        public async Task DispatcherRenewJobRequestStopOnJobTokenExpiredExceptions()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -347,7 +347,7 @@ public async void DispatcherRenewJobRequestStopOnJobTokenExpiredExceptions()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void RenewJobRequestNewAgentNameUpdatesSettings()
+        public async Task RenewJobRequestNewAgentNameUpdatesSettings()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -404,7 +404,7 @@ public async void RenewJobRequestNewAgentNameUpdatesSettings()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void RenewJobRequestSameAgentNameIgnored()
+        public async Task RenewJobRequestSameAgentNameIgnored()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -459,7 +459,7 @@ public async void RenewJobRequestSameAgentNameIgnored()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void RenewJobRequestNullAgentNameIgnored()
+        public async Task RenewJobRequestNullAgentNameIgnored()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -512,7 +512,7 @@ public async void RenewJobRequestNullAgentNameIgnored()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobRequestRecoverFromExceptions()
+        public async Task DispatcherRenewJobRequestRecoverFromExceptions()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -573,7 +573,7 @@ public async void DispatcherRenewJobRequestRecoverFromExceptions()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobRequestFirstRenewRetrySixTimes()
+        public async Task DispatcherRenewJobRequestFirstRenewRetrySixTimes()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -628,7 +628,7 @@ public async void DispatcherRenewJobRequestFirstRenewRetrySixTimes()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatcherRenewJobRequestStopOnExpiredRequest()
+        public async Task DispatcherRenewJobRequestStopOnExpiredRequest()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -694,7 +694,7 @@ public async void DispatcherRenewJobRequestStopOnExpiredRequest()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void DispatchesOneTimeJobRequest()
+        public async Task DispatchesOneTimeJobRequest()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
diff --git a/src/Test/L0/Listener/SelfUpdaterL0.cs b/src/Test/L0/Listener/SelfUpdaterL0.cs
index be095ce9093..096201f3ac8 100644
--- a/src/Test/L0/Listener/SelfUpdaterL0.cs
+++ b/src/Test/L0/Listener/SelfUpdaterL0.cs
@@ -78,7 +78,7 @@ private async Task FetchLatestRunner()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync()
+        public async Task TestSelfUpdateAsync()
         {
             try
             {
@@ -137,7 +137,7 @@ public async void TestSelfUpdateAsync()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_NoUpdateOnOldVersion()
+        public async Task TestSelfUpdateAsync_NoUpdateOnOldVersion()
         {
             try
             {
@@ -188,7 +188,7 @@ public async void TestSelfUpdateAsync_NoUpdateOnOldVersion()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_DownloadRetry()
+        public async Task TestSelfUpdateAsync_DownloadRetry()
         {
             try
             {
@@ -241,7 +241,7 @@ public async void TestSelfUpdateAsync_DownloadRetry()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_ValidateHash()
+        public async Task TestSelfUpdateAsync_ValidateHash()
         {
             try
             {
diff --git a/src/Test/L0/Listener/SelfUpdaterV2L0.cs b/src/Test/L0/Listener/SelfUpdaterV2L0.cs
index 5115a6bbb7f..fc4c46ed5a2 100644
--- a/src/Test/L0/Listener/SelfUpdaterV2L0.cs
+++ b/src/Test/L0/Listener/SelfUpdaterV2L0.cs
@@ -74,7 +74,7 @@ private async Task FetchLatestRunner()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync()
+        public async Task TestSelfUpdateAsync()
         {
             try
             {
@@ -134,7 +134,7 @@ public async void TestSelfUpdateAsync()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_DownloadRetry()
+        public async Task TestSelfUpdateAsync_DownloadRetry()
         {
             try
             {
@@ -183,7 +183,7 @@ public async void TestSelfUpdateAsync_DownloadRetry()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Runner")]
-        public async void TestSelfUpdateAsync_ValidateHash()
+        public async Task TestSelfUpdateAsync_ValidateHash()
         {
             try
             {
diff --git a/src/Test/L0/Worker/ActionManagerL0.cs b/src/Test/L0/Worker/ActionManagerL0.cs
index bc477931226..7354e855238 100644
--- a/src/Test/L0/Worker/ActionManagerL0.cs
+++ b/src/Test/L0/Worker/ActionManagerL0.cs
@@ -38,7 +38,7 @@ public sealed class ActionManagerL0
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadActionFromDotCom_OnPremises_Legacy()
+        public async Task PrepareActions_DownloadActionFromDotCom_OnPremises_Legacy()
         {
             try
             {
@@ -99,7 +99,7 @@ public async void PrepareActions_DownloadActionFromDotCom_OnPremises_Legacy()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadActionFromDotCom_ZipFileError()
+        public async Task PrepareActions_DownloadActionFromDotCom_ZipFileError()
         {
             try
             {
@@ -156,7 +156,7 @@ public async void PrepareActions_DownloadActionFromDotCom_ZipFileError()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadUnknownActionFromGraph_OnPremises_Legacy()
+        public async Task PrepareActions_DownloadUnknownActionFromGraph_OnPremises_Legacy()
         {
             try
             {
@@ -216,7 +216,7 @@ public async void PrepareActions_DownloadUnknownActionFromGraph_OnPremises_Legac
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_PullImageFromDockerHub()
+        public async Task PrepareActions_PullImageFromDockerHub()
         {
             try
             {
@@ -254,7 +254,7 @@ public async void PrepareActions_PullImageFromDockerHub()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadActionFromGraph()
+        public async Task PrepareActions_DownloadActionFromGraph()
         {
             try
             {
@@ -296,7 +296,7 @@ public async void PrepareActions_DownloadActionFromGraph()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_DownloadActionFromGraph_UseCache()
+        public async Task PrepareActions_DownloadActionFromGraph_UseCache()
         {
             try
             {
@@ -406,7 +406,7 @@ public async void PrepareActions_DownloadActionFromGraph_UseCache()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_AlwaysClearActionsCache()
+        public async Task PrepareActions_AlwaysClearActionsCache()
         {
             try
             {
@@ -436,7 +436,7 @@ public async void PrepareActions_AlwaysClearActionsCache()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_SkipDownloadActionForSelfRepo()
+        public async Task PrepareActions_SkipDownloadActionForSelfRepo()
         {
             try
             {
@@ -472,7 +472,7 @@ public async void PrepareActions_SkipDownloadActionForSelfRepo()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithDockerfile()
+        public async Task PrepareActions_RepositoryActionWithDockerfile()
         {
             try
             {
@@ -511,7 +511,7 @@ public async void PrepareActions_RepositoryActionWithDockerfile()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithDockerfileInRelativePath()
+        public async Task PrepareActions_RepositoryActionWithDockerfileInRelativePath()
         {
             try
             {
@@ -552,7 +552,7 @@ public async void PrepareActions_RepositoryActionWithDockerfileInRelativePath()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionfile_Dockerfile()
+        public async Task PrepareActions_RepositoryActionWithActionfile_Dockerfile()
         {
             try
             {
@@ -591,7 +591,7 @@ public async void PrepareActions_RepositoryActionWithActionfile_Dockerfile()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionfile_DockerfileRelativePath()
+        public async Task PrepareActions_RepositoryActionWithActionfile_DockerfileRelativePath()
         {
             try
             {
@@ -631,7 +631,7 @@ public async void PrepareActions_RepositoryActionWithActionfile_DockerfileRelati
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionfile_DockerHubImage()
+        public async Task PrepareActions_RepositoryActionWithActionfile_DockerHubImage()
         {
             try
             {
@@ -670,7 +670,7 @@ public async void PrepareActions_RepositoryActionWithActionfile_DockerHubImage()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionYamlFile_DockerHubImage()
+        public async Task PrepareActions_RepositoryActionWithActionYamlFile_DockerHubImage()
         {
             try
             {
@@ -709,7 +709,7 @@ public async void PrepareActions_RepositoryActionWithActionYamlFile_DockerHubIma
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionfileAndDockerfile()
+        public async Task PrepareActions_RepositoryActionWithActionfileAndDockerfile()
         {
             try
             {
@@ -749,7 +749,7 @@ public async void PrepareActions_RepositoryActionWithActionfileAndDockerfile()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_NotPullOrBuildImagesMultipleTimes()
+        public async Task PrepareActions_NotPullOrBuildImagesMultipleTimes()
         {
             try
             {
@@ -889,7 +889,7 @@ public async void PrepareActions_NotPullOrBuildImagesMultipleTimes()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithActionfile_Node()
+        public async Task PrepareActions_RepositoryActionWithActionfile_Node()
         {
             try
             {
@@ -926,7 +926,7 @@ public async void PrepareActions_RepositoryActionWithActionfile_Node()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithInvalidWrapperActionfile_Node()
+        public async Task PrepareActions_RepositoryActionWithInvalidWrapperActionfile_Node()
         {
             try
             {
@@ -969,7 +969,7 @@ public async void PrepareActions_RepositoryActionWithInvalidWrapperActionfile_No
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_RepositoryActionWithWrapperActionfile_PreSteps()
+        public async Task PrepareActions_RepositoryActionWithWrapperActionfile_PreSteps()
         {
             try
             {
@@ -1024,7 +1024,7 @@ public async void PrepareActions_RepositoryActionWithWrapperActionfile_PreSteps(
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_CompositeActionWithActionfile_Node()
+        public async Task PrepareActions_CompositeActionWithActionfile_Node()
         {
             try
             {
@@ -1067,7 +1067,7 @@ public async void PrepareActions_CompositeActionWithActionfile_Node()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_CompositeActionWithActionfile_MaxLimit()
+        public async Task PrepareActions_CompositeActionWithActionfile_MaxLimit()
         {
             try
             {
@@ -1107,7 +1107,7 @@ public async void PrepareActions_CompositeActionWithActionfile_MaxLimit()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_CompositeActionWithActionfile_CompositePrestepNested()
+        public async Task PrepareActions_CompositeActionWithActionfile_CompositePrestepNested()
         {
             try
             {
@@ -1149,7 +1149,7 @@ public async void PrepareActions_CompositeActionWithActionfile_CompositePrestepN
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void PrepareActions_CompositeActionWithActionfile_CompositeContainerNested()
+        public async Task PrepareActions_CompositeActionWithActionfile_CompositeContainerNested()
         {
             try
             {
diff --git a/src/Test/L0/Worker/ActionRunnerL0.cs b/src/Test/L0/Worker/ActionRunnerL0.cs
index 8186e25b642..872a4150780 100644
--- a/src/Test/L0/Worker/ActionRunnerL0.cs
+++ b/src/Test/L0/Worker/ActionRunnerL0.cs
@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading;
+using System.Threading.Tasks;
 using Xunit;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 
@@ -33,7 +34,7 @@ public sealed class ActionRunnerL0
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void MergeDefaultInputs()
+        public async Task MergeDefaultInputs()
         {
             //Arrange
             Setup();
@@ -79,7 +80,7 @@ public async void MergeDefaultInputs()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void WriteEventPayload()
+        public async Task WriteEventPayload()
         {
             //Arrange
             Setup();
@@ -319,7 +320,7 @@ public void EvaluateDisplayNameWithoutContext()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void WarnInvalidInputs()
+        public async Task WarnInvalidInputs()
         {
             //Arrange
             Setup();
@@ -372,7 +373,7 @@ public async void WarnInvalidInputs()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void SetGitHubContextActionRepoRef()
+        public async Task SetGitHubContextActionRepoRef()
         {
             //Arrange
             Setup();
diff --git a/src/Test/L0/Worker/ContainerOperationProviderL0.cs b/src/Test/L0/Worker/ContainerOperationProviderL0.cs
index 1ca7ebbb0ee..ad85740c8bc 100644
--- a/src/Test/L0/Worker/ContainerOperationProviderL0.cs
+++ b/src/Test/L0/Worker/ContainerOperationProviderL0.cs
@@ -32,7 +32,7 @@ public sealed class ContainerOperationProviderL0
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void RunServiceContainersHealthcheck_UnhealthyServiceContainer_AssertFailedTask()
+        public async Task RunServiceContainersHealthcheck_UnhealthyServiceContainer_AssertFailedTask()
         {
             //Arrange
             Setup();
@@ -54,7 +54,7 @@ public async void RunServiceContainersHealthcheck_UnhealthyServiceContainer_Asse
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void RunServiceContainersHealthcheck_UnhealthyServiceContainer_AssertExceptionThrown()
+        public async Task RunServiceContainersHealthcheck_UnhealthyServiceContainer_AssertExceptionThrown()
         {
             //Arrange
             Setup();
@@ -68,7 +68,7 @@ public async void RunServiceContainersHealthcheck_UnhealthyServiceContainer_Asse
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void RunServiceContainersHealthcheck_healthyServiceContainer_AssertSucceededTask()
+        public async Task RunServiceContainersHealthcheck_healthyServiceContainer_AssertSucceededTask()
         {
             //Arrange
             Setup();
@@ -85,7 +85,7 @@ public async void RunServiceContainersHealthcheck_healthyServiceContainer_Assert
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void RunServiceContainersHealthcheck_healthyServiceContainerWithoutHealthcheck_AssertSucceededTask()
+        public async Task RunServiceContainersHealthcheck_healthyServiceContainerWithoutHealthcheck_AssertSucceededTask()
         {
             //Arrange
             Setup();
diff --git a/src/Test/L0/Worker/OutputManagerL0.cs b/src/Test/L0/Worker/OutputManagerL0.cs
index 7005547b56e..e3bda998c26 100644
--- a/src/Test/L0/Worker/OutputManagerL0.cs
+++ b/src/Test/L0/Worker/OutputManagerL0.cs
@@ -647,7 +647,7 @@ public void MatcherTimeout()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void MatcherFile()
+        public async Task MatcherFile()
         {
             Environment.SetEnvironmentVariable("RUNNER_TEST_GET_REPOSITORY_PATH_FAILSAFE", "2");
             var matchers = new IssueMatchersConfig
@@ -761,7 +761,7 @@ public async void MatcherFile()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void MatcherFile_JobContainer()
+        public async Task MatcherFile_JobContainer()
         {
             var matchers = new IssueMatchersConfig
             {
@@ -822,7 +822,7 @@ public async void MatcherFile_JobContainer()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void MatcherFile_StepContainer()
+        public async Task MatcherFile_StepContainer()
         {
             var matchers = new IssueMatchersConfig
             {
@@ -884,7 +884,7 @@ public async void MatcherFile_StepContainer()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void MatcherFromPath()
+        public async Task MatcherFromPath()
         {
             var matchers = new IssueMatchersConfig
             {
@@ -940,7 +940,7 @@ public async void MatcherFromPath()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void MatcherDefaultFromPath()
+        public async Task MatcherDefaultFromPath()
         {
             var matchers = new IssueMatchersConfig
             {
diff --git a/src/Test/L0/Worker/SnapshotOperationProviderL0.cs b/src/Test/L0/Worker/SnapshotOperationProviderL0.cs
index d2d5260b69b..225eddacec4 100644
--- a/src/Test/L0/Worker/SnapshotOperationProviderL0.cs
+++ b/src/Test/L0/Worker/SnapshotOperationProviderL0.cs
@@ -2,6 +2,7 @@
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Worker;
@@ -22,7 +23,7 @@ public class SnapshotOperationProviderL0
     [InlineData(false)]
     [Trait("Level", "L0")]
     [Trait("Category", "Worker")]
-    public async void CreateSnapshotRequestAsync(bool shouldSnapshotDirectoryAlreadyExist)
+    public async Task CreateSnapshotRequestAsync(bool shouldSnapshotDirectoryAlreadyExist)
     {
         using (TestHostContext testHostContext = CreateTestHostContext())
         {
diff --git a/src/Test/L0/Worker/WorkerL0.cs b/src/Test/L0/Worker/WorkerL0.cs
index defcc981404..91655b966bc 100644
--- a/src/Test/L0/Worker/WorkerL0.cs
+++ b/src/Test/L0/Worker/WorkerL0.cs
@@ -79,7 +79,7 @@ private JobCancelMessage CreateJobCancelMessage(Guid jobId)
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void DispatchRunNewJob()
+        public async Task DispatchRunNewJob()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
@@ -131,7 +131,7 @@ public async void DispatchRunNewJob()
         [Fact]
         [Trait("Level", "L0")]
         [Trait("Category", "Worker")]
-        public async void DispatchCancellation()
+        public async Task DispatchCancellation()
         {
             //Arrange
             using (var hc = new TestHostContext(this))
diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
index a5a19aea7d1..567b157838e 100644
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -4,6 +4,12 @@
         <RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
         <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
         <NoWarn>NU1701;NU1603;NU1603;xUnit2013;SYSLIB0050;SYSLIB0051</NoWarn>
+        <OutputType>Exe</OutputType>
+        <SelfContained>true</SelfContained>
+
+        <!-- xUnit1051: Calls to methods which accept CancellationToken should use TestContext.Current.CancellationToken to allow test cancellation to be more responsive. -->
+        <!-- This should be considered to be fixed in future. -->
+        <NoWarn>$(NoWarn);xUnit1051</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -15,9 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
-        <PackageReference Include="xunit" Version="2.7.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
+        <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.1" />
+        <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
         <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
         <PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
diff --git a/src/dev.sh b/src/dev.sh
index cd589bf9ea6..92b4d18e28f 100755
--- a/src/dev.sh
+++ b/src/dev.sh
@@ -17,7 +17,7 @@ LAYOUT_DIR="$SCRIPT_DIR/../_layout"
 DOWNLOAD_DIR="$SCRIPT_DIR/../_downloads/netcore2x"
 PACKAGE_DIR="$SCRIPT_DIR/../_package"
 DOTNETSDK_ROOT="$SCRIPT_DIR/../_dotnetsdk"
-DOTNETSDK_VERSION="8.0.416"
+DOTNETSDK_VERSION="10.0.101"
 DOTNETSDK_INSTALLDIR="$DOTNETSDK_ROOT/$DOTNETSDK_VERSION"
 RUNNER_VERSION=$(cat runnerversion)
 
diff --git a/src/dir.proj b/src/dir.proj
index 056a312e8f8..d86a1ba628b 100644
--- a/src/dir.proj
+++ b/src/dir.proj
@@ -48,7 +48,7 @@
 
     <Target Name="Test" DependsOnTargets="GenerateConstant">
         <Exec Command="dotnet build Test/Test.csproj -c $(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime)" ConsoleToMSBuild="true" />
-        <Exec Command="dotnet test Test/Test.csproj -c $(BUILDCONFIG) --no-build --logger:trx" ConsoleToMSBuild="true" />
+        <Exec Command="dotnet test --project Test/Test.csproj -c $(BUILDCONFIG) --no-build --report-trx" ConsoleToMSBuild="true" />
     </Target>
 
     <Target Name="Layout" DependsOnTargets="Clean;Build">
diff --git a/src/global.json b/src/global.json
deleted file mode 100644
index 68bd8fe2d32..00000000000
--- a/src/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "8.0.416"
-  }
-}