From 62a07570ef705c271ba3f31dc676f801034786b6 Mon Sep 17 00:00:00 2001
From: Thomas Wiedebusch <thomas.wiedebusch@t-wiedebusch.de>
Date: Tue, 26 Apr 2022 21:21:14 +0200
Subject: [PATCH] GTB 2.2.2.2 ReSharper run on GenesisMeter.cs

---
 Common/Common.sln.DotSettings.user            |   1 +
 .../CommonCore.Configuration.csproj           |   6 +
 .../CommonCore.Configuration/packages.config  |   4 +
 Common/CommonCore/CommonCore.csproj           |   8 +
 .../ThreadWatcher/ThreadWatcher.csproj        |   6 +
 .../CommonCore/ThreadWatcher/packages.config  |   4 +
 Common/CommonCore/packages.config             |   4 +
 .../ZeroFlowGenesisMeter.cs                   |   6 +-
 .../Interfaces/Ports/PortCore/PortCore.csproj |   8 +
 .../Interfaces/Ports/PortCore/packages.config |   4 +
 .../Ports/SerialPorts/BaseSerialPort.cs       |   2 -
 .../Ports/SerialPorts/SerialPorts.csproj      |   3 +
 .../Ports/SerialPorts/packages.config         |   1 +
 .../TransmitProtocol/TransmitProtocol.csproj  |   3 +
 .../TransmitProtocol/packages.config          |   1 +
 .../Genesis/Applications/Applications.csproj  |   4 +
 .../Genesis/Applications/packages.config      |   4 +
 .../Genesis/DataPackages/DataPackages.csproj  |   3 +
 .../Genesis/DataPackages/packages.config      |   1 +
 .../Genesis/GenesisCore/GenesisMeter.cs       | 164 ++++++++++--------
 .../Genesis/GenesisCore/MeterPortScanner.cs   |   6 +-
 .../GenesisCore/_GenesisMeterMeasurement.cs   |   2 +-
 .../Genesis/GenesisFile/GenesisFile.csproj    |   3 +
 .../Genesis/GenesisFile/MeterFwUpdate.cs      |   4 +-
 .../Genesis/GenesisFile/MeterLutUpdate.cs     |   2 +-
 .../Genesis/GenesisFile/packages.config       |   1 +
 .../Genesis/GenesisPwd/GenesisPwd.csproj      |   6 +
 .../Genesis/GenesisPwd/packages.config        |   4 +
 .../ProtocolCore/ProtocolCore.csproj          |   3 +
 .../Protocols/ProtocolCore/packages.config    |   1 +
 .../RequestProtocol/RequestProtocol.csproj    |   3 +
 .../Protocols/RequestProtocol/packages.config |   1 +
 .../StreamingProtocol.csproj                  |   3 +
 .../StreamingProtocol/packages.config         |   1 +
 .../WaterMeterCore/WaterMeterCore.csproj      |   3 +
 .../WaterMeterRegisters.csproj                |   6 +
 ...erRegisters.csproj.CoreCompileInputs.cache |   2 +-
 .../WaterMeterRegisters/packages.config       |   4 +
 .../WaterMeter/WaterMeterCore/packages.config |   1 +
 .../Cordonel/MeterSize.cs                     |   3 +-
 .../Cordonel/MeterSizeConverter.cs            |   6 -
 .../Logic.ProductionToProductMapper.csproj    |   4 +
 .../packages.config                           |   4 +
 .../Actions/ProductionProcessFullReadOut.cs   |   6 +-
 .../SoftwareAccessHelper.csproj               |   3 +
 Common/SoftwareAccessHelper/packages.config   |   1 +
 Common/Ui/GenesisToolBox/FrmFwUpdate.cs       |   4 +-
 Common/Ui/GenesisToolBox/FrmLog.cs            |   4 +-
 Common/Ui/GenesisToolBox/FrmLutUpdate.cs      |   4 +-
 Common/Ui/LegacyGenesisControl/ctlBatch.cs    |   2 +-
 .../ByteArrayStyle/ByteArrayStyle.csproj      |   6 +
 Common/Utils/ByteArrayStyle/packages.config   |   4 +
 Common/Utils/Crc16Ccitt/Crc16Ccitt.csproj     |   3 +
 Common/Utils/Crc16Ccitt/packages.config       |   1 +
 Common/Utils/Logging/Logging.csproj           |   3 +
 Common/Utils/Logging/packages.config          |   1 +
 Common/Utils/ProcessExec/ProcessExec.csproj   |   6 +
 Common/Utils/ProcessExec/packages.config      |   4 +
 .../FwUpdateConfig/FwUpdateConfig.csproj      |   6 +
 .../Common/FwUpdateConfig/packages.config     |   4 +
 .../Common/FwUpdateDb/FwUpdateDb.csproj       |   6 +-
 .../Common/FwUpdateDb/packages.config         |   4 +
 .../Common/FwUpdateSafe/FwUpdateSafe.csproj   |   7 +-
 .../Common/FwUpdateSafe/packages.config       |   4 +
 .../DllLoadTest/DllLoadTest.csproj            |   4 +
 ServiceFwUpdate/DllLoadTest/packages.config   |   4 +
 .../ServiceFwUpdate.sln.DotSettings           |   4 +
 .../ServiceFwUpdate.sln.DotSettings.user      |   1 +
 .../FwUpdateLoader.csproj                     |   7 +-
 .../Ui/ServiceFwUpdateLoader/packages.config  |   1 +
 .../ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs |   2 +-
 .../ServiceFwUpdateSw.csproj                  |   3 +-
 .../Ui/ServiceFwUpdateSw/packages.config      |   1 +
 73 files changed, 303 insertions(+), 117 deletions(-)
 create mode 100644 Common/CommonCore.Configuration/packages.config
 create mode 100644 Common/CommonCore/ThreadWatcher/packages.config
 create mode 100644 Common/CommonCore/packages.config
 create mode 100644 Common/Hardware/Interfaces/Ports/PortCore/packages.config
 create mode 100644 Common/Hardware/WaterMeter/Genesis/Applications/packages.config
 create mode 100644 Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config
 create mode 100644 Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config
 create mode 100644 Common/Logic.PrdoctionToProductMapper/packages.config
 create mode 100644 Common/Utils/ByteArrayStyle/packages.config
 create mode 100644 Common/Utils/ProcessExec/packages.config
 create mode 100644 ServiceFwUpdate/Common/FwUpdateConfig/packages.config
 create mode 100644 ServiceFwUpdate/Common/FwUpdateDb/packages.config
 create mode 100644 ServiceFwUpdate/Common/FwUpdateSafe/packages.config
 create mode 100644 ServiceFwUpdate/DllLoadTest/packages.config

