From e9fc8b417cdf9d0cf85715c9c2ca2da69bef8360 Mon Sep 17 00:00:00 2001
From: Samuele Locatelli <samuele@steamware.net>
Date: Wed, 18 Dec 2024 19:18:07 +0100
Subject: [PATCH] IOB-WIN-NEXT: eliminazione CosturaFody, fix gestione folder
 lib, test MTC new su jetco OK!!!

---
 IOB-UT-NEXT/IOB-UT-NEXT.csproj   | 4 ++--
 IOB-UT-NEXT/packages.config      | 2 +-
 IOB-WIN-NEXT/App.config          | 1 +
 IOB-WIN-NEXT/DATA/CONF/MAIN.ini  | 4 ++--
 IOB-WIN-NEXT/IOB-WIN-NEXT.csproj | 9 ---------
 IOB-WIN-NEXT/packages.config     | 2 --
 IOB-WIN-NEXT/postBuildTgt.bat    | 4 ++--
 7 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
index 5729ae42..d1b47cbf 100644
--- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj
+++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
@@ -81,8 +81,8 @@
     <Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
       <HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
     </Reference>
-    <Reference Include="MapoSDK, Version=6.14.2309.1908, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MapoSDK.6.14.2309.1908\lib\MapoSDK.dll</HintPath>
+    <Reference Include="MapoSDK, Version=6.14.2411.518, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MapoSDK.6.14.2411.518\lib\MapoSDK.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
diff --git a/IOB-UT-NEXT/packages.config b/IOB-UT-NEXT/packages.config
index 657ca54e..1bbf7169 100644
--- a/IOB-UT-NEXT/packages.config
+++ b/IOB-UT-NEXT/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MapoSDK" version="6.14.2309.1908" targetFramework="net462" />
+  <package id="MapoSDK" version="6.14.2411.518" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
   <package id="NLog" version="5.2.3" targetFramework="net462" />
diff --git a/IOB-WIN-NEXT/App.config b/IOB-WIN-NEXT/App.config
index 268bca55..69428063 100644
--- a/IOB-WIN-NEXT/App.config
+++ b/IOB-WIN-NEXT/App.config
@@ -111,6 +111,7 @@
   </appSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="lib;libs" xmlns="urn:schemas-microsoft-com:asm.v1" />
       <dependentAssembly>
         <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
index 34333770..2533e40d 100644
--- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini
@@ -50,10 +50,10 @@ CLI_INST=SteamWareSim
 ;NB: mettere copy always ai file di conf x fare test...
 ;STARTLIST=2014
 ;STARTLIST=Tend_RAMA_10_47
-;STARTLIST=3024
 ;STARTLIST=3024-PING
-STARTLIST=3019
 ;STARTLIST=2015
+STARTLIST=SIMUL_01
+;STARTLIST=3024
 
 
 MAXCNC=10
\ No newline at end of file
diff --git a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
index f3e9074a..e4ab01ee 100644
--- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" />
-  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" />
   <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -107,9 +106,6 @@
     <Reference Include="CndexLinkDotNet">
       <HintPath>..\EgwProxy.MultiCncLib\ExtLib\CndexLinkDotNet.dll</HintPath>
     </Reference>
-    <Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
-    </Reference>
     <Reference Include="EasyModbus, Version=5.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll</HintPath>
     </Reference>
@@ -1163,9 +1159,6 @@
     <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1938.49\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1938.49\build\Microsoft.Web.WebView2.targets'))" />
     <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.6.8.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.2\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.5.1\build\EntityFramework.targets'))" />
     <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.131.0.6778.10800\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.131.0.6778.10800\build\Selenium.WebDriver.ChromeDriver.targets'))" />
@@ -1176,8 +1169,6 @@
   <Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
   <Import Project="..\packages\Microsoft.Web.WebView2.1.0.1938.49\build\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.1938.49\build\Microsoft.Web.WebView2.targets')" />
   <Import Project="..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.SlowCheetah.4.0.50\build\Microsoft.VisualStudio.SlowCheetah.targets')" />
-  <Import Project="..\packages\Fody.6.8.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.2\build\Fody.targets')" />
-  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
   <Import Project="..\packages\EntityFramework.6.5.1\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.5.1\build\EntityFramework.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.131.0.6778.10800\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.131.0.6778.10800\build\Selenium.WebDriver.ChromeDriver.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.MSEdgeDriver.131.0.2903.48\build\Selenium.WebDriver.MSEdgeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.MSEdgeDriver.131.0.2903.48\build\Selenium.WebDriver.MSEdgeDriver.targets')" />
diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config
index d3156a8b..edbb88d3 100644
--- a/IOB-WIN-NEXT/packages.config
+++ b/IOB-WIN-NEXT/packages.config
@@ -2,7 +2,6 @@
 <packages>
   <package id="Autoupdater.NET.Official" version="1.8.4" targetFramework="net462" />
   <package id="BouncyCastle.Cryptography" version="2.4.0" targetFramework="net462" />
-  <package id="Costura.Fody" version="6.0.0" targetFramework="net462" developmentDependency="true" />
   <package id="EasyModbusTCP" version="5.6.0" targetFramework="net462" />
   <package id="EgwProxy.Ftp" version="3.6.2410.816" targetFramework="net462" />
   <package id="EgwProxy.Gomba" version="3.6.2309.1416" targetFramework="net462" />
@@ -12,7 +11,6 @@
   <package id="EgwProxy.SqlDb" version="3.6.2303.1515" targetFramework="net462" />
   <package id="EntityFramework" version="6.5.1" targetFramework="net462" />
   <package id="FluentFTP" version="51.1.0" targetFramework="net462" />
-  <package id="Fody" version="6.8.2" targetFramework="net462" developmentDependency="true" />
   <package id="MapoSDK" version="6.14.2411.518" targetFramework="net462" />
   <package id="MathNet.Numerics" version="4.15.0" targetFramework="net462" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
diff --git a/IOB-WIN-NEXT/postBuildTgt.bat b/IOB-WIN-NEXT/postBuildTgt.bat
index 9eaa624e..1da16f13 100644
--- a/IOB-WIN-NEXT/postBuildTgt.bat
+++ b/IOB-WIN-NEXT/postBuildTgt.bat
@@ -68,14 +68,14 @@ REM IMI Remosa
 REM ROBOCOPY %2 \\192.168.0.12\Steamware\IOB-WIN-NEXT-DEB /MIR
 
 REM IOB-WIN-SIM
-ROBOCOPY %2 \\IOB-WIN-SIMULA\Steamware\IOB-WIN-NEXT-DEB /MIR
+REM ROBOCOPY %2 \\IOB-WIN-SIMULA\Steamware\IOB-WIN-NEXT-DEB /MIR
 
 REM IOBVPN4MACHINE
 REM ROBOCOPY %2 \\10.51.90.5\Steamware\IOB-WIN-NEXT-DEB /MIR
 REM ROBOCOPY %2 \\10.51.90.5\Steamware\IOB-WIN-NEXT-DEB /MIR /log:RobocopyTransfer.log
 REM ROBOCOPY %2 Z:\IOB-WIN-NEXT-DEB /MIR
-REM ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-NEXT-DEB /MIR
 REM ROBOCOPY %2 \\10.51.90.10\Steamware\IOB-WIN-NEXT-DEB /MIR
+ROBOCOPY %2 \\10.51.90.9\Steamware\IOB-WIN-NEXT-DEB /MIR
 
 goto END