Clean up after rebase

Author: FrankBakkerNl

NetDaemon.sln

@@ -68,6 +68,7 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetDaemon.AppModel.SourceDeployedApps", "src\AppModel\NetDaemon.AppModel.SourceDeployedApps\NetDaemon.AppModel.SourceDeployedApps.csproj", "{AE48B790-C3D7-440E-945E-EE5C82AE2A86}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugMinimalHost", "src\debug\DebugMinimalHost\DebugMinimalHost.csproj", "{24BF4C65-4F48-4349-9649-E152A4E1496E}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleClient", "src\debug\ConsoleClient\ConsoleClient.csproj", "{E966FBC9-D7AF-44F1-BE0F-C344B01A5323}"
 EndProject
 Global

src/Client/NetDaemon.HassClient/Common/Extensions/ServiceCollectionExtension.cs

@@ -17,13 +17,8 @@ public static IServiceCollection AddHomeAssistantClient(this IServiceCollection
             .AddSingleton<IHomeAssistantRunner>(s => s.GetRequiredService<HomeAssistantRunner>())
             .AddSingleton<HomeAssistantApiManager>()
             .AddSingleton<IHomeAssistantApiManager>(s => s.GetRequiredService<HomeAssistantApiManager>())
-            .AddTransient(s => s.GetRequiredService<IHomeAssistantRunner>().CurrentConnection!)
-
-
-
             .AddSingleton<IHomeAssistantConnectionProvider>(s => s.GetRequiredService<HomeAssistantRunner>())
             .AddTransient(s => s.GetRequiredService<IHomeAssistantConnectionProvider>().CurrentConnection!)
-
             .AddWebSocketFactory()
             .AddPipelineFactory()
             .AddConnectionFactory()

src/Client/NetDaemon.HassClient/Common/IHomeAssistantRunner.cs

@@ -12,11 +12,6 @@ public interface IHomeAssistantRunner : IHomeAssistantConnectionProvider, IAsync
     /// </summary>
     IObservable<DisconnectReason> OnDisconnect { get; }
 
-    /// <summary>
-    /// The current connection to Home Assistant. Null if disconnected.
-    /// </summary>
-    IHomeAssistantConnection? CurrentConnection { get; }
-
     /// <summary>
     /// Maintains a connection to the Home Assistant server
     /// </summary>

src/HassModel/NetDaemon.HassModel.Tests/Internal/AppScopedHaContextProviderTest.cs

@@ -363,10 +363,10 @@ private async Task<ServiceProvider> CreateServiceProvider()
             );
         serviceCollection.AddSingleton<IObservable<HassEvent>>(_hassEventSubjectMock);
 
-        var connectioProviderMock = new Mock<IHomeAssistantConnectionProvider>();
+        var connectionProviderMock = new Mock<IHomeAssistantConnectionProvider>();
 
-        connectioProviderMock.SetupGet(n => n.CurrentConnection).Returns(_hassConnectionMock.Object);
-        serviceCollection.AddSingleton(_ => connectioProviderMock.Object);
+        connectionProviderMock.SetupGet(n => n.CurrentConnection).Returns(_hassConnectionMock.Object);
+        serviceCollection.AddSingleton(_ => connectionProviderMock.Object);
 
         var apiManagerMock = new Mock<IHomeAssistantApiManager>();
 

src/HassModel/NetDaemon.HassModel/HaContextFactory.cs

@@ -8,7 +8,7 @@ public static class HaContextFactory
     /// <summary>
     /// Creates a new instance of <see cref="IHaContext"/> using the provided WebSocket URL and token.
     /// </summary>
-    /// <remarks>Do not use this in NetDaemon apps. Apps should use UseNetDaemonRuntime and resolve IHaContext via dependency injection</remarks>
+    /// <remarks>Do not use this in NetDaemon apps. Apps should use AddNetDaemonRuntime and resolve IHaContext via dependency injection. HaContextFactory</remarks>
     /// <param name="homeAssistantWebsocketUrl">The Websocket Url to HomeAssistant, eg: ws://localhost:8123/api/websocket</param>
     /// <param name="token">The long-lived access token for Home Assistant</param>
     /// <returns>An instance of IHaContext</returns>

src/HassModel/NetDaemon.HassModel/Internal/AppScopedHaContextProvider.cs

@@ -44,7 +44,6 @@ public AppScopedHaContextProvider(
 
     IHomeAssistantConnection CurrentConnection => _connectionProvider.CurrentConnection ?? throw new InvalidOperationException("No connection to Home Assistant");
 
-
     // By making the HaRegistry instance internal it can also be registered as scoped in the DI container and injected into applications
     internal HaRegistry Registry { get; }
 

src/Runtime/NetDaemon.Runtime.Tests/Integration/TestRuntime.cs

@@ -16,12 +16,6 @@ public async Task TestApplicationIsLoaded()
         var timedCancellationSource = new CancellationTokenSource(5000);
         var haRunner = new HomeAssistantRunnerMock();
 
-        var con1 = haRunner.Object.CurrentConnection;
-        var run = haRunner.Object;
-        var conprovider = run as IHomeAssistantConnectionProvider;
-        var con2 = conprovider.CurrentConnection;
-
-
         var hostBuilder = GetDefaultHostBuilder();
         var host = hostBuilder.ConfigureServices((_, services) =>
             services