diff --git a/Common/Common.sln.DotSettings.user b/Common/Common.sln.DotSettings.user
index f95d55cf..4480347e 100644
--- a/Common/Common.sln.DotSettings.user
+++ b/Common/Common.sln.DotSettings.user
@@ -21,6 +21,7 @@
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="D:\Projekte\SENSUS_tfs_workspaces\WorkBenchV2\Main\Common\Ui\IrdaFunctionalTestApp\bin\Debug\Xylem.Common.Hardware.WaterMeter.Genesis.DataPackages.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/ExcludedFiles/FilesAndFoldersToSkip/=1057AD21_002DBA22_002D4CAB_002DB3FE_002D88C5C9980E6A_002Fd_003AScripts_002Ff_003Ajquery_002D1_002E10_002E2_002Eintellisense_002Ejs/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">NewVersion</s:String>
 	<s:Boolean x:Key="/Default/Environment/Hierarchy/EntityFrameworkOptions/IsAlreadyNotifiedAboutEntityFramework/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=a44a776d_002Dd671_002D4675_002Dac7b_002Db6775ec7f289/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
diff --git a/Common/CommonCore.Configuration/CommonCore.Configuration.csproj b/Common/CommonCore.Configuration/CommonCore.Configuration.csproj
index 7ebe4d03..8060f871 100644
--- a/Common/CommonCore.Configuration/CommonCore.Configuration.csproj
+++ b/Common/CommonCore.Configuration/CommonCore.Configuration.csproj
@@ -76,6 +76,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
@@ -87,6 +90,9 @@
     <Compile Include="ServiceUrls.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Common/CommonCore.Configuration/packages.config b/Common/CommonCore.Configuration/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/CommonCore.Configuration/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/CommonCore/CommonCore.csproj b/Common/CommonCore/CommonCore.csproj
index 5cb72a4f..ca186d90 100644
--- a/Common/CommonCore/CommonCore.csproj
+++ b/Common/CommonCore/CommonCore.csproj
@@ -89,5 +89,13 @@
     <Compile Include="Exceptions\Web\TokenRequiredException.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj b/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj
index 58039701..e1ae540d 100644
--- a/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj
+++ b/Common/CommonCore/ThreadWatcher/ThreadWatcher.csproj
@@ -61,6 +61,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -68,6 +71,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ThreadWatcher.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Common/CommonCore/ThreadWatcher/packages.config b/Common/CommonCore/ThreadWatcher/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/CommonCore/ThreadWatcher/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/CommonCore/packages.config b/Common/CommonCore/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/CommonCore/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/CordonelPreadjustmentUi/ZeroFlowGenesisMeter.cs b/Common/CordonelPreadjustmentUi/ZeroFlowGenesisMeter.cs
index 342a76fe..a5f56e7f 100644
--- a/Common/CordonelPreadjustmentUi/ZeroFlowGenesisMeter.cs
+++ b/Common/CordonelPreadjustmentUi/ZeroFlowGenesisMeter.cs
@@ -106,8 +106,8 @@ namespace CordonelPreadjustmentUi
             Setup(PathsCount);
 
             //on zeroflow every param has to be stored
-            _configuration.UseRegisterWatchService = true;
-            _configuration.RegisterWatchServiceUrl = Xylem.Common.CommonCore.Configuration.ServiceUrls.RegisterWatchServiceUrl();
+            Configuration.UseRegisterWatchService = true;
+            Configuration.RegisterWatchServiceUrl = Xylem.Common.CommonCore.Configuration.ServiceUrls.RegisterWatchServiceUrl();
 
         }
         public ZeroFlowGenesisMeter(int Slot, int PathsCount, PortConfig request, PortConfig streaming, bool ignoreCurrptData) : base()
@@ -118,7 +118,7 @@ namespace CordonelPreadjustmentUi
 
             //overide register watch service
             //on zeroflow every param has to be stored
-            _configuration.UseRegisterWatchService = true;
+            Configuration.UseRegisterWatchService = true;
 
         }
         private void Setup(int PathsCount)
diff --git a/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj b/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj
index c28953ca..94f91eb9 100644
--- a/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj
+++ b/Common/Hardware/Interfaces/Ports/PortCore/PortCore.csproj
@@ -103,5 +103,13 @@
       <Name>CommonCore</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Common/Hardware/Interfaces/Ports/PortCore/packages.config b/Common/Hardware/Interfaces/Ports/PortCore/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Hardware/Interfaces/Ports/PortCore/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Hardware/Interfaces/Ports/SerialPorts/BaseSerialPort.cs b/Common/Hardware/Interfaces/Ports/SerialPorts/BaseSerialPort.cs
index 747c402b..80c43bad 100644
--- a/Common/Hardware/Interfaces/Ports/SerialPorts/BaseSerialPort.cs
+++ b/Common/Hardware/Interfaces/Ports/SerialPorts/BaseSerialPort.cs
@@ -202,8 +202,6 @@ namespace Xylem.Common.Hardware.Interfaces.Ports.SerialPorts
                 //Run thread again to notice CancellationToken has changed
                 _onSyncReceiveThread.Set();
 
-
-
             }
             catch (Exception ex)
             {
diff --git a/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj b/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj
index da6b7ebc..1b47c37a 100644
--- a/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj
+++ b/Common/Hardware/Interfaces/Ports/SerialPorts/SerialPorts.csproj
@@ -215,6 +215,9 @@
     <Compile Include="UartSerialPort.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config b/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config
+++ b/Common/Hardware/Interfaces/Ports/SerialPorts/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ 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 1b4a30e7..54f6c9ac 100644
--- a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/TransmitProtocol.csproj
+++ b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/TransmitProtocol.csproj
@@ -97,6 +97,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config
+++ b/Common/Hardware/Interfaces/Protocols/TransmitProtocol/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ 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 ff2a3b05..c2c57832 100644
--- a/Common/Hardware/WaterMeter/Genesis/Applications/Applications.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/Applications/Applications.csproj
@@ -60,6 +60,9 @@
     <OutputPath>bin\x64\_MANUAL_CONTROL\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
@@ -88,6 +91,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.de.resx">
diff --git a/Common/Hardware/WaterMeter/Genesis/Applications/packages.config b/Common/Hardware/WaterMeter/Genesis/Applications/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Hardware/WaterMeter/Genesis/Applications/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ 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 970a3113..1bb2bc1e 100644
--- a/Common/Hardware/WaterMeter/Genesis/DataPackages/DataPackages.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/DataPackages/DataPackages.csproj
@@ -228,6 +228,9 @@
     <Compile Include="TempTofCalc.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config b/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config
+++ b/Common/Hardware/WaterMeter/Genesis/DataPackages/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
index efbce87f..aba4d6e3 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/GenesisMeter.cs
@@ -71,7 +71,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
 
         }
 
-        public ProcessConfig _configuration = new ProcessConfig();
+        /// <summary>
+        /// Process configuration
+        /// </summary>
+        public ProcessConfig Configuration = new ProcessConfig();
 
         /// <summary>
         /// Transmit protocol access for underlie objects to change response timeout
