Update samples (#6693)

Youssef1313 · web-flow · commit 8547715e7de5 · 2025-10-08T09:36:12.000Z
diff --git a/samples/public/Directory.Build.props b/samples/public/Directory.Build.props
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <AspireTestingVersion>9.5.0</AspireTestingVersion>
-    <CodeCoverageVersion>18.0.4</CodeCoverageVersion>
-    <MSTestVersion>3.11.0</MSTestVersion>
+    <CodeCoverageVersion>18.1.0</CodeCoverageVersion>
+    <MSTestVersion>4.0.0</MSTestVersion>
     <MSTestAOTVersion>1.0.0-alpha.25501.5</MSTestAOTVersion>
     <PlaywrightVersion>1.55.0</PlaywrightVersion>
-    <TestingPlatformVersion>1.9.0</TestingPlatformVersion>
-    <VSTestVersion>17.13.0</VSTestVersion>
+    <TestingPlatformVersion>2.0.0</TestingPlatformVersion>
+    <VSTestVersion>18.0.0</VSTestVersion>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);SA0001;EnableGenerateDocumentationFile</NoWarn>
   </PropertyGroup>
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/CompositeExtensionFactorySample.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/CompositeExtensionFactorySample.cs
@@ -1,11 +1,12 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.Testing.Platform.Extensions;
 using Microsoft.Testing.Platform.Extensions.Messages;
 using Microsoft.Testing.Platform.Extensions.OutputDevice;
 using Microsoft.Testing.Platform.Extensions.TestHost;
 using Microsoft.Testing.Platform.OutputDevice;
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace TestingPlatformExplorer.InProcess;
 
@@ -47,47 +48,47 @@ public async Task ConsumeAsync(IDataProducer dataProducer, IData value, Cancella
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is in progress")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             case PassedTestNodeStateProperty _:
                 {
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is completed")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             case FailedTestNodeStateProperty failedTestNodeStateProperty:
                 {
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is failed with '{failedTestNodeStateProperty?.Exception?.Message}'")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Red }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             case SkippedTestNodeStateProperty _:
                 {
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is skipped")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.White }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             default:
                 break;
         }
     }
 
-    public async Task OnTestSessionStartingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
+    public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("[DisplayCompositeExtensionFactorySample]Hello from OnTestSessionStartingAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, testSessionContext.CancellationToken);
 
-    public async Task OnTestSessionFinishingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
+    public async Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]Total received 'TestNodeUpdateMessage': {_testNodeUpdateMessageCount}")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-        });
+        }, testSessionContext.CancellationToken);
 }
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/DisplayDataConsumer.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/DisplayDataConsumer.cs
@@ -1,9 +1,9 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.Testing.Platform.Extensions;
 using Microsoft.Testing.Platform.Extensions.Messages;
 using Microsoft.Testing.Platform.Extensions.OutputDevice;
-using Microsoft.Testing.Platform.Extensions.TestHost;
 using Microsoft.Testing.Platform.OutputDevice;
 
 namespace TestingPlatformExplorer.InProcess;
@@ -41,31 +41,31 @@ public async Task ConsumeAsync(IDataProducer dataProducer, IData value, Cancella
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is in progress")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             case PassedTestNodeStateProperty _:
                 {
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is completed")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             case FailedTestNodeStateProperty failedTestNodeStateProperty:
                 {
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is failed with '{failedTestNodeStateProperty?.Exception?.Message}'")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Red }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             case SkippedTestNodeStateProperty _:
                 {
                     await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is skipped")
                     {
                         ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.White }
-                    });
+                    }, cancellationToken);
                     break;
                 }
             default:
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/DisplayTestApplicationLifecycleCallbacks.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/DisplayTestApplicationLifecycleCallbacks.cs
@@ -6,7 +6,8 @@
 using Microsoft.Testing.Platform.OutputDevice;
 
 namespace TestingPlatformExplorer.InProcess;
-internal sealed class DisplayTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IOutputDeviceDataProducer
+
+internal sealed class DisplayTestApplicationLifecycleCallbacks : ITestHostApplicationLifetime, IOutputDeviceDataProducer
 {
     private readonly IOutputDevice _outputDevice;
 
@@ -23,17 +24,17 @@ public DisplayTestApplicationLifecycleCallbacks(IOutputDevice outputDevice)
         _outputDevice = outputDevice;
     }
 
