From 9cf792c3971e33ba9e993a6dab11ff35167571bf Mon Sep 17 00:00:00 2001 From: Roland Drabesch Date: Wed, 2 Aug 2023 12:38:58 +0200 Subject: [PATCH] logtime no commit --- Common/.vs/config/applicationhost.config | 2 +- .../CommonCore.Configuration.csproj | 8 +- .../CommonCore.Configuration/packages.config | 3 +- Common/CommonCore/CommonCore.csproj | 10 +- .../ThreadWatcher/ThreadWatcher.csproj | 9 +- .../CommonCore/ThreadWatcher/packages.config | 3 +- Common/CommonCore/packages.config | 3 +- .../CordonelAssemblyLine.csproj | 9 +- .../Model/LeakViewModel.cs | 2 +- .../Model/MarriageViewModel.cs | 2 +- .../Model/PickingModel.cs | 95 +++--- Common/CordonelAssemblyLine/packages.config | 3 +- .../CordonelPreadjustmentUi.csproj | 9 +- .../Parameters/FlushParams.cs | 12 + .../CordonelPreadjustmentUi/packages.config | 3 +- Common/Cryptology/Security/Cryptology.csproj | 9 +- Common/Cryptology/Security/packages.config | 3 +- .../Interfaces/Ports/PortCore/PortCore.csproj | 9 +- .../Interfaces/Ports/PortCore/packages.config | 3 +- .../Ports/SerialPorts/SerialPorts.csproj | 10 +- .../Ports/SerialPorts/packages.config | 4 +- .../ProtocolCore/ProtocolCore.csproj | 8 + .../Protocols/ProtocolCore/packages.config | 4 +- .../TransmitProtocol/TransmitProtocol.csproj | 10 +- .../TransmitProtocol/packages.config | 4 +- .../TestbenchAdapter/TestbenchAdapter.csproj | 6 +- .../Siemens/Client/UALibray/UALibrary.csproj | 5 +- .../Siemens/Client/UALibray/packages.config | 2 +- .../PLC/Siemens/Stack/Core/PlcCore.csproj | 4 +- .../PLC/Siemens/Stack/Core/packages.config | 2 +- .../Genesis/Applications/Applications.csproj | 9 +- .../Genesis/Applications/packages.config | 3 +- .../Genesis/DataPackages/DataPackages.csproj | 10 +- .../Genesis/DataPackages/packages.config | 4 +- .../GenesisConfig/GenesisConfig.csproj | 11 +- .../Genesis/GenesisConfig/packages.config | 3 +- .../Genesis/GenesisCore/GenesisCore.csproj | 10 +- .../Genesis/GenesisCore/GenesisMeter.cs | 2 +- .../Genesis/GenesisCore/packages.config | 4 +- .../Genesis/GenesisFile/GenesisFile.csproj | 8 +- .../Genesis/GenesisFile/packages.config | 4 +- .../Genesis/GenesisPwd/GenesisPwd.csproj | 14 +- .../Genesis/GenesisPwd/packages.config | 3 +- .../GenesisStatus/GenesisStatus.csproj | 9 +- .../Genesis/GenesisStatus/packages.config | 3 +- .../RequestProtocol/RequestProtocol.csproj | 10 +- .../Protocols/RequestProtocol/packages.config | 4 +- .../StreamingProtocol.csproj | 10 +- .../StreamingProtocol/packages.config | 4 +- .../Genesis/Registers/Registers.csproj | 11 +- .../Genesis/Registers/packages.config | 4 +- .../MagFlux/DataPackages/DataPackages.csproj | 10 +- .../MagFlux/DataPackages/packages.config | 4 +- .../MagFluxConfig/MagFluxConfig.csproj | 9 +- .../MagFlux/MagFluxConfig/packages.config | 3 +- .../MagFlux/MagFluxCore/MagFluxCore.csproj | 8 +- .../MagFlux/MagFluxCore/packages.config | 4 +- .../RequestProtocol/RequestProtocol.csproj | 4 +- .../Protocols/RequestProtocol/packages.config | 2 +- .../StreamingProtocol.csproj | 8 + .../WaterMeterCore/WaterMeterCore.csproj | 10 +- .../WaterMeterRegisters.csproj | 11 +- ...erRegisters.csproj.CoreCompileInputs.cache | 2 +- .../WaterMeterRegisters/packages.config | 3 +- .../WaterMeter/WaterMeterCore/packages.config | 4 +- .../Logic.ProductionToProductMapper.csproj | 9 +- .../packages.config | 3 +- .../ProductionOrderCore.csproj | 8 +- .../Logic/ProductionOrderCore/packages.config | 3 +- Common/Logic/RelatePcb/RelatePcb.csproj | 8 +- Common/Logic/ServiceCore/ServiceCore.csproj | 7 + .../Measurements.UnitTests/App.config | 2 +- .../Measurements.UnitTests.csproj | 10 +- .../Measurements.UnitTests/packages.config | 3 +- .../Measurements/Measurements.csproj | 6 +- Common/Metrology/Measurements/packages.config | 2 +- .../Actions/ProductionProcessConnect.cs | 1 + .../Actions/ProductionProcessPasswordFile.cs | 4 +- .../ProductionUiCordonel.csproj | 10 +- Common/ProductionUiCordonel/packages.config | 3 +- .../Controllers/EasyAccessControler.cs | 4 +- .../Controllers/PasswordController.cs | 2 +- .../MeterProcessState.csproj | 8 +- Common/Service/MeterProcessState/Web.config | 4 +- .../Service/MeterProcessState/packages.config | 4 +- Common/Service/ProductionService/App.config | 8 +- .../ProductionService.csproj | 4 + .../Service/ProductionService/packages.config | 1 + .../SoftwareAccessHelper.csproj | 9 +- Common/SoftwareAccessHelper/packages.config | 3 +- Common/TempFlansh/TempFlansh.csproj | 9 +- Common/TempFlansh/packages.config | 3 +- .../Tools.JsonToXlsHelper.csproj | 10 +- ...ToXlsHelper.csproj.CoreCompileInputs.cache | 2 +- .../Tools.JsonToXlsHelper/packages.config | 3 +- .../Ui.ProductionControls.csproj | 5 + .../DynamicStremingLogAnalyzer.csproj | 6 + Common/Ui/GenesisToolBox/FrmFwUpdate.cs | 52 ++++ .../FrmLowLevelTools.Designer.cs | 56 +++- Common/Ui/GenesisToolBox/FrmLowLevelTools.cs | 162 ++++++++++ .../Ui/GenesisToolBox/GenesisToolBox.csproj | 2 +- .../frmRegisterStore.Designer.cs | 78 +---- Common/Ui/GenesisToolBox/frmRegisterStore.cs | 289 ++++-------------- Common/Ui/GenesisToolBox/packages.config | 2 +- Common/Ui/IrdaDemo/IrdaDemo.csproj | 9 +- .../IrdaFunctionalTestApp.csproj | 7 +- .../LegacyGenesisControl/LegacyGenCtl.csproj | 10 +- .../Ui/LegacyGenesisControl/packages.config | 3 +- .../Ui/MagFluxToolBox/MagFluxToolBox.csproj | 8 +- Common/Ui/MagFluxToolBox/packages.config | 4 +- Common/Ui/RawDataViewer/RawDataViewer.csproj | 5 + Common/Ui/RawDataViewer/packages.config | 1 + Common/Ui/RfidFunctionalTestApp/App.config | 4 + .../RfidFuctionalTestApp.csproj | 6 +- .../Ui/RfidFunctionalTestApp/packages.config | 2 +- .../ByteArrayStyle/ByteArrayStyle.csproj | 9 +- Common/Utils/ByteArrayStyle/packages.config | 3 +- Common/Utils/Crc16Ccitt/Crc16Ccitt.csproj | 10 +- Common/Utils/Crc16Ccitt/packages.config | 4 +- Common/Utils/Logging/Logging.csproj | 9 +- Common/Utils/Logging/NLogHelper.cs | 2 +- Common/Utils/Logging/packages.config | 4 +- Common/Utils/ProcessExec/ProcessExec.csproj | 8 +- Common/Utils/ProcessExec/packages.config | 3 +- .../FwUpdateConfig/FwUpdateConfig.csproj | 8 +- .../Common/FwUpdateConfig/packages.config | 3 +- .../Common/FwUpdateDb/FwUpdateDb.csproj | 9 +- .../Common/FwUpdateDb/packages.config | 3 +- .../Common/FwUpdateSafe/FwUpdateSafe.csproj | 10 +- .../Common/FwUpdateSafe/packages.config | 3 +- 130 files changed, 845 insertions(+), 585 deletions(-) diff --git a/Common/.vs/config/applicationhost.config b/Common/.vs/config/applicationhost.config index 12afd122..40cde372 100644 --- a/Common/.vs/config/applicationhost.config +++ b/Common/.vs/config/applicationhost.config @@ -155,7 +155,7 @@ - + diff --git a/Common/CommonCore.Configuration/CommonCore.Configuration.csproj b/Common/CommonCore.Configuration/CommonCore.Configuration.csproj index 8060f871..64dbb459 100644 --- a/Common/CommonCore.Configuration/CommonCore.Configuration.csproj +++ b/Common/CommonCore.Configuration/CommonCore.Configuration.csproj @@ -76,12 +76,16 @@ MinimumRecommendedRules.ruleset - - ..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.5.2.2\lib\net35\NLog.dll + diff --git a/Common/CommonCore.Configuration/packages.config b/Common/CommonCore.Configuration/packages.config index 0fa4e015..bf477414 100644 --- a/Common/CommonCore.Configuration/packages.config +++ b/Common/CommonCore.Configuration/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/CommonCore/CommonCore.csproj b/Common/CommonCore/CommonCore.csproj index 9952408f..acb7b6b5 100644 --- a/Common/CommonCore/CommonCore.csproj +++ b/Common/CommonCore/CommonCore.csproj @@ -91,9 +91,15 @@ - - ..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\NLog.5.2.2\lib\net35\NLog.dll + + + + diff --git a/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj b/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj index e1ae540d..2f1f9bed 100644 --- a/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj +++ b/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj @@ -61,11 +61,16 @@ MinimumRecommendedRules.ruleset - - ..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/CommonCore/ThreadWatcher/packages.config b/Common/CommonCore/ThreadWatcher/packages.config index 0fa4e015..bf477414 100644 --- a/Common/CommonCore/ThreadWatcher/packages.config +++ b/Common/CommonCore/ThreadWatcher/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/CommonCore/packages.config b/Common/CommonCore/packages.config index 0fa4e015..bf477414 100644 --- a/Common/CommonCore/packages.config +++ b/Common/CommonCore/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj index ca9e7a83..fad8a794 100644 --- a/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj +++ b/Common/CordonelAssemblyLine/CordonelAssemblyLine.csproj @@ -71,13 +71,16 @@ true - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NLog.5.2.2\lib\net46\NLog.dll - + diff --git a/Common/CordonelAssemblyLine/Model/LeakViewModel.cs b/Common/CordonelAssemblyLine/Model/LeakViewModel.cs index bd92c5fa..b75575eb 100644 --- a/Common/CordonelAssemblyLine/Model/LeakViewModel.cs +++ b/Common/CordonelAssemblyLine/Model/LeakViewModel.cs @@ -119,7 +119,7 @@ namespace CordonelAssemblyLine.Model public LeakViewModel(Int32 slotNR, Int32? stationID = null) { - _logger = NLogHelper.CreateOrGetLogger("ProductionUI"); + //_logger = NLogHelper.CreateOrGetLogger("ProductionUI"); StationID = stationID; SlotNr = slotNR; tmrAutoDetect = new Timer(intervalWithoutDetect); diff --git a/Common/CordonelAssemblyLine/Model/MarriageViewModel.cs b/Common/CordonelAssemblyLine/Model/MarriageViewModel.cs index f4b2f59d..ecfc557b 100644 --- a/Common/CordonelAssemblyLine/Model/MarriageViewModel.cs +++ b/Common/CordonelAssemblyLine/Model/MarriageViewModel.cs @@ -27,7 +27,7 @@ namespace CordonelAssemblyLine.Model public event EventHandler OnMsgRaise; public MarriageViewModel(String scannerPort, Int32 slotNr) { - _logger = NLogHelper.CreateOrGetLogger("ProductionUI"); + //_logger = NLogHelper.CreateOrGetLogger("ProductionUI"); _scannerPort = scannerPort; _slotNr = slotNr; } diff --git a/Common/CordonelAssemblyLine/Model/PickingModel.cs b/Common/CordonelAssemblyLine/Model/PickingModel.cs index 17558ea9..15cc7199 100644 --- a/Common/CordonelAssemblyLine/Model/PickingModel.cs +++ b/Common/CordonelAssemblyLine/Model/PickingModel.cs @@ -11,7 +11,6 @@ using System.Threading; using System.Threading.Tasks; using Xylem.Common.CommonCore.Configuration; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore; -using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore.Consts; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile; using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisStatus; using Xylem.Common.Hardware.WaterMeter.Genesis.Registers; @@ -628,77 +627,71 @@ namespace CordonelAssemblyLine.Model lblS08Color = _progressDone; lblS10Color = _progressCurrent; - if (_orderDetails.MeterSize <= 1) + + StringBuilder sbUrl = new StringBuilder(); + sbUrl.Append("http://10.49.40.25/MeterProcessState/api/FileUpToDate/GetLutFiles"); + sbUrl.Append($"?Metersize={_orderDetails.MeterSize}"); + sbUrl.Append("&ForProd=true"); + //?Metersize=2&Region=EMEA& + if (_orderDetails.FrequencyIndicator != 0) { - lblS10Color = _progressDone; - lblS10Text = "Keine LUT für DN40/50"; + //get ema + sbUrl.Append("&Region=EMEA"); } else { - StringBuilder sbUrl = new StringBuilder(); - sbUrl.Append("http://10.49.40.25/MeterProcessState/api/FileUpToDate/GetLutFiles"); - sbUrl.Append($"?Metersize={_orderDetails.MeterSize}"); - sbUrl.Append("&ForProd=true"); - //?Metersize=2&Region=EMEA& - if (_orderDetails.FrequencyIndicator != 0) - { - //get ema - sbUrl.Append("&Region=EMEA"); - } - else - { - //get na - sbUrl.Append("&Region=NA"); - } + //get na + sbUrl.Append("&Region=NA"); + } - try - { - var retLut = LocalWebRequest.GetRequest(sbUrl.ToString(), 80000); - var a = JsonConvert.DeserializeObject>(retLut); + try + { + var retLut = LocalWebRequest.GetRequest(sbUrl.ToString(), 80000); + var a = JsonConvert.DeserializeObject>(retLut); - if (a.Count == 1) + if (a.Count == 1) + { + SetState($"Vergleich abgeschlossen:{State}"); + var lut = a.First(); + lblS10Text = $"Update {lut.FileCrc:0x8}"; + + var meterLutUpdate = new MeterLutUpdate(meter); + var loadResult = meterLutUpdate.LoadLutFromStream(lut.FileName, lut.FileContent.ToList()); + var updateResult = meterLutUpdate.UpdateMeterLut(); + if (loadResult && updateResult) { - SetState($"Vergleich abgeschlossen:{State}"); - var lut = a.First(); - lblS10Text = $"Update {lut.FileCrc:0x8}"; - - var meterLutUpdate = new MeterLutUpdate(meter); - var loadResult = meterLutUpdate.LoadLutFromStream(lut.FileName, lut.FileContent.ToList()); - var updateResult = meterLutUpdate.UpdateMeterLut(); - if (loadResult && updateResult) - { - lblS10Text = $"{lut.FileName} in meter"; - lblS10Color = _progressDone; - } - else - { - Result = "Fehler beim Update"; - SetState(Result); - lblS10Text = Result; - lblS10Color = _progressError; - - ret = false; - } + lblS10Text = $"{lut.FileName} in meter"; + lblS10Color = _progressDone; } else { - Result = "Keine eindeutige LUT gefunden"; + Result = "Fehler beim Update"; SetState(Result); - lblS10Color = _progressError; lblS10Text = Result; + lblS10Color = _progressError; + ret = false; } - } - catch (Exception) + else { - Result = "Fehler beim LUT Update"; + Result = "Keine eindeutige LUT gefunden"; SetState(Result); lblS10Color = _progressError; lblS10Text = Result; - return false; + ret = false; } + } + catch (Exception) + { + Result = "Fehler beim LUT Update"; + SetState(Result); + lblS10Color = _progressError; + lblS10Text = Result; + return false; + } + } } else diff --git a/Common/CordonelAssemblyLine/packages.config b/Common/CordonelAssemblyLine/packages.config index 43cb3fa8..b6395ab2 100644 --- a/Common/CordonelAssemblyLine/packages.config +++ b/Common/CordonelAssemblyLine/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj index a916389b..754d89e9 100644 --- a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj +++ b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj @@ -105,8 +105,11 @@ - - ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.5.2.2\lib\net35\NLog.dll ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll @@ -115,12 +118,14 @@ ..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll + ..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Net.Http.dll + diff --git a/Common/CordonelPreadjustmentUi/Parameters/FlushParams.cs b/Common/CordonelPreadjustmentUi/Parameters/FlushParams.cs index 3cf093fd..61fc2e2f 100644 --- a/Common/CordonelPreadjustmentUi/Parameters/FlushParams.cs +++ b/Common/CordonelPreadjustmentUi/Parameters/FlushParams.cs @@ -28,6 +28,18 @@ namespace Xylem.Common.Ui.CordonelPreadjustmentUi.Parameters FlowrateQmH = 100; DurationS = 120; break; + case MeterSize.DN100: + FlowrateQmH = 140; + DurationS = 120; + break; + case MeterSize.DN125: + FlowrateQmH = 140; + DurationS = 120; + break; + case MeterSize.DN150: + FlowrateQmH = 200; + DurationS = 120; + break; default: Message = $"Warning no parameter for meter size {meterSize.GetHashCode()} use default!{Environment.NewLine}"; FlowrateQmH = 40; diff --git a/Common/CordonelPreadjustmentUi/packages.config b/Common/CordonelPreadjustmentUi/packages.config index 0406b056..776b23da 100644 --- a/Common/CordonelPreadjustmentUi/packages.config +++ b/Common/CordonelPreadjustmentUi/packages.config @@ -1,5 +1,6 @@  - + + \ No newline at end of file diff --git a/Common/Cryptology/Security/Cryptology.csproj b/Common/Cryptology/Security/Cryptology.csproj index 5a1cd25d..af3c4d29 100644 --- a/Common/Cryptology/Security/Cryptology.csproj +++ b/Common/Cryptology/Security/Cryptology.csproj @@ -57,12 +57,17 @@ ..\..\packages\BouncyCastle.Crypto.dll.1.8.1\lib\BouncyCastle.Crypto.dll - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\..\packages\NLog.5.2.2\lib\net46\NLog.dll + + diff --git a/Common/Cryptology/Security/packages.config b/Common/Cryptology/Security/packages.config index a74693fa..fec7de64 100644 --- a/Common/Cryptology/Security/packages.config +++ b/Common/Cryptology/Security/packages.config @@ -1,5 +1,6 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj b/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj index 51d117a6..b4a3fad9 100644 --- a/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj +++ b/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj @@ -107,10 +107,15 @@ - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/Interfaces/Ports/PortCore/packages.config b/Common/Hardware/Interfaces/Ports/PortCore/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Hardware/Interfaces/Ports/PortCore/packages.config +++ b/Common/Hardware/Interfaces/Ports/PortCore/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj b/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj index 1b47c37a..7bab72ca 100644 --- a/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj +++ b/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj @@ -215,14 +215,16 @@ - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config b/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config +++ b/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/Interfaces/Protocols/ProtocolCore/ProtocolCore.csproj b/Common/Hardware/Interfaces/Protocols/ProtocolCore/ProtocolCore.csproj index 0bf4a8db..f530dd73 100644 --- a/Common/Hardware/Interfaces/Protocols/ProtocolCore/ProtocolCore.csproj +++ b/Common/Hardware/Interfaces/Protocols/ProtocolCore/ProtocolCore.csproj @@ -174,8 +174,16 @@ MinimumRecommendedRules.ruleset + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + + diff --git a/Common/Hardware/Interfaces/Protocols/ProtocolCore/packages.config b/Common/Hardware/Interfaces/Protocols/ProtocolCore/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/Interfaces/Protocols/ProtocolCore/packages.config +++ b/Common/Hardware/Interfaces/Protocols/ProtocolCore/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/TransmitProtocol.csproj b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/TransmitProtocol.csproj index 54f6c9ac..7d23fd38 100644 --- a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/TransmitProtocol.csproj +++ b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/TransmitProtocol.csproj @@ -97,14 +97,16 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config +++ b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/TestbenchAdapter.csproj b/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/TestbenchAdapter.csproj index f53dd818..86c3d493 100644 --- a/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/TestbenchAdapter.csproj +++ b/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/TestbenchAdapter.csproj @@ -93,11 +93,11 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\..\packages\NLog.4.5.6\lib\net45\NLog.dll - True + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net45\NLog.dll + diff --git a/Common/Hardware/PLC/Siemens/Client/UALibray/UALibrary.csproj b/Common/Hardware/PLC/Siemens/Client/UALibray/UALibrary.csproj index d8ef4b89..03d39308 100644 --- a/Common/Hardware/PLC/Siemens/Client/UALibray/UALibrary.csproj +++ b/Common/Hardware/PLC/Siemens/Client/UALibray/UALibrary.csproj @@ -132,10 +132,11 @@ prompt - - ..\..\..\..\..\packages\NLog.4.6.7\lib\net45\NLog.dll + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net45\NLog.dll + 3.5 diff --git a/Common/Hardware/PLC/Siemens/Client/UALibray/packages.config b/Common/Hardware/PLC/Siemens/Client/UALibray/packages.config index 8220f69e..497d2d63 100644 --- a/Common/Hardware/PLC/Siemens/Client/UALibray/packages.config +++ b/Common/Hardware/PLC/Siemens/Client/UALibray/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Common/Hardware/PLC/Siemens/Stack/Core/PlcCore.csproj b/Common/Hardware/PLC/Siemens/Stack/Core/PlcCore.csproj index cfbb2398..4aa7ea04 100644 --- a/Common/Hardware/PLC/Siemens/Stack/Core/PlcCore.csproj +++ b/Common/Hardware/PLC/Siemens/Stack/Core/PlcCore.csproj @@ -136,8 +136,8 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\..\packages\NLog.4.6.7\lib\net45\NLog.dll + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net45\NLog.dll diff --git a/Common/Hardware/PLC/Siemens/Stack/Core/packages.config b/Common/Hardware/PLC/Siemens/Stack/Core/packages.config index 8220f69e..497d2d63 100644 --- a/Common/Hardware/PLC/Siemens/Stack/Core/packages.config +++ b/Common/Hardware/PLC/Siemens/Stack/Core/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/Applications/Applications.csproj b/Common/Hardware/WaterMeter/Genesis/Applications/Applications.csproj index c2c57832..baeac7f8 100644 --- a/Common/Hardware/WaterMeter/Genesis/Applications/Applications.csproj +++ b/Common/Hardware/WaterMeter/Genesis/Applications/Applications.csproj @@ -60,12 +60,17 @@ bin\x64\_MANUAL_CONTROL\ - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/Applications/packages.config b/Common/Hardware/WaterMeter/Genesis/Applications/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/Applications/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/Applications/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/DataPackages/DataPackages.csproj b/Common/Hardware/WaterMeter/Genesis/DataPackages/DataPackages.csproj index e499e78e..9105a180 100644 --- a/Common/Hardware/WaterMeter/Genesis/DataPackages/DataPackages.csproj +++ b/Common/Hardware/WaterMeter/Genesis/DataPackages/DataPackages.csproj @@ -227,13 +227,15 @@ - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config b/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisConfig/GenesisConfig.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisConfig/GenesisConfig.csproj index 59cd0cd7..23d97d2a 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisConfig/GenesisConfig.csproj +++ b/Common/Hardware/WaterMeter/Genesis/GenesisConfig/GenesisConfig.csproj @@ -77,15 +77,16 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.5.6\lib\net40-client\NLog.dll - True + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisConfig/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisConfig/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisConfig/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/GenesisConfig/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisCore.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisCore.csproj index 90ed5e0a..67763bd3 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisCore.csproj +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisCore.csproj @@ -242,14 +242,16 @@ - - ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs index dc49fc0b..56333c63 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs @@ -574,7 +574,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore var tmpUrl = $"http://10.49.40.25/MeterProcessState/api/TestBench/SetMeterLogPathInfo?SerialNumber={SerialNumber}&TestRunId={testRunString}&BasePath={basePath}&MainLogName={pathMain}&LEDName={pathRaw}"; _logger.Debug($"Request Url: { tmpUrl}"); //ToDO: Update to service URl - LocalWebRequest.GetRequest(tmpUrl); + LocalWebRequest.GetRequest(tmpUrl,5000); } } diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisCore/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj index 0cdbacb1..cb76acb2 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj +++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj @@ -79,11 +79,11 @@ - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\..\ServiceFwUpdate\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisPwd/GenesisPwd.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/GenesisPwd.csproj index 271c05e1..f7336319 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisPwd/GenesisPwd.csproj +++ b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/GenesisPwd.csproj @@ -53,10 +53,14 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\Logic.PrdoctionToProductMapper\bin\Debug\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + @@ -69,9 +73,6 @@ - - - {9EB1F659-6F73-4F65-BCAB-4114FD94F5FC} @@ -82,5 +83,8 @@ SoftwareAccessHelper + + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj index 19a59454..6b0acb92 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj +++ b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/GenesisStatus.csproj @@ -31,11 +31,14 @@ 4 - - False - ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/GenesisStatus/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/GenesisStatus/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.csproj b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.csproj index b77487f6..70cc9fc6 100644 --- a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.csproj +++ b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.csproj @@ -256,13 +256,15 @@ - - ..\..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/StreamingProtocol.csproj b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/StreamingProtocol.csproj index fe432b6d..208438c6 100644 --- a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/StreamingProtocol.csproj +++ b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/StreamingProtocol.csproj @@ -238,13 +238,15 @@ - - ..\..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/Genesis/Registers/Registers.csproj b/Common/Hardware/WaterMeter/Genesis/Registers/Registers.csproj index f5448f94..bb6e63f0 100644 --- a/Common/Hardware/WaterMeter/Genesis/Registers/Registers.csproj +++ b/Common/Hardware/WaterMeter/Genesis/Registers/Registers.csproj @@ -77,16 +77,17 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll - True + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/Genesis/Registers/packages.config b/Common/Hardware/WaterMeter/Genesis/Registers/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/Genesis/Registers/packages.config +++ b/Common/Hardware/WaterMeter/Genesis/Registers/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/MagFlux/DataPackages/DataPackages.csproj b/Common/Hardware/WaterMeter/MagFlux/DataPackages/DataPackages.csproj index 74a42b3b..d6cac487 100644 --- a/Common/Hardware/WaterMeter/MagFlux/DataPackages/DataPackages.csproj +++ b/Common/Hardware/WaterMeter/MagFlux/DataPackages/DataPackages.csproj @@ -222,13 +222,15 @@ - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/MagFlux/DataPackages/packages.config b/Common/Hardware/WaterMeter/MagFlux/DataPackages/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/MagFlux/DataPackages/packages.config +++ b/Common/Hardware/WaterMeter/MagFlux/DataPackages/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/MagFluxConfig.csproj b/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/MagFluxConfig.csproj index 74e9c3b6..f51296f0 100644 --- a/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/MagFluxConfig.csproj +++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/MagFluxConfig.csproj @@ -31,11 +31,16 @@ 4 - - ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\..\..\..\packages\NLog.5.2.2\lib\net46\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/packages.config b/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/packages.config index 281c1455..e07979d0 100644 --- a/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/packages.config +++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxConfig/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxCore.csproj b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxCore.csproj index 9a1c258a..5368c7fc 100644 --- a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxCore.csproj +++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxCore.csproj @@ -31,11 +31,11 @@ 4 - - ..\..\..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.6.7\lib\net45\NLog.dll + + ..\..\..\..\packages\NLog.5.2.2\lib\net46\NLog.dll diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/packages.config b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/packages.config index 9aaa89a8..e07979d0 100644 --- a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/packages.config +++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.csproj b/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.csproj index 9ea615bb..28ff6b99 100644 --- a/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.csproj +++ b/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/RequestProtocol.csproj @@ -31,8 +31,8 @@ 4 - - ..\..\..\..\..\packages\NLog.4.6.7\lib\net45\NLog.dll + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net46\NLog.dll diff --git a/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/packages.config b/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/packages.config index edcaaf36..7df2ac52 100644 --- a/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/packages.config +++ b/Common/Hardware/WaterMeter/MagFlux/Protocols/RequestProtocol/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/StreamingProtocol.csproj b/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/StreamingProtocol.csproj index a3ab2460..fd1cdc8e 100644 --- a/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/StreamingProtocol.csproj +++ b/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/StreamingProtocol.csproj @@ -31,8 +31,13 @@ 4 + + ..\..\..\..\..\packages\NLog.5.2.2\lib\net46\NLog.dll + + + @@ -71,5 +76,8 @@ DataPackages + + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj index 2110ca03..fb4040ce 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj @@ -279,13 +279,15 @@ - - ..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll + + ..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj index a9425ac5..1114de8d 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj @@ -77,16 +77,17 @@ MinimumRecommendedRules.ruleset - - ..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll - - ..\..\..\..\packages\NLog.4.5.6\lib\net40-client\NLog.dll - True + + ..\..\..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache index 51b278d8..d110f5fc 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -2060865c94a192d7a90bef853b7068b66f669cb3 +c43c40a030005a8f189e6179faf40a6d42bfef5c diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config +++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/packages.config b/Common/Hardware/WaterMeter/WaterMeterCore/packages.config index 9c07e4f8..bf477414 100644 --- a/Common/Hardware/WaterMeter/WaterMeterCore/packages.config +++ b/Common/Hardware/WaterMeter/WaterMeterCore/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj b/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj index a5b601e9..576a92fd 100644 --- a/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj +++ b/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj @@ -61,11 +61,16 @@ MinimumRecommendedRules.ruleset - - ..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\packages\NLog.5.2.2\lib\net35\NLog.dll + + diff --git a/Common/Logic.PrdoctionToProductMapper/packages.config b/Common/Logic.PrdoctionToProductMapper/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Logic.PrdoctionToProductMapper/packages.config +++ b/Common/Logic.PrdoctionToProductMapper/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Logic/ProductionOrderCore/ProductionOrderCore.csproj b/Common/Logic/ProductionOrderCore/ProductionOrderCore.csproj index 80a35456..992b49ff 100644 --- a/Common/Logic/ProductionOrderCore/ProductionOrderCore.csproj +++ b/Common/Logic/ProductionOrderCore/ProductionOrderCore.csproj @@ -73,10 +73,14 @@ MinimumRecommendedRules.ruleset - - ..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll + + + ..\..\packages\NLog.5.2.2\lib\net35\NLog.dll + diff --git a/Common/Logic/ProductionOrderCore/packages.config b/Common/Logic/ProductionOrderCore/packages.config index 0fa4e015..bf477414 100644 --- a/Common/Logic/ProductionOrderCore/packages.config +++ b/Common/Logic/ProductionOrderCore/packages.config @@ -1,4 +1,5 @@  - + + \ No newline at end of file diff --git a/Common/Logic/RelatePcb/RelatePcb.csproj b/Common/Logic/RelatePcb/RelatePcb.csproj index ea7150fd..c3e713a2 100644 --- a/Common/Logic/RelatePcb/RelatePcb.csproj +++ b/Common/Logic/RelatePcb/RelatePcb.csproj @@ -74,12 +74,14 @@ - ..\..\packages\NLog.4.5.6\lib\net40-client\NLog.dll + ..\..\packages\NLog.5.2.2\lib\net35\NLog.dll True + + @@ -88,7 +90,9 @@ - + + +