From 955b0e7118ed218911dcff6875773cbe151eaa44 Mon Sep 17 00:00:00 2001 From: ig Date: Sat, 25 Feb 2023 15:53:58 +0100 Subject: [PATCH] tie namespace and assembly names to directory structure --- csharp/InnovEnergy.props | 5 +-- csharp/InnovEnergy.sln | 2 +- csharp/app/Backend/Backend.csproj | 20 ++--------- csharp/app/BmsTunnel/BatteryConnection.cs | 4 +-- csharp/app/BmsTunnel/BmsTunnel.cs | 2 +- csharp/app/BmsTunnel/BmsTunnel.csproj | 4 --- csharp/app/BmsTunnel/CliPrograms.cs | 2 +- csharp/app/BmsTunnel/Program.cs | 2 +- csharp/app/Collector/Collector.csproj | 4 --- csharp/app/Collector/src/BatteryDataParser.cs | 8 ++--- .../app/Collector/src/BatteryDataParserV4.cs | 8 ++--- .../Collector/src/Influx/FieldAttribute.cs | 2 +- .../app/Collector/src/Influx/InfluxRecord.cs | 6 ++-- .../src/Influx/LineProtocolSyntax.cs | 2 +- .../app/Collector/src/Influx/TagAttribute.cs | 2 +- csharp/app/Collector/src/Program.cs | 12 +++---- csharp/app/Collector/src/Records/Alarms.cs | 4 +-- .../Collector/src/Records/BatteryRecord.cs | 2 +- .../Collector/src/Records/BatteryStatus.cs | 4 +-- csharp/app/Collector/src/Records/Error.cs | 4 +-- .../src/Records/InstallationStatus.cs | 4 +-- csharp/app/Collector/src/Records/IoStatus.cs | 4 +-- csharp/app/Collector/src/Records/Leds.cs | 4 +-- .../app/Collector/src/Records/Temperatures.cs | 5 ++- csharp/app/Collector/src/Records/Warnings.cs | 5 ++- csharp/app/Collector/src/Settings.cs | 2 +- csharp/app/Collector/src/Utils/Extensions.cs | 2 +- csharp/app/Collector/src/Utils/Log.cs | 2 +- csharp/app/Collector/src/Utils/Property.cs | 2 +- .../src/Utils/ReadOnlyListExtensions.cs | 2 +- csharp/app/Collector/src/Utils/Utils.cs | 2 +- csharp/app/EmuMeterDriver/Config.cs | 2 +- csharp/app/EmuMeterDriver/EmuMeterDriver.cs | 3 +- .../app/EmuMeterDriver/EmuMeterDriver.csproj | 4 --- csharp/app/EmuMeterDriver/Nic.cs | 2 +- csharp/app/EmuMeterDriver/Program.cs | 2 +- csharp/app/EmuMeterDriver/Signal.cs | 2 +- csharp/app/EmuMeterDriver/Utils.cs | 2 +- csharp/app/InnovEnergy.app.props | 2 +- csharp/app/OpenVpnCertificatesServer/Files.cs | 4 +-- csharp/app/OpenVpnCertificatesServer/Http.cs | 5 ++- .../OpenVpnCertificatesServer.csproj | 4 --- .../PKI/CertificateAuthority.cs | 2 +- .../app/OpenVpnCertificatesServer/PKI/Pem.cs | 2 +- .../PKI/PwdFinder.cs | 2 +- .../app/OpenVpnCertificatesServer/Program.cs | 13 ++++--- csharp/app/OpenVpnCertificatesServer/Utils.cs | 5 ++- csharp/app/RemoteSupportConsole/Login.cs | 2 +- .../ObservablePipeSource.cs | 2 +- csharp/app/RemoteSupportConsole/Program.cs | 2 +- .../RemoteSupportConsole.csproj | 4 --- csharp/app/RemoteSupportConsole/Ssh.cs | 2 +- .../app/RemoteSupportConsole/VpnConnection.cs | 2 +- csharp/app/RemoteSupportConsole/VpnInfo.cs | 2 +- .../app/RemoteSupportConsole/VrmConnection.cs | 2 +- csharp/app/RemoteSupportConsole/VrmInfo.cs | 2 +- csharp/app/RemoteSupportConsole/VrmProxy.cs | 2 +- csharp/app/SaliMax/SaliMax.csproj | 35 +++++++++---------- csharp/app/SaliMax/src/AsciiArt.cs | 2 +- csharp/app/SaliMax/src/BusPort.cs | 2 +- .../src/Controller/AvgBatteriesStatus.cs | 2 +- csharp/app/SaliMax/src/Controller/Control.cs | 4 +-- .../SaliMax/src/Controller/ControlRecord.cs | 6 ++-- .../SaliMax/src/Controller/ControlTarget.cs | 2 +- .../app/SaliMax/src/Controller/Controller.cs | 10 +++--- .../SaliMax/src/Controller/SaliMaxState.cs | 2 +- csharp/app/SaliMax/src/Controller/State.cs | 2 +- .../app/SaliMax/src/Controller/StateConfig.cs | 2 +- .../SaliMax/src/Controller/StatusRecord.cs | 8 ++--- csharp/app/SaliMax/src/Log/Ampt.cs | 4 +-- csharp/app/SaliMax/src/Log/Battery48Tl.cs | 2 +- csharp/app/SaliMax/src/Log/EmuMeter.cs | 4 +-- csharp/app/SaliMax/src/Log/JsonUtil.cs | 2 +- csharp/app/SaliMax/src/Log/Salimax.cs | 6 ++-- csharp/app/SaliMax/src/Log/TruConvertAc.cs | 4 +-- csharp/app/SaliMax/src/Log/TruConvertDc.cs | 4 +-- csharp/app/SaliMax/src/Program.cs | 20 +++++------ csharp/app/SaliMax/src/S3Config.cs | 2 +- .../src/SaliMaxRelays/RelayMapBoolean.cs | 2 +- .../src/SaliMaxRelays/SaliMaxRelaysDevice.cs | 2 +- .../src/SaliMaxRelays/SaliMaxRelaysStatus.cs | 2 +- csharp/app/SaliMax/src/SystemConfig/Config.cs | 2 +- .../app/SaliMax/src/SystemConfig/Defaults.cs | 2 +- .../SaliMax/src/SystemConfig/SalimaxConfig.cs | 4 +-- csharp/app/SaliMax/src/Topology.cs | 8 ++--- csharp/app/SaliMax/src/Utils.cs | 2 +- csharp/lib/Channels/Channels.csproj | 4 --- .../Channels/V2/Bak/Connections/Connection.cs | 2 +- .../V2/Bak/Connections/Connections.cs | 2 +- .../Channels/V2/Bak/Connections/Extensions.cs | 2 +- .../V2/Bak/Connections/IConnection.cs | 2 +- csharp/lib/Channels/V2/Bak/GenericChannel.cs | 4 +-- csharp/lib/Devices/AMPT/Ampt.csproj | 2 +- .../lib/Devices/AMPT/AmptCommunicationUnit.cs | 2 +- csharp/lib/Devices/AMPT/AmptDeviceStatus.cs | 2 +- csharp/lib/Devices/AMPT/AmptStatus.cs | 5 +-- csharp/lib/Devices/AMPT/AmptStringStatus.cs | 2 +- csharp/lib/Devices/Adam6060/Adam6060.csproj | 2 +- .../Devices/Battery48TL/Battery48TL.csproj | 2 +- csharp/lib/Devices/EmuMeter/EmuMeter.csproj | 2 +- .../Trumpf/TruConvert/TruConvert.csproj | 8 ++--- .../Trumpf/TruConvertAc/AlarmMessage.cs | 2 +- .../Trumpf/TruConvertAc/TruConvertAc.csproj | 2 +- .../Trumpf/TruConvertAc/WarningMessage.cs | 2 +- .../Trumpf/TruConvertDc/TruConvertDc.csproj | 2 +- csharp/lib/InnovEnergy.lib.props | 1 + csharp/lib/Protocols/DBus/DBus.csproj | 2 +- csharp/lib/Protocols/Modbus/Modbus.csproj | 2 +- csharp/lib/S3/DataRec.cs | 4 +-- .../Drivers/Internal/Delegates/ReadRecord.cs | 6 ++-- .../Drivers/Internal/Delegates/WriteRecord.cs | 6 ++-- csharp/lib/S3/Drivers/Internal/Reader.cs | 10 +++--- .../lib/S3/Drivers/Internal/Reader.public.cs | 8 ++--- .../S3/Drivers/Internal/Util/Aggregator.cs | 8 ++--- .../lib/S3/Drivers/Internal/Util/Sampler.cs | 10 +++--- csharp/lib/S3/Drivers/Internal/Writer.cs | 14 ++++---- .../lib/S3/Drivers/Internal/Writer.public.cs | 8 ++--- csharp/lib/S3/Drivers/MemoryDriver.cs | 12 +++---- csharp/lib/S3/Drivers/S3Config.cs | 2 +- csharp/lib/S3/Drivers/S3Driver.cs | 16 ++++----- csharp/lib/S3/Metadata/AggregationLevel.cs | 4 +-- csharp/lib/S3/Metadata/FieldType.cs | 2 +- csharp/lib/S3/Program.cs | 10 +++--- csharp/lib/S3/Records/Fields/Field.cs | 2 +- csharp/lib/S3/Records/Fields/NumberField.cs | 2 +- csharp/lib/S3/Records/Fields/TextField.cs | 2 +- csharp/lib/S3/Records/Fields/TextFrequency.cs | 2 +- csharp/lib/S3/Records/Fields/UnitAttribute.cs | 2 +- csharp/lib/S3/Records/Fields/WithUnit.cs | 2 +- .../lib/S3/Records/Operations/Aggregation.cs | 6 ++-- .../lib/S3/Records/Operations/Conversion.cs | 4 +-- csharp/lib/S3/Records/Record.cs | 8 ++--- .../lib/S3/Records/Serialization/FieldTag.cs | 2 +- csharp/lib/S3/Records/Serialization/Parser.cs | 8 ++--- .../S3/Records/Serialization/Serializer.cs | 8 ++--- .../Records/Specialized/AggregatedRecord.cs | 6 ++-- .../Records/Specialized/TimeStampedRecord.cs | 4 +-- csharp/lib/S3/S3.csproj | 5 --- csharp/lib/StatusApi/StatusApi.csproj | 2 +- csharp/lib/{Units => StatusData}/Current.cs | 4 +-- .../{Units => StatusData}/Json/Converters.cs | 2 +- .../Json/CurrentConverter.cs | 2 +- .../Json/PowerConverter.cs | 2 +- .../Json/ResistanceConverter.cs | 2 +- .../Json/VoltageConverter.cs | 2 +- csharp/lib/{Units => StatusData}/Power.cs | 4 ++- .../lib/{Units => StatusData}/Resistance.cs | 2 +- csharp/lib/StatusData/State.cs | 21 +++++++++++ .../StatusData.csproj} | 2 +- csharp/lib/{Units => StatusData}/Units.cs | 2 +- csharp/lib/{Units => StatusData}/Voltage.cs | 2 +- .../SysTools/Edges/RemoteCommandToProcess.cs | 6 ++-- .../Edges/RemotePathToRemoteCommand.cs | 4 +-- .../SysTools/Edges/SshHostToRemoteCommand.cs | 4 +-- .../lib/SysTools/Edges/SshHostToRemotePath.cs | 4 +-- csharp/lib/SysTools/Edges/StringToCommand.cs | 2 +- csharp/lib/SysTools/Edges/StringToProcess.cs | 4 +-- .../lib/SysTools/Edges/StringToRemotePath.cs | 4 +-- csharp/lib/SysTools/Edges/StringToSysPath.cs | 2 +- .../lib/SysTools/Edges/SysCommandToProcess.cs | 4 +-- .../Edges/SysCommandToRemoteCommand.cs | 4 +-- csharp/lib/SysTools/Edges/SysPathToProcess.cs | 4 +-- .../lib/SysTools/Edges/SysPathToRemotePath.cs | 4 +-- .../lib/SysTools/Edges/SysPathToSysCommand.cs | 2 +- csharp/lib/SysTools/FileIo.cs | 4 +-- csharp/lib/SysTools/Process/AsyncProcess.cs | 4 +-- csharp/lib/SysTools/Process/ProcessResult.cs | 4 +-- csharp/lib/SysTools/Process/SyncProcess.cs | 4 +-- csharp/lib/SysTools/Remote/RemoteCommand.cs | 4 +-- csharp/lib/SysTools/Remote/RemoteFileIo.cs | 6 ++-- csharp/lib/SysTools/Remote/RemotePath.cs | 2 +- csharp/lib/SysTools/Remote/SshHost.cs | 6 ++-- csharp/lib/SysTools/SysCommand.cs | 4 +-- csharp/lib/SysTools/SysDirs.cs | 2 +- csharp/lib/SysTools/SysPath.cs | 6 ++-- csharp/lib/SysTools/SysTools.csproj | 12 ------- csharp/lib/SysTools/Utils/ConsoleUtils.cs | 2 +- csharp/lib/SysTools/Utils/EnumerableUtils.cs | 2 +- csharp/lib/SysTools/Utils/StringUtils.cs | 2 +- csharp/lib/SysTools/Utils/Utils.cs | 2 +- csharp/lib/Time/Time.csproj | 6 ---- csharp/lib/Time/Unix/UnixTime.Compare.cs | 2 +- csharp/lib/Time/Unix/UnixTime.Constructors.cs | 2 +- csharp/lib/Time/Unix/UnixTime.Converters.cs | 2 +- csharp/lib/Time/Unix/UnixTime.Operators.cs | 2 +- csharp/lib/Time/Unix/UnixTime.Overrides.cs | 2 +- csharp/lib/Time/Unix/UnixTime.cs | 2 +- csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs | 2 +- .../Time/Unix/UnixTimeDelta.Constructors.cs | 2 +- .../lib/Time/Unix/UnixTimeDelta.Operators.cs | 2 +- .../lib/Time/Unix/UnixTimeDelta.Overrides.cs | 2 +- .../lib/Time/Unix/UnixTimeDeltaExtensions.cs | 2 +- csharp/lib/Time/Unix/UnixTimeSpan.cs | 2 +- csharp/lib/Utils/Utils.csproj | 2 +- csharp/lib/Victron/VeDBus/VeDBus.csproj | 2 +- csharp/lib/Victron/VictronVRM/Installation.cs | 2 +- .../lib/Victron/VictronVRM/VictronVRM.csproj | 2 +- csharp/lib/WebServer/WebServer.csproj | 2 +- 198 files changed, 372 insertions(+), 430 deletions(-) rename csharp/lib/{Units => StatusData}/Current.cs (97%) rename csharp/lib/{Units => StatusData}/Json/Converters.cs (90%) rename csharp/lib/{Units => StatusData}/Json/CurrentConverter.cs (91%) rename csharp/lib/{Units => StatusData}/Json/PowerConverter.cs (90%) rename csharp/lib/{Units => StatusData}/Json/ResistanceConverter.cs (91%) rename csharp/lib/{Units => StatusData}/Json/VoltageConverter.cs (91%) rename csharp/lib/{Units => StatusData}/Power.cs (95%) rename csharp/lib/{Units => StatusData}/Resistance.cs (97%) create mode 100644 csharp/lib/StatusData/State.cs rename csharp/lib/{Units/Units.csproj => StatusData/StatusData.csproj} (75%) rename csharp/lib/{Units => StatusData}/Units.cs (89%) rename csharp/lib/{Units => StatusData}/Voltage.cs (97%) diff --git a/csharp/InnovEnergy.props b/csharp/InnovEnergy.props index 57ac5931e..c6c92bd2a 100644 --- a/csharp/InnovEnergy.props +++ b/csharp/InnovEnergy.props @@ -3,13 +3,14 @@ InnovEnergy enable - default + preview true - InnovEnergy enable net6.0 true false + $(Company).$(MSBuildProjectDirectory.Replace($(SolutionDir), "").Replace("lib/", "Lib/").Replace("app/", "App/").Replace("src/", "").Replace("/",".")) + $(Company) Team diff --git a/csharp/InnovEnergy.sln b/csharp/InnovEnergy.sln index 69f33a105..5002df0a2 100644 --- a/csharp/InnovEnergy.sln +++ b/csharp/InnovEnergy.sln @@ -65,7 +65,7 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Backend", "app/Backend/Backend.csproj", "{A56F58C2-B265-435B-A985-53B4D6F49B1A}" EndProject EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Units", "lib/Units/Units.csproj", "{C04FB6DA-23C6-46BB-9B21-8F4FBA32FFF7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StatusData", "lib\StatusData\StatusData.csproj", "{C04FB6DA-23C6-46BB-9B21-8F4FBA32FFF7}" EndProject Global diff --git a/csharp/app/Backend/Backend.csproj b/csharp/app/Backend/Backend.csproj index e6a136cb1..eebe0dae8 100644 --- a/csharp/app/Backend/Backend.csproj +++ b/csharp/app/Backend/Backend.csproj @@ -1,12 +1,5 @@ - - - net6.0 - enable - enable - preview - Innovenergy.Backend - + @@ -28,17 +21,10 @@ - - - ..\..\..\..\..\..\.nuget\packages\awssdk.core\3.7.8.10\lib\netcoreapp3.1\AWSSDK.Core.dll - - - ..\..\..\..\..\.nuget\packages\sqlite-net-pcl\1.8.116\lib\netstandard2.0\SQLite-net.dll - - + - + diff --git a/csharp/app/BmsTunnel/BatteryConnection.cs b/csharp/app/BmsTunnel/BatteryConnection.cs index 1dd0378a6..28dd3ee8a 100644 --- a/csharp/app/BmsTunnel/BatteryConnection.cs +++ b/csharp/app/BmsTunnel/BatteryConnection.cs @@ -1,9 +1,9 @@ using CliWrap; using CliWrap.Buffered; using InnovEnergy.Lib.Utils; -using static InnovEnergy.BmsTunnel.CliPrograms; +using static InnovEnergy.App.BmsTunnel.CliPrograms; -namespace InnovEnergy.BmsTunnel; +namespace InnovEnergy.App.BmsTunnel; using Nodes = IReadOnlyList; diff --git a/csharp/app/BmsTunnel/BmsTunnel.cs b/csharp/app/BmsTunnel/BmsTunnel.cs index 2af527047..85cefdf14 100644 --- a/csharp/app/BmsTunnel/BmsTunnel.cs +++ b/csharp/app/BmsTunnel/BmsTunnel.cs @@ -3,7 +3,7 @@ using System.Text; using CliWrap.Buffered; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.BmsTunnel; +namespace InnovEnergy.App.BmsTunnel; public class BmsTunnel : IDisposable diff --git a/csharp/app/BmsTunnel/BmsTunnel.csproj b/csharp/app/BmsTunnel/BmsTunnel.csproj index 6078a616a..9fe1fc75d 100644 --- a/csharp/app/BmsTunnel/BmsTunnel.csproj +++ b/csharp/app/BmsTunnel/BmsTunnel.csproj @@ -1,10 +1,6 @@ - - InnovEnergy.BmsTunnel - - diff --git a/csharp/app/BmsTunnel/CliPrograms.cs b/csharp/app/BmsTunnel/CliPrograms.cs index 98588b622..c27df92df 100644 --- a/csharp/app/BmsTunnel/CliPrograms.cs +++ b/csharp/app/BmsTunnel/CliPrograms.cs @@ -1,6 +1,6 @@ using CliWrap; -namespace InnovEnergy.BmsTunnel; +namespace InnovEnergy.App.BmsTunnel; public static class CliPrograms { diff --git a/csharp/app/BmsTunnel/Program.cs b/csharp/app/BmsTunnel/Program.cs index 5f2d42de7..c3ce8f71e 100644 --- a/csharp/app/BmsTunnel/Program.cs +++ b/csharp/app/BmsTunnel/Program.cs @@ -5,7 +5,7 @@ using InnovEnergy.Lib.Utils; using static System.String; -namespace InnovEnergy.BmsTunnel; +namespace InnovEnergy.App.BmsTunnel; public static class Program { diff --git a/csharp/app/Collector/Collector.csproj b/csharp/app/Collector/Collector.csproj index 9bbb60eb9..b2e28418b 100644 --- a/csharp/app/Collector/Collector.csproj +++ b/csharp/app/Collector/Collector.csproj @@ -1,9 +1,5 @@ - - - InnovEnergy.Collector - diff --git a/csharp/app/Collector/src/BatteryDataParser.cs b/csharp/app/Collector/src/BatteryDataParser.cs index 81c84313e..23e0c2bfb 100644 --- a/csharp/app/Collector/src/BatteryDataParser.cs +++ b/csharp/app/Collector/src/BatteryDataParser.cs @@ -1,14 +1,14 @@ using System.Net; using System.Text; -using InnovEnergy.Collector.Influx; -using InnovEnergy.Collector.Records; -using InnovEnergy.Collector.Utils; +using InnovEnergy.App.Collector.Influx; +using InnovEnergy.App.Collector.Records; +using InnovEnergy.App.Collector.Utils; using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Utils.Net; using Convert = System.Convert; -namespace InnovEnergy.Collector; +namespace InnovEnergy.App.Collector; using Data = IReadOnlyList; diff --git a/csharp/app/Collector/src/BatteryDataParserV4.cs b/csharp/app/Collector/src/BatteryDataParserV4.cs index dc3064f0c..8d8ae5bd0 100644 --- a/csharp/app/Collector/src/BatteryDataParserV4.cs +++ b/csharp/app/Collector/src/BatteryDataParserV4.cs @@ -1,15 +1,15 @@ using System.Net; using System.Text; -using InnovEnergy.Collector.Influx; -using InnovEnergy.Collector.Records; -using InnovEnergy.Collector.Utils; +using InnovEnergy.App.Collector.Influx; +using InnovEnergy.App.Collector.Records; +using InnovEnergy.App.Collector.Utils; using InnovEnergy.Lib.Utils; using Convert = System.Convert; // NOT (YET) USED -namespace InnovEnergy.Collector; +namespace InnovEnergy.App.Collector; using Data = IReadOnlyList; diff --git a/csharp/app/Collector/src/Influx/FieldAttribute.cs b/csharp/app/Collector/src/Influx/FieldAttribute.cs index 9f8438ac7..58dc3d0ba 100644 --- a/csharp/app/Collector/src/Influx/FieldAttribute.cs +++ b/csharp/app/Collector/src/Influx/FieldAttribute.cs @@ -2,7 +2,7 @@ using static System.AttributeTargets; #nullable disable -namespace InnovEnergy.Collector.Influx; +namespace InnovEnergy.App.Collector.Influx; [AttributeUsage(Property)] public class FieldAttribute : Attribute diff --git a/csharp/app/Collector/src/Influx/InfluxRecord.cs b/csharp/app/Collector/src/Influx/InfluxRecord.cs index 4043f0837..6406ea876 100644 --- a/csharp/app/Collector/src/Influx/InfluxRecord.cs +++ b/csharp/app/Collector/src/Influx/InfluxRecord.cs @@ -1,10 +1,10 @@ using System.Text; -using InnovEnergy.Collector.Utils; +using InnovEnergy.App.Collector.Utils; using InnovEnergy.Lib.Utils; using static System.Globalization.CultureInfo; -using static InnovEnergy.Collector.Influx.LineProtocolSyntax; +using static InnovEnergy.App.Collector.Influx.LineProtocolSyntax; -namespace InnovEnergy.Collector.Influx; +namespace InnovEnergy.App.Collector.Influx; public static class InfluxRecord { diff --git a/csharp/app/Collector/src/Influx/LineProtocolSyntax.cs b/csharp/app/Collector/src/Influx/LineProtocolSyntax.cs index 95b1a2bd6..2c55b3725 100644 --- a/csharp/app/Collector/src/Influx/LineProtocolSyntax.cs +++ b/csharp/app/Collector/src/Influx/LineProtocolSyntax.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using static System.Globalization.CultureInfo; -namespace InnovEnergy.Collector.Influx; +namespace InnovEnergy.App.Collector.Influx; internal static class LineProtocolSyntax { diff --git a/csharp/app/Collector/src/Influx/TagAttribute.cs b/csharp/app/Collector/src/Influx/TagAttribute.cs index 3db4ee3a1..db028d6a8 100644 --- a/csharp/app/Collector/src/Influx/TagAttribute.cs +++ b/csharp/app/Collector/src/Influx/TagAttribute.cs @@ -1,6 +1,6 @@ using static System.AttributeTargets; -namespace InnovEnergy.Collector.Influx; +namespace InnovEnergy.App.Collector.Influx; [AttributeUsage(Property)] public class TagAttribute : Attribute diff --git a/csharp/app/Collector/src/Program.cs b/csharp/app/Collector/src/Program.cs index 01d02ce43..28b58dbcf 100644 --- a/csharp/app/Collector/src/Program.cs +++ b/csharp/app/Collector/src/Program.cs @@ -2,17 +2,17 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Reactive.Subjects; -using InnovEnergy.Collector.Influx; -using InnovEnergy.Collector.Records; -using InnovEnergy.Lib.Utils; -using static System.Text.Encoding; -using static InnovEnergy.Lib.Utils.ExceptionHandling; using System.Text.Json; +using InnovEnergy.App.Collector.Influx; +using InnovEnergy.App.Collector.Records; +using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Utils.Net; using InnovEnergy.Lib.WebServer; +using static System.Text.Encoding; +using static InnovEnergy.Lib.Utils.ExceptionHandling; -namespace InnovEnergy.Collector; +namespace InnovEnergy.App.Collector; // TODO: net6 diff --git a/csharp/app/Collector/src/Records/Alarms.cs b/csharp/app/Collector/src/Records/Alarms.cs index 959855519..793680e82 100644 --- a/csharp/app/Collector/src/Records/Alarms.cs +++ b/csharp/app/Collector/src/Records/Alarms.cs @@ -1,10 +1,10 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; // ReSharper disable IdentifierTypo // ReSharper disable UnusedAutoPropertyAccessor.Global // ReSharper disable InconsistentNaming -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public class Alarms : BatteryRecord { diff --git a/csharp/app/Collector/src/Records/BatteryRecord.cs b/csharp/app/Collector/src/Records/BatteryRecord.cs index a244d1a77..49cfcc00c 100644 --- a/csharp/app/Collector/src/Records/BatteryRecord.cs +++ b/csharp/app/Collector/src/Records/BatteryRecord.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public abstract class BatteryRecord {} \ No newline at end of file diff --git a/csharp/app/Collector/src/Records/BatteryStatus.cs b/csharp/app/Collector/src/Records/BatteryStatus.cs index 25f2a6ab3..2816b7545 100644 --- a/csharp/app/Collector/src/Records/BatteryStatus.cs +++ b/csharp/app/Collector/src/Records/BatteryStatus.cs @@ -1,9 +1,9 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; // ReSharper disable UnusedAutoPropertyAccessor.Global // ReSharper disable MemberCanBePrivate.Global -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public class BatteryStatus : BatteryRecord { diff --git a/csharp/app/Collector/src/Records/Error.cs b/csharp/app/Collector/src/Records/Error.cs index 3d151af2e..9ffa399ef 100644 --- a/csharp/app/Collector/src/Records/Error.cs +++ b/csharp/app/Collector/src/Records/Error.cs @@ -1,8 +1,8 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; // ReSharper disable UnusedAutoPropertyAccessor.Global -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public class Error : BatteryRecord { diff --git a/csharp/app/Collector/src/Records/InstallationStatus.cs b/csharp/app/Collector/src/Records/InstallationStatus.cs index 99937ddb7..a93a4374c 100644 --- a/csharp/app/Collector/src/Records/InstallationStatus.cs +++ b/csharp/app/Collector/src/Records/InstallationStatus.cs @@ -1,6 +1,6 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public class InstallationStatus : BatteryRecord { diff --git a/csharp/app/Collector/src/Records/IoStatus.cs b/csharp/app/Collector/src/Records/IoStatus.cs index 4d0791219..a9c2c7247 100644 --- a/csharp/app/Collector/src/Records/IoStatus.cs +++ b/csharp/app/Collector/src/Records/IoStatus.cs @@ -1,8 +1,8 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; // ReSharper disable UnusedAutoPropertyAccessor.Global -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public class IoStatus : BatteryRecord { diff --git a/csharp/app/Collector/src/Records/Leds.cs b/csharp/app/Collector/src/Records/Leds.cs index 39a7e97be..6dc3170cb 100644 --- a/csharp/app/Collector/src/Records/Leds.cs +++ b/csharp/app/Collector/src/Records/Leds.cs @@ -1,9 +1,9 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; // ReSharper disable UnusedAutoPropertyAccessor.Global // ReSharper disable UnusedMember.Global -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; public class Leds : BatteryRecord { diff --git a/csharp/app/Collector/src/Records/Temperatures.cs b/csharp/app/Collector/src/Records/Temperatures.cs index 6b621084d..34d53a92e 100644 --- a/csharp/app/Collector/src/Records/Temperatures.cs +++ b/csharp/app/Collector/src/Records/Temperatures.cs @@ -1,7 +1,6 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; - -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; #pragma warning disable CS8618 diff --git a/csharp/app/Collector/src/Records/Warnings.cs b/csharp/app/Collector/src/Records/Warnings.cs index c74aee213..3d5d2a176 100644 --- a/csharp/app/Collector/src/Records/Warnings.cs +++ b/csharp/app/Collector/src/Records/Warnings.cs @@ -1,7 +1,6 @@ -using InnovEnergy.Collector.Influx; +using InnovEnergy.App.Collector.Influx; - -namespace InnovEnergy.Collector.Records; +namespace InnovEnergy.App.Collector.Records; #pragma warning disable CS8618 diff --git a/csharp/app/Collector/src/Settings.cs b/csharp/app/Collector/src/Settings.cs index 10502f536..7708dc819 100644 --- a/csharp/app/Collector/src/Settings.cs +++ b/csharp/app/Collector/src/Settings.cs @@ -1,6 +1,6 @@ using System.Net; -namespace InnovEnergy.Collector; +namespace InnovEnergy.App.Collector; public static class Settings { diff --git a/csharp/app/Collector/src/Utils/Extensions.cs b/csharp/app/Collector/src/Utils/Extensions.cs index 3371ec718..9b79e4ab4 100644 --- a/csharp/app/Collector/src/Utils/Extensions.cs +++ b/csharp/app/Collector/src/Utils/Extensions.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace InnovEnergy.Collector.Utils; +namespace InnovEnergy.App.Collector.Utils; public static class Extensions { diff --git a/csharp/app/Collector/src/Utils/Log.cs b/csharp/app/Collector/src/Utils/Log.cs index 316f41af3..8e32f0174 100644 --- a/csharp/app/Collector/src/Utils/Log.cs +++ b/csharp/app/Collector/src/Utils/Log.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Collector.Utils; +namespace InnovEnergy.App.Collector.Utils; internal static class Log { diff --git a/csharp/app/Collector/src/Utils/Property.cs b/csharp/app/Collector/src/Utils/Property.cs index 89d0aa012..ccf4b45ac 100644 --- a/csharp/app/Collector/src/Utils/Property.cs +++ b/csharp/app/Collector/src/Utils/Property.cs @@ -1,7 +1,7 @@ using System.Reflection; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.Collector.Utils; +namespace InnovEnergy.App.Collector.Utils; public readonly struct Property { diff --git a/csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs b/csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs index ec53ff191..7c8d915b3 100644 --- a/csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs +++ b/csharp/app/Collector/src/Utils/ReadOnlyListExtensions.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Collector.Utils; +namespace InnovEnergy.App.Collector.Utils; public static class ReadOnlyListExtensions { diff --git a/csharp/app/Collector/src/Utils/Utils.cs b/csharp/app/Collector/src/Utils/Utils.cs index fd47cc583..51c9d3fbb 100644 --- a/csharp/app/Collector/src/Utils/Utils.cs +++ b/csharp/app/Collector/src/Utils/Utils.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Collector.Utils; +namespace InnovEnergy.App.Collector.Utils; public static class Utils { diff --git a/csharp/app/EmuMeterDriver/Config.cs b/csharp/app/EmuMeterDriver/Config.cs index e7bad3e06..ee0ad64db 100644 --- a/csharp/app/EmuMeterDriver/Config.cs +++ b/csharp/app/EmuMeterDriver/Config.cs @@ -1,7 +1,7 @@ using System.Reflection; using InnovEnergy.Lib.Victron.VeDBus; -namespace InnovEnergy.EmuMeter; +namespace InnovEnergy.App.EmuMeterDriver; public static class Config { diff --git a/csharp/app/EmuMeterDriver/EmuMeterDriver.cs b/csharp/app/EmuMeterDriver/EmuMeterDriver.cs index 6e923678a..9c57f2c7a 100644 --- a/csharp/app/EmuMeterDriver/EmuMeterDriver.cs +++ b/csharp/app/EmuMeterDriver/EmuMeterDriver.cs @@ -5,8 +5,7 @@ using InnovEnergy.Lib.Protocols.Modbus.Clients; using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Victron.VeDBus; - -namespace InnovEnergy.EmuMeter; +namespace InnovEnergy.App.EmuMeterDriver; public static class EmuMeterDriver { diff --git a/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj b/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj index 9132521ae..ae7263dc2 100644 --- a/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj +++ b/csharp/app/EmuMeterDriver/EmuMeterDriver.csproj @@ -1,10 +1,6 @@ - - InnovEnergy.EmuMeter - - diff --git a/csharp/app/EmuMeterDriver/Nic.cs b/csharp/app/EmuMeterDriver/Nic.cs index 9ddb9096e..0b81b0843 100644 --- a/csharp/app/EmuMeterDriver/Nic.cs +++ b/csharp/app/EmuMeterDriver/Nic.cs @@ -2,7 +2,7 @@ using System.Text.Json.Nodes; using CliWrap; using CliWrap.Buffered; -namespace InnovEnergy.EmuMeter; +namespace InnovEnergy.App.EmuMeterDriver; public readonly struct Nic { diff --git a/csharp/app/EmuMeterDriver/Program.cs b/csharp/app/EmuMeterDriver/Program.cs index 8a8c70561..6ad63d04d 100644 --- a/csharp/app/EmuMeterDriver/Program.cs +++ b/csharp/app/EmuMeterDriver/Program.cs @@ -1,4 +1,4 @@ -using InnovEnergy.EmuMeter; +using InnovEnergy.App.EmuMeterDriver; using InnovEnergy.Lib.Protocols.DBus; using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Utils.Net; diff --git a/csharp/app/EmuMeterDriver/Signal.cs b/csharp/app/EmuMeterDriver/Signal.cs index e606e2f53..ef375bb91 100644 --- a/csharp/app/EmuMeterDriver/Signal.cs +++ b/csharp/app/EmuMeterDriver/Signal.cs @@ -2,7 +2,7 @@ using InnovEnergy.Lib.Devices.EmuMeter; using InnovEnergy.Lib.Protocols.DBus.Protocol.DataTypes; using InnovEnergy.Lib.Victron.VeDBus; -namespace InnovEnergy.EmuMeter; +namespace InnovEnergy.App.EmuMeterDriver; public record Signal(Func Source, ObjectPath Path, String Format = "") { diff --git a/csharp/app/EmuMeterDriver/Utils.cs b/csharp/app/EmuMeterDriver/Utils.cs index cab67bd3c..65f02de6a 100644 --- a/csharp/app/EmuMeterDriver/Utils.cs +++ b/csharp/app/EmuMeterDriver/Utils.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.EmuMeter; +namespace InnovEnergy.App.EmuMeterDriver; public static class Utils { diff --git a/csharp/app/InnovEnergy.app.props b/csharp/app/InnovEnergy.app.props index beb4a7a4a..38d62f4dc 100644 --- a/csharp/app/InnovEnergy.app.props +++ b/csharp/app/InnovEnergy.app.props @@ -11,7 +11,6 @@ true true true - @@ -20,6 +19,7 @@ Exe + InnovEnergy.App.$(AssemblyName) diff --git a/csharp/app/OpenVpnCertificatesServer/Files.cs b/csharp/app/OpenVpnCertificatesServer/Files.cs index 35f78f44b..00fbf58d5 100644 --- a/csharp/app/OpenVpnCertificatesServer/Files.cs +++ b/csharp/app/OpenVpnCertificatesServer/Files.cs @@ -1,6 +1,4 @@ -namespace InnovEnergy.OpenVpnCertificatesServer; - -using System; +namespace InnovEnergy.App.OpenVpnCertificatesServer; public static class Files { diff --git a/csharp/app/OpenVpnCertificatesServer/Http.cs b/csharp/app/OpenVpnCertificatesServer/Http.cs index 3f72fb5da..5442047ae 100644 --- a/csharp/app/OpenVpnCertificatesServer/Http.cs +++ b/csharp/app/OpenVpnCertificatesServer/Http.cs @@ -1,9 +1,8 @@ -namespace InnovEnergy.OpenVpnCertificatesServer; - -using System; using System.Net; using Flurl; +namespace InnovEnergy.App.OpenVpnCertificatesServer; + public static class Http { // TODO: use worker thread diff --git a/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj b/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj index c2110f3cb..2773cd430 100644 --- a/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj +++ b/csharp/app/OpenVpnCertificatesServer/OpenVpnCertificatesServer.csproj @@ -1,10 +1,6 @@ - - InnovEnergy.OpenVpnCertificatesServer - - diff --git a/csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs b/csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs index ec35a7836..b782c8165 100644 --- a/csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs +++ b/csharp/app/OpenVpnCertificatesServer/PKI/CertificateAuthority.cs @@ -7,7 +7,7 @@ using Org.BouncyCastle.Math; using Org.BouncyCastle.Security; using Org.BouncyCastle.X509; -namespace InnovEnergy.OpenVpnCertificatesServer.PKI; +namespace InnovEnergy.App.OpenVpnCertificatesServer.PKI; public static class CertificateAuthority { diff --git a/csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs b/csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs index 3698135ee..8015c4e71 100644 --- a/csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs +++ b/csharp/app/OpenVpnCertificatesServer/PKI/Pem.cs @@ -1,6 +1,6 @@ using Org.BouncyCastle.OpenSsl; -namespace InnovEnergy.OpenVpnCertificatesServer.PKI; +namespace InnovEnergy.App.OpenVpnCertificatesServer.PKI; public static class Pem { diff --git a/csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs b/csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs index 70d54fd51..3bbe9354a 100644 --- a/csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs +++ b/csharp/app/OpenVpnCertificatesServer/PKI/PwdFinder.cs @@ -1,6 +1,6 @@ using Org.BouncyCastle.OpenSsl; -namespace InnovEnergy.OpenVpnCertificatesServer.PKI; +namespace InnovEnergy.App.OpenVpnCertificatesServer.PKI; public class PwdFinder : IPasswordFinder { diff --git a/csharp/app/OpenVpnCertificatesServer/Program.cs b/csharp/app/OpenVpnCertificatesServer/Program.cs index 3d765b2cd..c9bff3a03 100644 --- a/csharp/app/OpenVpnCertificatesServer/Program.cs +++ b/csharp/app/OpenVpnCertificatesServer/Program.cs @@ -1,15 +1,14 @@ -using InnovEnergy.Lib.Utils; -using InnovEnergy.Lib.Victron.VictronVRM; -using InnovEnergy.OpenVpnCertificatesServer.PKI; -using System.Diagnostics; +using System.Diagnostics; using System.Text; using Flurl; using ICSharpCode.SharpZipLib.Tar; +using InnovEnergy.App.OpenVpnCertificatesServer.PKI; +using InnovEnergy.Lib.Utils; +using InnovEnergy.Lib.Victron.VictronVRM; using Org.BouncyCastle.Crypto; +using static InnovEnergy.App.OpenVpnCertificatesServer.PKI.CertificateAuthority; -using static InnovEnergy.OpenVpnCertificatesServer.PKI.CertificateAuthority; - -namespace InnovEnergy.OpenVpnCertificatesServer; +namespace InnovEnergy.App.OpenVpnCertificatesServer; // dotnet publish OpenVpnCertificatesServer.csproj -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained true && scp bin/Release/net6.0/linux-x64/publish/OpenVpnCertificatesServer ig@salidomo.innovenergy.ch:~/get_cert/get_cert diff --git a/csharp/app/OpenVpnCertificatesServer/Utils.cs b/csharp/app/OpenVpnCertificatesServer/Utils.cs index 9ed8734f7..aea6faf59 100644 --- a/csharp/app/OpenVpnCertificatesServer/Utils.cs +++ b/csharp/app/OpenVpnCertificatesServer/Utils.cs @@ -1,9 +1,8 @@ -namespace InnovEnergy.OpenVpnCertificatesServer; - -using System; using System.Text; using ICSharpCode.SharpZipLib.Tar; +namespace InnovEnergy.App.OpenVpnCertificatesServer; + public static class Utils { public static void WriteFile(this TarOutputStream tar, String fileName, Byte[] contents, Boolean executable = false) diff --git a/csharp/app/RemoteSupportConsole/Login.cs b/csharp/app/RemoteSupportConsole/Login.cs index 901fd7175..7e3edbe35 100644 --- a/csharp/app/RemoteSupportConsole/Login.cs +++ b/csharp/app/RemoteSupportConsole/Login.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class Login { diff --git a/csharp/app/RemoteSupportConsole/ObservablePipeSource.cs b/csharp/app/RemoteSupportConsole/ObservablePipeSource.cs index 281ee75f4..a5e1af9d7 100644 --- a/csharp/app/RemoteSupportConsole/ObservablePipeSource.cs +++ b/csharp/app/RemoteSupportConsole/ObservablePipeSource.cs @@ -2,7 +2,7 @@ using System.Reactive.Linq; using System.Reactive.Threading.Tasks; using CliWrap; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class ObservablePipeSource { diff --git a/csharp/app/RemoteSupportConsole/Program.cs b/csharp/app/RemoteSupportConsole/Program.cs index bd21d71d0..7ce5cbdcd 100644 --- a/csharp/app/RemoteSupportConsole/Program.cs +++ b/csharp/app/RemoteSupportConsole/Program.cs @@ -4,7 +4,7 @@ using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Victron.VictronVRM; using static System.Globalization.CompareOptions; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; // dotnet publish -c release -r ubuntu-x64 // dotnet publish RemoteSupportConsole.csproj -c Release -r linux-x64 -p:PublishSingleFile=true --self-contained true diff --git a/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj b/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj index 3a4a4aaa3..cb8c7d1b8 100644 --- a/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj +++ b/csharp/app/RemoteSupportConsole/RemoteSupportConsole.csproj @@ -1,10 +1,6 @@ - - InnovEnergy.RemoteSupportConsole - - diff --git a/csharp/app/RemoteSupportConsole/Ssh.cs b/csharp/app/RemoteSupportConsole/Ssh.cs index 55502ecb7..d9acc9662 100644 --- a/csharp/app/RemoteSupportConsole/Ssh.cs +++ b/csharp/app/RemoteSupportConsole/Ssh.cs @@ -1,7 +1,7 @@ using CliWrap; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class Ssh { diff --git a/csharp/app/RemoteSupportConsole/VpnConnection.cs b/csharp/app/RemoteSupportConsole/VpnConnection.cs index 29f52b40c..b2442eea1 100644 --- a/csharp/app/RemoteSupportConsole/VpnConnection.cs +++ b/csharp/app/RemoteSupportConsole/VpnConnection.cs @@ -2,7 +2,7 @@ using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Victron.VictronVRM; using static System.ConsoleColor; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class VpnConnection { diff --git a/csharp/app/RemoteSupportConsole/VpnInfo.cs b/csharp/app/RemoteSupportConsole/VpnInfo.cs index d7f39fbbc..0137a3b50 100644 --- a/csharp/app/RemoteSupportConsole/VpnInfo.cs +++ b/csharp/app/RemoteSupportConsole/VpnInfo.cs @@ -2,7 +2,7 @@ using Flurl; using Flurl.Http; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class VpnInfo { diff --git a/csharp/app/RemoteSupportConsole/VrmConnection.cs b/csharp/app/RemoteSupportConsole/VrmConnection.cs index 52515a025..03dd1e252 100644 --- a/csharp/app/RemoteSupportConsole/VrmConnection.cs +++ b/csharp/app/RemoteSupportConsole/VrmConnection.cs @@ -7,7 +7,7 @@ using InnovEnergy.Lib.Victron.VictronVRM; using static System.ConsoleColor; using static System.StringSplitOptions; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class VrmConnection { diff --git a/csharp/app/RemoteSupportConsole/VrmInfo.cs b/csharp/app/RemoteSupportConsole/VrmInfo.cs index 9b37d00fc..32568ae23 100644 --- a/csharp/app/RemoteSupportConsole/VrmInfo.cs +++ b/csharp/app/RemoteSupportConsole/VrmInfo.cs @@ -3,7 +3,7 @@ using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Victron.VictronVRM; using static System.ConsoleColor; -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public static class VrmInfo diff --git a/csharp/app/RemoteSupportConsole/VrmProxy.cs b/csharp/app/RemoteSupportConsole/VrmProxy.cs index cc00370c5..c629c5476 100644 --- a/csharp/app/RemoteSupportConsole/VrmProxy.cs +++ b/csharp/app/RemoteSupportConsole/VrmProxy.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.RemoteSupportConsole; +namespace InnovEnergy.App.RemoteSupportConsole; public readonly record struct VrmProxy(IDisposable Connection, String User, String Host, String Port) : IDisposable { diff --git a/csharp/app/SaliMax/SaliMax.csproj b/csharp/app/SaliMax/SaliMax.csproj index 0893e2a24..2c2d378bd 100644 --- a/csharp/app/SaliMax/SaliMax.csproj +++ b/csharp/app/SaliMax/SaliMax.csproj @@ -1,25 +1,24 @@ - - InnovEnergy.SaliMax - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/csharp/app/SaliMax/src/AsciiArt.cs b/csharp/app/SaliMax/src/AsciiArt.cs index c8ffc4596..7485a1363 100644 --- a/csharp/app/SaliMax/src/AsciiArt.cs +++ b/csharp/app/SaliMax/src/AsciiArt.cs @@ -1,6 +1,6 @@ using InnovEnergy.Lib.Utils; -namespace InnovEnergy.SaliMax; +namespace InnovEnergy.App.SaliMax; public static class AsciiArt { diff --git a/csharp/app/SaliMax/src/BusPort.cs b/csharp/app/SaliMax/src/BusPort.cs index 20fc1c9a6..e8cbd649b 100644 --- a/csharp/app/SaliMax/src/BusPort.cs +++ b/csharp/app/SaliMax/src/BusPort.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SaliMax; +namespace InnovEnergy.App.SaliMax; public enum BusPort { diff --git a/csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs b/csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs index 7b90a6640..b62316d85 100644 --- a/csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs +++ b/csharp/app/SaliMax/src/Controller/AvgBatteriesStatus.cs @@ -1,6 +1,6 @@ using InnovEnergy.Lib.Devices.Battery48TL; -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public class AvgBatteriesStatus { diff --git a/csharp/app/SaliMax/src/Controller/Control.cs b/csharp/app/SaliMax/src/Controller/Control.cs index 144e2b166..08589edb5 100644 --- a/csharp/app/SaliMax/src/Controller/Control.cs +++ b/csharp/app/SaliMax/src/Controller/Control.cs @@ -1,6 +1,4 @@ -using static InnovEnergy.SaliMax.SystemConfig.SalimaxConfig; - -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public static class Control { diff --git a/csharp/app/SaliMax/src/Controller/ControlRecord.cs b/csharp/app/SaliMax/src/Controller/ControlRecord.cs index c00373efb..ce7e4fc8f 100644 --- a/csharp/app/SaliMax/src/Controller/ControlRecord.cs +++ b/csharp/app/SaliMax/src/Controller/ControlRecord.cs @@ -1,9 +1,9 @@ +using InnovEnergy.App.SaliMax.SaliMaxRelays; +using InnovEnergy.App.SaliMax.SystemConfig; using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; -using InnovEnergy.SaliMax.SaliMaxRelays; -using InnovEnergy.SaliMax.SystemConfig; -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public class ControlRecord { diff --git a/csharp/app/SaliMax/src/Controller/ControlTarget.cs b/csharp/app/SaliMax/src/Controller/ControlTarget.cs index d08fa47ab..1e279f8d3 100644 --- a/csharp/app/SaliMax/src/Controller/ControlTarget.cs +++ b/csharp/app/SaliMax/src/Controller/ControlTarget.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public enum ControlTarget // TODO to delete { diff --git a/csharp/app/SaliMax/src/Controller/Controller.cs b/csharp/app/SaliMax/src/Controller/Controller.cs index e578c5b2d..cadb47477 100644 --- a/csharp/app/SaliMax/src/Controller/Controller.cs +++ b/csharp/app/SaliMax/src/Controller/Controller.cs @@ -1,14 +1,14 @@ +using InnovEnergy.App.SaliMax.SaliMaxRelays; +using InnovEnergy.App.SaliMax.SystemConfig; using InnovEnergy.Lib.Devices.Trumpf.TruConvert; using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -using InnovEnergy.SaliMax.SaliMaxRelays; -using InnovEnergy.SaliMax.SystemConfig; -using InnovEnergy.Time.Unix; -using static InnovEnergy.SaliMax.SaliMaxRelays.RelayState; +using static InnovEnergy.App.SaliMax.SaliMaxRelays.RelayState; -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public static class Controller { diff --git a/csharp/app/SaliMax/src/Controller/SaliMaxState.cs b/csharp/app/SaliMax/src/Controller/SaliMaxState.cs index cd81b24b5..be7470fae 100644 --- a/csharp/app/SaliMax/src/Controller/SaliMaxState.cs +++ b/csharp/app/SaliMax/src/Controller/SaliMaxState.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public struct SaliMaxState { diff --git a/csharp/app/SaliMax/src/Controller/State.cs b/csharp/app/SaliMax/src/Controller/State.cs index a8ad8d11b..7634d1d66 100644 --- a/csharp/app/SaliMax/src/Controller/State.cs +++ b/csharp/app/SaliMax/src/Controller/State.cs @@ -1,5 +1,5 @@ -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public enum State : Int16 { diff --git a/csharp/app/SaliMax/src/Controller/StateConfig.cs b/csharp/app/SaliMax/src/Controller/StateConfig.cs index be40aafc0..ce356d311 100644 --- a/csharp/app/SaliMax/src/Controller/StateConfig.cs +++ b/csharp/app/SaliMax/src/Controller/StateConfig.cs @@ -1,5 +1,5 @@ -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public static class StateConfig { diff --git a/csharp/app/SaliMax/src/Controller/StatusRecord.cs b/csharp/app/SaliMax/src/Controller/StatusRecord.cs index 0969b841b..53de658b8 100644 --- a/csharp/app/SaliMax/src/Controller/StatusRecord.cs +++ b/csharp/app/SaliMax/src/Controller/StatusRecord.cs @@ -1,12 +1,12 @@ -using InnovEnergy.Lib.Devices.Ampt; +using InnovEnergy.App.SaliMax.SaliMaxRelays; +using InnovEnergy.App.SaliMax.SystemConfig; +using InnovEnergy.Lib.Devices.AMPT; using InnovEnergy.Lib.Devices.Battery48TL; using InnovEnergy.Lib.Devices.EmuMeter; using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; -using InnovEnergy.SaliMax.SaliMaxRelays; -using InnovEnergy.SaliMax.SystemConfig; -namespace InnovEnergy.SaliMax.Controller; +namespace InnovEnergy.App.SaliMax.Controller; public record StatusRecord { diff --git a/csharp/app/SaliMax/src/Log/Ampt.cs b/csharp/app/SaliMax/src/Log/Ampt.cs index 1a63b9eab..efaa6e388 100644 --- a/csharp/app/SaliMax/src/Log/Ampt.cs +++ b/csharp/app/SaliMax/src/Log/Ampt.cs @@ -1,8 +1,8 @@ using System.Text.Json.Nodes; -using InnovEnergy.Lib.Devices.Ampt; +using InnovEnergy.Lib.Devices.AMPT; using InnovEnergy.Lib.StatusApi; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; public static class Ampt { diff --git a/csharp/app/SaliMax/src/Log/Battery48Tl.cs b/csharp/app/SaliMax/src/Log/Battery48Tl.cs index db755c78d..f2c85bcbf 100644 --- a/csharp/app/SaliMax/src/Log/Battery48Tl.cs +++ b/csharp/app/SaliMax/src/Log/Battery48Tl.cs @@ -2,7 +2,7 @@ using System.Text.Json.Nodes; using InnovEnergy.Lib.Devices.Battery48TL; using InnovEnergy.Lib.StatusApi; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; public static class Battery48Tl { diff --git a/csharp/app/SaliMax/src/Log/EmuMeter.cs b/csharp/app/SaliMax/src/Log/EmuMeter.cs index 8b61199cf..bb5dbbf29 100644 --- a/csharp/app/SaliMax/src/Log/EmuMeter.cs +++ b/csharp/app/SaliMax/src/Log/EmuMeter.cs @@ -3,9 +3,9 @@ using InnovEnergy.Lib.Devices.EmuMeter; using InnovEnergy.Lib.StatusApi; using InnovEnergy.Lib.Utils; using static DecimalMath.DecimalEx; -using static InnovEnergy.SaliMax.Log.JsonUtil; +using static InnovEnergy.App.SaliMax.Log.JsonUtil; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; public static class EmuMeter { diff --git a/csharp/app/SaliMax/src/Log/JsonUtil.cs b/csharp/app/SaliMax/src/Log/JsonUtil.cs index 3201cb9b5..e82f2af01 100644 --- a/csharp/app/SaliMax/src/Log/JsonUtil.cs +++ b/csharp/app/SaliMax/src/Log/JsonUtil.cs @@ -1,7 +1,7 @@ using System.Text.Json.Nodes; using InnovEnergy.Lib.StatusApi; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; public static class JsonUtil { diff --git a/csharp/app/SaliMax/src/Log/Salimax.cs b/csharp/app/SaliMax/src/Log/Salimax.cs index 76bd25648..09a7de12f 100644 --- a/csharp/app/SaliMax/src/Log/Salimax.cs +++ b/csharp/app/SaliMax/src/Log/Salimax.cs @@ -1,9 +1,9 @@ using System.Text.Json.Nodes; +using InnovEnergy.App.SaliMax.Controller; using InnovEnergy.Lib.StatusApi; -using InnovEnergy.SaliMax.Controller; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; public static class Salimax { diff --git a/csharp/app/SaliMax/src/Log/TruConvertAc.cs b/csharp/app/SaliMax/src/Log/TruConvertAc.cs index eeb56ea4c..af49cbc66 100644 --- a/csharp/app/SaliMax/src/Log/TruConvertAc.cs +++ b/csharp/app/SaliMax/src/Log/TruConvertAc.cs @@ -2,9 +2,9 @@ using System.Text.Json.Nodes; using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; using InnovEnergy.Lib.Utils; using static DecimalMath.DecimalEx; -using static InnovEnergy.SaliMax.Log.JsonUtil; +using static InnovEnergy.App.SaliMax.Log.JsonUtil; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; public static class TruConvertAc { diff --git a/csharp/app/SaliMax/src/Log/TruConvertDc.cs b/csharp/app/SaliMax/src/Log/TruConvertDc.cs index 09e39d1f2..34c23942b 100644 --- a/csharp/app/SaliMax/src/Log/TruConvertDc.cs +++ b/csharp/app/SaliMax/src/Log/TruConvertDc.cs @@ -1,8 +1,8 @@ using System.Text.Json.Nodes; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; -using static InnovEnergy.SaliMax.Log.JsonUtil; +using static InnovEnergy.App.SaliMax.Log.JsonUtil; -namespace InnovEnergy.SaliMax.Log; +namespace InnovEnergy.App.SaliMax.Log; using JO = JsonObject; diff --git a/csharp/app/SaliMax/src/Program.cs b/csharp/app/SaliMax/src/Program.cs index 0734b5b6f..229e3f0b8 100644 --- a/csharp/app/SaliMax/src/Program.cs +++ b/csharp/app/SaliMax/src/Program.cs @@ -1,27 +1,23 @@ - - - using System.Diagnostics; using System.Text.Json; using System.Text.Json.Nodes; using System.Text.Json.Serialization; using Flurl.Http; +using InnovEnergy.App.SaliMax.Controller; +using InnovEnergy.App.SaliMax.Log; +using InnovEnergy.App.SaliMax.SaliMaxRelays; +using InnovEnergy.App.SaliMax.SystemConfig; +using InnovEnergy.Lib.Devices.AMPT; +using InnovEnergy.Lib.Devices.Battery48TL; using InnovEnergy.Lib.Devices.EmuMeter; using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; -using InnovEnergy.Lib.Devices.Ampt; -using InnovEnergy.Lib.Devices.Battery48TL; -using InnovEnergy.SaliMax.Controller; -using InnovEnergy.SaliMax.Log; -using InnovEnergy.SaliMax.SaliMaxRelays; -using InnovEnergy.SaliMax.SystemConfig; -using InnovEnergy.Time.Unix; - +using InnovEnergy.Lib.Time.Unix; #pragma warning disable IL2026 -namespace InnovEnergy.SaliMax; +namespace InnovEnergy.App.SaliMax; internal static class Program { diff --git a/csharp/app/SaliMax/src/S3Config.cs b/csharp/app/SaliMax/src/S3Config.cs index 92238fb96..2e04acd81 100644 --- a/csharp/app/SaliMax/src/S3Config.cs +++ b/csharp/app/SaliMax/src/S3Config.cs @@ -5,7 +5,7 @@ using InnovEnergy.Lib.Utils; using static System.Text.Encoding; using Convert = System.Convert; -namespace InnovEnergy.SaliMax; +namespace InnovEnergy.App.SaliMax; public record S3Config { diff --git a/csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs b/csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs index c1408c2ff..bafd76793 100644 --- a/csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs +++ b/csharp/app/SaliMax/src/SaliMaxRelays/RelayMapBoolean.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SaliMax.SaliMaxRelays; +namespace InnovEnergy.App.SaliMax.SaliMaxRelays; public enum RelayState { diff --git a/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs b/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs index 5fb1b8a69..4b5db1e06 100644 --- a/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs +++ b/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysDevice.cs @@ -1,7 +1,7 @@ using InnovEnergy.Lib.Devices.Adam6060; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.SaliMax.SaliMaxRelays; +namespace InnovEnergy.App.SaliMax.SaliMaxRelays; public class SaliMaxRelaysDevice { diff --git a/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs b/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs index 64c08b992..915896d54 100644 --- a/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs +++ b/csharp/app/SaliMax/src/SaliMaxRelays/SaliMaxRelaysStatus.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SaliMax.SaliMaxRelays; +namespace InnovEnergy.App.SaliMax.SaliMaxRelays; public record SaliMaxRelayStatus { diff --git a/csharp/app/SaliMax/src/SystemConfig/Config.cs b/csharp/app/SaliMax/src/SystemConfig/Config.cs index c11f7d6f7..73e42897a 100644 --- a/csharp/app/SaliMax/src/SystemConfig/Config.cs +++ b/csharp/app/SaliMax/src/SystemConfig/Config.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SaliMax.SystemConfig; +namespace InnovEnergy.App.SaliMax.SystemConfig; public static class Config { diff --git a/csharp/app/SaliMax/src/SystemConfig/Defaults.cs b/csharp/app/SaliMax/src/SystemConfig/Defaults.cs index 6b11b6ad1..1fcb95d25 100644 --- a/csharp/app/SaliMax/src/SystemConfig/Defaults.cs +++ b/csharp/app/SaliMax/src/SystemConfig/Defaults.cs @@ -1,7 +1,7 @@ using InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; using InnovEnergy.Lib.Devices.Trumpf.TruConvertDc; -namespace InnovEnergy.SaliMax.SystemConfig; +namespace InnovEnergy.App.SaliMax.SystemConfig; public static class Defaults { diff --git a/csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs b/csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs index 79d01fdd5..2170783e3 100644 --- a/csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs +++ b/csharp/app/SaliMax/src/SystemConfig/SalimaxConfig.cs @@ -1,9 +1,9 @@ using System.Text.Json; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -using InnovEnergy.Time.Unix; using static System.Text.Json.JsonSerializer; -namespace InnovEnergy.SaliMax.SystemConfig; +namespace InnovEnergy.App.SaliMax.SystemConfig; // shut up trim warnings #pragma warning disable IL2026 diff --git a/csharp/app/SaliMax/src/Topology.cs b/csharp/app/SaliMax/src/Topology.cs index ab8a26ee9..f9db2b68b 100644 --- a/csharp/app/SaliMax/src/Topology.cs +++ b/csharp/app/SaliMax/src/Topology.cs @@ -1,10 +1,10 @@ -#undef BatteriesAllowed +#undef BatteriesAllowed +using InnovEnergy.App.SaliMax.Controller; +using InnovEnergy.App.SaliMax.Log; using InnovEnergy.Lib.Utils; -using InnovEnergy.SaliMax.Controller; -using InnovEnergy.SaliMax.Log; -namespace InnovEnergy.SaliMax; +namespace InnovEnergy.App.SaliMax; public static class Topology { diff --git a/csharp/app/SaliMax/src/Utils.cs b/csharp/app/SaliMax/src/Utils.cs index 337502413..4104b5384 100644 --- a/csharp/app/SaliMax/src/Utils.cs +++ b/csharp/app/SaliMax/src/Utils.cs @@ -1,6 +1,6 @@ using InnovEnergy.Lib.Utils; -namespace InnovEnergy.SaliMax; +namespace InnovEnergy.App.SaliMax; public static class Utils { diff --git a/csharp/lib/Channels/Channels.csproj b/csharp/lib/Channels/Channels.csproj index ad3b1fed5..38b2fa318 100644 --- a/csharp/lib/Channels/Channels.csproj +++ b/csharp/lib/Channels/Channels.csproj @@ -2,10 +2,6 @@ - - InnovEnergy.Lib.Channels - - diff --git a/csharp/lib/Channels/V2/Bak/Connections/Connection.cs b/csharp/lib/Channels/V2/Bak/Connections/Connection.cs index 82d0b9f67..ecd18b168 100644 --- a/csharp/lib/Channels/V2/Bak/Connections/Connection.cs +++ b/csharp/lib/Channels/V2/Bak/Connections/Connection.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Lib.Channels.V2.Connections; +namespace InnovEnergy.Lib.Channels.V2.Bak.Connections; public abstract class Connection : IConnection where C : IDisposable { diff --git a/csharp/lib/Channels/V2/Bak/Connections/Connections.cs b/csharp/lib/Channels/V2/Bak/Connections/Connections.cs index 1af0c31a1..12e2f7207 100644 --- a/csharp/lib/Channels/V2/Bak/Connections/Connections.cs +++ b/csharp/lib/Channels/V2/Bak/Connections/Connections.cs @@ -1,6 +1,6 @@ using System.Net.Sockets; -namespace InnovEnergy.Lib.Channels.V2.Connections; +namespace InnovEnergy.Lib.Channels.V2.Bak.Connections; public class TcpClientConnection : Connection { diff --git a/csharp/lib/Channels/V2/Bak/Connections/Extensions.cs b/csharp/lib/Channels/V2/Bak/Connections/Extensions.cs index 1dd40eb78..d681564ce 100644 --- a/csharp/lib/Channels/V2/Bak/Connections/Extensions.cs +++ b/csharp/lib/Channels/V2/Bak/Connections/Extensions.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Lib.Channels.V2.Connections; +namespace InnovEnergy.Lib.Channels.V2.Bak.Connections; public static class Connection { diff --git a/csharp/lib/Channels/V2/Bak/Connections/IConnection.cs b/csharp/lib/Channels/V2/Bak/Connections/IConnection.cs index 8490accec..7463f3132 100644 --- a/csharp/lib/Channels/V2/Bak/Connections/IConnection.cs +++ b/csharp/lib/Channels/V2/Bak/Connections/IConnection.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Lib.Channels.V2.Connections; +namespace InnovEnergy.Lib.Channels.V2.Bak.Connections; public interface IConnection { diff --git a/csharp/lib/Channels/V2/Bak/GenericChannel.cs b/csharp/lib/Channels/V2/Bak/GenericChannel.cs index 6cad9ba22..151bc8aea 100644 --- a/csharp/lib/Channels/V2/Bak/GenericChannel.cs +++ b/csharp/lib/Channels/V2/Bak/GenericChannel.cs @@ -1,6 +1,6 @@ -using InnovEnergy.Lib.Channels.V2.Connections; +using InnovEnergy.Lib.Channels.V2.Bak.Connections; -namespace InnovEnergy.Lib.Channels.V2; +namespace InnovEnergy.Lib.Channels.V2.Bak; public abstract class GenericChannel2 : IChannel, IConnection { diff --git a/csharp/lib/Devices/AMPT/Ampt.csproj b/csharp/lib/Devices/AMPT/Ampt.csproj index 5f3e41475..a576a4ee7 100644 --- a/csharp/lib/Devices/AMPT/Ampt.csproj +++ b/csharp/lib/Devices/AMPT/Ampt.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Devices.Ampt - InnovEnergy.Lib.Devices.Ampt + diff --git a/csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs b/csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs index 239502762..e701c8463 100644 --- a/csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs +++ b/csharp/lib/Devices/AMPT/AmptCommunicationUnit.cs @@ -3,7 +3,7 @@ using InnovEnergy.Lib.Protocols.Modbus.Clients; using InnovEnergy.Lib.Protocols.Modbus.Connections; using InnovEnergy.Lib.StatusApi.Connections; -namespace InnovEnergy.Lib.Devices.Ampt; +namespace InnovEnergy.Lib.Devices.AMPT; public class AmptCommunicationUnit { diff --git a/csharp/lib/Devices/AMPT/AmptDeviceStatus.cs b/csharp/lib/Devices/AMPT/AmptDeviceStatus.cs index 00d9e352f..371395e46 100644 --- a/csharp/lib/Devices/AMPT/AmptDeviceStatus.cs +++ b/csharp/lib/Devices/AMPT/AmptDeviceStatus.cs @@ -1,7 +1,7 @@ using InnovEnergy.Lib.StatusApi.Connections; using InnovEnergy.Lib.StatusApi.Devices; -namespace InnovEnergy.Lib.Devices.Ampt; +namespace InnovEnergy.Lib.Devices.AMPT; public record AmptDeviceStatus ( diff --git a/csharp/lib/Devices/AMPT/AmptStatus.cs b/csharp/lib/Devices/AMPT/AmptStatus.cs index 48ce01d2f..45ff33662 100644 --- a/csharp/lib/Devices/AMPT/AmptStatus.cs +++ b/csharp/lib/Devices/AMPT/AmptStatus.cs @@ -1,7 +1,4 @@ -using InnovEnergy.Lib.StatusApi.Connections; -using InnovEnergy.Lib.StatusApi.Devices; - -namespace InnovEnergy.Lib.Devices.Ampt; +namespace InnovEnergy.Lib.Devices.AMPT; public record AmptStatus ( diff --git a/csharp/lib/Devices/AMPT/AmptStringStatus.cs b/csharp/lib/Devices/AMPT/AmptStringStatus.cs index e8776950f..bd3b2c5e0 100644 --- a/csharp/lib/Devices/AMPT/AmptStringStatus.cs +++ b/csharp/lib/Devices/AMPT/AmptStringStatus.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Lib.Devices.Ampt; +namespace InnovEnergy.Lib.Devices.AMPT; public record AmptStringStatus { diff --git a/csharp/lib/Devices/Adam6060/Adam6060.csproj b/csharp/lib/Devices/Adam6060/Adam6060.csproj index f4fcbcbb6..9cc351396 100644 --- a/csharp/lib/Devices/Adam6060/Adam6060.csproj +++ b/csharp/lib/Devices/Adam6060/Adam6060.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Devices.Adam6060 - InnovEnergy.Lib.Devices.Adam6060 + diff --git a/csharp/lib/Devices/Battery48TL/Battery48TL.csproj b/csharp/lib/Devices/Battery48TL/Battery48TL.csproj index 51feacfe1..5007b1d4b 100644 --- a/csharp/lib/Devices/Battery48TL/Battery48TL.csproj +++ b/csharp/lib/Devices/Battery48TL/Battery48TL.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Devices.Battery48TL - InnovEnergy.Lib.Devices.Battery48TL + diff --git a/csharp/lib/Devices/EmuMeter/EmuMeter.csproj b/csharp/lib/Devices/EmuMeter/EmuMeter.csproj index c05adbe6b..fc57021a4 100644 --- a/csharp/lib/Devices/EmuMeter/EmuMeter.csproj +++ b/csharp/lib/Devices/EmuMeter/EmuMeter.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Devices.EmuMeter - InnovEnergy.Lib.Devices.EmuMeter + diff --git a/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj b/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj index 0f5571422..ffe741177 100644 --- a/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj +++ b/csharp/lib/Devices/Trumpf/TruConvert/TruConvert.csproj @@ -2,14 +2,12 @@ - InnovEnergy.Lib.Devices.Trumpf.TruConvert - InnovEnergy.Lib.Devices.Trumpf.TruConvert - latest + - + - + diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs b/csharp/lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs index aceada544..df5535008 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/AlarmMessage.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace InnovEnergy.Lib.Devices.Trumpf.TruConvert; +namespace InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; [SuppressMessage("ReSharper", "IdentifierTypo")] [SuppressMessage("ReSharper", "UnusedMember.Global")] diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj b/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj index 31669d385..0e28aa423 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/TruConvertAc.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Devices.Trumpf.TruConvertAc - InnovEnergy.Lib.Devices.Trumpf.TruConvertAc + latest diff --git a/csharp/lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs b/csharp/lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs index 45a5538de..2fb74b947 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs +++ b/csharp/lib/Devices/Trumpf/TruConvertAc/WarningMessage.cs @@ -1,6 +1,6 @@ using System.Diagnostics.CodeAnalysis; -namespace InnovEnergy.Lib.Devices.Trumpf.TruConvert; +namespace InnovEnergy.Lib.Devices.Trumpf.TruConvertAc; [SuppressMessage("ReSharper", "IdentifierTypo")] [SuppressMessage("ReSharper", "UnusedMember.Global")] diff --git a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj b/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj index c2acc0062..109275eee 100644 --- a/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj +++ b/csharp/lib/Devices/Trumpf/TruConvertDc/TruConvertDc.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Devices.Trumpf.TruConvertDc - InnovEnergy.Lib.Devices.Trumpf.TruConvertDc + latest diff --git a/csharp/lib/InnovEnergy.lib.props b/csharp/lib/InnovEnergy.lib.props index 0e1ca7736..de75048b8 100644 --- a/csharp/lib/InnovEnergy.lib.props +++ b/csharp/lib/InnovEnergy.lib.props @@ -4,6 +4,7 @@ Library + $(RootNamespace) diff --git a/csharp/lib/Protocols/DBus/DBus.csproj b/csharp/lib/Protocols/DBus/DBus.csproj index 7f74a94ad..7a32ff8a1 100644 --- a/csharp/lib/Protocols/DBus/DBus.csproj +++ b/csharp/lib/Protocols/DBus/DBus.csproj @@ -5,7 +5,7 @@ DBus Library true InnovEnergy.Lib.Protocols.DBus - InnovEnergy.Lib.Protocols.DBus + diff --git a/csharp/lib/Protocols/Modbus/Modbus.csproj b/csharp/lib/Protocols/Modbus/Modbus.csproj index ec6eb7bf8..18f18b58f 100644 --- a/csharp/lib/Protocols/Modbus/Modbus.csproj +++ b/csharp/lib/Protocols/Modbus/Modbus.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.Protocols.Modbus - InnovEnergy.Lib.Protocols.Modbus + diff --git a/csharp/lib/S3/DataRec.cs b/csharp/lib/S3/DataRec.cs index f0d9b2e30..5ae585689 100644 --- a/csharp/lib/S3/DataRec.cs +++ b/csharp/lib/S3/DataRec.cs @@ -1,6 +1,6 @@ -using InnovEnergy.S3.Records.Fields; +using InnovEnergy.Lib.S3.Records.Fields; -namespace InnovEnergy.S3; +namespace InnovEnergy.Lib.S3; public record DataRec { diff --git a/csharp/lib/S3/Drivers/Internal/Delegates/ReadRecord.cs b/csharp/lib/S3/Drivers/Internal/Delegates/ReadRecord.cs index 82c56cda8..ad088d513 100644 --- a/csharp/lib/S3/Drivers/Internal/Delegates/ReadRecord.cs +++ b/csharp/lib/S3/Drivers/Internal/Delegates/ReadRecord.cs @@ -1,6 +1,6 @@ -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records.Specialized; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records.Specialized; -namespace InnovEnergy.S3.Drivers.Internal.Delegates; +namespace InnovEnergy.Lib.S3.Drivers.Internal.Delegates; public delegate Task ReadRecord(AggregationLevel level, UInt32 index); \ No newline at end of file diff --git a/csharp/lib/S3/Drivers/Internal/Delegates/WriteRecord.cs b/csharp/lib/S3/Drivers/Internal/Delegates/WriteRecord.cs index 3c06195ab..4bccde97d 100644 --- a/csharp/lib/S3/Drivers/Internal/Delegates/WriteRecord.cs +++ b/csharp/lib/S3/Drivers/Internal/Delegates/WriteRecord.cs @@ -1,6 +1,6 @@ -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records.Specialized; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records.Specialized; -namespace InnovEnergy.S3.Drivers.Internal.Delegates; +namespace InnovEnergy.Lib.S3.Drivers.Internal.Delegates; public delegate Task WriteRecord(TimeStampedRecord record, AggregationLevel level, UInt32 index); \ No newline at end of file diff --git a/csharp/lib/S3/Drivers/Internal/Reader.cs b/csharp/lib/S3/Drivers/Internal/Reader.cs index eccfc84c4..e5ba5c59e 100644 --- a/csharp/lib/S3/Drivers/Internal/Reader.cs +++ b/csharp/lib/S3/Drivers/Internal/Reader.cs @@ -1,10 +1,10 @@ -using InnovEnergy.S3.Drivers.Internal.Delegates; -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Drivers.Internal.Delegates; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Drivers.Internal; +namespace InnovEnergy.Lib.S3.Drivers.Internal; public partial class Reader { diff --git a/csharp/lib/S3/Drivers/Internal/Reader.public.cs b/csharp/lib/S3/Drivers/Internal/Reader.public.cs index 622571c83..424b3ccfe 100644 --- a/csharp/lib/S3/Drivers/Internal/Reader.public.cs +++ b/csharp/lib/S3/Drivers/Internal/Reader.public.cs @@ -1,9 +1,9 @@ -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Drivers.Internal; +namespace InnovEnergy.Lib.S3.Drivers.Internal; public partial class Reader { diff --git a/csharp/lib/S3/Drivers/Internal/Util/Aggregator.cs b/csharp/lib/S3/Drivers/Internal/Util/Aggregator.cs index de1721858..999a2aa1a 100644 --- a/csharp/lib/S3/Drivers/Internal/Util/Aggregator.cs +++ b/csharp/lib/S3/Drivers/Internal/Util/Aggregator.cs @@ -1,9 +1,9 @@ -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records; -using InnovEnergy.S3.Records.Operations; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records; +using InnovEnergy.Lib.S3.Records.Operations; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Drivers.Internal.Util; +namespace InnovEnergy.Lib.S3.Drivers.Internal.Util; public class Aggregator { diff --git a/csharp/lib/S3/Drivers/Internal/Util/Sampler.cs b/csharp/lib/S3/Drivers/Internal/Util/Sampler.cs index e8b136265..384b00487 100644 --- a/csharp/lib/S3/Drivers/Internal/Util/Sampler.cs +++ b/csharp/lib/S3/Drivers/Internal/Util/Sampler.cs @@ -1,9 +1,9 @@ -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Drivers.Internal.Util; +namespace InnovEnergy.Lib.S3.Drivers.Internal.Util; internal class Sampler { diff --git a/csharp/lib/S3/Drivers/Internal/Writer.cs b/csharp/lib/S3/Drivers/Internal/Writer.cs index e9ee15700..19156a4d3 100644 --- a/csharp/lib/S3/Drivers/Internal/Writer.cs +++ b/csharp/lib/S3/Drivers/Internal/Writer.cs @@ -1,13 +1,13 @@ using System.Diagnostics; -using InnovEnergy.S3.Drivers.Internal.Delegates; -using InnovEnergy.S3.Drivers.Internal.Util; -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Drivers.Internal.Delegates; +using InnovEnergy.Lib.S3.Drivers.Internal.Util; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Drivers.Internal; +namespace InnovEnergy.Lib.S3.Drivers.Internal; using AggregationLevels = IReadOnlyList; using Aggregators = IReadOnlyList; diff --git a/csharp/lib/S3/Drivers/Internal/Writer.public.cs b/csharp/lib/S3/Drivers/Internal/Writer.public.cs index 4d5ee131e..15ab491cf 100644 --- a/csharp/lib/S3/Drivers/Internal/Writer.public.cs +++ b/csharp/lib/S3/Drivers/Internal/Writer.public.cs @@ -1,9 +1,9 @@ -using InnovEnergy.S3.Records; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Records; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Drivers.Internal; +namespace InnovEnergy.Lib.S3.Drivers.Internal; public partial class Writer { diff --git a/csharp/lib/S3/Drivers/MemoryDriver.cs b/csharp/lib/S3/Drivers/MemoryDriver.cs index 31f3e998a..8b70abf5e 100644 --- a/csharp/lib/S3/Drivers/MemoryDriver.cs +++ b/csharp/lib/S3/Drivers/MemoryDriver.cs @@ -1,10 +1,10 @@ -using InnovEnergy.S3.Drivers.Internal; -using InnovEnergy.S3.Drivers.Internal.Delegates; -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Drivers.Internal; +using InnovEnergy.Lib.S3.Drivers.Internal.Delegates; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Drivers; +namespace InnovEnergy.Lib.S3.Drivers; using Levels = IReadOnlyList; using Memory = Dictionary; diff --git a/csharp/lib/S3/Drivers/S3Config.cs b/csharp/lib/S3/Drivers/S3Config.cs index 4b4d60d18..758244b3f 100644 --- a/csharp/lib/S3/Drivers/S3Config.cs +++ b/csharp/lib/S3/Drivers/S3Config.cs @@ -5,7 +5,7 @@ using InnovEnergy.Lib.Utils; using static System.Text.Encoding; using Convert = System.Convert; -namespace InnovEnergy.S3.Drivers; +namespace InnovEnergy.Lib.S3.Drivers; public record S3Config { diff --git a/csharp/lib/S3/Drivers/S3Driver.cs b/csharp/lib/S3/Drivers/S3Driver.cs index 91a4ada47..9d231e998 100644 --- a/csharp/lib/S3/Drivers/S3Driver.cs +++ b/csharp/lib/S3/Drivers/S3Driver.cs @@ -1,16 +1,14 @@ using Flurl.Http; -using InnovEnergy.S3.Drivers.Internal; -using InnovEnergy.S3.Drivers.Internal.Delegates; -using InnovEnergy.S3.Metadata; -using InnovEnergy.S3.Records.Serialization; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Drivers.Internal; +using InnovEnergy.Lib.S3.Drivers.Internal.Delegates; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.S3.Records.Serialization; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Drivers; +namespace InnovEnergy.Lib.S3.Drivers; using Levels = IReadOnlyList; -using Memory = Dictionary; - public class S3Driver : Writer { diff --git a/csharp/lib/S3/Metadata/AggregationLevel.cs b/csharp/lib/S3/Metadata/AggregationLevel.cs index 895ca3306..fd1ecd184 100644 --- a/csharp/lib/S3/Metadata/AggregationLevel.cs +++ b/csharp/lib/S3/Metadata/AggregationLevel.cs @@ -1,6 +1,6 @@ -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Metadata; +namespace InnovEnergy.Lib.S3.Metadata; public record AggregationLevel { diff --git a/csharp/lib/S3/Metadata/FieldType.cs b/csharp/lib/S3/Metadata/FieldType.cs index aa4093858..9ca91a1af 100644 --- a/csharp/lib/S3/Metadata/FieldType.cs +++ b/csharp/lib/S3/Metadata/FieldType.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.S3.Metadata; +namespace InnovEnergy.Lib.S3.Metadata; public enum FieldType { diff --git a/csharp/lib/S3/Program.cs b/csharp/lib/S3/Program.cs index 91fd538c8..4ba261f71 100644 --- a/csharp/lib/S3/Program.cs +++ b/csharp/lib/S3/Program.cs @@ -1,12 +1,14 @@ using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Reactive.Subjects; -using InnovEnergy.S3.Metadata; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -using static InnovEnergy.Time.Unix.UnixTimeSpan; +using static InnovEnergy.Lib.Time.Unix.UnixTimeSpan; + +namespace InnovEnergy.Lib.S3; + -namespace InnovEnergy.S3; public enum MyEnum { diff --git a/csharp/lib/S3/Records/Fields/Field.cs b/csharp/lib/S3/Records/Fields/Field.cs index 6831a6957..a68f29cd4 100644 --- a/csharp/lib/S3/Records/Fields/Field.cs +++ b/csharp/lib/S3/Records/Fields/Field.cs @@ -1,3 +1,3 @@ -namespace InnovEnergy.S3.Records.Fields; +namespace InnovEnergy.Lib.S3.Records.Fields; public abstract record Field; \ No newline at end of file diff --git a/csharp/lib/S3/Records/Fields/NumberField.cs b/csharp/lib/S3/Records/Fields/NumberField.cs index dca272106..62aca9f6c 100644 --- a/csharp/lib/S3/Records/Fields/NumberField.cs +++ b/csharp/lib/S3/Records/Fields/NumberField.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.S3.Records.Fields; +namespace InnovEnergy.Lib.S3.Records.Fields; public record NumberField : Field { diff --git a/csharp/lib/S3/Records/Fields/TextField.cs b/csharp/lib/S3/Records/Fields/TextField.cs index 561d50772..7b1ebd2e4 100644 --- a/csharp/lib/S3/Records/Fields/TextField.cs +++ b/csharp/lib/S3/Records/Fields/TextField.cs @@ -1,6 +1,6 @@ using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Records.Fields; +namespace InnovEnergy.Lib.S3.Records.Fields; public record TextField : Field { diff --git a/csharp/lib/S3/Records/Fields/TextFrequency.cs b/csharp/lib/S3/Records/Fields/TextFrequency.cs index 39631a4c1..60974957f 100644 --- a/csharp/lib/S3/Records/Fields/TextFrequency.cs +++ b/csharp/lib/S3/Records/Fields/TextFrequency.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.S3.Records.Fields; +namespace InnovEnergy.Lib.S3.Records.Fields; public record TextFrequency { diff --git a/csharp/lib/S3/Records/Fields/UnitAttribute.cs b/csharp/lib/S3/Records/Fields/UnitAttribute.cs index af47ca5b7..1bd25600c 100644 --- a/csharp/lib/S3/Records/Fields/UnitAttribute.cs +++ b/csharp/lib/S3/Records/Fields/UnitAttribute.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.S3.Records.Fields; +namespace InnovEnergy.Lib.S3.Records.Fields; [AttributeUsage(AttributeTargets.Property)] public sealed class UnitAttribute : Attribute diff --git a/csharp/lib/S3/Records/Fields/WithUnit.cs b/csharp/lib/S3/Records/Fields/WithUnit.cs index 26dcdc9ad..01104d9de 100644 --- a/csharp/lib/S3/Records/Fields/WithUnit.cs +++ b/csharp/lib/S3/Records/Fields/WithUnit.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.S3.Records.Fields; +namespace InnovEnergy.Lib.S3.Records.Fields; public readonly struct WithUnit { diff --git a/csharp/lib/S3/Records/Operations/Aggregation.cs b/csharp/lib/S3/Records/Operations/Aggregation.cs index b13ddd651..1b938947f 100644 --- a/csharp/lib/S3/Records/Operations/Aggregation.cs +++ b/csharp/lib/S3/Records/Operations/Aggregation.cs @@ -1,11 +1,11 @@ using System.Diagnostics.CodeAnalysis; -using InnovEnergy.S3.Records.Fields; +using InnovEnergy.Lib.S3.Records.Fields; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Records.Operations; +namespace InnovEnergy.Lib.S3.Records.Operations; // ReSharper disable ArgumentsStyleOther -using NamedField = KeyValuePair; + public static class Aggregation { diff --git a/csharp/lib/S3/Records/Operations/Conversion.cs b/csharp/lib/S3/Records/Operations/Conversion.cs index 489d9648f..cb68eb4ca 100644 --- a/csharp/lib/S3/Records/Operations/Conversion.cs +++ b/csharp/lib/S3/Records/Operations/Conversion.cs @@ -1,9 +1,9 @@ using System.Reflection; -using InnovEnergy.S3.Records.Fields; +using InnovEnergy.Lib.S3.Records.Fields; using InnovEnergy.Lib.Utils; using static System.Reflection.BindingFlags; -namespace InnovEnergy.S3.Records.Operations; +namespace InnovEnergy.Lib.S3.Records.Operations; public static class Conversion { diff --git a/csharp/lib/S3/Records/Record.cs b/csharp/lib/S3/Records/Record.cs index 050151c07..365765843 100644 --- a/csharp/lib/S3/Records/Record.cs +++ b/csharp/lib/S3/Records/Record.cs @@ -1,8 +1,8 @@ -using InnovEnergy.S3.Records.Fields; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Records.Fields; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Records; +namespace InnovEnergy.Lib.S3.Records; public record Record : Field { diff --git a/csharp/lib/S3/Records/Serialization/FieldTag.cs b/csharp/lib/S3/Records/Serialization/FieldTag.cs index 19d486da5..8dff3261b 100644 --- a/csharp/lib/S3/Records/Serialization/FieldTag.cs +++ b/csharp/lib/S3/Records/Serialization/FieldTag.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.S3.Records.Serialization; +namespace InnovEnergy.Lib.S3.Records.Serialization; public enum FieldTag : Byte { diff --git a/csharp/lib/S3/Records/Serialization/Parser.cs b/csharp/lib/S3/Records/Serialization/Parser.cs index 694b9bc26..76319a31a 100644 --- a/csharp/lib/S3/Records/Serialization/Parser.cs +++ b/csharp/lib/S3/Records/Serialization/Parser.cs @@ -1,10 +1,10 @@ using System.Text; -using InnovEnergy.S3.Records.Fields; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Records.Fields; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -namespace InnovEnergy.S3.Records.Serialization; +namespace InnovEnergy.Lib.S3.Records.Serialization; public class Parser { diff --git a/csharp/lib/S3/Records/Serialization/Serializer.cs b/csharp/lib/S3/Records/Serialization/Serializer.cs index 888132fbf..d7766df8d 100644 --- a/csharp/lib/S3/Records/Serialization/Serializer.cs +++ b/csharp/lib/S3/Records/Serialization/Serializer.cs @@ -1,10 +1,10 @@ -using InnovEnergy.S3.Records.Fields; -using InnovEnergy.S3.Records.Specialized; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Records.Fields; +using InnovEnergy.Lib.S3.Records.Specialized; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; using static System.Text.Encoding; -namespace InnovEnergy.S3.Records.Serialization; +namespace InnovEnergy.Lib.S3.Records.Serialization; public static class Serializer { diff --git a/csharp/lib/S3/Records/Specialized/AggregatedRecord.cs b/csharp/lib/S3/Records/Specialized/AggregatedRecord.cs index f8340d63d..e4b9a2283 100644 --- a/csharp/lib/S3/Records/Specialized/AggregatedRecord.cs +++ b/csharp/lib/S3/Records/Specialized/AggregatedRecord.cs @@ -1,7 +1,7 @@ -using InnovEnergy.S3.Metadata; -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.S3.Metadata; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Records.Specialized; +namespace InnovEnergy.Lib.S3.Records.Specialized; public readonly struct AggregatedRecord { diff --git a/csharp/lib/S3/Records/Specialized/TimeStampedRecord.cs b/csharp/lib/S3/Records/Specialized/TimeStampedRecord.cs index 28060830a..57dc56aed 100644 --- a/csharp/lib/S3/Records/Specialized/TimeStampedRecord.cs +++ b/csharp/lib/S3/Records/Specialized/TimeStampedRecord.cs @@ -1,6 +1,6 @@ -using InnovEnergy.Time.Unix; +using InnovEnergy.Lib.Time.Unix; -namespace InnovEnergy.S3.Records.Specialized; +namespace InnovEnergy.Lib.S3.Records.Specialized; public readonly struct TimeStampedRecord { diff --git a/csharp/lib/S3/S3.csproj b/csharp/lib/S3/S3.csproj index c68d60ec8..0da1127e5 100644 --- a/csharp/lib/S3/S3.csproj +++ b/csharp/lib/S3/S3.csproj @@ -2,11 +2,6 @@ - - InnovEnergy.S3 - latest - - diff --git a/csharp/lib/StatusApi/StatusApi.csproj b/csharp/lib/StatusApi/StatusApi.csproj index 96f7a934f..edc182ef8 100644 --- a/csharp/lib/StatusApi/StatusApi.csproj +++ b/csharp/lib/StatusApi/StatusApi.csproj @@ -3,7 +3,7 @@ InnovEnergy.Lib.StatusApi - InnovEnergy.Lib.StatusApi + diff --git a/csharp/lib/Units/Current.cs b/csharp/lib/StatusData/Current.cs similarity index 97% rename from csharp/lib/Units/Current.cs rename to csharp/lib/StatusData/Current.cs index e313271b8..2f65add3c 100644 --- a/csharp/lib/Units/Current.cs +++ b/csharp/lib/StatusData/Current.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Units; +namespace InnovEnergy.Lib.StatusData; public readonly struct Current { @@ -29,6 +29,4 @@ public readonly struct Current // U=RI public static Voltage operator *(Current current, Resistance resistance) => new Voltage(resistance.Value* current.Value); - - } \ No newline at end of file diff --git a/csharp/lib/Units/Json/Converters.cs b/csharp/lib/StatusData/Json/Converters.cs similarity index 90% rename from csharp/lib/Units/Json/Converters.cs rename to csharp/lib/StatusData/Json/Converters.cs index 81406754f..ab6a4336b 100644 --- a/csharp/lib/Units/Json/Converters.cs +++ b/csharp/lib/StatusData/Json/Converters.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using InnovEnergy.Units.Json; +using InnovEnergy.Lib.StatusData.Json; // ReSharper disable once CheckNamespace namespace InnovEnergy.Units; diff --git a/csharp/lib/Units/Json/CurrentConverter.cs b/csharp/lib/StatusData/Json/CurrentConverter.cs similarity index 91% rename from csharp/lib/Units/Json/CurrentConverter.cs rename to csharp/lib/StatusData/Json/CurrentConverter.cs index 93733110f..64707325f 100644 --- a/csharp/lib/Units/Json/CurrentConverter.cs +++ b/csharp/lib/StatusData/Json/CurrentConverter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace InnovEnergy.Units.Json; +namespace InnovEnergy.Lib.StatusData.Json; public class CurrentConverter : JsonConverter { diff --git a/csharp/lib/Units/Json/PowerConverter.cs b/csharp/lib/StatusData/Json/PowerConverter.cs similarity index 90% rename from csharp/lib/Units/Json/PowerConverter.cs rename to csharp/lib/StatusData/Json/PowerConverter.cs index 037252da4..8c33d3eae 100644 --- a/csharp/lib/Units/Json/PowerConverter.cs +++ b/csharp/lib/StatusData/Json/PowerConverter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace InnovEnergy.Units.Json; +namespace InnovEnergy.Lib.StatusData.Json; public class PowerConverter : JsonConverter { diff --git a/csharp/lib/Units/Json/ResistanceConverter.cs b/csharp/lib/StatusData/Json/ResistanceConverter.cs similarity index 91% rename from csharp/lib/Units/Json/ResistanceConverter.cs rename to csharp/lib/StatusData/Json/ResistanceConverter.cs index 022daff8c..a60d99009 100644 --- a/csharp/lib/Units/Json/ResistanceConverter.cs +++ b/csharp/lib/StatusData/Json/ResistanceConverter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace InnovEnergy.Units.Json; +namespace InnovEnergy.Lib.StatusData.Json; public class ResistanceConverter : JsonConverter { diff --git a/csharp/lib/Units/Json/VoltageConverter.cs b/csharp/lib/StatusData/Json/VoltageConverter.cs similarity index 91% rename from csharp/lib/Units/Json/VoltageConverter.cs rename to csharp/lib/StatusData/Json/VoltageConverter.cs index 62922c1d7..b51ceabf5 100644 --- a/csharp/lib/Units/Json/VoltageConverter.cs +++ b/csharp/lib/StatusData/Json/VoltageConverter.cs @@ -1,7 +1,7 @@ using System.Text.Json; using System.Text.Json.Serialization; -namespace InnovEnergy.Units.Json; +namespace InnovEnergy.Lib.StatusData.Json; public class VoltageConverter : JsonConverter { diff --git a/csharp/lib/Units/Power.cs b/csharp/lib/StatusData/Power.cs similarity index 95% rename from csharp/lib/Units/Power.cs rename to csharp/lib/StatusData/Power.cs index d6e88bccc..3a605dfca 100644 --- a/csharp/lib/Units/Power.cs +++ b/csharp/lib/StatusData/Power.cs @@ -1,4 +1,6 @@ -namespace InnovEnergy.Units; +using InnovEnergy.Units; + +namespace InnovEnergy.Lib.StatusData; public readonly struct Power { diff --git a/csharp/lib/Units/Resistance.cs b/csharp/lib/StatusData/Resistance.cs similarity index 97% rename from csharp/lib/Units/Resistance.cs rename to csharp/lib/StatusData/Resistance.cs index ae551e019..d10573e77 100644 --- a/csharp/lib/Units/Resistance.cs +++ b/csharp/lib/StatusData/Resistance.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Units; +namespace InnovEnergy.Lib.StatusData; public readonly struct Resistance { diff --git a/csharp/lib/StatusData/State.cs b/csharp/lib/StatusData/State.cs new file mode 100644 index 000000000..1f91b1249 --- /dev/null +++ b/csharp/lib/StatusData/State.cs @@ -0,0 +1,21 @@ +namespace InnovEnergy.Lib.StatusData; + +public readonly struct State +{ + public IReadOnlyList Values { get; } + + public State(IReadOnlyList values) => Values = values; + + public State(params String[] values) : this((IReadOnlyList)values){} + public State(params State[] states) : this(states.SelectMany(s => s.Values).ToList()){} + + public State(Enum e) : this(e.ToString()) + { + } + + public static implicit operator State(Enum e) => new State(e); + public static implicit operator State(String s) => new State(s); + + // parallel + public static State operator |(State left, State right) => new State(left, right); +} \ No newline at end of file diff --git a/csharp/lib/Units/Units.csproj b/csharp/lib/StatusData/StatusData.csproj similarity index 75% rename from csharp/lib/Units/Units.csproj rename to csharp/lib/StatusData/StatusData.csproj index 090825d42..22522002f 100644 --- a/csharp/lib/Units/Units.csproj +++ b/csharp/lib/StatusData/StatusData.csproj @@ -3,7 +3,7 @@ Library - InnovEnergy.Units + preview diff --git a/csharp/lib/Units/Units.cs b/csharp/lib/StatusData/Units.cs similarity index 89% rename from csharp/lib/Units/Units.cs rename to csharp/lib/StatusData/Units.cs index ced38eb03..4dacaa297 100644 --- a/csharp/lib/Units/Units.cs +++ b/csharp/lib/StatusData/Units.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Units; +namespace InnovEnergy.Lib.StatusData; public static partial class Units { diff --git a/csharp/lib/Units/Voltage.cs b/csharp/lib/StatusData/Voltage.cs similarity index 97% rename from csharp/lib/Units/Voltage.cs rename to csharp/lib/StatusData/Voltage.cs index ae39f9a0d..fa7c8a7fc 100644 --- a/csharp/lib/Units/Voltage.cs +++ b/csharp/lib/StatusData/Voltage.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Units; +namespace InnovEnergy.Lib.StatusData; public readonly struct Voltage { diff --git a/csharp/lib/SysTools/Edges/RemoteCommandToProcess.cs b/csharp/lib/SysTools/Edges/RemoteCommandToProcess.cs index 71453ab3d..984594e11 100644 --- a/csharp/lib/SysTools/Edges/RemoteCommandToProcess.cs +++ b/csharp/lib/SysTools/Edges/RemoteCommandToProcess.cs @@ -1,7 +1,7 @@ -using InnovEnergy.SysTools.Process; -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Process; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class RemoteCommandToProcess { diff --git a/csharp/lib/SysTools/Edges/RemotePathToRemoteCommand.cs b/csharp/lib/SysTools/Edges/RemotePathToRemoteCommand.cs index 112623032..5e882d473 100644 --- a/csharp/lib/SysTools/Edges/RemotePathToRemoteCommand.cs +++ b/csharp/lib/SysTools/Edges/RemotePathToRemoteCommand.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class RemotePathToRemoteCommand { diff --git a/csharp/lib/SysTools/Edges/SshHostToRemoteCommand.cs b/csharp/lib/SysTools/Edges/SshHostToRemoteCommand.cs index 9dd56a042..c9cfba220 100644 --- a/csharp/lib/SysTools/Edges/SshHostToRemoteCommand.cs +++ b/csharp/lib/SysTools/Edges/SshHostToRemoteCommand.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SshHostToRemoteCommand { diff --git a/csharp/lib/SysTools/Edges/SshHostToRemotePath.cs b/csharp/lib/SysTools/Edges/SshHostToRemotePath.cs index 3d7c75156..4833861b6 100644 --- a/csharp/lib/SysTools/Edges/SshHostToRemotePath.cs +++ b/csharp/lib/SysTools/Edges/SshHostToRemotePath.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SshHostToRemotePath { diff --git a/csharp/lib/SysTools/Edges/StringToCommand.cs b/csharp/lib/SysTools/Edges/StringToCommand.cs index f905db3d8..1dc691b7f 100644 --- a/csharp/lib/SysTools/Edges/StringToCommand.cs +++ b/csharp/lib/SysTools/Edges/StringToCommand.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class StringToCommand { diff --git a/csharp/lib/SysTools/Edges/StringToProcess.cs b/csharp/lib/SysTools/Edges/StringToProcess.cs index 6a4229ef6..e8d3c4d63 100644 --- a/csharp/lib/SysTools/Edges/StringToProcess.cs +++ b/csharp/lib/SysTools/Edges/StringToProcess.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Process; +using InnovEnergy.Lib.SysTools.Process; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; using Env = Dictionary; diff --git a/csharp/lib/SysTools/Edges/StringToRemotePath.cs b/csharp/lib/SysTools/Edges/StringToRemotePath.cs index 5fd37b695..9a32e16b1 100644 --- a/csharp/lib/SysTools/Edges/StringToRemotePath.cs +++ b/csharp/lib/SysTools/Edges/StringToRemotePath.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class StringToRemotePath { diff --git a/csharp/lib/SysTools/Edges/StringToSysPath.cs b/csharp/lib/SysTools/Edges/StringToSysPath.cs index 4e31e2836..bf7a93615 100644 --- a/csharp/lib/SysTools/Edges/StringToSysPath.cs +++ b/csharp/lib/SysTools/Edges/StringToSysPath.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class StringToSysPath { diff --git a/csharp/lib/SysTools/Edges/SysCommandToProcess.cs b/csharp/lib/SysTools/Edges/SysCommandToProcess.cs index ceee12ebe..b8b142b6f 100644 --- a/csharp/lib/SysTools/Edges/SysCommandToProcess.cs +++ b/csharp/lib/SysTools/Edges/SysCommandToProcess.cs @@ -1,9 +1,9 @@ using System.Diagnostics; using System.Reactive.Linq; using System.Text; -using InnovEnergy.SysTools.Process; +using InnovEnergy.Lib.SysTools.Process; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SysCommandToProcess { diff --git a/csharp/lib/SysTools/Edges/SysCommandToRemoteCommand.cs b/csharp/lib/SysTools/Edges/SysCommandToRemoteCommand.cs index acb42b570..faa77d432 100644 --- a/csharp/lib/SysTools/Edges/SysCommandToRemoteCommand.cs +++ b/csharp/lib/SysTools/Edges/SysCommandToRemoteCommand.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SysCommandToRemoteCommand { diff --git a/csharp/lib/SysTools/Edges/SysPathToProcess.cs b/csharp/lib/SysTools/Edges/SysPathToProcess.cs index be8fe9904..60a030fe8 100644 --- a/csharp/lib/SysTools/Edges/SysPathToProcess.cs +++ b/csharp/lib/SysTools/Edges/SysPathToProcess.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Process; +using InnovEnergy.Lib.SysTools.Process; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SysPathToProcess { diff --git a/csharp/lib/SysTools/Edges/SysPathToRemotePath.cs b/csharp/lib/SysTools/Edges/SysPathToRemotePath.cs index aebf6eade..410f6bb7e 100644 --- a/csharp/lib/SysTools/Edges/SysPathToRemotePath.cs +++ b/csharp/lib/SysTools/Edges/SysPathToRemotePath.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Remote; -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SysPathToRemotePath { diff --git a/csharp/lib/SysTools/Edges/SysPathToSysCommand.cs b/csharp/lib/SysTools/Edges/SysPathToSysCommand.cs index 647778e9d..9f27e68ff 100644 --- a/csharp/lib/SysTools/Edges/SysPathToSysCommand.cs +++ b/csharp/lib/SysTools/Edges/SysPathToSysCommand.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Edges; +namespace InnovEnergy.Lib.SysTools.Edges; public static class SysPathToSysCommand { diff --git a/csharp/lib/SysTools/FileIo.cs b/csharp/lib/SysTools/FileIo.cs index 1df5a0adf..7328bd324 100644 --- a/csharp/lib/SysTools/FileIo.cs +++ b/csharp/lib/SysTools/FileIo.cs @@ -1,7 +1,7 @@ using System.Text; -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Utils; -namespace InnovEnergy.SysTools; +namespace InnovEnergy.Lib.SysTools; public static class FileIo { diff --git a/csharp/lib/SysTools/Process/AsyncProcess.cs b/csharp/lib/SysTools/Process/AsyncProcess.cs index c8c0f3262..3fb9e967f 100644 --- a/csharp/lib/SysTools/Process/AsyncProcess.cs +++ b/csharp/lib/SysTools/Process/AsyncProcess.cs @@ -2,10 +2,10 @@ using System.Diagnostics; using System.Reactive.Concurrency; using System.Reactive.Linq; using System.Reactive.Subjects; -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Utils; using static System.ConsoleColor; -namespace InnovEnergy.SysTools.Process; +namespace InnovEnergy.Lib.SysTools.Process; using Env = Dictionary; diff --git a/csharp/lib/SysTools/Process/ProcessResult.cs b/csharp/lib/SysTools/Process/ProcessResult.cs index bf9f3a52a..162a2280d 100644 --- a/csharp/lib/SysTools/Process/ProcessResult.cs +++ b/csharp/lib/SysTools/Process/ProcessResult.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Utils; -namespace InnovEnergy.SysTools.Process; +namespace InnovEnergy.Lib.SysTools.Process; public readonly struct ProcessResult { diff --git a/csharp/lib/SysTools/Process/SyncProcess.cs b/csharp/lib/SysTools/Process/SyncProcess.cs index 89b23073e..36caedf3a 100644 --- a/csharp/lib/SysTools/Process/SyncProcess.cs +++ b/csharp/lib/SysTools/Process/SyncProcess.cs @@ -1,9 +1,9 @@ using System.Diagnostics; using System.Text.RegularExpressions; -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Utils; using static System.ConsoleColor; -namespace InnovEnergy.SysTools.Process; +namespace InnovEnergy.Lib.SysTools.Process; using Env = Dictionary; diff --git a/csharp/lib/SysTools/Remote/RemoteCommand.cs b/csharp/lib/SysTools/Remote/RemoteCommand.cs index 75d1febf5..69e59d571 100644 --- a/csharp/lib/SysTools/Remote/RemoteCommand.cs +++ b/csharp/lib/SysTools/Remote/RemoteCommand.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Utils; -namespace InnovEnergy.SysTools.Remote; +namespace InnovEnergy.Lib.SysTools.Remote; public readonly struct RemoteCommand { diff --git a/csharp/lib/SysTools/Remote/RemoteFileIo.cs b/csharp/lib/SysTools/Remote/RemoteFileIo.cs index 1ecdf6868..1444b5539 100644 --- a/csharp/lib/SysTools/Remote/RemoteFileIo.cs +++ b/csharp/lib/SysTools/Remote/RemoteFileIo.cs @@ -1,7 +1,7 @@ -using InnovEnergy.SysTools.Edges; -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Edges; +using InnovEnergy.Lib.SysTools.Utils; -namespace InnovEnergy.SysTools.Remote; +namespace InnovEnergy.Lib.SysTools.Remote; public static class RemoteFileIo { diff --git a/csharp/lib/SysTools/Remote/RemotePath.cs b/csharp/lib/SysTools/Remote/RemotePath.cs index e8a048bdd..97b21da39 100644 --- a/csharp/lib/SysTools/Remote/RemotePath.cs +++ b/csharp/lib/SysTools/Remote/RemotePath.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Remote; +namespace InnovEnergy.Lib.SysTools.Remote; public readonly struct RemotePath { diff --git a/csharp/lib/SysTools/Remote/SshHost.cs b/csharp/lib/SysTools/Remote/SshHost.cs index 7f7187302..5afade016 100644 --- a/csharp/lib/SysTools/Remote/SshHost.cs +++ b/csharp/lib/SysTools/Remote/SshHost.cs @@ -1,7 +1,7 @@ -using InnovEnergy.SysTools.Edges; -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Edges; +using InnovEnergy.Lib.SysTools.Utils; -namespace InnovEnergy.SysTools.Remote; +namespace InnovEnergy.Lib.SysTools.Remote; public readonly struct SshHost { diff --git a/csharp/lib/SysTools/SysCommand.cs b/csharp/lib/SysTools/SysCommand.cs index da3826e83..9d264c27d 100644 --- a/csharp/lib/SysTools/SysCommand.cs +++ b/csharp/lib/SysTools/SysCommand.cs @@ -1,6 +1,6 @@ -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Utils; -namespace InnovEnergy.SysTools; +namespace InnovEnergy.Lib.SysTools; public readonly struct SysCommand { diff --git a/csharp/lib/SysTools/SysDirs.cs b/csharp/lib/SysTools/SysDirs.cs index afec2e014..5c3c5bc68 100644 --- a/csharp/lib/SysTools/SysDirs.cs +++ b/csharp/lib/SysTools/SysDirs.cs @@ -1,7 +1,7 @@ using static System.Environment; using static System.Environment.SpecialFolder; -namespace InnovEnergy.SysTools; +namespace InnovEnergy.Lib.SysTools; public static class SysDirs { diff --git a/csharp/lib/SysTools/SysPath.cs b/csharp/lib/SysTools/SysPath.cs index 42bd090e0..383460ab8 100644 --- a/csharp/lib/SysTools/SysPath.cs +++ b/csharp/lib/SysTools/SysPath.cs @@ -1,9 +1,9 @@ using System.Text; -using InnovEnergy.SysTools.Remote; -using InnovEnergy.SysTools.Utils; +using InnovEnergy.Lib.SysTools.Remote; +using InnovEnergy.Lib.SysTools.Utils; using static System.IO.Path; -namespace InnovEnergy.SysTools; +namespace InnovEnergy.Lib.SysTools; public readonly struct SysPath { diff --git a/csharp/lib/SysTools/SysTools.csproj b/csharp/lib/SysTools/SysTools.csproj index 506350df6..aa11972a1 100644 --- a/csharp/lib/SysTools/SysTools.csproj +++ b/csharp/lib/SysTools/SysTools.csproj @@ -1,18 +1,6 @@ - - Library - - - - full - - - - InnovEnergy.SysTools - - diff --git a/csharp/lib/SysTools/Utils/ConsoleUtils.cs b/csharp/lib/SysTools/Utils/ConsoleUtils.cs index f1d418b3b..5c58ef3b4 100644 --- a/csharp/lib/SysTools/Utils/ConsoleUtils.cs +++ b/csharp/lib/SysTools/Utils/ConsoleUtils.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Utils; +namespace InnovEnergy.Lib.SysTools.Utils; internal static class ConsoleUtils { diff --git a/csharp/lib/SysTools/Utils/EnumerableUtils.cs b/csharp/lib/SysTools/Utils/EnumerableUtils.cs index e0e6338dc..16d6c8671 100644 --- a/csharp/lib/SysTools/Utils/EnumerableUtils.cs +++ b/csharp/lib/SysTools/Utils/EnumerableUtils.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Utils; +namespace InnovEnergy.Lib.SysTools.Utils; internal static class EnumerableUtils { diff --git a/csharp/lib/SysTools/Utils/StringUtils.cs b/csharp/lib/SysTools/Utils/StringUtils.cs index c67f724c7..c6a6ef12c 100644 --- a/csharp/lib/SysTools/Utils/StringUtils.cs +++ b/csharp/lib/SysTools/Utils/StringUtils.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Utils; +namespace InnovEnergy.Lib.SysTools.Utils; internal static class StringUtils { diff --git a/csharp/lib/SysTools/Utils/Utils.cs b/csharp/lib/SysTools/Utils/Utils.cs index 6129cc8df..73e37198e 100644 --- a/csharp/lib/SysTools/Utils/Utils.cs +++ b/csharp/lib/SysTools/Utils/Utils.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.SysTools.Utils; +namespace InnovEnergy.Lib.SysTools.Utils; public static class Utils { diff --git a/csharp/lib/Time/Time.csproj b/csharp/lib/Time/Time.csproj index 5b0b36b7e..a2a63460f 100644 --- a/csharp/lib/Time/Time.csproj +++ b/csharp/lib/Time/Time.csproj @@ -1,9 +1,3 @@ - - - Library - InnovEnergy.Time - - diff --git a/csharp/lib/Time/Unix/UnixTime.Compare.cs b/csharp/lib/Time/Unix/UnixTime.Compare.cs index ca91d5ce2..044ef1a32 100644 --- a/csharp/lib/Time/Unix/UnixTime.Compare.cs +++ b/csharp/lib/Time/Unix/UnixTime.Compare.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTime : IComparable, IEquatable { diff --git a/csharp/lib/Time/Unix/UnixTime.Constructors.cs b/csharp/lib/Time/Unix/UnixTime.Constructors.cs index ba26db8f3..5d963e488 100644 --- a/csharp/lib/Time/Unix/UnixTime.Constructors.cs +++ b/csharp/lib/Time/Unix/UnixTime.Constructors.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTime { diff --git a/csharp/lib/Time/Unix/UnixTime.Converters.cs b/csharp/lib/Time/Unix/UnixTime.Converters.cs index d8495f092..0d5d17aeb 100644 --- a/csharp/lib/Time/Unix/UnixTime.Converters.cs +++ b/csharp/lib/Time/Unix/UnixTime.Converters.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTime { diff --git a/csharp/lib/Time/Unix/UnixTime.Operators.cs b/csharp/lib/Time/Unix/UnixTime.Operators.cs index 850ccbfe3..7aeb71b69 100644 --- a/csharp/lib/Time/Unix/UnixTime.Operators.cs +++ b/csharp/lib/Time/Unix/UnixTime.Operators.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTime { diff --git a/csharp/lib/Time/Unix/UnixTime.Overrides.cs b/csharp/lib/Time/Unix/UnixTime.Overrides.cs index 66621de8e..c2ba77a5e 100644 --- a/csharp/lib/Time/Unix/UnixTime.Overrides.cs +++ b/csharp/lib/Time/Unix/UnixTime.Overrides.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTime { diff --git a/csharp/lib/Time/Unix/UnixTime.cs b/csharp/lib/Time/Unix/UnixTime.cs index b441c0c5f..f771fd01d 100644 --- a/csharp/lib/Time/Unix/UnixTime.cs +++ b/csharp/lib/Time/Unix/UnixTime.cs @@ -2,7 +2,7 @@ // ReSharper disable ArrangeStaticMemberQualifier -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTime { diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs b/csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs index aac266c70..72f59f82e 100644 --- a/csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs +++ b/csharp/lib/Time/Unix/UnixTimeDelta.Compare.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTimeSpan : IComparable, IEquatable { diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Constructors.cs b/csharp/lib/Time/Unix/UnixTimeDelta.Constructors.cs index 7811fb4d6..c1fa4f877 100644 --- a/csharp/lib/Time/Unix/UnixTimeDelta.Constructors.cs +++ b/csharp/lib/Time/Unix/UnixTimeDelta.Constructors.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTimeSpan { diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Operators.cs b/csharp/lib/Time/Unix/UnixTimeDelta.Operators.cs index d373ccde1..dc2805e2d 100644 --- a/csharp/lib/Time/Unix/UnixTimeDelta.Operators.cs +++ b/csharp/lib/Time/Unix/UnixTimeDelta.Operators.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTimeSpan { diff --git a/csharp/lib/Time/Unix/UnixTimeDelta.Overrides.cs b/csharp/lib/Time/Unix/UnixTimeDelta.Overrides.cs index 0c000fab9..9552fbbe3 100644 --- a/csharp/lib/Time/Unix/UnixTimeDelta.Overrides.cs +++ b/csharp/lib/Time/Unix/UnixTimeDelta.Overrides.cs @@ -1,6 +1,6 @@ using System.Text; -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTimeSpan { diff --git a/csharp/lib/Time/Unix/UnixTimeDeltaExtensions.cs b/csharp/lib/Time/Unix/UnixTimeDeltaExtensions.cs index c51928b98..fd98e3487 100644 --- a/csharp/lib/Time/Unix/UnixTimeDeltaExtensions.cs +++ b/csharp/lib/Time/Unix/UnixTimeDeltaExtensions.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public static class UnixTimeDeltaExtensions { diff --git a/csharp/lib/Time/Unix/UnixTimeSpan.cs b/csharp/lib/Time/Unix/UnixTimeSpan.cs index cb54ae279..d525deaba 100644 --- a/csharp/lib/Time/Unix/UnixTimeSpan.cs +++ b/csharp/lib/Time/Unix/UnixTimeSpan.cs @@ -1,4 +1,4 @@ -namespace InnovEnergy.Time.Unix; +namespace InnovEnergy.Lib.Time.Unix; public readonly partial struct UnixTimeSpan { diff --git a/csharp/lib/Utils/Utils.csproj b/csharp/lib/Utils/Utils.csproj index 0ddcddea5..222f85663 100644 --- a/csharp/lib/Utils/Utils.csproj +++ b/csharp/lib/Utils/Utils.csproj @@ -2,7 +2,7 @@ - InnovEnergy.Lib.Utils + diff --git a/csharp/lib/Victron/VeDBus/VeDBus.csproj b/csharp/lib/Victron/VeDBus/VeDBus.csproj index 939a409a2..5f986d84c 100644 --- a/csharp/lib/Victron/VeDBus/VeDBus.csproj +++ b/csharp/lib/Victron/VeDBus/VeDBus.csproj @@ -3,7 +3,7 @@ - InnovEnergy.Lib.Victron.VeDBus + latest diff --git a/csharp/lib/Victron/VictronVRM/Installation.cs b/csharp/lib/Victron/VictronVRM/Installation.cs index ba479b0f6..aa233e275 100644 --- a/csharp/lib/Victron/VictronVRM/Installation.cs +++ b/csharp/lib/Victron/VictronVRM/Installation.cs @@ -1,6 +1,6 @@ using System.Text.Json.Nodes; +using InnovEnergy.Lib.Time.Unix; using InnovEnergy.Lib.Utils; -using InnovEnergy.Time.Unix; // ReSharper disable StringLiteralTypo diff --git a/csharp/lib/Victron/VictronVRM/VictronVRM.csproj b/csharp/lib/Victron/VictronVRM/VictronVRM.csproj index d8fe8e6dd..4370080ea 100644 --- a/csharp/lib/Victron/VictronVRM/VictronVRM.csproj +++ b/csharp/lib/Victron/VictronVRM/VictronVRM.csproj @@ -7,7 +7,7 @@ - InnovEnergy.Lib.Victron.VictronVRM + latest diff --git a/csharp/lib/WebServer/WebServer.csproj b/csharp/lib/WebServer/WebServer.csproj index e879bb272..8063be2ce 100644 --- a/csharp/lib/WebServer/WebServer.csproj +++ b/csharp/lib/WebServer/WebServer.csproj @@ -3,7 +3,7 @@ - InnovEnergy.Lib.WebServer +