@@ -128,7 +131,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         ///     <see cref="T:Xylem.Sensus.WaterMeter.Genesis.Logic.Domain.Genesis.DataPackages.MeterRegister" /> but never less is
         ///     is the identification of the meter it has a separate Property
         /// </summary>
-        public String SerialNumber { get { return _serialNumber; } set { _serialNumber = value; SetLogger(); } }
+        public String SerialNumber { get => _serialNumber;
+            set { _serialNumber = value; SetLogger(); } }
 
 
         /// <inheritdoc />
@@ -166,7 +170,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <summary>
         ///     Enable use of registers that are not valid (last version not match the current app)
         /// </summary>
-        public Boolean IsDevelopmentUsage { get; set; } = false;
+        public Boolean IsDevelopmentUsage { get; set; }
 
 
 
@@ -202,9 +206,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// </summary>
         public StreamingProtocol StreamingProtocol;
         /// <summary>
-        ///     to reduce the IrdA communication in test bench, preparation will be done once (when SkipPrepearationForTestBench is true)
+        ///     to reduce the IrdA communication in test bench, preparation will be done once (when SkipPreparationForTestBench is true)
         /// </summary>
-        public bool SkipPrepearationForTestBench { get; set; } = false;
+        public Boolean SkipPreparationForTestBench { get; set; }
 
         /// <summary>
         ///     Response received after request for record
