Remove_Common

dev/DebugHost/apps/ConcurrencyTestApp.cs

@@ -3,7 +3,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using NetDaemon.AppModel;
-using NetDaemon.HassModel.Common;
+using NetDaemon.HassModel;
 
 namespace Apps;
 

dev/DebugHost/apps/HelloApp/HelloApp.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Linq;
 using Microsoft.Extensions.Logging;
 using NetDaemon.AppModel;
-using NetDaemon.HassModel.Common;
+using NetDaemon.HassModel;
 
 namespace Apps;
 

dev/DebugHost/apps/YamlApp/YamlApp.cs

@@ -1,6 +1,6 @@
 
 using NetDaemon.AppModel;
-using NetDaemon.HassModel.Common;
+using NetDaemon.HassModel;
 
 namespace Apps;
 

src/Client/NetDaemon.HassClient.Debug/GlobalUsings.cs

@@ -3,8 +3,8 @@
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Hosting;
 global using Microsoft.Extensions.Options;
-global using NetDaemon.Client.Common;
-global using NetDaemon.Client.Common.Extensions;
-global using NetDaemon.Client.Common.HomeAssistant.Extensions;
-global using NetDaemon.Client.Common.HomeAssistant.Model;
-global using NetDaemon.Client.Common.Settings;
+global using NetDaemon.Client;
+global using NetDaemon.Client.Extensions;
+global using NetDaemon.Client.HomeAssistant.Extensions;
+global using NetDaemon.Client.HomeAssistant.Model;
+global using NetDaemon.Client.Settings;

src/Client/NetDaemon.HassClient.Tests/ExtensionsTest/ServiceCollectionExtensionTests.cs

@@ -1,4 +1,4 @@
-using NetDaemon.Client.Common.Extensions;
+using NetDaemon.Client.Extensions;
 
 namespace NetDaemon.HassClient.Tests.ExtensionsTest;
 

src/Client/NetDaemon.HassClient.Tests/GlobalUsings.cs

@@ -13,14 +13,14 @@
 global using FluentAssertions;
 global using Moq;
 global using Xunit;
-global using NetDaemon.Client.Common;
-global using NetDaemon.Client.Common.HomeAssistant.Model;
+global using NetDaemon.Client;
+global using NetDaemon.Client.HomeAssistant.Model;
 global using NetDaemon.Client.Internal;
 global using NetDaemon.Client.Internal.Helpers;
 global using NetDaemon.Client.Internal.Net;
-global using NetDaemon.Client.Common.Exceptions;
+global using NetDaemon.Client.Exceptions;
 global using NetDaemon.Client.Internal.Extensions;
 global using NetDaemon.Client.Internal.HomeAssistant.Commands;
-global using NetDaemon.Client.Common.Settings;
-global using NetDaemon.Client.Common.HomeAssistant.Extensions;
+global using NetDaemon.Client.Settings;
+global using NetDaemon.Client.HomeAssistant.Extensions;
 global using NetDaemon.HassClient.Tests.Helpers;

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common;
+namespace NetDaemon.Client;
 
 /// <summary>
 ///     The reason websocket connection disconnected

src/Client/NetDaemon.HassClient/Common/Exceptions/HomeAssistantConnectionException.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.Exceptions;
+namespace NetDaemon.Client.Exceptions;
 
 // We allow exception not to have default constructors since
 // in this case it only makes sense to have a reason

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.Extensions;
+namespace NetDaemon.Client.Extensions;
 
 /// <summary>
 ///     ServiceCollectionExtensions

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Extensions/HassEventExtensions.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Extensions;
+namespace NetDaemon.Client.HomeAssistant.Extensions;
 
 /// <summary>
 ///     Extensions to HassEvents to convert to more specific event types

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Extensions/HomeAssistantApiManagerExtensions.cs

@@ -1,6 +1,6 @@
 using System.Web;
 
