Obsolete ITestApplicationLifecycleCallbacks and add ITestHostApplicationLifetime

Youssef1313 · Youssef1313 · commit bd9795c7bb40 · 2025-06-27T08:04:44.000+02:00
diff --git a/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildExtensions.cs b/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildExtensions.cs
@@ -20,7 +20,7 @@ public static class MSBuildExtensions
     public static void AddMSBuild(this ITestApplicationBuilder builder)
     {
         builder.CommandLine.AddProvider(() => new MSBuildCommandLineProvider());
-        builder.TestHost.AddTestApplicationLifecycleCallbacks(
+        builder.TestHost.AddTestHostApplicationLifetime(
             serviceProvider => new MSBuildTestApplicationLifecycleCallbacks(
                 serviceProvider.GetConfiguration(),
                 serviceProvider.GetCommandLineOptions(),
diff --git a/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildTestApplicationLifecycleCallbacks.cs b/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildTestApplicationLifecycleCallbacks.cs
@@ -13,7 +13,7 @@
 
 namespace Microsoft.Testing.Extensions.MSBuild;
 
-internal sealed class MSBuildTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IDisposable
+internal sealed class MSBuildTestApplicationLifecycleCallbacks : ITestHostApplicationLifetime, IDisposable
 {
     private readonly IConfiguration _configuration;
     private readonly ICommandLineOptions _commandLineOptions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.Retry/RetryExtensions.cs b/src/Platform/Microsoft.Testing.Extensions.Retry/RetryExtensions.cs
@@ -23,7 +23,7 @@ public static void AddRetryProvider(this ITestApplicationBuilder builder)
     {
         builder.CommandLine.AddProvider(() => new RetryCommandLineOptionsProvider());
 
-        builder.TestHost.AddTestApplicationLifecycleCallbacks(serviceProvider
+        builder.TestHost.AddTestHostApplicationLifetime(serviceProvider
             => new RetryLifecycleCallbacks(serviceProvider));
 
         CompositeExtensionFactory<RetryDataConsumer> compositeExtensionFactory
diff --git a/src/Platform/Microsoft.Testing.Extensions.Retry/RetryLifecycleCallbacks.cs b/src/Platform/Microsoft.Testing.Extensions.Retry/RetryLifecycleCallbacks.cs
@@ -16,7 +16,7 @@
 
 namespace Microsoft.Testing.Extensions.Policy;
 
-internal sealed class RetryLifecycleCallbacks : ITestApplicationLifecycleCallbacks,
+internal sealed class RetryLifecycleCallbacks : ITestHostApplicationLifetime,
 #if NETCOREAPP
     IAsyncDisposable
 #else
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportExtensions.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportExtensions.cs
@@ -47,7 +47,7 @@ public static void AddTrxReportProvider(this ITestApplicationBuilder builder)
                 serviceProvider.GetService<TrxTestApplicationLifecycleCallbacks>(),
                 serviceProvider.GetLoggerFactory().CreateLogger<TrxReportGenerator>()));
 
-        builder.TestHost.AddTestApplicationLifecycleCallbacks(serviceProvider =>
+        builder.TestHost.AddTestHostApplicationLifetime(serviceProvider =>
             new TrxTestApplicationLifecycleCallbacks(
                 serviceProvider.GetCommandLineOptions(),
                 serviceProvider.GetEnvironment()));
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.Testing.Extensions.TrxReport.Abstractions;
 
-internal sealed class TrxTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IDisposable
+internal sealed class TrxTestApplicationLifecycleCallbacks : ITestHostApplicationLifetime, IDisposable
 {
     private readonly bool _isEnabled;
     private readonly IEnvironment _environment;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/CommonTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/CommonTestHost.cs
@@ -101,21 +101,25 @@ private async Task<int> RunTestAppAsync(CancellationToken testApplicationCancell
         if (RunTestApplicationLifeCycleCallbacks)
         {
             // Get the test application lifecycle callbacks to be able to call the before run
+#pragma warning disable CS0618 // Type or member is obsolete
             foreach (ITestApplicationLifecycleCallbacks testApplicationLifecycleCallbacks in ServiceProvider.GetServicesInternal<ITestApplicationLifecycleCallbacks>())
             {
                 await testApplicationLifecycleCallbacks.BeforeRunAsync(testApplicationCancellationToken).ConfigureAwait(false);
             }
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         int exitCode = await InternalRunAsync().ConfigureAwait(false);
 
         if (RunTestApplicationLifeCycleCallbacks)
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             foreach (ITestApplicationLifecycleCallbacks testApplicationLifecycleCallbacks in ServiceProvider.GetServicesInternal<ITestApplicationLifecycleCallbacks>())
             {
                 await testApplicationLifecycleCallbacks.AfterRunAsync(exitCode, testApplicationCancellationToken).ConfigureAwait(false);
                 await DisposeHelper.DisposeAsync(testApplicationLifecycleCallbacks).ConfigureAwait(false);
             }
+#pragma warning restore CS0618 // Type or member is obsolete
         }
 
         return exitCode;
@@ -239,13 +243,16 @@ protected static async Task DisposeServiceProviderAsync(ServiceProvider serviceP
             }
 
             // We need to ensure that we won't dispose special services till the shutdown
+#pragma warning disable CS0618 // Type or member is obsolete
             if (!isProcessShutdown &&
                 service is ITelemetryCollector or
                  ITestApplicationLifecycleCallbacks or
+                 ITestHostApplicationLifetime or
                  IPushOnlyProtocol)
             {
                 continue;
             }
+#pragma warning restore CS0618 // Type or member is obsolete
 
             if (!alreadyDisposed.Contains(service))
             {
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs
@@ -441,8 +441,10 @@ await LogTestHostCreatedAsync(
             systemEnvironment).ConfigureAwait(false);
 
         // Build and register the test application lifecycle callbacks.
+#pragma warning disable CS0618 // Type or member is obsolete
         ITestApplicationLifecycleCallbacks[] testApplicationLifecycleCallback =
             await ((TestHostManager)TestHost).BuildTestApplicationLifecycleCallbackAsync(serviceProvider).ConfigureAwait(false);
+#pragma warning restore CS0618 // Type or member is obsolete
         serviceProvider.AddServices(testApplicationLifecycleCallback);
 
         // ServerMode and Console mode uses different host
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs
@@ -290,7 +290,7 @@ protected override async Task<int> InternalRunAsync()
                 if (_testHostsInformation.LifetimeHandlers.Length > 0)
                 {
                     // We don't block the host during the 'OnTestHostProcessStartedAsync' by-design, if 'ITestHostProcessLifetimeHandler' extensions needs
-                    // to block the execution of the test host should add an in-process extension like an 'ITestApplicationLifecycleCallbacks' and
+                    // to block the execution of the test host should add an in-process extension like an 'ITestHostApplicationLifetime' and
                     // wait for a connection/signal to return.
                     TestHostProcessInformation testHostProcessInformation = new(_testHostPID.Value);
                     foreach (ITestHostProcessLifetimeHandler lifetimeHandler in _testHostsInformation.LifetimeHandlers)
diff --git a/src/Platform/Microsoft.Testing.Platform/PublicAPI/PublicAPI.Unshipped.txt b/src/Platform/Microsoft.Testing.Platform/PublicAPI/PublicAPI.Unshipped.txt
@@ -1,3 +1,5 @@
 #nullable enable
 Microsoft.Testing.Platform.Builder.ITestApplicationBuilder.RegisterTestFramework(System.Func<System.IServiceProvider!, Microsoft.Testing.Platform.Capabilities.TestFramework.ITestFrameworkCapabilities!>! capabilitiesFactory, System.Func<Microsoft.Testing.Platform.Capabilities.TestFramework.ITestFrameworkCapabilities!, System.IServiceProvider!, Microsoft.Testing.Platform.Extensions.TestFramework.ITestFramework!>! frameworkFactory) -> Microsoft.Testing.Platform.Builder.ITestApplicationBuilder!
 *REMOVED*Microsoft.Testing.Platform.Builder.ITestApplicationBuilder.RegisterTestFramework(System.Func<System.IServiceProvider!, Microsoft.Testing.Platform.Capabilities.TestFramework.ITestFrameworkCapabilities!>! capabilitiesFactory, System.Func<Microsoft.Testing.Platform.Capabilities.TestFramework.ITestFrameworkCapabilities!, System.IServiceProvider!, Microsoft.Testing.Platform.Extensions.TestFramework.ITestFramework!>! adapterFactory) -> Microsoft.Testing.Platform.Builder.ITestApplicationBuilder!
+Microsoft.Testing.Platform.Extensions.TestHost.ITestHostApplicationLifetime
+Microsoft.Testing.Platform.TestHost.ITestHostManager.AddTestHostApplicationLifetime(System.Func<System.IServiceProvider!, Microsoft.Testing.Platform.Extensions.TestHost.ITestHostApplicationLifetime!>! testHostApplicationLifetimeFactory) -> void
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/ServiceProvider.cs b/src/Platform/Microsoft.Testing.Platform/Services/ServiceProvider.cs
@@ -17,6 +17,7 @@ internal sealed class ServiceProvider : IServiceProvider, ICloneable
 
     public bool AllowTestAdapterFrameworkRegistration { get; set; }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     private static Type[] InternalOnlyExtensions =>
     [
         // TestHost
@@ -28,6 +29,7 @@ internal sealed class ServiceProvider : IServiceProvider, ICloneable
         typeof(ITestHostEnvironmentVariableProvider),
         typeof(ITestHostProcessLifetimeHandler)
     ];
+#pragma warning restore CS0618 // Type or member is obsolete
 
     public void AddService(object service, bool throwIfSameInstanceExit = true)
     {
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHost/ITestHostApplicationLifetime.cs b/src/Platform/Microsoft.Testing.Platform/TestHost/ITestHostApplicationLifetime.cs
@@ -6,6 +6,7 @@ namespace Microsoft.Testing.Platform.Extensions.TestHost;
 /// <summary>
 /// Represents the interface for test application lifecycle callbacks.
 /// </summary>
+[Obsolete("Use ITestHostApplicationLifetime instead. This interface will be removed in v2.")]
 public interface ITestApplicationLifecycleCallbacks : ITestHostExtension
 {
     /// <summary>
@@ -23,3 +24,13 @@ public interface ITestApplicationLifecycleCallbacks : ITestHostExtension
     /// <returns>A task representing the asynchronous operation.</returns>
     Task AfterRunAsync(int exitCode, CancellationToken cancellation);
 }
+
+/// <summary>
+/// Represents the interface for test application lifecycle callbacks.
+/// </summary>
+#pragma warning disable CS0618 // Type or member is obsolete
+public interface ITestHostApplicationLifetime : ITestHostExtension, ITestApplicationLifecycleCallbacks
+#pragma warning restore CS0618 // Type or member is obsolete
+{
+    // In v2, move BeforeRunAsync and AfterRunAsync to ITestHostApplicationLifetime directly
+}
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHost/ITestHostManager.cs b/src/Platform/Microsoft.Testing.Platform/TestHost/ITestHostManager.cs
@@ -15,8 +15,15 @@ public interface ITestHostManager
     /// Adds a test application lifecycle callbacks.
     /// </summary>
     /// <param name="testApplicationLifecycleCallbacks">The factory method for creating the test application lifecycle callbacks.</param>
+    [Obsolete("Use 'AddTestHostApplicationLifetime' instead.")]
     void AddTestApplicationLifecycleCallbacks(Func<IServiceProvider, ITestApplicationLifecycleCallbacks> testApplicationLifecycleCallbacks);
 
+    /// <summary>
+    /// Adds a test application lifecycle callbacks.
+    /// </summary>
+    /// <param name="testHostApplicationLifetimeFactory">The factory method for creating the test host application lifetime callbacks.</param>
+    void AddTestHostApplicationLifetime(Func<IServiceProvider, ITestHostApplicationLifetime> testHostApplicationLifetimeFactory);
+
     /// <summary>
     /// Adds a data consumer.
     /// </summary>
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHost/TestHostManager.cs b/src/Platform/Microsoft.Testing.Platform/TestHost/TestHostManager.cs
@@ -16,7 +16,9 @@ internal sealed class TestHostManager : ITestHostManager
     private readonly List<object> _factoryOrdering = [];
 
     // Exposed extension points
+#pragma warning disable CS0618 // Type or member is obsolete
     private readonly List<Func<IServiceProvider, ITestApplicationLifecycleCallbacks>> _testApplicationLifecycleCallbacksFactories = [];
+#pragma warning restore CS0618 // Type or member is obsolete
     private readonly List<Func<IServiceProvider, IDataConsumer>> _dataConsumerFactories = [];
     private readonly List<Func<IServiceProvider, ITestSessionLifetimeHandler>> _testSessionLifetimeHandlerFactories = [];
     private readonly List<ICompositeExtensionFactory> _dataConsumersCompositeServiceFactories = [];
@@ -88,12 +90,22 @@ internal async Task<ActionResult<ITestExecutionFilterFactory>> TryBuildTestExecu
         return ActionResult.Fail<ITestExecutionFilterFactory>();
     }
 
+    [Obsolete]
     public void AddTestApplicationLifecycleCallbacks(Func<IServiceProvider, ITestApplicationLifecycleCallbacks> testApplicationLifecycleCallbacks)
     {
         Guard.NotNull(testApplicationLifecycleCallbacks);
         _testApplicationLifecycleCallbacksFactories.Add(testApplicationLifecycleCallbacks);
     }
 
+    public void AddTestHostApplicationLifetime(Func<IServiceProvider, ITestHostApplicationLifetime> testHostApplicationLifetime)
+    {
+        Guard.NotNull(testHostApplicationLifetime);
+#pragma warning disable CS0612 // Type or member is obsolete
+        _testApplicationLifecycleCallbacksFactories.Add(testHostApplicationLifetime);
+#pragma warning restore CS0612 // Type or member is obsolete
+    }
+
+#pragma warning disable CS0618 // Type or member is obsolete
     internal async Task<ITestApplicationLifecycleCallbacks[]> BuildTestApplicationLifecycleCallbackAsync(ServiceProvider serviceProvider)
     {
         List<ITestApplicationLifecycleCallbacks> testApplicationLifecycleCallbacks = [];
@@ -120,6 +132,7 @@ internal async Task<ITestApplicationLifecycleCallbacks[]> BuildTestApplicationLi
 
         return [.. testApplicationLifecycleCallbacks];
     }
+#pragma warning restore CS0618 // Type or member is obsolete
 
     public void AddDataConsumer(Func<IServiceProvider, IDataConsumer> dataConsumerFactory)
     {
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/ServerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/ServerTests.cs
@@ -38,7 +38,7 @@ public async Task ServerCanBeStartedAndAborted_TcpIp() => await RetryHelper.Retr
                     TestApplicationHooks testApplicationHooks = new();
                     string[] args = ["--no-banner", "--server", "--client-host", "localhost", "--client-port", $"{server.Port}", "--internal-testingplatform-skipbuildercheck"];
                     ITestApplicationBuilder builder = await TestApplication.CreateBuilderAsync(args);
-                    builder.TestHost.AddTestApplicationLifecycleCallbacks(_ => testApplicationHooks);
+                    builder.TestHost.AddTestHostApplicationLifetime(_ => testApplicationHooks);
                     builder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new MockTestAdapter());
                     var testApplication = (TestApplication)await builder.BuildAsync();
                     testApplication.ServiceProvider.GetRequiredService<SystemConsole>().SuppressOutput();
@@ -59,7 +59,7 @@ public async Task ServerCanInitialize()
         string[] args = ["--no-banner", "--server", "--client-port", $"{server.Port}", "--internal-testingplatform-skipbuildercheck"];
         TestApplicationHooks testApplicationHooks = new();
         ITestApplicationBuilder builder = await TestApplication.CreateBuilderAsync(args);
-        builder.TestHost.AddTestApplicationLifecycleCallbacks(_ => testApplicationHooks);
+        builder.TestHost.AddTestHostApplicationLifetime(_ => testApplicationHooks);
         builder.RegisterTestFramework(_ => new TestFrameworkCapabilities(), (_, __) => new MockTestAdapter());
         var testApplication = (TestApplication)await builder.BuildAsync();
         testApplication.ServiceProvider.GetRequiredService<SystemConsole>().SuppressOutput();
@@ -252,7 +252,7 @@ private static async Task WriteMessageAsync(StreamWriter writer, string message)
         await writer.FlushAsync();
     }
 
-    private sealed class TestApplicationHooks : ITestApplicationLifecycleCallbacks, IDisposable
+    private sealed class TestApplicationHooks : ITestHostApplicationLifetime, IDisposable
     {
         private readonly SemaphoreSlim _waitForBeforeRunAsync = new(0, 1);
 
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Services/ServiceProviderTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Services/ServiceProviderTests.cs
@@ -33,6 +33,7 @@ public void GetService_InternalExtension_ShouldNotReturn()
 
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
         Assert.IsNull(_serviceProvider.GetService<ITestApplicationLifecycleCallbacks>());
+        Assert.IsNull(_serviceProvider.GetService<ITestHostApplicationLifetime>());
     }
 
     [TestMethod]
@@ -52,6 +53,7 @@ public void GetServiceInternal_InternalExtension_ShouldReturn()
 
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
         Assert.IsNotNull(_serviceProvider.GetServiceInternal<ITestApplicationLifecycleCallbacks>());
+        Assert.IsNotNull(_serviceProvider.GetServiceInternal<ITestHostApplicationLifetime>());
     }
 
     [TestMethod]
@@ -156,6 +158,7 @@ public void GetServicesInternal_ExtensionMethod_InternalExtension_ShouldReturn()
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
 
         Assert.AreEqual(2, _serviceProvider.GetServicesInternal<ITestApplicationLifecycleCallbacks>().Count());
+        Assert.AreEqual(2, _serviceProvider.GetServicesInternal<ITestHostApplicationLifetime>().Count());
     }
 
     [TestMethod]
@@ -165,6 +168,7 @@ public void GetServicesInternal_InternalExtension_ShouldNotReturn()
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
 
         Assert.AreEqual(0, _serviceProvider.GetServicesInternal(typeof(ITestApplicationLifecycleCallbacks), stopAtFirst: false, skipInternalOnlyExtensions: true).Count());
+        Assert.AreEqual(0, _serviceProvider.GetServicesInternal(typeof(ITestHostApplicationLifetime), stopAtFirst: false, skipInternalOnlyExtensions: true).Count());
     }
 
     [TestMethod]
@@ -174,6 +178,7 @@ public void GetServicesInternal_InternalExtension_ShouldReturn()
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
 
         Assert.AreEqual(2, _serviceProvider.GetServicesInternal(typeof(ITestApplicationLifecycleCallbacks), stopAtFirst: false, skipInternalOnlyExtensions: false).Count());
+        Assert.AreEqual(2, _serviceProvider.GetServicesInternal(typeof(ITestHostApplicationLifetime), stopAtFirst: false, skipInternalOnlyExtensions: false).Count());
     }
 
     [TestMethod]
@@ -183,6 +188,7 @@ public void GetServicesInternal_InternalExtension_FirstOnly_ShouldReturnOne()
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
 
         Assert.AreEqual(1, _serviceProvider.GetServicesInternal(typeof(ITestApplicationLifecycleCallbacks), stopAtFirst: true, skipInternalOnlyExtensions: false).Count());
+        Assert.AreEqual(1, _serviceProvider.GetServicesInternal(typeof(ITestHostApplicationLifetime), stopAtFirst: true, skipInternalOnlyExtensions: false).Count());
     }
 
     [TestMethod]
@@ -192,6 +198,7 @@ public void GetServiceInternal_InternalExtension_ShouldReturnOne()
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
 
         Assert.IsNotNull(_serviceProvider.GetServiceInternal(typeof(ITestApplicationLifecycleCallbacks), skipInternalOnlyExtensions: false));
+        Assert.IsNotNull(_serviceProvider.GetServiceInternal(typeof(ITestHostApplicationLifetime), skipInternalOnlyExtensions: false));
     }
 
     [TestMethod]
@@ -201,6 +208,7 @@ public void GetServiceInternal_InternalExtension_SkipInternalOnlyExtensions_Shou
         _serviceProvider.AddService(new TestApplicationLifecycleCallbacks());
 
         Assert.IsNull(_serviceProvider.GetServiceInternal(typeof(ITestApplicationLifecycleCallbacks), skipInternalOnlyExtensions: true));
+        Assert.IsNull(_serviceProvider.GetServiceInternal(typeof(ITestHostApplicationLifetime), skipInternalOnlyExtensions: true));
     }
 
     private sealed class TestFramework : ITestFramework
@@ -294,7 +302,7 @@ private sealed class DataConsumer : IDataConsumer
         public Task<bool> IsEnabledAsync() => throw new NotImplementedException();
     }
 
-    private sealed class TestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks
+    private sealed class TestApplicationLifecycleCallbacks : ITestHostApplicationLifetime
     {
         public string Uid => throw new NotImplementedException();
 
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/TestApplicationBuilderTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/TestApplicationBuilderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static class MSBuildExtensions`
`20`	`20`	`public static void AddMSBuild(this ITestApplicationBuilder builder)`
`21`	`21`	`{`
`22`	`22`	`builder.CommandLine.AddProvider(() => new MSBuildCommandLineProvider());`
`23`		`- builder.TestHost.AddTestApplicationLifecycleCallbacks(`
	`23`	`+ builder.TestHost.AddTestHostApplicationLifetime(`
`24`	`24`	`serviceProvider => new MSBuildTestApplicationLifecycleCallbacks(`
`25`	`25`	`serviceProvider.GetConfiguration(),`
`26`	`26`	`serviceProvider.GetCommandLineOptions(),`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`namespace Microsoft.Testing.Extensions.MSBuild;`
`15`	`15`
`16`		`-internal sealed class MSBuildTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IDisposable`
	`16`	`+internal sealed class MSBuildTestApplicationLifecycleCallbacks : ITestHostApplicationLifetime, IDisposable`
`17`	`17`	`{`
`18`	`18`	`private readonly IConfiguration _configuration;`
`19`	`19`	`private readonly ICommandLineOptions _commandLineOptions;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public static void AddRetryProvider(this ITestApplicationBuilder builder)`
`23`	`23`	`{`
`24`	`24`	`builder.CommandLine.AddProvider(() => new RetryCommandLineOptionsProvider());`
`25`	`25`
`26`		`- builder.TestHost.AddTestApplicationLifecycleCallbacks(serviceProvider`
	`26`	`+ builder.TestHost.AddTestHostApplicationLifetime(serviceProvider`
`27`	`27`	`=> new RetryLifecycleCallbacks(serviceProvider));`
`28`	`28`
`29`	`29`	`CompositeExtensionFactory<RetryDataConsumer> compositeExtensionFactory`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Microsoft.Testing.Extensions.TrxReport.Abstractions;`
`14`	`14`
`15`		`-internal sealed class TrxTestApplicationLifecycleCallbacks : ITestApplicationLifecycleCallbacks, IDisposable`
	`15`	`+internal sealed class TrxTestApplicationLifecycleCallbacks : ITestHostApplicationLifetime, IDisposable`
`16`	`16`	`{`
`17`	`17`	`private readonly bool _isEnabled;`
`18`	`18`	`private readonly IEnvironment _environment;`
Original file line number	Diff line number	Diff line change
`@@ -101,21 +101,25 @@ private async Task<int> RunTestAppAsync(CancellationToken testApplicationCancell`
`101`	`101`	`if (RunTestApplicationLifeCycleCallbacks)`
`102`	`102`	`{`
`103`	`103`	`// Get the test application lifecycle callbacks to be able to call the before run`
	`104`	`+#pragma warning disable CS0618 // Type or member is obsolete`
`104`	`105`	`foreach (ITestApplicationLifecycleCallbacks testApplicationLifecycleCallbacks in ServiceProvider.GetServicesInternal<ITestApplicationLifecycleCallbacks>())`
`105`	`106`	`{`
`106`	`107`	`await testApplicationLifecycleCallbacks.BeforeRunAsync(testApplicationCancellationToken).ConfigureAwait(false);`
`107`	`108`	`}`
	`109`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`int exitCode = await InternalRunAsync().ConfigureAwait(false);`
`111`	`113`
`112`	`114`	`if (RunTestApplicationLifeCycleCallbacks)`
`113`	`115`	`{`
	`116`	`+#pragma warning disable CS0618 // Type or member is obsolete`
`114`	`117`	`foreach (ITestApplicationLifecycleCallbacks testApplicationLifecycleCallbacks in ServiceProvider.GetServicesInternal<ITestApplicationLifecycleCallbacks>())`
`115`	`118`	`{`
`116`	`119`	`await testApplicationLifecycleCallbacks.AfterRunAsync(exitCode, testApplicationCancellationToken).ConfigureAwait(false);`
`117`	`120`	`await DisposeHelper.DisposeAsync(testApplicationLifecycleCallbacks).ConfigureAwait(false);`
`118`	`121`	`}`
	`122`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`119`	`123`	`}`
`120`	`124`
`121`	`125`	`return exitCode;`
`@@ -239,13 +243,16 @@ protected static async Task DisposeServiceProviderAsync(ServiceProvider serviceP`
`239`	`243`	`}`
`240`	`244`
`241`	`245`	`// We need to ensure that we won't dispose special services till the shutdown`
	`246`	`+#pragma warning disable CS0618 // Type or member is obsolete`
`242`	`247`	`if (!isProcessShutdown &&`
`243`	`248`	`service is ITelemetryCollector or`
`244`	`249`	`ITestApplicationLifecycleCallbacks or`
	`250`	`+ ITestHostApplicationLifetime or`
`245`	`251`	`IPushOnlyProtocol)`
`246`	`252`	`{`
`247`	`253`	`continue;`
`248`	`254`	`}`
	`255`	`+#pragma warning restore CS0618 // Type or member is obsolete`
`249`	`256`
`250`	`257`	`if (!alreadyDisposed.Contains(service))`
`251`	`258`	`{`
Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ protected override async Task<int> InternalRunAsync()`
`290`	`290`	`if (_testHostsInformation.LifetimeHandlers.Length > 0)`
`291`	`291`	`{`
`292`	`292`	`// We don't block the host during the 'OnTestHostProcessStartedAsync' by-design, if 'ITestHostProcessLifetimeHandler' extensions needs`
`293`		`- // to block the execution of the test host should add an in-process extension like an 'ITestApplicationLifecycleCallbacks' and`
	`293`	`+ // to block the execution of the test host should add an in-process extension like an 'ITestHostApplicationLifetime' and`
`294`	`294`	`// wait for a connection/signal to return.`
`295`	`295`	`TestHostProcessInformation testHostProcessInformation = new(_testHostPID.Value);`
`296`	`296`	`foreach (ITestHostProcessLifetimeHandler lifetimeHandler in _testHostsInformation.LifetimeHandlers)`