-    public async Task AfterRunAsync(int exitCode, CancellationToken cancellation)
+    public async Task AfterRunAsync(int exitCode, CancellationToken cancellationToken)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"Hello from AfterRunAsync, exit code: {exitCode}")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, cancellationToken);
 
     public async Task BeforeRunAsync(CancellationToken cancellationToken)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from BeforeRunAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, cancellationToken);
 
     public Task<bool> IsEnabledAsync() => Task.FromResult(true);
 }
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/DisplayTestSessionLifeTimeHandler.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/In-process extensions/DisplayTestSessionLifeTimeHandler.cs
@@ -5,9 +5,10 @@
 using Microsoft.Testing.Platform.Extensions.OutputDevice;
 using Microsoft.Testing.Platform.Extensions.TestHost;
 using Microsoft.Testing.Platform.OutputDevice;
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace TestingPlatformExplorer.InProcess;
+
 internal sealed class DisplayTestSessionLifeTimeHandler : ITestSessionLifetimeHandler,
     IOutputDeviceDataProducer,
     IAsyncInitializableExtension,
@@ -31,32 +32,33 @@ public DisplayTestSessionLifeTimeHandler(IOutputDevice outputDevice)
 
     public Task<bool> IsEnabledAsync() => Task.FromResult(true);
 
-    public async Task OnTestSessionStartingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
+    public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from OnTestSessionStartingAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, testSessionContext.CancellationToken);
 
-    public async Task OnTestSessionFinishingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
+    public async Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from OnTestSessionFinishingAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, testSessionContext.CancellationToken);
+
     public async Task InitializeAsync()
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from InitializeAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, CancellationToken.None);
 
     public async Task CleanupAsync()
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from CleanupAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, CancellationToken.None);
 
     public async ValueTask DisposeAsync()
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from DisposeAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }
-        });
+        }, CancellationToken.None);
 }
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/Out-of-process extensions/MonitorTestHost.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/Out-of-process extensions/MonitorTestHost.cs
@@ -30,17 +30,17 @@ public async Task BeforeTestHostProcessStartAsync(CancellationToken cancellation
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("BeforeTestHostProcessStartAsync")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-        });
+        }, cancellationToken);
 
-    public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellation)
+    public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"OnTestHostProcessExitedAsync, test host exited with exit code {testHostProcessInformation.ExitCode}")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-        });
+        }, cancellationToken);
 
-    public async Task OnTestHostProcessStartedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellation)
+    public async Task OnTestHostProcessStartedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)
         => await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"OnTestHostProcessStartedAsync, test host started with PID {testHostProcessInformation.PID}")
         {
             ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }
-        });
+        }, cancellationToken);
 }
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/Program.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/Program.cs
@@ -23,7 +23,7 @@
 testApplicationBuilder.CommandLine.AddProvider(() => new TestingFrameworkCommandLineOptions());
 
 // In-process extensions
-testApplicationBuilder.TestHost.AddTestApplicationLifecycleCallbacks(serviceProvider
+testApplicationBuilder.TestHost.AddTestHostApplicationLifetime(serviceProvider
     => new DisplayTestApplicationLifecycleCallbacks(serviceProvider.GetOutputDevice()));
 testApplicationBuilder.TestHost.AddTestSessionLifetimeHandle(serviceProvider
     => new DisplayTestSessionLifeTimeHandler(serviceProvider.GetOutputDevice()));
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/TestingFramework/TestingFramework.cs b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/TestingFramework/TestingFramework.cs
@@ -112,10 +112,11 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context)
                                 Properties = new PropertyBag(DiscoveredTestNodeStateProperty.CachedInstance),
                             };
 
-                            TestMethodIdentifierProperty testMethodIdentifierProperty = new(test.DeclaringType!.Assembly!.FullName!,
+                            var testMethodIdentifierProperty = new TestMethodIdentifierProperty(test.DeclaringType!.Assembly!.FullName!,
                             test.DeclaringType!.Namespace!,
                             test.DeclaringType.Name!,
                             test.Name,
+                            test.GetGenericArguments().Length,
                             test.GetParameters().Select(x => x.ParameterType.FullName).ToArray()!,
                             test.ReturnType.FullName!);
 
@@ -137,11 +138,11 @@ public async Task ExecuteRequestAsync(ExecuteRequestContext context)
                 {
                     try
                     {
-                        await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"TestingFramework version '{Version}' running tests with parallelism of {_dopValue}") { ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green } });
+                        await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"TestingFramework version '{Version}' running tests with parallelism of {_dopValue}") { ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green } }, context.CancellationToken);
 
                         StringBuilder reportBody = new();
                         MethodInfo[] tests = GetTestsMethodFromAssemblies();
