diff --git a/EgwProxy.Ftp.Debug.nuspec b/EgwProxy.Ftp.Debug.nuspec index 18a977c3..a10657b2 100644 --- a/EgwProxy.Ftp.Debug.nuspec +++ b/EgwProxy.Ftp.Debug.nuspec @@ -1,5 +1,5 @@ - + EgwProxy.Ftp #version# @@ -11,6 +11,12 @@ #releaseNotes# #copyright# EgwProxy.Ftp EgwProxy Ftp + + + + + + diff --git a/EgwProxy.Ftp.Release.nuspec b/EgwProxy.Ftp.Release.nuspec index 428928da..c0d24811 100644 --- a/EgwProxy.Ftp.Release.nuspec +++ b/EgwProxy.Ftp.Release.nuspec @@ -1,5 +1,5 @@ - + EgwProxy.Ftp #version# @@ -11,6 +11,10 @@ #releaseNotes# #copyright# EgwProxy.Ftp EgwProxy Ftp + + + + diff --git a/EgwProxy.Icoel.DataLayer/App.config b/EgwProxy.Icoel.DataLayer/App.config index bb4630dd..20384aaf 100644 --- a/EgwProxy.Icoel.DataLayer/App.config +++ b/EgwProxy.Icoel.DataLayer/App.config @@ -1,20 +1,20 @@  - - -
- - - - - - - - - - - - + + +
+ + + + + + + + + + + + diff --git a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj index 9388cba0..ca18137e 100644 --- a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj +++ b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj @@ -35,128 +35,33 @@ 4 - - ..\packages\Azure.Core.1.6.0\lib\net461\Azure.Core.dll - - - ..\packages\Azure.Identity.1.3.0\lib\netstandard2.0\Azure.Identity.dll - ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll - ..\packages\Microsoft.Data.SqlClient.4.1.0\lib\net461\Microsoft.Data.SqlClient.dll - - ..\packages\Microsoft.Identity.Client.4.22.0\lib\net461\Microsoft.Identity.Client.dll - - - ..\packages\Microsoft.Identity.Client.Extensions.Msal.2.16.5\lib\net45\Microsoft.Identity.Client.Extensions.Msal.dll - - - ..\packages\Microsoft.IdentityModel.JsonWebTokens.6.8.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll - - - ..\packages\Microsoft.IdentityModel.Logging.6.8.0\lib\net461\Microsoft.IdentityModel.Logging.dll - - - ..\packages\Microsoft.IdentityModel.Protocols.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.dll - - - ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll - - - ..\packages\Microsoft.IdentityModel.Tokens.6.8.0\lib\net461\Microsoft.IdentityModel.Tokens.dll - ..\packages\NLog.4.7.9\lib\net45\NLog.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\packages\System.Configuration.ConfigurationManager.5.0.0\lib\net461\System.Configuration.ConfigurationManager.dll - - - ..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll - - - ..\packages\System.IdentityModel.Tokens.Jwt.6.8.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll - - - ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll - True - True - - - ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll - True - True - - - ..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll - - - ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll - True - True - - - ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - True - - - ..\packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\net461\System.Security.Cryptography.ProtectedData.dll - - - ..\packages\System.Security.Permissions.5.0.0\lib\net461\System.Security.Permissions.dll - - - ..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll - - - ..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll - - - ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll - - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - @@ -186,14 +91,11 @@ + - Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/EgwProxy.Icoel.DataLayer/packages.config b/EgwProxy.Icoel.DataLayer/packages.config index d4e647cc..84723a59 100644 --- a/EgwProxy.Icoel.DataLayer/packages.config +++ b/EgwProxy.Icoel.DataLayer/packages.config @@ -1,36 +1,5 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EgwProxy.Icoel.Debug.nuspec b/EgwProxy.Icoel.Debug.nuspec index 5026df13..578007e9 100644 --- a/EgwProxy.Icoel.Debug.nuspec +++ b/EgwProxy.Icoel.Debug.nuspec @@ -11,6 +11,10 @@ #releaseNotes# #copyright# EgwProxy.Icoel EgwProxy Icoel + + + + diff --git a/EgwProxy.Icoel.Release.nuspec b/EgwProxy.Icoel.Release.nuspec index 096e2022..046d2cb6 100644 --- a/EgwProxy.Icoel.Release.nuspec +++ b/EgwProxy.Icoel.Release.nuspec @@ -11,6 +11,10 @@ #releaseNotes# #copyright# EgwProxy.Icoel EgwProxy Icoel + + + + diff --git a/EgwProxy.Icoel.Test/EgwProxy.Icoel.Test.csproj b/EgwProxy.Icoel.Test/EgwProxy.Icoel.Test.csproj index 37efc51e..f4930294 100644 --- a/EgwProxy.Icoel.Test/EgwProxy.Icoel.Test.csproj +++ b/EgwProxy.Icoel.Test/EgwProxy.Icoel.Test.csproj @@ -59,5 +59,15 @@ + + + {e36544cb-d699-48d8-9f81-c2758e7c7d19} + EgwProxy.Icoel.DataLayer + + + {c45f5e6e-866b-4a34-a598-29aab2d178ad} + EgwProxy.Icoel + + \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index 0789791b..b06d4194 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -39,10 +39,10 @@ CLI_INST=SteamWareSim ;STARTLIST=GIACO_CENTERFRIGO ;STARTLIST=GIACO_NWSE ;STARTLIST=SIM_DP_01 +;STARTLIST=WPS ;STARTLIST=FINASSI_HELPI_01 ;STARTLIST=FINASSI_OMP_01 ;STARTLIST=BAGLIETTO_CIMOLAI_01 -;STARTLIST=SIMUL_01 -STARTLIST=WPS +STARTLIST=SIMUL_01 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 41885a61..af99c53b 100644 --- a/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj +++ b/IOB-WIN-NEXT/IOB-WIN-NEXT.csproj @@ -107,13 +107,13 @@ ..\packages\EasyModbusTCP.5.6.0\lib\net40\EasyModbus.dll - ..\packages\EgwProxy.Ftp.3.6.2210.418\lib\EgwProxy.Ftp.dll + ..\packages\EgwProxy.Ftp.3.6.2210.1815\lib\EgwProxy.Ftp.dll - ..\packages\EgwProxy.Icoel.3.6.2206.2811\lib\EgwProxy.Icoel.dll + ..\packages\EgwProxy.Icoel.3.6.2210.1815\lib\EgwProxy.Icoel.dll - ..\packages\EgwProxy.Icoel.3.6.2206.2811\lib\EgwProxy.Icoel.DataLayer.dll + ..\packages\EgwProxy.Icoel.3.6.2210.1815\lib\EgwProxy.Icoel.DataLayer.dll ..\packages\EgwProxy.MultiCncLib.3.6.2207.1211\lib\EgwProxy.MultiCncLib.dll diff --git a/IOB-WIN-NEXT/packages.config b/IOB-WIN-NEXT/packages.config index 78bd877b..e753473c 100644 --- a/IOB-WIN-NEXT/packages.config +++ b/IOB-WIN-NEXT/packages.config @@ -2,8 +2,8 @@ - - + +