diff --git a/IOB-WIN-FORM/IOB-WIN-FORM.csproj b/IOB-WIN-FORM/IOB-WIN-FORM.csproj
index ca506eea..288b827c 100644
--- a/IOB-WIN-FORM/IOB-WIN-FORM.csproj
+++ b/IOB-WIN-FORM/IOB-WIN-FORM.csproj
@@ -14,6 +14,7 @@
+ true
true
@@ -91,6 +92,9 @@
..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll
+
+ ..\packages\System.Resources.Extensions.4.7.1\lib\net461\System.Resources.Extensions.dll
+
..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll
diff --git a/IOB-WIN-FORM/Iob/Simula.cs b/IOB-WIN-FORM/Iob/Simula.cs
index a1d089fe..0f70f550 100644
--- a/IOB-WIN-FORM/Iob/Simula.cs
+++ b/IOB-WIN-FORM/Iob/Simula.cs
@@ -973,10 +973,10 @@ namespace IOB_WIN_FORM.Iob
item.reqValue = "";
MemBlock = new byte[byteSize];
- serObj = JsonConvert.SerializeObject(item, Formatting.Indented);
- lgInfo($"Inizio processing plcWriteParams per {currMem.name} | valore richiesto {currMem.value}{Environment.NewLine}---------------UPDATED PARAM---------------{Environment.NewLine}{serObj}{Environment.NewLine}---------------");
- serObj = JsonConvert.SerializeObject(currMem, Formatting.Indented);
- lgInfo($"---------------MEMORY CONTENT---------------{Environment.NewLine}{serObj}{Environment.NewLine}---------------");
+ serObj = JsonSerialize(item, Formatting.Indented);
+ lgInfo($"Inizio processing plcWriteParams per {currMem.name} | valore richiesto {currMem.value}{Environment.NewLine}---------------UPDATED PARAM---------------{Environment.NewLine}{serObj}{Environment.NewLine}---------------");
+ serObj = JsonSerialize(currMem, Formatting.Indented);
+ lgInfo($"---------------MEMORY CONTENT---------------{Environment.NewLine}{serObj}{Environment.NewLine}---------------");
lgInfo($"---------------MemBlock data---------------{Environment.NewLine}{BitConverter.ToString(MemBlock)}{Environment.NewLine}--------------- END data ---------------");
// salvo
@@ -1611,7 +1611,7 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- listaArt = JsonConvert.DeserializeObject>(rawListArt);
+ listaArt = JsonDeserialize>(rawListArt);
okArt = listaArt.Count > 0;
}
catch (Exception exc)
@@ -1627,7 +1627,7 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- listaDoss = JsonConvert.DeserializeObject>(rawListDOSS);
+ listaDoss = JsonDeserialize>(rawListDOSS);
okDoss = listaDoss.Count > 0;
}
catch (Exception exc)
@@ -1643,7 +1643,7 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- listaPODL = JsonConvert.DeserializeObject>(rawListPODL);
+ listaPODL = JsonDeserialize>(rawListPODL);
okPodl = listaPODL.Count > 0;
}
catch (Exception exc)
@@ -1659,7 +1659,7 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- anagLVFasi = JsonConvert.DeserializeObject>(rawLVFasi);
+ anagLVFasi = JsonDeserialize>(rawLVFasi);
dictAF = anagLVFasi.ToDictionary(x => x.value, x => x.label);
okLVFasi = listaArt.Count > 0;
}
@@ -1760,8 +1760,8 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- listaArt = JsonConvert.DeserializeObject>(rawListArt);
- okArt = listaArt.Count > 0;
+ listaArt = JsonDeserialize>(rawListArt);
+ okArt = listaArt.Count > 0;
}
catch (Exception exc)
{
@@ -1776,8 +1776,8 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- listaDoss = JsonConvert.DeserializeObject>(rawListDOSS);
- okDoss = listaDoss.Count > 0;
+ listaDoss = JsonDeserialize>(rawListDOSS);
+ okDoss = listaDoss.Count > 0;
}
catch (Exception exc)
{
@@ -1792,8 +1792,8 @@ namespace IOB_WIN_FORM.Iob
{
try
{
- listaPODL = JsonConvert.DeserializeObject>(rawListPODL);
- okPodl = listaPODL.Count > 0;
+ listaPODL = JsonDeserialize>(rawListPODL);
+ okPodl = listaPODL.Count > 0;
}
catch (Exception exc)
{
@@ -1828,7 +1828,7 @@ namespace IOB_WIN_FORM.Iob
if (selArt != null && selDoss != null)
{
// recupero il resultset dei valori FluxLog da caricare
- DossierFluxLogDTO resultSet = JsonConvert.DeserializeObject(selDoss.Valore);
+ DossierFluxLogDTO resultSet = JsonDeserialize(selDoss.Valore);
List listFluxLog = resultSet.ODL;
// preparo elenco parametri da inviare...
@@ -2167,7 +2167,7 @@ namespace IOB_WIN_FORM.Iob
///
private void sendDataItemsList(List dataItems)
{
- string rawData = JsonConvert.SerializeObject(dataItems);
+ string rawData = JsonSerialize(dataItems);
HttpService.CallUrlPost($"{urlSaveDataItems}", rawData);
}
diff --git a/IOB-WIN-FORM/packages.config b/IOB-WIN-FORM/packages.config
index 093b0468..18b5ff20 100644
--- a/IOB-WIN-FORM/packages.config
+++ b/IOB-WIN-FORM/packages.config
@@ -16,6 +16,7 @@
+
diff --git a/build_all.ps1 b/build_all.ps1
index dbbe56e7..fbd77c4a 100644
--- a/build_all.ps1
+++ b/build_all.ps1
@@ -1,5 +1,5 @@
# Cerca ricorsivamente solo le soluzioni che iniziano con 'IOB-WIN-'
-$pattern = "IOB-WIN-*.sln"
+$pattern = "IOB-WIN-NEXT.sln"
$solutions = Get-ChildItem -Path . -Filter $pattern -Recurse
if ($solutions.Count -eq 0) {