-                        List<Task> results = new();
+                        var results = new List<Task>();
                         foreach (MethodInfo test in tests)
                         {
                             if (runTestExecutionRequest.Filter is TestNodeUidListFilter filter)
diff --git a/samples/public/TestingPlatformExamples/TestingPlatformExplorer/TestingPlatformExplorer.csproj b/samples/public/TestingPlatformExamples/TestingPlatformExplorer/TestingPlatformExplorer.csproj
@@ -11,13 +11,13 @@
 
   <ItemGroup>
     <!-- Update to the last version if needed -->
-    <PackageReference Include="Microsoft.Testing.Platform" Version="1.4.0-preview.24415.5" />
+    <PackageReference Include="Microsoft.Testing.Platform" Version="$(TestingPlatformVersion)" />
 
     <!-- Needed to support the Trx capability -->
-    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="1.4.0-preview.24415.5" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport.Abstractions" Version="$(TestingPlatformVersion)" />
 
     <!-- Add the trx extension -->
-    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.4.0-preview.24415.5" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="$(TestingPlatformVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/public/global.json b/samples/public/global.json
@@ -1,5 +1,5 @@
 {
     "msbuild-sdks": {
-        "MSTest.Sdk": "3.11.0"
+        "MSTest.Sdk": "4.0.0"
     }
 }
diff --git a/samples/public/mstest-runner/CustomReportExtension/CustomReportExtension/CustomReportExtension.csproj b/samples/public/mstest-runner/CustomReportExtension/CustomReportExtension/CustomReportExtension.csproj
@@ -6,12 +6,11 @@
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
     <EnableMSTestRunner>true</EnableMSTestRunner>
     <OutputType>Exe</OutputType>
 
     <!-- For simplicity, we will create the program.cs manually -->
-    <GenerateProgramFile>false</GenerateProgramFile>
+    <GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/public/mstest-runner/CustomReportExtension/CustomReportExtension/TestResultConsoleReporter.cs b/samples/public/mstest-runner/CustomReportExtension/CustomReportExtension/TestResultConsoleReporter.cs
@@ -1,9 +1,10 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using Microsoft.Testing.Platform.Extensions;
 using Microsoft.Testing.Platform.Extensions.Messages;
 using Microsoft.Testing.Platform.Extensions.TestHost;
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 internal sealed class TestResultConsoleReporter :
     // This is the extension point to subscribe to data messages published to the platform.
@@ -51,15 +52,15 @@ public Task ConsumeAsync(IDataProducer dataProducer, IData value, CancellationTo
 
     public Task<bool> IsEnabledAsync() => Task.FromResult(true);
 
-    public Task OnTestSessionFinishingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
+    public Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)
     {
-        PrintMessage($"Closing test session '{sessionUid.Value}'");
+        PrintMessage($"Closing test session '{testSessionContext.SessionUid.Value}'");
         return Task.CompletedTask;
     }
 
-    public Task OnTestSessionStartingAsync(SessionUid sessionUid, CancellationToken cancellationToken)
+    public Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)
     {
-        PrintMessage($"Starting test session '{sessionUid.Value}'");
+        PrintMessage($"Starting test session '{testSessionContext.SessionUid.Value}'");
         return Task.CompletedTask;
     }
 
diff --git a/samples/public/mstest-runner/EnsureTestFramework/EnsureTestFramework/EnsureTestFramework.csproj b/samples/public/mstest-runner/EnsureTestFramework/EnsureTestFramework/EnsureTestFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
diff --git a/samples/public/mstest-runner/MSTestProjectWithExplicitMain/MSTestProjectWithExplicitMain/MSTestProjectWithExplicitMain.csproj b/samples/public/mstest-runner/MSTestProjectWithExplicitMain/MSTestProjectWithExplicitMain/MSTestProjectWithExplicitMain.csproj
@@ -18,10 +18,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.12.6" />
-    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.4.0" />
-    <PackageReference Include="MSTest" Version="3.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(VSTestVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="$(CodeCoverageVersion)" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="$(TestingPlatformVersion)" />
+    <PackageReference Include="MSTest" Version="$(MSTestVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/public/mstest-runner/MSTestRunnerWinUI/UnitTest/UnitTest.csproj b/samples/public/mstest-runner/MSTestRunnerWinUI/UnitTest/UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>UnitTest</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license. See LICENSE file in the project root for full license information.`
`3`	`3`
	`4`	`+using Microsoft.Testing.Platform.Extensions;`
`4`	`5`	`using Microsoft.Testing.Platform.Extensions.Messages;`
`5`	`6`	`using Microsoft.Testing.Platform.Extensions.OutputDevice;`
`6`	`7`	`using Microsoft.Testing.Platform.Extensions.TestHost;`
`7`	`8`	`using Microsoft.Testing.Platform.OutputDevice;`
`8`		`-using Microsoft.Testing.Platform.TestHost;`
	`9`	`+using Microsoft.Testing.Platform.Services;`
`9`	`10`
`10`	`11`	`namespace TestingPlatformExplorer.InProcess;`
`11`	`12`
`@@ -47,47 +48,47 @@ public async Task ConsumeAsync(IDataProducer dataProducer, IData value, Cancella`
`47`	`48`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is in progress")`
`48`	`49`	`{`
`49`	`50`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`50`		`- });`
	`51`	`+ }, cancellationToken);`
`51`	`52`	`break;`
`52`	`53`	`}`
`53`	`54`	`case PassedTestNodeStateProperty _:`
`54`	`55`	`{`
`55`	`56`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is completed")`
`56`	`57`	`{`
`57`	`58`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`58`		`- });`
	`59`	`+ }, cancellationToken);`
`59`	`60`	`break;`
`60`	`61`	`}`
`61`	`62`	`case FailedTestNodeStateProperty failedTestNodeStateProperty:`
`62`	`63`	`{`
`63`	`64`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is failed with '{failedTestNodeStateProperty?.Exception?.Message}'")`
`64`	`65`	`{`
`65`	`66`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Red }`
`66`		`- });`
	`67`	`+ }, cancellationToken);`
`67`	`68`	`break;`
`68`	`69`	`}`
`69`	`70`	`case SkippedTestNodeStateProperty _:`
`70`	`71`	`{`
`71`	`72`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is skipped")`
`72`	`73`	`{`
`73`	`74`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.White }`
`74`		`- });`
	`75`	`+ }, cancellationToken);`
`75`	`76`	`break;`
`76`	`77`	`}`
`77`	`78`	`default:`
`78`	`79`	`break;`
`79`	`80`	`}`
`80`	`81`	`}`
`81`	`82`
`82`		`- public async Task OnTestSessionStartingAsync(SessionUid sessionUid, CancellationToken cancellationToken)`
	`83`	`+ public async Task OnTestSessionStartingAsync(ITestSessionContext testSessionContext)`
`83`	`84`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("[DisplayCompositeExtensionFactorySample]Hello from OnTestSessionStartingAsync")`
`84`	`85`	`{`
`85`	`86`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }`
`86`		`- });`
	`87`	`+ }, testSessionContext.CancellationToken);`
`87`	`88`
`88`		`- public async Task OnTestSessionFinishingAsync(SessionUid sessionUid, CancellationToken cancellationToken)`
	`89`	`+ public async Task OnTestSessionFinishingAsync(ITestSessionContext testSessionContext)`
`89`	`90`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayCompositeExtensionFactorySample]Total received 'TestNodeUpdateMessage': {_testNodeUpdateMessageCount}")`
`90`	`91`	`{`
`91`	`92`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`92`		`- });`
	`93`	`+ }, testSessionContext.CancellationToken);`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`// Copyright (c) Microsoft Corporation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT license. See LICENSE file in the project root for full license information.`
