From dedc586508da4bd728efe5f734b1e45bb5b07995 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Fri, 30 Apr 2021 13:24:46 +0200
Subject: [PATCH] update Json newtonsoft

---
 IOB-WIN-NEXT/App.config          | 176 ++++++++++++++++---------------
 IOB-WIN-NEXT/IOB-WIN-NEXT.csproj |   9 +-
 IOB-WIN-NEXT/packages.config     |   4 +-
 3 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/IOB-WIN-NEXT/App.config b/IOB-WIN-NEXT/App.config
index 1d3a71ac..d26b4441 100644
--- a/IOB-WIN-NEXT/App.config
+++ b/IOB-WIN-NEXT/App.config
@@ -1,132 +1,136 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <appSettings>
-    <add key="appName" value="IOB-WIN"/>
+    <add key="appName" value="IOB-WIN" />
     <!--<add key="appVers" value="develop" />-->
-    <add key="enableTest" value="true"/>
-    <add key="enableContapezzi" value="true"/>
-    <add key="enableMode" value="true"/>
-    <add key="enableOverrides" value="false"/>
-    <add key="enableTSVC" value="true"/>
-    <add key="enableDynData" value="false"/>
-    <add key="enableSysInfo" value="false"/>
-    <add key="enableAlarms" value="true"/>
-    <add key="doStartMemDump" value="false"/>
-    <add key="doSampleMemory" value="false"/>
-    <add key="basePrgMemPath" value="CNCMEMUSER"/>
-    <add key="pingMsTimeout" value="1500"/>
-    <add key="urlCallTOut" value="1000"/>
+    <add key="enableTest" value="true" />
+    <add key="enableContapezzi" value="true" />
+    <add key="enableMode" value="true" />
+    <add key="enableOverrides" value="false" />
+    <add key="enableTSVC" value="true" />
+    <add key="enableDynData" value="false" />
+    <add key="enableSysInfo" value="false" />
+    <add key="enableAlarms" value="true" />
+    <add key="doStartMemDump" value="false" />
+    <add key="doSampleMemory" value="false" />
+    <add key="basePrgMemPath" value="CNCMEMUSER" />
+    <add key="pingMsTimeout" value="1500" />
+    <add key="urlCallTOut" value="1000" />
     <!-- ciclo corto x invio a server: ms -->
-    <add key="timerIntMs" value="10"/>
-    <add key="fastCount" value="20"/>
-    <add key="normCount" value="200"/>
-    <add key="slowCount" value="500"/>
-    <add key="verySlowCount" value="3000"/>
-    <add key="sampleMemCount" value="6000"/>
-    <add key="waitEndCycle" value="0"/>
-    <add key="comCheckTOut" value="10"/>
+    <add key="timerIntMs" value="10" />
+    <add key="fastCount" value="20" />
+    <add key="normCount" value="200" />
+    <add key="slowCount" value="500" />
+    <add key="verySlowCount" value="3000" />
+    <add key="sampleMemCount" value="6000" />
+    <add key="waitEndCycle" value="0" />
+    <add key="comCheckTOut" value="10" />
     <!-- watchdog, ping, check disconnesso -->
-    <add key="nMaxSend" value="10"/>
-    <add key="pingTestSec" value="5"/>
-    <add key="watchdogMaxSec" value="90"/>
-    <add key="disconMaxSec" value="30"/>
-    <add key="defIOB" value="2999"/>
-    <add key="pauseSendMSec" value="1000"/>
+    <add key="nMaxSend" value="10" />
+    <add key="pingTestSec" value="5" />
+    <add key="watchdogMaxSec" value="90" />
+    <add key="disconMaxSec" value="30" />
+    <add key="defIOB" value="2999" />
+    <add key="pauseSendMSec" value="1000" />
     <!--gestione coda-->
-    <add key="maxQueueFLog" value="16384"/>
+    <add key="maxQueueFLog" value="16384" />
     <!--parametri SIM-->
-    <add key="waitSimPar" value="45"/>
+    <add key="waitSimPar" value="45" />
     <!--gestione REDIS-->
-    <add key="RedisConn" value="localhost,abortConnect=false,ssl=false"/>
-    <add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false"/>
-    <add key="redisDb" value="10"/>
+    <add key="RedisConn" value="localhost,abortConnect=false,ssl=false" />
+    <add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false" />
+    <add key="redisDb" value="10" />
     <!--gestione invio dati in blocchi Json-->
