From af2cbd6bebc2ab5d46112e2661ddf4727fbc0966 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:13:21 +0200 Subject: [PATCH 1/8] update nuget dep x FTP proxy --- EgwProxy.FTP.sln.nuspec | 21 +++++++++++++++++++++ EgwProxy.Ftp.Debug.nuspec | 4 ++++ EgwProxy.Ftp.Release.nuspec | 4 ++++ 3 files changed, 29 insertions(+) create mode 100644 EgwProxy.FTP.sln.nuspec diff --git a/EgwProxy.FTP.sln.nuspec b/EgwProxy.FTP.sln.nuspec new file mode 100644 index 00000000..73aa7d95 --- /dev/null +++ b/EgwProxy.FTP.sln.nuspec @@ -0,0 +1,21 @@ + + + + EgwProxy.FTP.sln + 1.0.0 + samuele + false + MIT + + http://project_url_here_or_delete_this_line/ + Package description + Summary of changes made in this release of the package. + $copyright$ + Tag1 Tag2 + + + + + + + \ No newline at end of file diff --git a/EgwProxy.Ftp.Debug.nuspec b/EgwProxy.Ftp.Debug.nuspec index 18a977c3..c6405473 100644 --- a/EgwProxy.Ftp.Debug.nuspec +++ b/EgwProxy.Ftp.Debug.nuspec @@ -17,4 +17,8 @@ + + + + \ No newline at end of file diff --git a/EgwProxy.Ftp.Release.nuspec b/EgwProxy.Ftp.Release.nuspec index 428928da..9d036888 100644 --- a/EgwProxy.Ftp.Release.nuspec +++ b/EgwProxy.Ftp.Release.nuspec @@ -16,4 +16,8 @@ + + + + \ No newline at end of file From 962027e4369b0aa50e6764f43ece1b696ba328fe Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:15:51 +0200 Subject: [PATCH 2/8] Update conf dipendenze nuget --- EgwProxy.Ftp.Debug.nuspec | 10 +++++----- EgwProxy.Ftp.Release.nuspec | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/EgwProxy.Ftp.Debug.nuspec b/EgwProxy.Ftp.Debug.nuspec index c6405473..12d71e79 100644 --- a/EgwProxy.Ftp.Debug.nuspec +++ b/EgwProxy.Ftp.Debug.nuspec @@ -1,5 +1,5 @@ - + EgwProxy.Ftp #version# @@ -11,14 +11,14 @@ #releaseNotes# #copyright# EgwProxy.Ftp EgwProxy Ftp + + + + - - - - \ No newline at end of file diff --git a/EgwProxy.Ftp.Release.nuspec b/EgwProxy.Ftp.Release.nuspec index 9d036888..c0d24811 100644 --- a/EgwProxy.Ftp.Release.nuspec +++ b/EgwProxy.Ftp.Release.nuspec @@ -1,5 +1,5 @@ - + EgwProxy.Ftp #version# @@ -11,13 +11,13 @@ #releaseNotes# #copyright# EgwProxy.Ftp EgwProxy Ftp + + + + - - - - \ No newline at end of file From 414d5df6eeba861e25723c8958a38f3198ee18af Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:23:15 +0200 Subject: [PATCH 3/8] Update nuget/nuspec --- EgwProxy.Ftp.Debug.nuspec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/EgwProxy.Ftp.Debug.nuspec b/EgwProxy.Ftp.Debug.nuspec index 12d71e79..a10657b2 100644 --- a/EgwProxy.Ftp.Debug.nuspec +++ b/EgwProxy.Ftp.Debug.nuspec @@ -12,8 +12,10 @@ #copyright# EgwProxy.Ftp EgwProxy Ftp - - + + + + From e0cb419f82293f85e9d0a62bc05f2790386bc2df Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:33:42 +0200 Subject: [PATCH 4/8] Update nuspec x Icoel package... inizio --- EgwProxy.FTP.sln.nuspec | 21 ------------------- EgwProxy.Icoel.DataLayer/App.config | 2 +- .../EgwProxy.Icoel.DataLayer.csproj | 16 -------------- EgwProxy.Icoel.DataLayer/packages.config | 5 ----- .../EgwProxy.Icoel.Test.csproj | 10 +++++++++ 5 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 EgwProxy.FTP.sln.nuspec diff --git a/EgwProxy.FTP.sln.nuspec b/EgwProxy.FTP.sln.nuspec deleted file mode 100644 index 73aa7d95..00000000 --- a/EgwProxy.FTP.sln.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - EgwProxy.FTP.sln - 1.0.0 - samuele - false - MIT - - http://project_url_here_or_delete_this_line/ - Package description - Summary of changes made in this release of the package. - $copyright$ - Tag1 Tag2 - - - - - - - \ No newline at end of file diff --git a/EgwProxy.Icoel.DataLayer/App.config b/EgwProxy.Icoel.DataLayer/App.config index bb4630dd..269c6d5c 100644 --- a/EgwProxy.Icoel.DataLayer/App.config +++ b/EgwProxy.Icoel.DataLayer/App.config @@ -1,7 +1,7 @@  - +
diff --git a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj index 9388cba0..68905492 100644 --- a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj +++ b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj @@ -35,12 +35,6 @@ 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 @@ -186,14 +180,4 @@ - - - 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}. - - - - - - - \ No newline at end of file diff --git a/EgwProxy.Icoel.DataLayer/packages.config b/EgwProxy.Icoel.DataLayer/packages.config index d4e647cc..11e8dd15 100644 --- a/EgwProxy.Icoel.DataLayer/packages.config +++ b/EgwProxy.Icoel.DataLayer/packages.config @@ -1,11 +1,6 @@  - - - - - 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 From a3acb09a03baa2b965bf3511e181ebc102349630 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:36:37 +0200 Subject: [PATCH 5/8] Ancora update nuget deps Icoel --- .../EgwProxy.Icoel.DataLayer.csproj | 33 ------------------- EgwProxy.Icoel.DataLayer/packages.config | 11 ------- 2 files changed, 44 deletions(-) diff --git a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj index 68905492..6725a378 100644 --- a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj +++ b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj @@ -41,33 +41,9 @@ ..\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 @@ -87,9 +63,6 @@ - - ..\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 @@ -138,12 +111,6 @@ - - ..\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 diff --git a/EgwProxy.Icoel.DataLayer/packages.config b/EgwProxy.Icoel.DataLayer/packages.config index 11e8dd15..f2138606 100644 --- a/EgwProxy.Icoel.DataLayer/packages.config +++ b/EgwProxy.Icoel.DataLayer/packages.config @@ -1,18 +1,9 @@  - - - - - - - - - @@ -24,8 +15,6 @@ - - \ No newline at end of file From 89c964c3cd0328fe195f852f1cb470fc3ace0393 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:41:12 +0200 Subject: [PATCH 6/8] COmpleto update nuspec x Icoel proxy --- .../EgwProxy.Icoel.DataLayer.csproj | 56 ------------------- EgwProxy.Icoel.DataLayer/packages.config | 16 ------ EgwProxy.Icoel.Debug.nuspec | 3 + EgwProxy.Icoel.Release.nuspec | 3 + 4 files changed, 6 insertions(+), 72 deletions(-) diff --git a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj index 6725a378..7b99c82f 100644 --- a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj +++ b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj @@ -48,76 +48,20 @@ ..\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.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.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 - diff --git a/EgwProxy.Icoel.DataLayer/packages.config b/EgwProxy.Icoel.DataLayer/packages.config index f2138606..1a6b20de 100644 --- a/EgwProxy.Icoel.DataLayer/packages.config +++ b/EgwProxy.Icoel.DataLayer/packages.config @@ -1,20 +1,4 @@  - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/EgwProxy.Icoel.Debug.nuspec b/EgwProxy.Icoel.Debug.nuspec index 5026df13..5198a025 100644 --- a/EgwProxy.Icoel.Debug.nuspec +++ b/EgwProxy.Icoel.Debug.nuspec @@ -11,6 +11,9 @@ #releaseNotes# #copyright# EgwProxy.Icoel EgwProxy Icoel + + + diff --git a/EgwProxy.Icoel.Release.nuspec b/EgwProxy.Icoel.Release.nuspec index 096e2022..e76b1933 100644 --- a/EgwProxy.Icoel.Release.nuspec +++ b/EgwProxy.Icoel.Release.nuspec @@ -11,6 +11,9 @@ #releaseNotes# #copyright# EgwProxy.Icoel EgwProxy Icoel + + + From de9b6fa3fb8a7d7c2a0f6d4bedfbba1f71dbcb94 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:47:44 +0200 Subject: [PATCH 7/8] Update nuget Icoel con EntityFramework 6.4.4 --- EgwProxy.Icoel.DataLayer/App.config | 30 +++++++++---------- .../EgwProxy.Icoel.DataLayer.csproj | 7 +++++ EgwProxy.Icoel.DataLayer/packages.config | 1 + EgwProxy.Icoel.Debug.nuspec | 1 + EgwProxy.Icoel.Release.nuspec | 1 + 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/EgwProxy.Icoel.DataLayer/App.config b/EgwProxy.Icoel.DataLayer/App.config index 269c6d5c..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 7b99c82f..ca18137e 100644 --- a/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj +++ b/EgwProxy.Icoel.DataLayer/EgwProxy.Icoel.DataLayer.csproj @@ -91,4 +91,11 @@ + + + + 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 1a6b20de..84723a59 100644 --- a/EgwProxy.Icoel.DataLayer/packages.config +++ b/EgwProxy.Icoel.DataLayer/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/EgwProxy.Icoel.Debug.nuspec b/EgwProxy.Icoel.Debug.nuspec index 5198a025..578007e9 100644 --- a/EgwProxy.Icoel.Debug.nuspec +++ b/EgwProxy.Icoel.Debug.nuspec @@ -13,6 +13,7 @@ EgwProxy.Icoel EgwProxy Icoel + diff --git a/EgwProxy.Icoel.Release.nuspec b/EgwProxy.Icoel.Release.nuspec index e76b1933..046d2cb6 100644 --- a/EgwProxy.Icoel.Release.nuspec +++ b/EgwProxy.Icoel.Release.nuspec @@ -13,6 +13,7 @@ EgwProxy.Icoel EgwProxy Icoel + From 568e65946a75046295230cb19503d8ca8cdbf5e2 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Tue, 18 Oct 2022 15:54:07 +0200 Subject: [PATCH 8/8] Update NugetPack EgwProxy - ftp - icoel --- IOB-WIN-NEXT/DATA/CONF/MAIN.ini | 4 ++-- IOB-WIN-NEXT/IOB-WIN-NEXT.csproj | 6 +++--- IOB-WIN-NEXT/packages.config | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 @@ - - + +