-namespace NetDaemon.Client.Common.HomeAssistant.Extensions;
+namespace NetDaemon.Client.HomeAssistant.Extensions;
 
 /// <summary>
 ///     Adds extensions to the IHomeAssistantApiManager

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Extensions/IHomeAssistantConnectionExtensions.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Extensions;
+namespace NetDaemon.Client.HomeAssistant.Extensions;
 
 /// <summary>
 ///     HomeAssistantConnection extensions

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/CommandMessage.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record CommandMessage : HassMessageBase
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassArea.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassArea
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassConfig.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassConfig
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassContext.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassContext
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassDevice.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassDevice
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassEntity.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassEntity
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassError.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassError
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassEvent.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassEvent
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassMessageBase.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassMessageBase
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassServiceEventData.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassServiceEventData
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassState.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassState
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassStateChangedEventData.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassStateChangedEventData
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassUnitSystem.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 public record HassUnitSystem
 {

src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/Targets.cs

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.HomeAssistant.Model;
+namespace NetDaemon.Client.HomeAssistant.Model;
 
 /// <summary>
 ///     Represents a target for a service call in Home Assistant

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common;
+namespace NetDaemon.Client;
 
 /// <summary>
 ///     Make connection to Home Assistant

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common;
+namespace NetDaemon.Client;
 
 /// <summary>
 ///     Handle home assistant API calls using json over http

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common;
+namespace NetDaemon.Client;
 
 /// <summary>
 ///     HomeAssistantClient

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common;
+namespace NetDaemon.Client;
 
 public interface IHomeAssistantConnection : IHomeAssistantApiManager, IAsyncDisposable
 {

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common;
+namespace NetDaemon.Client;
 
 public interface IHomeAssistantRunner : IAsyncDisposable
 {

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

@@ -1,4 +1,4 @@
-namespace NetDaemon.Client.Common.Settings;
+namespace NetDaemon.Client.Settings;
 
 /// <summary>
 ///     Home Assistant related settings

src/Client/NetDaemon.HassClient/GlobalUsings.cs

@@ -18,17 +18,16 @@
 global using Microsoft.Extensions.Logging;
 global using Microsoft.Extensions.Options;
 // HassClient usings
-global using NetDaemon.Client.Common;
-global using NetDaemon.Client.Common.HomeAssistant.Model;
+global using NetDaemon.Client.HomeAssistant.Model;
 global using NetDaemon.Client.Internal;
 global using NetDaemon.Client.Internal.Helpers;
 global using NetDaemon.Client.Internal.Json;
 global using NetDaemon.Client.Internal.Net;
-global using NetDaemon.Client.Common.Exceptions;
+global using NetDaemon.Client.Exceptions;
 global using NetDaemon.Client.Internal.Extensions;
 global using NetDaemon.Client.Internal.HomeAssistant.Commands;
 global using NetDaemon.Client.Internal.HomeAssistant.Messages;
-global using NetDaemon.Client.Common.Settings;
+global using NetDaemon.Client.Settings;
 
 // Make the internal visible to test project
 [assembly: InternalsVisibleTo("NetDaemon.HassClient.Tests")]

src/Client/NetDaemon.HassClient/NetDaemon.Client.csproj

@@ -17,7 +17,6 @@
         </PackageDescription>
         <PackageReleaseNotes>First alpha version, expect things to change!</PackageReleaseNotes>
         <tags>Home Assistant</tags>
-        <RootNamespace>JoySoftware.NetDaemon.Client</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

src/Extensions/NetDaemon.Extensions.Scheduling/INetDaemonScheduler.cs

@@ -1,44 +1,43 @@
 using System;
 
-namespace NetDaemon.Extensions.Scheduler
+namespace NetDaemon.Extensions.Scheduler;
+
+/// <summary>
+///     Scheduler interface
+/// </summary>
+public interface INetDaemonScheduler
 {
     /// <summary>
-    ///     Scheduler interface
+    ///     Schedules an action every (timespan)
     /// </summary>
-    public interface INetDaemonScheduler
-    {
-        /// <summary>
-        ///     Schedules an action every (timespan)
-        /// </summary>
-        /// <param name="period">The period to schedule</param>
-        /// <param name="action">Action to run</param>
-        IDisposable RunEvery(TimeSpan period, Action action);
+    /// <param name="period">The period to schedule</param>
+    /// <param name="action">Action to run</param>
+    IDisposable RunEvery(TimeSpan period, Action action);
 
-        /// <summary>
-        ///     Schedules an action every (timespan)
-        /// </summary>
-        /// <param name="period">The period to schedule</param>
-        /// <param name="startTime">The time to start the schedule</param>
-        /// <param name="action">Action to run</param>
-        IDisposable RunEvery(TimeSpan period, DateTimeOffset startTime, Action action);
+    /// <summary>
+    ///     Schedules an action every (timespan)
+    /// </summary>
+    /// <param name="period">The period to schedule</param>
+    /// <param name="startTime">The time to start the schedule</param>
+    /// <param name="action">Action to run</param>
+    IDisposable RunEvery(TimeSpan period, DateTimeOffset startTime, Action action);
 
-        /// <summary>
-        ///     Delays execution of an action (timespan) time
-        /// </summary>
-        /// <param name="timespan">Timespan to delay</param>
-        /// <param name="action">Action to run</param>
-        IDisposable RunIn(TimeSpan timespan, Action action);
+    /// <summary>
+    ///     Delays execution of an action (timespan) time
+    /// </summary>
+    /// <param name="timespan">Timespan to delay</param>
+    /// <param name="action">Action to run</param>
+    IDisposable RunIn(TimeSpan timespan, Action action);
 
-        /// <summary>
-        ///     Runs an action at a specific time
-        /// </summary>
-        /// <param name="timeOffset">Absolute time to run the action</param>
-        /// <param name="action">Action to run</param>
-        IDisposable RunAt(DateTimeOffset timeOffset, Action action);
+    /// <summary>
+    ///     Runs an action at a specific time
+    /// </summary>
+    /// <param name="timeOffset">Absolute time to run the action</param>
+    /// <param name="action">Action to run</param>
+    IDisposable RunAt(DateTimeOffset timeOffset, Action action);
 
-        /// <summary>
-        ///     The current time of the scheduler
-        /// </summary>
-        DateTimeOffset Now { get; }
-    }
+    /// <summary>
+    ///     The current time of the scheduler
+    /// </summary>
+    DateTimeOffset Now { get; }
 }

src/Extensions/NetDaemon.Extensions.Tts/GlobalUsings.cs

@@ -4,6 +4,6 @@
 global using System.Threading.Channels;
 global using System.Threading.Tasks;
 global using Microsoft.Extensions.Logging;
-global using NetDaemon.Client.Common;
-global using NetDaemon.Client.Common.HomeAssistant.Extensions;
-global using NetDaemon.Client.Common.HomeAssistant.Model;
+global using NetDaemon.Client;
+global using NetDaemon.Client.HomeAssistant.Extensions;
+global using NetDaemon.Client.HomeAssistant.Model;

src/HassModel/NetDaemon.HassModel.CodeGenerator/EntitiesGenerator.cs

@@ -1,4 +1,4 @@
-using NetDaemon.Client.Common.HomeAssistant.Model;
+using NetDaemon.Client.HomeAssistant.Model;
 
 namespace NetDaemon.HassModel.CodeGenerator;
 

src/HassModel/NetDaemon.HassModel.CodeGenerator/EntitySet.cs

@@ -1,4 +1,4 @@
-using NetDaemon.Client.Common.HomeAssistant.Model;
+using NetDaemon.Client.HomeAssistant.Model;
 
 namespace NetDaemon.HassModel.CodeGenerator;
 

src/HassModel/NetDaemon.HassModel.CodeGenerator/ExtensionMethodsGenerator.cs

@@ -1,4 +1,4 @@
-using NetDaemon.Client.Common.HomeAssistant.Model;
+using NetDaemon.Client.HomeAssistant.Model;
 
 namespace NetDaemon.HassModel.CodeGenerator;
 

src/HassModel/NetDaemon.HassModel.CodeGenerator/Generator.cs

@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
-using NetDaemon.Client.Common.HomeAssistant.Model;
+using NetDaemon.Client.HomeAssistant.Model;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 [assembly: InternalsVisibleTo("NetDaemon.Daemon.Tests")]

src/HassModel/NetDaemon.HassModel.CodeGenerator/GlobalUsings.cs

@@ -7,7 +7,6 @@
 global using NetDaemon.HassModel.CodeGenerator.Model;
 global using NetDaemon.HassModel.CodeGenerator.Helpers;
 global using NetDaemon.HassModel.CodeGenerator.Extensions;
-global using NetDaemon.HassModel.Common;
 global using NetDaemon.HassModel.Entities;
 global using Microsoft.CodeAnalysis;
 global using static NetDaemon.HassModel.CodeGenerator.Helpers.NamingHelper;

src/HassModel/NetDaemon.HassModel.CodeGenerator/Program.cs

@@ -5,11 +5,11 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using NetDaemon.Client.Common;
-using NetDaemon.Client.Common.Extensions;
-using NetDaemon.Client.Common.HomeAssistant.Extensions;
-using NetDaemon.Client.Common.HomeAssistant.Model;
-using NetDaemon.Client.Common.Settings;
+using NetDaemon.Client;
+using NetDaemon.Client.Extensions;
+using NetDaemon.Client.HomeAssistant.Extensions;
+using NetDaemon.Client.HomeAssistant.Model;
+using NetDaemon.Client.Settings;
 
 #pragma warning disable CA1303
 #pragma warning disable CA2007