-    <add key="minJsonData" value="2"/>
-    <add key="maxJsonData" value="100"/>
-    <add key="maxJsonDataEv" value="25"/>
+    <add key="minJsonData" value="2" />
+    <add key="maxJsonData" value="100" />
+    <add key="maxJsonDataEv" value="25" />
     <!--gestione multithread-->
-    <add key="sendDataByThread" value="false"/>
+    <add key="sendDataByThread" value="false" />
     <!--Modalità DEMO: DemoOUT indica che NON invia davvero al server e DemoIN che simula e NON legge da PLC-->
-    <add key="DemoIn" value="false"/>
-    <add key="DemoInSample" value="false"/>
-    <add key="DemoOut" value="false"/>
+    <add key="DemoIn" value="false" />
+    <add key="DemoInSample" value="false" />
+    <add key="DemoOut" value="false" />
     <!--definizione invio dati molto variabili-->
-    <add key="SendAxPos" value="false"/>
-    <add key="SendFeedSpeed" value="false"/>
+    <add key="SendAxPos" value="false" />
+    <add key="SendFeedSpeed" value="false" />
     <!--Definizione avvio Adapter-->
-    <add key="autoLoadConf" value="true"/>
-    <add key="autoStartOnLoad" value="true"/>
-    <add key="startMinimized" value="false"/>
-    <add key="windowCanMax" value="true"/>
-    <add key="trayClose" value="true"/>
-    <add key="autoSaveSec" value="60"/>
-    <add key="waitRecMSec" value="20000"/>
-    <add key="testCharSep" value="|"/>
-    <add key="delayShowLogMs" value="500"/>
-    <add key="vetoSeconds" value="5"/>
+    <add key="autoLoadConf" value="true" />
+    <add key="autoStartOnLoad" value="true" />
+    <add key="startMinimized" value="false" />
+    <add key="windowCanMax" value="true" />
+    <add key="trayClose" value="true" />
+    <add key="autoSaveSec" value="60" />
+    <add key="waitRecMSec" value="20000" />
+    <add key="testCharSep" value="|" />
+    <add key="delayShowLogMs" value="500" />
+    <add key="vetoSeconds" value="5" />
     <!--conf file-->
-    <add key="dataPath" value="DATA"/>
-    <add key="dataConfPath" value="DATA\CONF"/>
-    <add key="dataDatPath" value="DATA\DAT"/>
-    <add key="resxPath" value="Resources"/>
-    <add key="mainConfFile" value="MAIN.ini"/>
-    <add key="defaultPersLayerFile" value="PersistData.dat"/>
-    <add key="simDataFile" value="SimData.dat"/>
-    <add key="memDumpFile" value="MemoryDump.dat"/>
-    <add key="numSim" value="1"/>
-    <add key="MMapR" value="MMapR.map"/>
-    <add key="MMapW" value="MMapW.map"/>
-    <add key="AUpdAsAdm" value="true"/>
-    <add key="ConfToCloud" value="true"/>
+    <add key="dataPath" value="DATA" />
+    <add key="dataConfPath" value="DATA\CONF" />
+    <add key="dataDatPath" value="DATA\DAT" />
+    <add key="resxPath" value="Resources" />
+    <add key="mainConfFile" value="MAIN.ini" />
+    <add key="defaultPersLayerFile" value="PersistData.dat" />
+    <add key="simDataFile" value="SimData.dat" />
+    <add key="memDumpFile" value="MemoryDump.dat" />
+    <add key="numSim" value="1" />
+    <add key="MMapR" value="MMapR.map" />
+    <add key="MMapW" value="MMapW.map" />
+    <add key="AUpdAsAdm" value="true" />
+    <add key="ConfToCloud" value="true" />
     <!--logging-->
