From 0c1fd0418d556c69fec9663b715084a47e266c79 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Fri, 27 Dec 2024 06:36:52 -0500 Subject: [PATCH] chore: bump netdaemon 24.51.0 -> 24.52.0 --- .../modules/home-assistant/netdaemon/.version | 2 +- .../netdaemon/HomeAssistantGenerated | Bin 783868 -> 843174 bytes .../home-assistant/netdaemon/deps.json | 36 +++++++++--------- .../netdaemon/images/netdaemon.nix | 6 +-- .../home-assistant/netdaemon/netdaemon.csproj | 18 ++++----- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/configurations/homie/modules/home-assistant/netdaemon/.version b/configurations/homie/modules/home-assistant/netdaemon/.version index b4eaa5de..f91187a8 100644 --- a/configurations/homie/modules/home-assistant/netdaemon/.version +++ b/configurations/homie/modules/home-assistant/netdaemon/.version @@ -1 +1 @@ -24.51.0 +24.52.0 diff --git a/configurations/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated b/configurations/homie/modules/home-assistant/netdaemon/HomeAssistantGenerated index a62eed706de5d1dafd06114117cf7660ba61f3e7..fe99c93ddc1d22899835318d86474d579b8b293c 100644 GIT binary patch delta 29860 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 Puh#UggWY&!+7kW%+?Nx9 diff --git a/configurations/homie/modules/home-assistant/netdaemon/deps.json b/configurations/homie/modules/home-assistant/netdaemon/deps.json index a3ef3198..d04d96aa 100644 --- a/configurations/homie/modules/home-assistant/netdaemon/deps.json +++ b/configurations/homie/modules/home-assistant/netdaemon/deps.json @@ -171,48 +171,48 @@ }, { "pname": "NetDaemon.AppModel", - "version": "24.51.0", - "hash": "sha256-gZGv0mo8Y3c/ppfRDfQq0aLTepgmnOMOhVMTnl7qOyQ=" + "version": "24.52.0", + "hash": "sha256-3q+FmCwPkWDm44EYZIwAnnwewcn7r0Z0Z3Gbgxq12bA=" }, { "pname": "NetDaemon.AppModel.SourceDeployedApps", - "version": "24.51.0", - "hash": "sha256-NHsDb7ChPYC6+QBACvi2mFsa6VAJqEh1qegA8RHY3TU=" + "version": "24.52.0", + "hash": "sha256-fzCV53c4blMjEpdDMS5fI1KKvgNKfNlxQMqmmS11ng4=" }, { "pname": "NetDaemon.Client", - "version": "24.51.0", - "hash": "sha256-E4B61fI9DuczvxvkYEr9QJFaKNYg2vfVk3awXSBMaW4=" + "version": "24.52.0", + "hash": "sha256-GEf0VFJtWeiK6yUisY3U+LGDBWBgf4hWJ+dmDymB5LU=" }, { "pname": "NetDaemon.Extensions.Logging", - "version": "24.51.0", - "hash": "sha256-Jvk0shJ1ld+twM6KqlSdZZjGfaNfCFMgD6SHEMIzXAw=" + "version": "24.52.0", + "hash": "sha256-9+UxeGN0xzOUEQ8cneCy/4YhY6qOQ6usDOnnVlDMV74=" }, { "pname": "NetDaemon.Extensions.Scheduling", - "version": "24.51.0", - "hash": "sha256-TlrsICPnrUqfpVxFtmXxdZPeB3u6LGJDLb8ZULcYIYA=" + "version": "24.52.0", + "hash": "sha256-HT0SNoxqujYjKcY4JfEVNKxdfaOFuyUQHKmUGKKTpao=" }, { "pname": "NetDaemon.Extensions.Tts", - "version": "24.51.0", - "hash": "sha256-0Qh5Rs7oGCu3IWa8c4EV9j5RgLE+MJAA1PVDUqs3Zvg=" + "version": "24.52.0", + "hash": "sha256-rgxPfSO/kMbq/a3kCCm+9nAAzVoHBUcPMRWhVVDrKlI=" }, { "pname": "NetDaemon.HassModel", - "version": "24.51.0", - "hash": "sha256-d9SP2Neh8any4xxdpngpCy/OBGMHdjmIRCiDaCkjXpM=" + "version": "24.52.0", + "hash": "sha256-oNL0JGAtZQVhYYsUv8rXMKmSNLvi2fI41gF9zT8mTB8=" }, { "pname": "NetDaemon.HassModel.Integration", - "version": "24.51.0", - "hash": "sha256-SelTI+6nD9+MEtWG1IdL+g8DFiIBwv0TuXiLORsVmZI=" + "version": "24.52.0", + "hash": "sha256-YuhQZ///XjH0iNEF5wS1QcnFnAUD0ZA3ktPovF3P3dM=" }, { "pname": "NetDaemon.Runtime", - "version": "24.51.0", - "hash": "sha256-VCEBzcJmMbabUnnddyAP/lua/q412WQP38ZoTdXDaXg=" + "version": "24.52.0", + "hash": "sha256-FQqu3g/J/5AXcSrb7WXGSeFA9zjPnLPOCKwDNqYRVlI=" }, { "pname": "Serilog", diff --git a/configurations/homie/modules/home-assistant/netdaemon/images/netdaemon.nix b/configurations/homie/modules/home-assistant/netdaemon/images/netdaemon.nix index 6fe862d4..936099f2 100644 --- a/configurations/homie/modules/home-assistant/netdaemon/images/netdaemon.nix +++ b/configurations/homie/modules/home-assistant/netdaemon/images/netdaemon.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "netdaemon/netdaemon5"; - imageDigest = "sha256:983727221f52dba8375b5e90fe5e4e660e88fa5f2fe67cdd1141c3c7643b5ba7"; - hash = "sha256-kf7fP7x0PUaMivcLNOZ+3oH3d+NrpyCy74N7nlshywU="; + imageDigest = "sha256:5acac9a6f9dca0d8eab178ee211a73e03b3cf9fa2c8deecf45afce33f57d2011"; + hash = "sha256-IjRyb/6uAzPKu0pMFDxXBkZt2rTG43rXQx2SnmPXptI="; finalImageName = imageName; - finalImageTag = "24.51.0"; + finalImageTag = "24.52.0"; } diff --git a/configurations/homie/modules/home-assistant/netdaemon/netdaemon.csproj b/configurations/homie/modules/home-assistant/netdaemon/netdaemon.csproj index 008c444f..0ced81e3 100644 --- a/configurations/homie/modules/home-assistant/netdaemon/netdaemon.csproj +++ b/configurations/homie/modules/home-assistant/netdaemon/netdaemon.csproj @@ -24,15 +24,15 @@ - - - - - - - - - + + + + + + + + +