@@ -223,7 +227,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             {
                 try
                 {
-                    var addGenesisApplication = (ApplicationDefinition)add;
+                    var addGenesisApplication = add;
 
                     if (addGenesisApplication != null)
                     {
@@ -269,7 +273,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             try
             {
                 _logger.Trace($"Slot:{Slot} - Registers definitions loaded from {configFilePath}");
-                if (_configuration.AutoUpdateFiles)
+                if (Configuration.AutoUpdateFiles)
                 {
                     _logger.Trace($"Slot:{Slot} - Check for updates of {configFilePath}");
                     var fi = new FileInfo(configFilePath);
@@ -282,7 +286,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                             var baseFile = JsonConvert.DeserializeObject<BaseFile>(str);
                             _logger.Trace($"Slot:{Slot} - Updated register definitions File");
                             File.WriteAllText(configFilePath, baseFile.FileContent);
-                            File.SetCreationTime(configFilePath, baseFile.UploadDate.Value.UtcDateTime);
+                            if (baseFile.UploadDate != null)
+                                File.SetCreationTime(configFilePath, baseFile.UploadDate.Value.UtcDateTime);
                         }
                         else
                         {
@@ -606,7 +611,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                     ledTransmit.GetTransmitPortSettings());
                 StreamingProtocol = new StreamingProtocol(streamingIdent, ignoreCorruptedData);
             }
-            _configuration = new ProcessConfig(ProgramConfig.ConfigFileName);
+            Configuration = new ProcessConfig(ProgramConfig.ConfigFileName);
             _logger.Debug($"Slot:{Slot} - Setup done");
         }
 
@@ -723,7 +728,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <summary>
         /// call this if session is expired and you need an re-authorization
         /// </summary>
-        public EventHandler<AuthorizationRequiredEventArgs> OnAuthorizationRequired;
+        public EventHandler<AuthorizationRequiredEventArgs> AuthorizationRequired;
 
         /// <summary>
         ///     A helper to invoke events only if someone is listening, otherwise nothing will happen
@@ -913,7 +918,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             var firstPcbId = GetPcbId();
             if (string.IsNullOrEmpty(firstPcbId) || firstPcbId.Count() < 8)
             {
-                if (firstPcbId.Count() < 8)
+                if (firstPcbId != null && firstPcbId.Count() < 8)
                 {
 
                     Thread.Sleep(250);
@@ -949,7 +954,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                 _logger.Info($"Slot:{Slot} - Cannot get password from GenesisPasswordService, " +
                              $"URL({url}), Error({ex.Message})");
                 var listOfOfflinePasswords = JsonConvert.DeserializeObject<List<OfflinePasswordItem>>(File.ReadAllText(ProgramConfig.OfflineInfoFile));
-                autoPassword = listOfOfflinePasswords.First(x => x.PcbId == PcbId)?.Password;
+                autoPassword = listOfOfflinePasswords.First(x => x.PcbId == PcbId).Password;
                 if (!string.IsNullOrEmpty(autoPassword))
                 {
                     _logger.Info($"Slot:{Slot} - Got password from password file!");
@@ -960,7 +965,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         }
 
 
-        /// <inheritdoc />
         /// <remarks date="2018JAN08" author="drabesch">
         ///     Get password from server
         /// </remarks>
@@ -971,9 +975,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
 
             //without PCB ID it is not possible to login
             var firstPcbId = GetPcbId();
-            if (string.IsNullOrEmpty(firstPcbId) || firstPcbId.Count() < 8)
+            if (string.IsNullOrEmpty(firstPcbId) || firstPcbId.Length < 8)
             {
-                if (firstPcbId.Count() < 8)
+                if (firstPcbId != null && firstPcbId.Length < 8)
                 {
 
                     Thread.Sleep(250);
@@ -984,7 +988,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                 }
             }
 
-            url = url + PcbId;
+            url += PcbId;
             try
             {
                 //use 
@@ -1009,7 +1013,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                 _logger.Info($"Slot:{Slot} - Cannot get password from GenesisPasswordService, " +
                              $"URL({url}), Error({ex.Message})");
                 var listOfOfflinePasswords = JsonConvert.DeserializeObject<List<OfflinePasswordItem>>(File.ReadAllText(ProgramConfig.OfflineInfoFile));
-                autoPassword = listOfOfflinePasswords.First(x => x.PcbId == PcbId)?.Password;
+                autoPassword = listOfOfflinePasswords.First(x => x.PcbId == PcbId).Password;
                 if (!string.IsNullOrEmpty(autoPassword))
                 {
                     _logger.Info($"Slot:{Slot} - Got password from password file!");
@@ -1052,6 +1056,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <param name="password">password string to login</param>
         /// <param name="runImmediately"> true = process command; false = add command to list. call
         /// <see cref="RequestProtocolProcess()"></see> to process login command </param>
+        /// <param name="quickLogin"></param>
         /// <returns></returns>
         /// <remarks date="2019JAN01" author="drabesch">
         ///     pass runImmediately for auto login
@@ -1059,7 +1064,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <remarks date="2021-Feb-02" author="Thomas Wiedebusch">
         /// - Avoid retries during login, a retry will lock the Genesis for 2s, 4s, 8s, 16s and so on.
         /// </remarks>
-        private Boolean Login(String password, Boolean runImmediately, bool quickLogin = false)
+        private Boolean Login(String password, Boolean runImmediately, Boolean quickLogin = false)
         {
 
             var backupRetries = CommunicationConfig.RequestRetries;
@@ -1095,7 +1100,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                 }
 
 
-                if (_configuration != null && !_configuration.ProductionMode)
+                if (Configuration != null && !Configuration.ProductionMode)
                 {
                     IsDevelopmentUsage = true;
                 }
@@ -1197,14 +1202,14 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                 var recount = 4;
                 while (recount > 0)
                 {
-                    recount = recount - 1;
+                    recount -= 1;
 
                     if (WriteRegister(Register.System.CheckFwPresence, appVersionToRead.AppId))
                     {
 
 
                         //read version, skip retries on SYSTEM 0x04-> FW nor present is a valid feedback
-                        var readFwVersionBytes = ReadRegister(Register.System.CheckFwPresence, 4, 0x04);
+                        var readFwVersionBytes = ReadRegister(Register.System.CheckFwPresence, 4);
 
                     //the FW version as Uint32 will be used for comparison with the configuration.json
                     if (readFwVersionBytes != null && readFwVersionBytes.Length > 0)
@@ -1277,7 +1282,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             }
             catch (Exception)
             {
-
+                // ignored
             }
 
 
@@ -1323,10 +1328,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             foreach (var registerToCheck in tempConfigRegisters)
             {
                 var currentGroup = MeterAppListVersion.First(f => f.AppId == registerToCheck.Key.AppAddress);
-                if (currentGroup == null)
-                {
-                    continue;
-                }
 
                 if (!registerToCheck.Key.RegisterDetail.Version.First.HasValue &&
                     !registerToCheck.Key.RegisterDetail.Version.Last.HasValue)
@@ -1373,23 +1374,23 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
 
             if (IsDevelopmentUsage)
             {
-                List<RegisterDefinition> RegisterToPotentialAdd = new List<RegisterDefinition>();
+                var registerToPotentialAdd = new List<RegisterDefinition>();
                 foreach (var allRegisterItem in tempConfigRegisters)
                 {
-                    if (!_configRegister.MeterRegisterDic.Any(a => a.Key.GetIdent() == allRegisterItem.Key.GetIdent()))
+                    if (_configRegister.MeterRegisterDic.All(a => a.Key.GetIdent() != allRegisterItem.Key.GetIdent()))
                     {
-                        RegisterToPotentialAdd.Add(allRegisterItem.Key);
+                        registerToPotentialAdd.Add(allRegisterItem.Key);
                     }
                 }
-                if (RegisterToPotentialAdd.Any())
+                if (registerToPotentialAdd.Any())
                 {
 
 
-                    var RegisterAddForOldConfis = RegisterToPotentialAdd.GroupBy(item => item.GetIdent())
+                    var registerAddForOldConfigs = registerToPotentialAdd.GroupBy(item => item.GetIdent())
                                 .Select(grp => grp.Aggregate((max, cur) =>
                                                     (max == null || cur.RegisterDetail.Version.Last > max.RegisterDetail.Version.Last) ? cur : max));
 
-                    foreach (var registerAddOldConfig in RegisterAddForOldConfis)
+                    foreach (var registerAddOldConfig in registerAddForOldConfigs)
                     {
                         registerAddOldConfig.IsAvailable = false;
                         _configRegister.MeterRegisterDic.TryAdd(registerAddOldConfig, null);
@@ -1584,9 +1585,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             {
                 if (val > 0)
                 {
-                    i = i + (1 << cReg);
+                    i += (1 << cReg);
                 }
-                cReg = cReg + 1;
+                cReg += 1;
             }
 
             var fullAlarm = (Alarm)i;
@@ -1602,9 +1603,14 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         {
             WriteRegister(Register.Customer.TriggerAlarmCancel, clear.GetHashCode());
         }
+        /// <summary>
+        /// Alarm messages
+        /// </summary>
         [Flags]
         public enum Alarm
         {
+            // ReSharper disable InconsistentNaming
+#pragma warning disable CS1591
             REBOOT = 1 << 0,
             LOW_BATTERY = 1 << 1,
             EMPTY_PIPE = 1 << 4,
@@ -1620,6 +1626,8 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             METROLOGY_MEASURE = 1 << 15,
 
             ALL = 0xFFFFFF,
+#pragma warning restore CS1591
+            // ReSharper restore InconsistentNaming
         }
 
         /// <summary>
@@ -1627,7 +1635,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         ///     Read Privilege is always needed to BUGFIX read access to PCB ID
         /// </summary>
         /// <returns>PCB ID</returns>
-        public String GetPcbId(Int32 expectedLength = 12, int retyLeft = 2)
+        public String GetPcbId(Int32 expectedLength = 12, Int32 retriesLeft = 2)
         {
 
             if (RequestPort == null)
@@ -1636,29 +1644,28 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             }
             // Read Privilege is always needed to BUGFIX read access to PCB ID
             _logger.Info($"Slot:{Slot} - Get privilege level");
-            var readoutpri = ReadRegister(Register.Configexchange.Privilege);
+            ReadRegister(Register.Configexchange.Privilege);
 
 
 
             _logger.Info($"Slot:{Slot} - Get PCB identification old{PcbId}");
-            var listPcb = new List<byte>();
+            var listPcb = new List<Byte>();
 
-            var HasZero = false;
+            var hasZero = false;
             var maxReads = 4;
-            while (!HasZero)
+            while (!hasZero)
             {
                 var chunk = ReadRegister(Register.Configexchange.PCBSerialNumber, 4);
-                maxReads = maxReads - 1;
+                maxReads -= 1;
                 if (chunk == null)
                 {
-                    HasZero = true;
                     break;
                 }
                 listPcb.AddRange(chunk);
 
                 if (listPcb.Contains(0))
                 {
-                    HasZero = true;
+                    hasZero = true;
                 }
                 if (maxReads == 0)
                 {
@@ -1667,27 +1674,25 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             }
 
 
-            _logger.Info($"First read ");
+            _logger.Info("First read ");
             if (listPcb.Any())
             {
                 var response = listPcb.ToArray();
                 PcbId = Encoding.ASCII.GetString(response).Split('\0')[0];
 
-                if (PcbId.Length < 8 && retyLeft >= 1)
+                if (PcbId.Length < 8 && retriesLeft >= 1)
                 {
-                    return GetPcbId(expectedLength, retyLeft - 1);
+                    return GetPcbId(expectedLength, retriesLeft - 1);
                 }
 
                 return PcbId;
             }
-            else
+
+            if (retriesLeft >= 1)
             {
-                if (retyLeft >= 1)
-                {
-                    return GetPcbId(expectedLength, retyLeft - 1);
-                }
-                return string.Empty;
+                return GetPcbId(expectedLength, retriesLeft - 1);
             }
+            return string.Empty;
         }
 
         /// <summary>
@@ -1861,7 +1866,6 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                             IsLoggedOn = false;
                             if (Login(_password, false))
                             {
-                                break;
                             }
 
                             //    //removed because this stops all processing which is critical on FW-Update!
@@ -1918,14 +1922,12 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
             {
                 Logout();
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-
-
+                // ignored
             }
 
 
-
             //Run thread again to notice CancellationToken has changed
             _onSyncKeepSessionThread?.Set();
 
@@ -1936,7 +1938,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                 while (_keepSessionThread.ThreadState != ThreadState.Stopped && timeoutCounter > 0)
                 {
                     Thread.Sleep(1);
-                    timeoutCounter = timeoutCounter - 1;
+                    timeoutCounter -= 1;
                 }
 
                 if (_keepSessionThread.ThreadState != ThreadState.Stopped)
@@ -1980,20 +1982,20 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         public void LogRawData(Boolean on)
         {
             _enableRawDataLogging = on;
-            if (StreamingPort != null && StreamingPort is LedSerialPort)
+            if (StreamingPort is LedSerialPort port)
             {
-                ((LedSerialPort)StreamingPort).RecordStreamingRawData = _enableRawDataLogging;
+                port.RecordStreamingRawData = _enableRawDataLogging;
             }
         }
 
         /// <inheritdoc />
-        public void SetProcessState(DisplayCodes newState, Boolean webRequest = true)
+        public void SetProcessState(DisplayCodes newState, Boolean webRequest)
         {
 
             if (webRequest)
             {
                 var url = ServiceUrls.MeterProcessStateUrl();
-                url = url + $"setState?PcbID={PcbId}&code={newState.GetHashCode()}&version={Assembly.GetExecutingAssembly().GetName().Version.ToString()}";
+                url += $"setState?PcbID={PcbId}&code={newState.GetHashCode()}&version={Assembly.GetExecutingAssembly().GetName().Version}";
                 try
                 {
                     LocalWebRequest.PostRequestAsync(url);
@@ -2013,7 +2015,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         {
             var url = ServiceUrls.MeterProcessStateUrl();
 
-            url = url + $"GetLastState?PcbID={PcbId}";
+            url += $"GetLastState?PcbID={PcbId}";
 
             try
             {
@@ -2117,29 +2119,38 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         }
 
 
-        public void PushProgress(string ProgressName, string Version)
+        /// <summary>
+        /// Upload app list to data base
+        /// </summary>
+        /// <param name="progressName"></param>
+        /// <param name="version"></param>
+        public void PushProgress(String progressName, String version)
         {
             var apps = new List<CordonelAppVersion>();
             foreach (var item in MeterAppListVersion)
             {
-                apps.Add(new CordonelAppVersion(item.AppId, item.StrVersion, (item.AppId != 15 ? true : false)));
+                apps.Add(new CordonelAppVersion(item.AppId, item.StrVersion, item.AppId != 15));
             }
 
             apps.Add(new CordonelAppVersion(-1, CoreRevision, false));
 
-            var url = $"{ServiceUrls.MeterProcessStateUrl()}SetCordonelProgress?PcbId={PcbId}&ProgressName={ProgressName}&version={Version}";
-            var a = LocalWebRequest.PostRequestAsync(url, json: apps);
+            var url = $"{ServiceUrls.MeterProcessStateUrl()}SetCordonelProgress?PcbId={PcbId}&ProgressName={progressName}&version={version}";
+            LocalWebRequest.PostRequestAsync(url, json: apps);
 
         }
 
+        /// <summary>
+        /// Backup current register dictionary to data base
+        /// </summary>
+        /// <exception cref="Exception"></exception>
         public void StoreCurrentRegisterDic()
         {
             try
             {
                 var url = ServiceUrls.RegisterWatchServiceUrl();
-                if (!string.IsNullOrEmpty(_configuration?.RegisterWatchServiceUrl))
+                if (!string.IsNullOrEmpty(Configuration?.RegisterWatchServiceUrl))
                 {
-                    url = _configuration.RegisterWatchServiceUrl;
+                    url = Configuration.RegisterWatchServiceUrl;
                 }
 
                 var d = new List<RegisterToDb>();
@@ -2150,11 +2161,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                     {
                         d.Add(new RegisterToDb(a.Key.RegisterAddress, a.Value));
                     }
-                    catch (Exception e)
+                    catch (Exception )
                     {
-
+                        // ignored
                     }
-
                 }
 
 
@@ -2181,7 +2191,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <param name="value"></param>
         private void PostRegisterRead(RegisterDefinition reg, Byte[] value)
         {
-            if (_configuration.UseRegisterWatchService)
+            if (Configuration.UseRegisterWatchService)
             {
                 try
                 {
@@ -2192,7 +2202,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
                         valuestring = BitConverter.ToString(value);
                     }
 
-                    var url = $"{_configuration.RegisterWatchServiceUrl}RegisterWrite?PcbID={PcbId}&Address={BitConverter.ToString(reg.RegisterAddress)}&value={valuestring}";
+                    var url = $"{Configuration.RegisterWatchServiceUrl}RegisterWrite?PcbID={PcbId}&Address={BitConverter.ToString(reg.RegisterAddress)}&value={valuestring}";
 
                     var result = LocalWebRequest.PostRequestAsync(url, 1500, string.Empty);
 
@@ -2218,12 +2228,12 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         /// <param name="calibrationFactor3"></param>
         public void LogCalibrationData(UInt16 calibrationFactor1, UInt16 calibrationFactor2, UInt16 calibrationFactor3)
         {
-            if (_configuration.UseCalibrationLogger)
+            if (Configuration.UseCalibrationLogger)
             {
                 try
                 {
                     var request = (HttpWebRequest)WebRequest.Create(
-                        $"{_configuration.CalibrationLoggerServiceUrl}PostCalibrationResult?PcbID={PcbId}" +
+                        $"{Configuration.CalibrationLoggerServiceUrl}PostCalibrationResult?PcbID={PcbId}" +
                         $"&flowCalibrationPath1={calibrationFactor1}&flowCalibrationPath2={calibrationFactor2}" +
                         $"&flowCalibrationPath3={calibrationFactor3}");
 
@@ -2256,6 +2266,10 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
         }
         #endregion
 
+        /// <summary>
+        /// Set the process state
+        /// </summary>
+        /// <param name="newState"></param>
         public void SetProcessState(DisplayCodes newState)
         {
             SetProcessState(newState, true);
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/MeterPortScanner.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/MeterPortScanner.cs
index a7c9954a..94afa26b 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/MeterPortScanner.cs
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/MeterPortScanner.cs
@@ -184,9 +184,9 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
 
                     // configuration has to be set BEFORE adding meter to batch to avoid e.g. auto update files
                     // from network and therefore have a long network request timeout before the task starts
-                    _currentGenesis._configuration.UseRegisterWatchService = false;
-                    _currentGenesis._configuration.UseMinMaxCheck = false;
-                    _currentGenesis._configuration.AutoUpdateFiles = false;
+                    _currentGenesis.Configuration.UseRegisterWatchService = false;
+                    _currentGenesis.Configuration.UseMinMaxCheck = false;
+                    _currentGenesis.Configuration.AutoUpdateFiles = false;
                     _meterBatch.AddMeter(_currentGenesis);
                 }
                 catch (Exception)
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisCore/_GenesisMeterMeasurement.cs b/Common/Hardware/WaterMeter/Genesis/GenesisCore/_GenesisMeterMeasurement.cs
index 8890b286..104ac3c9 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisCore/_GenesisMeterMeasurement.cs
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisCore/_GenesisMeterMeasurement.cs
@@ -40,7 +40,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisCore
 
         private void PreMeasurement()
         {
-            //if (!SkipPrepearationForTestBench)
+            //if (!SkipPreparationForTestBench)
             //{
 
                 //TODO set display unit 
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj b/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj
index 09d6ebf2..dd76a2e7 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/GenesisFile.csproj
@@ -79,6 +79,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs
index 026d291a..961b629f 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterFwUpdate.cs
@@ -741,7 +741,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
             }
 
             _genesisMeter?.ReLogin();
-            _genesisMeter?.SetProcessState(DisplayCodes.FwUpdateActive, false);
+            _genesisMeter?.SetProcessState(DisplayCodes.FwUpdateActive, webRequest: false);
 
             if (_genesisMeter == null || !_genesisMeter.IsLoggedOn || _meterFile == null)
                 return false;
@@ -1048,7 +1048,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
             }
 
             _genesisMeter?.ReLogin();
-            _genesisMeter?.SetProcessState(DisplayCodes.FwUpdateActive, false);
+            _genesisMeter?.SetProcessState(DisplayCodes.FwUpdateActive, webRequest: false);
 
             if (_genesisMeter == null || !_genesisMeter.IsLoggedOn ||
                 FileApps == null || _meterFile == null)
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterLutUpdate.cs b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterLutUpdate.cs
index 66dfe0a7..998962c2 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterLutUpdate.cs
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/MeterLutUpdate.cs
@@ -369,7 +369,7 @@ namespace Xylem.Common.Hardware.WaterMeter.Genesis.GenesisFile
             if (_meterFile != null)
                 _meterFile.OnProcessUpdate += ProcessUpdate_Event;
             _genesisMeter?.ReLogin();
-            _genesisMeter?.SetProcessState(DisplayCodes.FwUpdateActive, false);
+            _genesisMeter?.SetProcessState(DisplayCodes.FwUpdateActive, webRequest: false);
 
             if (_genesisMeter == null || !_genesisMeter.IsLoggedOn)
             {
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisFile/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ 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 30189cb0..9b4e0a7d 100644
--- a/Common/Hardware/WaterMeter/Genesis/GenesisPwd/GenesisPwd.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/GenesisPwd.csproj
@@ -53,6 +53,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -65,5 +68,8 @@
     <Compile Include="MeterPwdDb.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Hardware/WaterMeter/Genesis/GenesisPwd/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/ProtocolCore.csproj b/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/ProtocolCore.csproj
index 5cf32417..6e279a45 100644
--- a/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/ProtocolCore.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/ProtocolCore.csproj
@@ -174,6 +174,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/packages.config b/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/packages.config
+++ b/Common/Hardware/WaterMeter/Genesis/Protocols/ProtocolCore/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ 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 88021efe..1838be41 100644
--- a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/RequestProtocol.csproj
@@ -256,6 +256,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config
+++ b/Common/Hardware/WaterMeter/Genesis/Protocols/RequestProtocol/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ 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 9486dcb5..8724e2da 100644
--- a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/StreamingProtocol.csproj
+++ b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/StreamingProtocol.csproj
@@ -238,6 +238,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config
+++ b/Common/Hardware/WaterMeter/Genesis/Protocols/StreamingProtocol/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj
index c9a39999..b948f86e 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterCore.csproj
@@ -278,6 +278,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj
index 9de08f72..a9425ac5 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/WaterMeterRegisters.csproj
@@ -77,6 +77,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\..\..\packages\NLog.4.5.6\lib\net40-client\NLog.dll</HintPath>
       <Private>True</Private>
@@ -94,6 +97,9 @@
     <Compile Include="MeterTypeRegisters.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
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 2d9cbed7..d8b5c8f6 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 @@
-7ac73abb7afd9e6ddc0520a1568581c7ed0afd36
+1a3d4919c9c702245832d925951f2b7cb72fc333
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/packages.config b/Common/Hardware/WaterMeter/WaterMeterCore/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/packages.config
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSize.cs b/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSize.cs
index 788a070e..13436829 100644
--- a/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSize.cs
+++ b/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSize.cs
@@ -1,4 +1,5 @@
-namespace Logic.ProductionToProductMapper.Cordonel
+// ReSharper disable InconsistentNaming
+namespace Logic.ProductionToProductMapper.Cordonel
 {
     public enum MeterSize
     {
diff --git a/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSizeConverter.cs b/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSizeConverter.cs
index 9c4c60e8..3170ab55 100644
--- a/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSizeConverter.cs
+++ b/Common/Logic.PrdoctionToProductMapper/Cordonel/MeterSizeConverter.cs
@@ -211,8 +211,6 @@ namespace Logic.ProductionToProductMapper.Cordonel
 
                 case 0:
                     return MeterSize.DN50;
-                default:
-                    break;
             }
             throw new NotImplementedException($"MeterSize {orderMeterSize} has no conversion");
         }
@@ -265,8 +263,6 @@ namespace Logic.ProductionToProductMapper.Cordonel
                                 return 7;
                             case MeterSize.US12:
                                 return 8;
-                            default:
-                                break;
                         }
                     }
                     else
@@ -289,8 +285,6 @@ namespace Logic.ProductionToProductMapper.Cordonel
                                 return 254;
                             case MeterSize.US12:
                                 return 305;
-                            default:
-                                break;
                         }
                     }
                     break;
diff --git a/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj b/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj
index 7be46e50..739f078e 100644
--- a/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj
+++ b/Common/Logic.PrdoctionToProductMapper/Logic.ProductionToProductMapper.csproj
@@ -61,6 +61,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
@@ -81,6 +84,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Hardware\WaterMeter\WaterMeterCore\WaterMeterCore.csproj">
diff --git a/Common/Logic.PrdoctionToProductMapper/packages.config b/Common/Logic.PrdoctionToProductMapper/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Logic.PrdoctionToProductMapper/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs
index a877ec77..8d85d1d1 100644
--- a/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs
+++ b/Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFullReadOut.cs
@@ -47,10 +47,10 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
                 UserControl.lblHl.Dispatcher.Invoke(DispatcherPriority.Send,
                     new Action(() => { UserControl.lblHl.Content = "Read out Registers"; }
                     ));
-                var oldConfigEntry = Meter._configuration.UseRegisterWatchService;
+                var oldConfigEntry = Meter.Configuration.UseRegisterWatchService;
                 if (oldConfigEntry)
                 {
-                    Meter._configuration.UseRegisterWatchService = false;
+                    Meter.Configuration.UseRegisterWatchService = false;
                 }
 
                 var total = Meter.GetRegistersDic().Keys.ToList();
@@ -81,7 +81,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
                 }
 
                 Meter.StoreCurrentRegisterDic();
-                Meter._configuration.UseRegisterWatchService = oldConfigEntry;
+                Meter.Configuration.UseRegisterWatchService = oldConfigEntry;
 
                 currentProcessState = ProductionProcessState.Done;
             }
diff --git a/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj b/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj
index 6324b659..90f32c40 100644
--- a/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj
+++ b/Common/SoftwareAccessHelper/SoftwareAccessHelper.csproj
@@ -76,6 +76,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="RestSharp, Version=105.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.105.0.0\lib\net4\RestSharp.dll</HintPath>
     </Reference>
diff --git a/Common/SoftwareAccessHelper/packages.config b/Common/SoftwareAccessHelper/packages.config
index 93d7ce4a..85525b7f 100644
--- a/Common/SoftwareAccessHelper/packages.config
+++ b/Common/SoftwareAccessHelper/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="RestSharp" version="105.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Common/Ui/GenesisToolBox/FrmFwUpdate.cs b/Common/Ui/GenesisToolBox/FrmFwUpdate.cs
index dc115775..abf1a2d6 100644
--- a/Common/Ui/GenesisToolBox/FrmFwUpdate.cs
+++ b/Common/Ui/GenesisToolBox/FrmFwUpdate.cs
@@ -697,8 +697,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
                 _currentGenesis.SetupFromConfigFile(slotNr);
                 _meterBatch.AddMeter(_currentGenesis);
 
-                _currentGenesis._configuration.UseRegisterWatchService = false;
-                _currentGenesis._configuration.UseMinMaxCheck = false;
+                _currentGenesis.Configuration.UseRegisterWatchService = false;
+                _currentGenesis.Configuration.UseMinMaxCheck = false;
 
                 Task.Factory.StartNew(() =>
                 {
diff --git a/Common/Ui/GenesisToolBox/FrmLog.cs b/Common/Ui/GenesisToolBox/FrmLog.cs
index 21bac127..27856843 100644
--- a/Common/Ui/GenesisToolBox/FrmLog.cs
+++ b/Common/Ui/GenesisToolBox/FrmLog.cs
@@ -70,8 +70,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
                 _currentGenesis.SetupFromConfigFile(slotNr);
                 _meterBatch.AddMeter(_currentGenesis);
 
-                _currentGenesis._configuration.UseRegisterWatchService = false;
-                _currentGenesis._configuration.UseMinMaxCheck = false;
+                _currentGenesis.Configuration.UseRegisterWatchService = false;
+                _currentGenesis.Configuration.UseMinMaxCheck = false;
 
                 Task.Factory.StartNew(() =>
                 {
diff --git a/Common/Ui/GenesisToolBox/FrmLutUpdate.cs b/Common/Ui/GenesisToolBox/FrmLutUpdate.cs
index 125fbd61..6606cdc1 100644
--- a/Common/Ui/GenesisToolBox/FrmLutUpdate.cs
+++ b/Common/Ui/GenesisToolBox/FrmLutUpdate.cs
@@ -187,8 +187,8 @@ namespace Xylem.Common.Ui.GenesisToolBox
                 _currentGenesis.SetupFromConfigFile(slotNr);
                 _meterBatch.AddMeter(_currentGenesis);
 
-                _currentGenesis._configuration.UseRegisterWatchService = false;
-                _currentGenesis._configuration.UseMinMaxCheck = false;
+                _currentGenesis.Configuration.UseRegisterWatchService = false;
+                _currentGenesis.Configuration.UseMinMaxCheck = false;
 
                 var xPosition = Location.X + Size.Width;
                 var yPosition = Location.Y;
diff --git a/Common/Ui/LegacyGenesisControl/ctlBatch.cs b/Common/Ui/LegacyGenesisControl/ctlBatch.cs
index 1b1a113c..8e5c540b 100644
--- a/Common/Ui/LegacyGenesisControl/ctlBatch.cs
+++ b/Common/Ui/LegacyGenesisControl/ctlBatch.cs
@@ -639,7 +639,7 @@ namespace XylemCommonUiLegacyGenCtl
                     meter.LogRawData(_rawLogging);
 
                     meter.RequestProtocol.AdditionalRetryTimeoutMs = 100;
-                    meter.SkipPrepearationForTestBench = SkipPrepearation;
+                    meter.SkipPreparationForTestBench = SkipPrepearation;
                     meter.EnableAutoLogon();
                     batch.AddMeter(meter);
 
diff --git a/Common/Utils/ByteArrayStyle/ByteArrayStyle.csproj b/Common/Utils/ByteArrayStyle/ByteArrayStyle.csproj
index 9e236fb4..7943ca06 100644
--- a/Common/Utils/ByteArrayStyle/ByteArrayStyle.csproj
+++ b/Common/Utils/ByteArrayStyle/ByteArrayStyle.csproj
@@ -57,6 +57,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Net.Http" />
@@ -68,5 +71,8 @@
     <Compile Include="ByteStyler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Common/Utils/ByteArrayStyle/packages.config b/Common/Utils/ByteArrayStyle/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Utils/ByteArrayStyle/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Utils/Crc16Ccitt/Crc16Ccitt.csproj b/Common/Utils/Crc16Ccitt/Crc16Ccitt.csproj
index af52ecda..cfc96833 100644
--- a/Common/Utils/Crc16Ccitt/Crc16Ccitt.csproj
+++ b/Common/Utils/Crc16Ccitt/Crc16Ccitt.csproj
@@ -159,6 +159,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Utils/Crc16Ccitt/packages.config b/Common/Utils/Crc16Ccitt/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Utils/Crc16Ccitt/packages.config
+++ b/Common/Utils/Crc16Ccitt/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Common/Utils/Logging/Logging.csproj b/Common/Utils/Logging/Logging.csproj
index 7b358786..9e21f083 100644
--- a/Common/Utils/Logging/Logging.csproj
+++ b/Common/Utils/Logging/Logging.csproj
@@ -172,6 +172,9 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NLog.4.6.7\lib\net40-client\NLog.dll</HintPath>
     </Reference>
diff --git a/Common/Utils/Logging/packages.config b/Common/Utils/Logging/packages.config
index 67b6ce44..9c07e4f8 100644
--- a/Common/Utils/Logging/packages.config
+++ b/Common/Utils/Logging/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
   <package id="NLog" version="4.6.7" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/Common/Utils/ProcessExec/ProcessExec.csproj b/Common/Utils/ProcessExec/ProcessExec.csproj
index 63c59ad2..f2efc006 100644
--- a/Common/Utils/ProcessExec/ProcessExec.csproj
+++ b/Common/Utils/ProcessExec/ProcessExec.csproj
@@ -57,6 +57,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\ServiceFwUpdate\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -75,5 +78,8 @@
     <Folder Include="Const\" />
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Common/Utils/ProcessExec/packages.config b/Common/Utils/ProcessExec/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/Common/Utils/ProcessExec/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Common/FwUpdateConfig/FwUpdateConfig.csproj b/ServiceFwUpdate/Common/FwUpdateConfig/FwUpdateConfig.csproj
index 668e5e85..c53051d8 100644
--- a/ServiceFwUpdate/Common/FwUpdateConfig/FwUpdateConfig.csproj
+++ b/ServiceFwUpdate/Common/FwUpdateConfig/FwUpdateConfig.csproj
@@ -53,6 +53,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -76,5 +79,8 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Common/FwUpdateConfig/packages.config b/ServiceFwUpdate/Common/FwUpdateConfig/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/ServiceFwUpdate/Common/FwUpdateConfig/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj b/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj
index 47a89c3d..7791ceaf 100644
--- a/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj
+++ b/ServiceFwUpdate/Common/FwUpdateDb/FwUpdateDb.csproj
@@ -56,8 +56,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Common\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp, Version=105.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -113,6 +112,9 @@
       <Name>FwUpdateSafe</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="..\..\..\Common\Utils\DateTimeServerShared\DateTimeServerShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Common/FwUpdateDb/packages.config b/ServiceFwUpdate/Common/FwUpdateDb/packages.config
new file mode 100644
index 00000000..a9de8b55
--- /dev/null
+++ b/ServiceFwUpdate/Common/FwUpdateDb/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj b/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj
index 0c8aa46f..5772f457 100644
--- a/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj
+++ b/ServiceFwUpdate/Common/FwUpdateSafe/FwUpdateSafe.csproj
@@ -55,6 +55,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -89,6 +92,8 @@
       <Name>Logic.ProductionToProductMapper</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Common/FwUpdateSafe/packages.config b/ServiceFwUpdate/Common/FwUpdateSafe/packages.config
new file mode 100644
index 00000000..a9de8b55
--- /dev/null
+++ b/ServiceFwUpdate/Common/FwUpdateSafe/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/ServiceFwUpdate/DllLoadTest/DllLoadTest.csproj b/ServiceFwUpdate/DllLoadTest/DllLoadTest.csproj
index 86286af4..3cb8464b 100644
--- a/ServiceFwUpdate/DllLoadTest/DllLoadTest.csproj
+++ b/ServiceFwUpdate/DllLoadTest/DllLoadTest.csproj
@@ -36,6 +36,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -65,6 +68,7 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/ServiceFwUpdate/DllLoadTest/packages.config b/ServiceFwUpdate/DllLoadTest/packages.config
new file mode 100644
index 00000000..0fa4e015
--- /dev/null
+++ b/ServiceFwUpdate/DllLoadTest/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings b/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings
index 18898991..1e0d97b7 100644
--- a/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings
+++ b/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings
@@ -5,6 +5,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Approver/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=auer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=binfile/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=BUGFIX/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Catalogue/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Ccitt/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=CONFIGEXCHANGE/@EntryIndexedValue">True</s:Boolean>
@@ -13,6 +14,8 @@
 	
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cordonel/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cordonels/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=DNMAX/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Drabesch/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=EMEA/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=FLEXNETVERSION/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=GENESISFLOW/@EntryIndexedValue">True</s:Boolean>
@@ -27,5 +30,6 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=SPXMLU/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=stackoverflow/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=statictype/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=UART/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=vako/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wiedebusch/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings.user b/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings.user
index 260fc1b1..bbe11f2e 100644
--- a/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings.user
+++ b/ServiceFwUpdate/ServiceFwUpdate.sln.DotSettings.user
@@ -3,4 +3,5 @@
   &lt;Assembly Path="D:\Projekte\SENSUS_tfs_workspaces\WorkBenchV2\Main\ServiceFwUpdate\packages\NLog.4.7.5\lib\net45\NLog.dll" /&gt;&#xD;
   &lt;Assembly Path="D:\Projekte\SENSUS_tfs_workspaces\WorkBenchV2\Main\ServiceFwUpdate\packages\NLog.4.7.8\lib\net45\NLog.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String>
+	<s:String x:Key="/Default/Environment/Hierarchy/Build/SolBuilderDuo/UseMsbuildSolutionBuilder/@EntryValue">NewVersion</s:String>
 	<s:Boolean x:Key="/Default/Housekeeping/ProjectModelSynchronizer/ProjectPathsToLoadFromDisk/=_002E_002E_005CCommon_005CUtils_005CProcessExec_005CProcessExec_002Eshproj/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/FwUpdateLoader.csproj b/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/FwUpdateLoader.csproj
index c678d98b..3867978d 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/FwUpdateLoader.csproj
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/FwUpdateLoader.csproj
@@ -72,8 +72,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Common\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
@@ -89,10 +88,6 @@
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xylem.Common.Utils.DateTimeServer, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Common\Utils\DateTimeServer\DateTimeServer\bin\Debug\Xylem.Common.Utils.DateTimeServer.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Common\FwUpdateSafe\Consts\DataContainerName.cs">
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/packages.config b/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/packages.config
index 6ec2282a..75cc475c 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/packages.config
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateLoader/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="NLog" version="4.6.7" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
index ec1bb399..533bbf30 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/FrmServiceFwUpdateSw.cs
@@ -2313,7 +2313,7 @@ namespace Xylem.ServiceFwUpdate.Ui.ServiceFwUpdateSw
                 //assign new meter and assign meter to FW update file if this exists
                 _currentGenesis = new GenesisMeter(Slot, _portConfig, null)
                 {
-                    _configuration =
+                    Configuration =
                     {
                         //configuration has to be set BEFORE adding meter to batch to avoid e.g. auto update files
                         //from network and therefore have a long network request timeout before the task starts
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/ServiceFwUpdateSw.csproj b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/ServiceFwUpdateSw.csproj
index 16166300..a035c2b4 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/ServiceFwUpdateSw.csproj
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/ServiceFwUpdateSw.csproj
@@ -80,8 +80,7 @@
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Common\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/packages.config b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/packages.config
index 7954edc9..f3dc84f1 100644
--- a/ServiceFwUpdate/Ui/ServiceFwUpdateSw/packages.config
+++ b/ServiceFwUpdate/Ui/ServiceFwUpdateSw/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="NLog" version="4.6.7" targetFramework="net472" />
   <package id="NLog.Config" version="4.6.7" targetFramework="net472" />
   <package id="NLog.Schema" version="4.6.7" targetFramework="net472" />