Merge dev to remodel

src/App/NetDaemon.App/Common/ExtensionMethods.cs

@@ -14,15 +14,15 @@ namespace NetDaemon.Common
     public static class NetDaemonExtensions
     {
         /// <summary>
-        ///     Converts a valuepair to dynamic object
+        ///     Converts valuepairs to dynamic object
         /// </summary>
-        /// <param name="attributeNameValuePair"></param>
+        /// <param name="attributeNameValuePairs"></param>
         [SuppressMessage("", "CA1062")]
-        public static dynamic ToDynamic(this (string name, object val)[] attributeNameValuePair)
+        public static dynamic ToDynamic(this (string name, object val)[] attributeNameValuePairs)
         {
             // Convert the tuple name/value pair to tuple that can be serialized dynamically
             var attributes = new FluentExpandoObject(true, true);
-            foreach (var (attribute, value) in attributeNameValuePair)
+            foreach (var (attribute, value) in attributeNameValuePairs)
             {
                 // We only add non-null values since the FluentExpandoObject will 
                 // return null on missing anyway
@@ -32,6 +32,15 @@ public static dynamic ToDynamic(this (string name, object val)[] attributeNameVa
             return attributes;
         }
 
+        /// <summary>
+        ///     Converts a valuepair to dynamic object
+        /// </summary>
+        /// <param name="attributeNameValuePair"></param>
+        public static dynamic ToDynamic(this (string name, object val) attributeNameValuePair)
+        {
+            return ToDynamic(new[] { attributeNameValuePair });
+        }
+
         /// <summary>
         ///     Converts a anoumous type to expando object
         /// </summary>

src/App/NetDaemon.App/NetDaemon.App.csproj

@@ -24,7 +24,7 @@
   <ItemGroup>
     <PackageReference Include="JoySoftware.HassClient" Version="21.30.1-beta" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
-    <PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="3.2.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Daemon/NetDaemon.Daemon/NetDaemon.Daemon.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
     <PackageReference Include="System.Reactive" Version="5.0.0" />
-    <PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="3.2.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/DaemonRunner/DaemonRunner/DaemonRunner.csproj

@@ -33,7 +33,7 @@
     <PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     <PackageReference Include="YamlDotNet" Version="11.2.1" />
-    <PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="3.2.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Fakes/NetDaemon.Fakes/NetDaemon.Fakes.csproj

@@ -35,7 +35,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Roslynator.Analyzers" Version="3.2.0">
+    <PackageReference Include="Roslynator.Analyzers" Version="3.2.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Fakes/NetDaemon.Fakes/ReactiveEventMock.cs

@@ -0,0 +1,31 @@
+using System;
+using NetDaemon.Common.Reactive;
+
+namespace NetDaemon.Daemon.Fakes
+{
+    /// <summary>
+    ///     Implements Observable RxEvent
+    /// </summary>
+    public class ReactiveEventMock<T> : IRxEvent where T: class, INetDaemonRxApp
+    {
+        private readonly RxAppMock<T> _daemonRxApp;
+
+        /// <summary>
+        ///     Constructor
+        /// </summary>
+        /// <param name="daemon">The NetDaemon host object</param>
+        public ReactiveEventMock(RxAppMock<T> daemon)
+        {
+            _daemonRxApp = daemon;
+        }
+
+        /// <summary>
+        ///     Implements IObservable ReactiveEvent
+        /// </summary>
+        /// <param name="observer">Observer</param>
+        public IDisposable Subscribe(IObserver<RxEvent> observer)
+        {
+            return _daemonRxApp!.EventChangesObservable.Subscribe(observer);
+        }
+    }
+}