`3`	`3`
	`4`	`+using Microsoft.Testing.Platform.Extensions;`
`4`	`5`	`using Microsoft.Testing.Platform.Extensions.Messages;`
`5`	`6`	`using Microsoft.Testing.Platform.Extensions.OutputDevice;`
`6`		`-using Microsoft.Testing.Platform.Extensions.TestHost;`
`7`	`7`	`using Microsoft.Testing.Platform.OutputDevice;`
`8`	`8`
`9`	`9`	`namespace TestingPlatformExplorer.InProcess;`
`@@ -41,31 +41,31 @@ public async Task ConsumeAsync(IDataProducer dataProducer, IData value, Cancella`
`41`	`41`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is in progress")`
`42`	`42`	`{`
`43`	`43`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`44`		`- });`
	`44`	`+ }, cancellationToken);`
`45`	`45`	`break;`
`46`	`46`	`}`
`47`	`47`	`case PassedTestNodeStateProperty _:`
`48`	`48`	`{`
`49`	`49`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is completed")`
`50`	`50`	`{`
`51`	`51`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`52`		`- });`
	`52`	`+ }, cancellationToken);`
`53`	`53`	`break;`
`54`	`54`	`}`
`55`	`55`	`case FailedTestNodeStateProperty failedTestNodeStateProperty:`
`56`	`56`	`{`
`57`	`57`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is failed with '{failedTestNodeStateProperty?.Exception?.Message}'")`
`58`	`58`	`{`
`59`	`59`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Red }`
`60`		`- });`
	`60`	`+ }, cancellationToken);`
`61`	`61`	`break;`
`62`	`62`	`}`
`63`	`63`	`case SkippedTestNodeStateProperty _:`
`64`	`64`	`{`
`65`	`65`	`await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"[DisplayDataConsumer]TestNode '{testNodeId}' with display name '{testNodeDisplayName}' is skipped")`
`66`	`66`	`{`
`67`	`67`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.White }`
`68`		`- });`
	`68`	`+ }, cancellationToken);`
`69`	`69`	`break;`
`70`	`70`	`}`
`71`	`71`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`using Microsoft.Testing.Platform.OutputDevice;`
`7`	`7`
`8`	`8`	`namespace TestingPlatformExplorer.InProcess;`
`9`		`-internal sealed class DisplayTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IOutputDeviceDataProducer`
	`9`	`+`
	`10`	`+internal sealed class DisplayTestApplicationLifecycleCallbacks : ITestHostApplicationLifetime, IOutputDeviceDataProducer`
`10`	`11`	`{`
`11`	`12`	`private readonly IOutputDevice _outputDevice;`
`12`	`13`
`@@ -23,17 +24,17 @@ public DisplayTestApplicationLifecycleCallbacks(IOutputDevice outputDevice)`
`23`	`24`	`_outputDevice = outputDevice;`
`24`	`25`	`}`
`25`	`26`
`26`		`- public async Task AfterRunAsync(int exitCode, CancellationToken cancellation)`
	`27`	`+ public async Task AfterRunAsync(int exitCode, CancellationToken cancellationToken)`
`27`	`28`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"Hello from AfterRunAsync, exit code: {exitCode}")`
`28`	`29`	`{`
`29`	`30`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }`
`30`		`- });`
	`31`	`+ }, cancellationToken);`
`31`	`32`
`32`	`33`	`public async Task BeforeRunAsync(CancellationToken cancellationToken)`
`33`	`34`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("Hello from BeforeRunAsync")`
`34`	`35`	`{`
`35`	`36`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.DarkGreen }`
`36`		`- });`
	`37`	`+ }, cancellationToken);`
`37`	`38`
`38`	`39`	`public Task<bool> IsEnabledAsync() => Task.FromResult(true);`
`39`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,17 +30,17 @@ public async Task BeforeTestHostProcessStartAsync(CancellationToken cancellation`
`30`	`30`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData("BeforeTestHostProcessStartAsync")`
`31`	`31`	`{`
`32`	`32`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`33`		`- });`
	`33`	`+ }, cancellationToken);`
`34`	`34`
`35`		`- public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellation)`
	`35`	`+ public async Task OnTestHostProcessExitedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)`
`36`	`36`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"OnTestHostProcessExitedAsync, test host exited with exit code {testHostProcessInformation.ExitCode}")`
`37`	`37`	`{`
`38`	`38`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`39`		`- });`
	`39`	`+ }, cancellationToken);`
`40`	`40`
`41`		`- public async Task OnTestHostProcessStartedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellation)`
	`41`	`+ public async Task OnTestHostProcessStartedAsync(ITestHostProcessInformation testHostProcessInformation, CancellationToken cancellationToken)`
`42`	`42`	`=> await _outputDevice.DisplayAsync(this, new FormattedTextOutputDeviceData($"OnTestHostProcessStartedAsync, test host started with PID {testHostProcessInformation.PID}")`
`43`	`43`	`{`
`44`	`44`	`ForegroundColor = new SystemConsoleColor() { ConsoleColor = ConsoleColor.Green }`
`45`		`- });`
	`45`	`+ }, cancellationToken);`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"msbuild-sdks": {`
`3`		`- "MSTest.Sdk": "3.11.0"`
	`3`	`+ "MSTest.Sdk": "4.0.0"`
`4`	`4`	`}`
`5`	`5`	`}`