-    <add key="recTime" value="true"/>
-    <add key="verbose" value="true"/>
-    <add key="logEvery" value="100"/>
-    <add key="zipLogOldDay" value="1"/>
-    <add key="maxLogDirSize" value="400"/>
-    <add key="numRowConsole" value="50"/>
-    <add key="verboseLogTOut" value="60"/>
+    <add key="recTime" value="true" />
+    <add key="verbose" value="true" />
+    <add key="logEvery" value="100" />
+    <add key="zipLogOldDay" value="1" />
+    <add key="maxLogDirSize" value="400" />
+    <add key="numRowConsole" value="50" />
+    <add key="verboseLogTOut" value="60" />
     <!--conf x FANUC-->
-    <add key="ClientSettingsProvider.ServiceUri" value=""/>
-    <add key="pzCountDelay" value="2000"/>
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="pzCountDelay" value="2000" />
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="lib;libs"/>
-      <probing privatePath="lib;libs" xmlns=""/>
+      <probing privatePath="lib;libs" />
+      <probing privatePath="lib;libs" xmlns="" />
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0"/>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0"/>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
       </providers>
     </roleManager>
   </system.web>
   <system.serviceModel>
     <bindings>
       <basicHttpBinding>
-        <binding name="OPENcontrol"/>
+        <binding name="OPENcontrol" />
       </basicHttpBinding>
     </bindings>
     <client>
-      <endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding" bindingConfiguration="OPENcontrol" contract="OpenControl.OPENcontrolPortType" name="OPENcontrol"/>
+      <endpoint address="http://192.168.20.2:8080" binding="basicHttpBinding" bindingConfiguration="OPENcontrol" contract="OpenControl.OPENcontrolPortType" name="OPENcontrol" />
     </client>
   </system.serviceModel>
 </configuration>
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index 4359c4c6..10ce9222 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -106,8 +106,8 @@
     <Reference Include="MTConnect-NET, Version=2.9.1.28314, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MTConnect.NET.2.9.1.28314\lib\net40\MTConnect-NET.dll</HintPath>
     </Reference>
-    <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 Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\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.7.9\lib\net45\NLog.dll</HintPath>
@@ -127,8 +127,8 @@
     <Reference Include="Opc.Ua.Security.Certificates, Version=1.4.365.0, Culture=neutral, PublicKeyToken=bfa7a73c5cf4b6e8, processorArchitecture=MSIL">
       <HintPath>..\packages\OPCFoundation.NetStandard.Opc.Ua.Security.Certificates.1.4.365.48\lib\net462\Opc.Ua.Security.Certificates.dll</HintPath>
     </Reference>
-    <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\RestSharp.105.2.3\lib\net4-client\RestSharp.dll</HintPath>
+    <Reference Include="RestSharp, Version=106.11.7.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
+      <HintPath>..\packages\RestSharp.106.11.7\lib\net452\RestSharp.dll</HintPath>
     </Reference>
     <Reference Include="S7.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
       <HintPath>..\packages\S7netplus.0.1.9\lib\net40\S7.Net.dll</HintPath>
@@ -171,6 +171,7 @@
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
+    <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config
index e3f40480..5af9c171 100644
--- a/IOB-WIN-NEXT/packages.config
+++ b/IOB-WIN-NEXT/packages.config
@@ -12,7 +12,7 @@
   <package id="Microsoft.NetFramework.Analyzers" version="3.3.2" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.VisualStudio.SlowCheetah" version="3.2.26" targetFramework="net40-client" developmentDependency="true" />
   <package id="MTConnect.NET" version="2.9.1.28314" targetFramework="net40-client" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net40-client" requireReinstallation="true" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
   <package id="NLog" version="4.7.9" targetFramework="net462" />
   <package id="OmronFinsTCP.Net" version="3.0.0.0" targetFramework="net40-client" />
   <package id="OPCFoundation.NetStandard.Opc.Ua.Client" version="1.4.365.48" targetFramework="net462" />
@@ -21,7 +21,7 @@
   <package id="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" version="1.4.365.48" targetFramework="net462" />
   <package id="Portable.BouncyCastle" version="1.8.10" targetFramework="net462" />
   <package id="PrettyBin" version="1.1.0" targetFramework="net461" />
-  <package id="RestSharp" version="105.2.3" targetFramework="net40-client" requireReinstallation="true" />
+  <package id="RestSharp" version="106.11.7" targetFramework="net462" />
   <package id="S7netplus" version="0.1.9" targetFramework="net40-client" requireReinstallation="true" />
   <package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net40-client" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net40-client" requireReinstallation="true" />