diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll
index f7e4a284..ab1264dd 100644
Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ
diff --git a/IOB-MAN/FodyWeavers.xml b/IOB-MAN/FodyWeavers.xml
deleted file mode 100644
index 5029e706..00000000
--- a/IOB-MAN/FodyWeavers.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/IOB-MAN/FodyWeavers.xsd b/IOB-MAN/FodyWeavers.xsd
deleted file mode 100644
index 44a53744..00000000
--- a/IOB-MAN/FodyWeavers.xsd
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks
-
-
-
-
- A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.
-
-
-
-
- A list of unmanaged 32 bit assembly names to include, delimited with line breaks.
-
-
-
-
- A list of unmanaged 64 bit assembly names to include, delimited with line breaks.
-
-
-
-
- The order of preloaded assemblies, delimited with line breaks.
-
-
-
-
-
- This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file.
-
-
-
-
- Controls if .pdbs for reference assemblies are also embedded.
-
-
-
-
- Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.
-
-
-
-
- As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off.
-
-
-
-
- Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code.
-
-
-
-
- Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior.
-
-
-
-
- A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with |
-
-
-
-
- A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.
-
-
-
-
- A list of unmanaged 32 bit assembly names to include, delimited with |.
-
-
-
-
- A list of unmanaged 64 bit assembly names to include, delimited with |.
-
-
-
-
- The order of preloaded assemblies, delimited with |.
-
-
-
-
-
-
-
- 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.
-
-
-
-
- A comma-separated list of error codes that can be safely ignored in assembly verification.
-
-
-
-
- 'false' to turn off automatic generation of the XML Schema file.
-
-
-
-
-
\ No newline at end of file
diff --git a/IOB-MAN/IOB-MAN.csproj b/IOB-MAN/IOB-MAN.csproj
index 4bcc5b2e..1fd575af 100644
--- a/IOB-MAN/IOB-MAN.csproj
+++ b/IOB-MAN/IOB-MAN.csproj
@@ -52,17 +52,17 @@
..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll
-
- ..\packages\MapoSDK.6.9.1912.1271\lib\net40\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.9.2001.1283\lib\net40\MapoSDK.dll
-
- ..\packages\MongoDB.Bson.2.10.0\lib\net452\MongoDB.Bson.dll
+
+ ..\packages\MongoDB.Bson.2.10.1\lib\net452\MongoDB.Bson.dll
-
- ..\packages\MongoDB.Driver.2.10.0\lib\net452\MongoDB.Driver.dll
+
+ ..\packages\MongoDB.Driver.2.10.1\lib\net452\MongoDB.Driver.dll
-
- ..\packages\MongoDB.Driver.Core.2.10.0\lib\net452\MongoDB.Driver.Core.dll
+
+ ..\packages\MongoDB.Driver.Core.2.10.1\lib\net452\MongoDB.Driver.Core.dll
..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll
@@ -71,7 +71,7 @@
..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll
- ..\packages\NLog.4.6.8\lib\net45\NLog.dll
+ ..\packages\NLog.4.6.7\lib\net45\NLog.dll
..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll
@@ -154,11 +154,10 @@
-
-
-
+
+
-
+
Always
@@ -174,12 +173,12 @@
True
Resources.resx
-
-
Always
+
+
Always
@@ -221,6 +220,5 @@
-
\ No newline at end of file
diff --git a/IOB-MAN/NLog.config b/IOB-MAN/NLog.config
index 93055638..7a0f3aa1 100644
--- a/IOB-MAN/NLog.config
+++ b/IOB-MAN/NLog.config
@@ -9,75 +9,33 @@
-
+
+
-
-
-
-
-
+
+
+
-
-
diff --git a/IOB-MAN/App_Readme/README_SteamWare.txt b/IOB-MAN/README.txt
similarity index 100%
rename from IOB-MAN/App_Readme/README_SteamWare.txt
rename to IOB-MAN/README.txt
diff --git a/IOB-MAN/App_Readme/SteamWare_demo/example-NLog.config b/IOB-MAN/example-NLog.config
similarity index 100%
rename from IOB-MAN/App_Readme/SteamWare_demo/example-NLog.config
rename to IOB-MAN/example-NLog.config
diff --git a/IOB-MAN/App_Readme/SteamWare_demo/example-app.config b/IOB-MAN/example-app.config
similarity index 100%
rename from IOB-MAN/App_Readme/SteamWare_demo/example-app.config
rename to IOB-MAN/example-app.config
diff --git a/IOB-MAN/App_Readme/SteamWare_demo/example-config-table.txt b/IOB-MAN/example-config-table.txt
similarity index 100%
rename from IOB-MAN/App_Readme/SteamWare_demo/example-config-table.txt
rename to IOB-MAN/example-config-table.txt
diff --git a/IOB-MAN/App_Readme/SteamWare_demo/example-favicon.ico b/IOB-MAN/example-favicon.ico
similarity index 100%
rename from IOB-MAN/App_Readme/SteamWare_demo/example-favicon.ico
rename to IOB-MAN/example-favicon.ico
diff --git a/IOB-MAN/packages.config b/IOB-MAN/packages.config
index a684fd55..bb94184e 100644
--- a/IOB-MAN/packages.config
+++ b/IOB-MAN/packages.config
@@ -4,25 +4,24 @@
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
diff --git a/IOB-UT/Enums.cs b/IOB-UT/Enums.cs
index bdc570ba..d326babf 100644
--- a/IOB-UT/Enums.cs
+++ b/IOB-UT/Enums.cs
@@ -189,6 +189,7 @@ namespace IOB_UT
B30 = 1 << 30,
B31 = 1 << 31
}
+#if false
///
/// Enumerazione tipi di semaforo
///
@@ -214,7 +215,8 @@ namespace IOB_UT
/// Grigio/Spento
///
SS
- }
+ }
+#endif
///
/// Enumerazione tipi di tipi di URL x invio
///
diff --git a/IOB-UT/IOB-UT.csproj b/IOB-UT/IOB-UT.csproj
index 965bc47f..398a9d3f 100644
--- a/IOB-UT/IOB-UT.csproj
+++ b/IOB-UT/IOB-UT.csproj
@@ -54,8 +54,8 @@
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
-
- ..\packages\MapoSDK.6.9.1912.1265\lib\net40\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.9.2001.1283\lib\net40\MapoSDK.dll
..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll
diff --git a/IOB-UT/packages.config b/IOB-UT/packages.config
index 78d59d0a..13c72ca0 100644
--- a/IOB-UT/packages.config
+++ b/IOB-UT/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index 3e6b24f5..a7b139d4 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -1,4 +1,5 @@
using IOB_UT;
+using MapoSDK;
using NLog;
using NLog.Config;
using NLog.Targets;
diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index 91fd537f..39e82d74 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -83,8 +83,8 @@
False
ExtLib\krcc.dll
-
- ..\packages\MapoSDK.6.9.1912.1268\lib\net40\MapoSDK.dll
+
+ ..\packages\MapoSDK.6.9.2001.1283\lib\net40\MapoSDK.dll
..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll
diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs
index 61a0e57b..90b0ae65 100644
--- a/IOB-WIN/IobOSAI.cs
+++ b/IOB-WIN/IobOSAI.cs
@@ -1,5 +1,6 @@
using CndexLinkDotNet;
using IOB_UT;
+using MapoSDK;
using System;
using System.Collections.Generic;
using System.Net;
diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index 4d443ec7..bfa756f7 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -1,4 +1,5 @@
using IOB_UT;
+using MapoSDK;
using System;
using System.Collections.Generic;
diff --git a/IOB-WIN/IobWPS.cs b/IOB-WIN/IobWPS.cs
index 79bf7085..384e07ee 100644
--- a/IOB-WIN/IobWPS.cs
+++ b/IOB-WIN/IobWPS.cs
@@ -1,4 +1,5 @@
using IOB_UT;
+using MapoSDK;
using Newtonsoft.Json;
using OpenQA.Selenium;
using OpenQA.Selenium.Chrome;
diff --git a/IOB-WIN/packages.config b/IOB-WIN/packages.config
index 93da5397..ddd49ab2 100644
--- a/IOB-WIN/packages.config
+++ b/IOB-WIN/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 58eb7382..a2f44ce8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,7 +9,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
- withEnv(['NEXT_BUILD_NUMBER=655']) {
+ withEnv(['NEXT_BUILD_NUMBER=656']) {
// env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '3.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'