diff --git a/Dockerfile b/Dockerfile index fc971fbd4..5a84f1882 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Pre-build .NET NetDaemon core project -FROM mcr.microsoft.com/dotnet/sdk:7.0.101-bullseye-slim-amd64 as netbuilder +FROM mcr.microsoft.com/dotnet/sdk:7.0.103-bullseye-slim-amd64 as netbuilder ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/Dockerfile.AddOn b/Dockerfile.AddOn index 417a95742..82e27e834 100644 --- a/Dockerfile.AddOn +++ b/Dockerfile.AddOn @@ -1,6 +1,6 @@ # No admin support yet, we need to build the websocket API # Pre-build .NET NetDaemon core project -FROM mcr.microsoft.com/dotnet/sdk:7.0.101-bullseye-slim-amd64 as netbuilder +FROM mcr.microsoft.com/dotnet/sdk:7.0.103-bullseye-slim-amd64 as netbuilder ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/NetDaemon.sln b/NetDaemon.sln index 65c5e2dad..35a403ef6 100644 --- a/NetDaemon.sln +++ b/NetDaemon.sln @@ -59,6 +59,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetDaemon.Extensions.MqttEn EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugWebHost", "src\debug\DebugWebHost\DebugWebHost.csproj", "{AEBC7828-7C19-4A86-B6E2-58B5171347B1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetDaemon.Tests.Integration", "tests\Integration\NetDaemon.Tests.Integration\NetDaemon.Tests.Integration.csproj", "{CB3D0079-0704-41CC-BA5E-AFE15281E854}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -297,6 +299,18 @@ Global {3EB8C461-C91E-4900-BFBD-0986CBBE87A6}.Release|x64.Build.0 = Release|Any CPU {3EB8C461-C91E-4900-BFBD-0986CBBE87A6}.Release|x86.ActiveCfg = Release|Any CPU {3EB8C461-C91E-4900-BFBD-0986CBBE87A6}.Release|x86.Build.0 = Release|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Debug|x64.ActiveCfg = Debug|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Debug|x64.Build.0 = Debug|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Debug|x86.ActiveCfg = Debug|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Debug|x86.Build.0 = Debug|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Release|Any CPU.Build.0 = Release|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Release|x64.ActiveCfg = Release|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Release|x64.Build.0 = Release|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Release|x86.ActiveCfg = Release|Any CPU + {CB3D0079-0704-41CC-BA5E-AFE15281E854}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -322,6 +336,7 @@ Global {F4B29B77-9B92-4037-A884-288CA5EF0B78} = {DFF3E7AA-7A50-4A1E-B3F8-EC01531FB83D} {3EB8C461-C91E-4900-BFBD-0986CBBE87A6} = {DFF3E7AA-7A50-4A1E-B3F8-EC01531FB83D} {AEBC7828-7C19-4A86-B6E2-58B5171347B1} = {E15D4280-7FFC-4F8B-9B8C-CF9AF2BF838C} + {CB3D0079-0704-41CC-BA5E-AFE15281E854} = {374E37D9-68D9-4A65-ACBC-C6DC2A7C3076} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7C5FBB7F-654C-4CAC-964F-6D71AF3D62F8} diff --git a/src/AppModel/NetDaemon.AppModel.Tests/NetDaemon.AppModel.Tests.csproj b/src/AppModel/NetDaemon.AppModel.Tests/NetDaemon.AppModel.Tests.csproj index 7490ede01..e0dd0efc3 100644 --- a/src/AppModel/NetDaemon.AppModel.Tests/NetDaemon.AppModel.Tests.csproj +++ b/src/AppModel/NetDaemon.AppModel.Tests/NetDaemon.AppModel.Tests.csproj @@ -12,9 +12,9 @@ - + - + diff --git a/src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj b/src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj index e51f1c6bc..8d816944f 100644 --- a/src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj +++ b/src/AppModel/NetDaemon.AppModel/NetDaemon.AppModel.csproj @@ -21,9 +21,9 @@ - + - + @@ -34,6 +34,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Client/NetDaemon.HassClient.Debug/NetDaemon.HassClient.Debug.csproj b/src/Client/NetDaemon.HassClient.Debug/NetDaemon.HassClient.Debug.csproj index dd6135e25..d71400f24 100644 --- a/src/Client/NetDaemon.HassClient.Debug/NetDaemon.HassClient.Debug.csproj +++ b/src/Client/NetDaemon.HassClient.Debug/NetDaemon.HassClient.Debug.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/Client/NetDaemon.HassClient.Tests/NetDaemon.HassClient.Tests.csproj b/src/Client/NetDaemon.HassClient.Tests/NetDaemon.HassClient.Tests.csproj index 8fedfa5d5..42ae3541b 100644 --- a/src/Client/NetDaemon.HassClient.Tests/NetDaemon.HassClient.Tests.csproj +++ b/src/Client/NetDaemon.HassClient.Tests/NetDaemon.HassClient.Tests.csproj @@ -7,9 +7,9 @@ false - + - + diff --git a/src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj b/src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj index aa2cd80c1..93861b84e 100644 --- a/src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj +++ b/src/Extensions/NetDaemon.Extensions.Logging/NetDaemon.Extensions.Logging.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj b/src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj index 72f703830..454976dd2 100644 --- a/src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj +++ b/src/Extensions/NetDaemon.Extensions.MqttEntityManager/NetDaemon.Extensions.MqttEntityManager.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/src/Extensions/NetDaemon.Extensions.Scheduling.Tests/NetDaemon.Extensions.Scheduling.Tests.csproj b/src/Extensions/NetDaemon.Extensions.Scheduling.Tests/NetDaemon.Extensions.Scheduling.Tests.csproj index 7a1673bb7..6276f00e8 100644 --- a/src/Extensions/NetDaemon.Extensions.Scheduling.Tests/NetDaemon.Extensions.Scheduling.Tests.csproj +++ b/src/Extensions/NetDaemon.Extensions.Scheduling.Tests/NetDaemon.Extensions.Scheduling.Tests.csproj @@ -15,7 +15,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - + diff --git a/src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj b/src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj index 2015dc03d..fcc8a9473 100644 --- a/src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj +++ b/src/Extensions/NetDaemon.Extensions.Scheduling/NetDaemon.Extensions.Scheduling.csproj @@ -23,7 +23,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj b/src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj index 45353d6a5..2a045f774 100644 --- a/src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj +++ b/src/Extensions/NetDaemon.Extensions.Tts/NetDaemon.Extensions.Tts.csproj @@ -21,7 +21,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/HassModel/NetDaemon.HassModel.Tests/NetDaemon.HassModel.Tests.csproj b/src/HassModel/NetDaemon.HassModel.Tests/NetDaemon.HassModel.Tests.csproj index fb2dcfb2c..fe01bbaa6 100644 --- a/src/HassModel/NetDaemon.HassModel.Tests/NetDaemon.HassModel.Tests.csproj +++ b/src/HassModel/NetDaemon.HassModel.Tests/NetDaemon.HassModel.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj b/src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj index fb1cfde5e..c80e1219d 100644 --- a/src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj +++ b/src/HassModel/NetDeamon.HassModel/NetDaemon.HassModel.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Host/NetDaemon.Host.Default/NetDaemon.Host.Default.csproj b/src/Host/NetDaemon.Host.Default/NetDaemon.Host.Default.csproj index e5797b16b..c2ae6191e 100644 --- a/src/Host/NetDaemon.Host.Default/NetDaemon.Host.Default.csproj +++ b/src/Host/NetDaemon.Host.Default/NetDaemon.Host.Default.csproj @@ -9,7 +9,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Runtime/NetDaemon.Runtime.Tests/NetDaemon.Runtime.Tests.csproj b/src/Runtime/NetDaemon.Runtime.Tests/NetDaemon.Runtime.Tests.csproj index 6051ec96c..7ed429f2f 100644 --- a/src/Runtime/NetDaemon.Runtime.Tests/NetDaemon.Runtime.Tests.csproj +++ b/src/Runtime/NetDaemon.Runtime.Tests/NetDaemon.Runtime.Tests.csproj @@ -7,9 +7,9 @@ false - + - + diff --git a/src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj b/src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj index f21b8571d..8d742326d 100644 --- a/src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj +++ b/src/Runtime/NetDaemon.Runtime/NetDaemon.Runtime.csproj @@ -21,9 +21,9 @@ - + - + diff --git a/src/debug/DebugHost/DebugHost.csproj b/src/debug/DebugHost/DebugHost.csproj index 30fd0195f..2d15b288d 100644 --- a/src/debug/DebugHost/DebugHost.csproj +++ b/src/debug/DebugHost/DebugHost.csproj @@ -9,7 +9,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Integration/NetDaemon.Tests.Integration/NetDaemon.Tests.Integration.csproj b/tests/Integration/NetDaemon.Tests.Integration/NetDaemon.Tests.Integration.csproj index 27d5249a0..febb1af2a 100644 --- a/tests/Integration/NetDaemon.Tests.Integration/NetDaemon.Tests.Integration.csproj +++ b/tests/Integration/NetDaemon.Tests.Integration/NetDaemon.Tests.Integration.csproj @@ -8,11 +8,11 @@ - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all