diff --git a/EgtBEAMWALL.DataLayer/AdminContext.cs b/EgtBEAMWALL.DataLayer/AdminContext.cs
index 091e429f..a7cfa42e 100644
--- a/EgtBEAMWALL.DataLayer/AdminContext.cs
+++ b/EgtBEAMWALL.DataLayer/AdminContext.cs
@@ -1,6 +1,6 @@
using EgtBEAMWALL.DataLayer.DatabaseModels;
using EgtBEAMWALL.DataLayer.Migrations;
-using MySql.Data.Entity;
+using MySql.Data.EntityFramework;
using System;
using System.Data.Entity;
using System.Data.Entity.Migrations;
@@ -69,6 +69,7 @@ namespace EgtBEAMWALL.DataLayer
}
catch (Exception exc)
{
+ Console.WriteLine(exc.ToString());
return false;
}
diff --git a/EgtBEAMWALL.DataLayer/App.config b/EgtBEAMWALL.DataLayer/App.config
index 872413c8..e6340a20 100644
--- a/EgtBEAMWALL.DataLayer/App.config
+++ b/EgtBEAMWALL.DataLayer/App.config
@@ -9,7 +9,8 @@
-
+
+
@@ -18,11 +19,26 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/EgtBEAMWALL.DataLayer/DatabaseContext.cs b/EgtBEAMWALL.DataLayer/DatabaseContext.cs
index 3e26f364..3122f8fe 100644
--- a/EgtBEAMWALL.DataLayer/DatabaseContext.cs
+++ b/EgtBEAMWALL.DataLayer/DatabaseContext.cs
@@ -1,5 +1,5 @@
using EgtBEAMWALL.DataLayer.DatabaseModels;
-using MySql.Data.Entity;
+using MySql.Data.EntityFramework;
using System;
using System.Data.Entity;
using System.Data.Entity.Infrastructure;
diff --git a/EgtBEAMWALL.DataLayer/DbConfig.cs b/EgtBEAMWALL.DataLayer/DbConfig.cs
index 83f7764e..41007d0b 100644
--- a/EgtBEAMWALL.DataLayer/DbConfig.cs
+++ b/EgtBEAMWALL.DataLayer/DbConfig.cs
@@ -73,9 +73,9 @@ namespace EgtBEAMWALL.DataLayer
DATABASE_NAME = $"EgtBwDb_{masterKey}";
DATABASE_USER = $"user_{nKey}";
DATABASE_PWD = $"pwd_{sKey}";
- CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None";
+ CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None";
// stringa admin con utente root egalware...
- ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;sslmode=None;CHARSET=utf8";
+ ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;SslMode=none;CHARSET=utf8";
}
///
diff --git a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj
index 419424ab..766494de 100644
--- a/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj
+++ b/EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj
@@ -37,6 +37,9 @@
false
+
+ ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll
+
..\ExtLibs\EgtWPFLib5.dll
@@ -46,11 +49,23 @@
..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
-
- ..\ExtLibs\MySql.Data.dll
+
+ ..\packages\Google.Protobuf.3.19.4\lib\net45\Google.Protobuf.dll
-
- ..\ExtLibs\MySql.Data.Entity.EF6.dll
+
+ ..\packages\K4os.Compression.LZ4.1.2.6\lib\net46\K4os.Compression.LZ4.dll
+
+
+ ..\packages\K4os.Compression.LZ4.Streams.1.2.6\lib\net46\K4os.Compression.LZ4.Streams.dll
+
+
+ ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll
+
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll
+
+
+ ..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll
..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
@@ -58,7 +73,13 @@
..\packages\NLog.5.0.1\lib\net46\NLog.dll
+
+ ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll
+
+
+ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
@@ -68,6 +89,16 @@
+
+ ..\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.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll
+
@@ -77,6 +108,12 @@
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll
+
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll
+
diff --git a/EgtBEAMWALL.DataLayer/packages.config b/EgtBEAMWALL.DataLayer/packages.config
index 803d3ead..9c297b4f 100644
--- a/EgtBEAMWALL.DataLayer/packages.config
+++ b/EgtBEAMWALL.DataLayer/packages.config
@@ -1,6 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index f0c37257..0acda3ee 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -108,8 +108,8 @@
..\ExtLibs\APServer.dll
True
-
- ..\packages\Portable.BouncyCastle.1.8.2\lib\net40\BouncyCastle.Crypto.dll
+
+ ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll
..\packages\Csv.1.0.31\lib\net40\Csv.dll
@@ -131,6 +131,9 @@
..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll
+
+ ..\packages\Google.Protobuf.3.19.4\lib\net45\Google.Protobuf.dll
+
..\ExtLibs\Interop.FXLog.dll
True
@@ -145,6 +148,15 @@
..\ExtLibs\ISOCNC.Remoting.dll
+
+ ..\packages\K4os.Compression.LZ4.1.2.6\lib\net46\K4os.Compression.LZ4.dll
+
+
+ ..\packages\K4os.Compression.LZ4.Streams.1.2.6\lib\net46\K4os.Compression.LZ4.Streams.dll
+
+
+ ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll
+
..\packages\Microsoft.DotNet.PlatformAbstractions.2.1.0\lib\net45\Microsoft.DotNet.PlatformAbstractions.dll
@@ -152,11 +164,11 @@
..\packages\Microsoft.Extensions.DependencyModel.2.1.0\lib\net451\Microsoft.Extensions.DependencyModel.dll
-
- ..\ExtLibs\MySql.Data.dll
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll
-
- ..\ExtLibs\MySql.Data.Entity.EF6.dll
+
+ ..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll
..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
@@ -164,6 +176,9 @@
..\packages\NLog.5.0.1\lib\net46\NLog.dll
+
+ ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll
+
..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\SdkApi.Core.dll
@@ -176,6 +191,9 @@
..\packages\Lextm.SharpSnmpLib.10.0.9\lib\net452\SharpSnmpLib.dll
+
+ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
..\packages\System.Collections.Specialized.4.3.0\lib\net46\System.Collections.Specialized.dll
True
@@ -190,6 +208,9 @@
+
+ ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
+
..\packages\System.Net.NameResolution.4.3.0\lib\net46\System.Net.NameResolution.dll
True
@@ -200,6 +221,13 @@
True
True
+
+
+ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
+
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll
+
..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
True
@@ -223,6 +251,9 @@
True
True
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll
+
@@ -230,6 +261,9 @@
..\packages\Zebra.Printer.SDK.2.15.2634\lib\net471\ZebraPrinterSdk.dll
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll
+
diff --git a/EgtBEAMWALL.Supervisor/app.config b/EgtBEAMWALL.Supervisor/app.config
index 59ae5a6d..0da34e12 100644
--- a/EgtBEAMWALL.Supervisor/app.config
+++ b/EgtBEAMWALL.Supervisor/app.config
@@ -9,7 +9,8 @@
-
+
+
@@ -18,18 +19,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/EgtBEAMWALL.Supervisor/packages.config b/EgtBEAMWALL.Supervisor/packages.config
index ee9ebfeb..d531e045 100644
--- a/EgtBEAMWALL.Supervisor/packages.config
+++ b/EgtBEAMWALL.Supervisor/packages.config
@@ -1,18 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/App.config b/EgtBEAMWALL.ViewerOptimizer/App.config
index 8466f90c..8ba2291a 100644
--- a/EgtBEAMWALL.ViewerOptimizer/App.config
+++ b/EgtBEAMWALL.ViewerOptimizer/App.config
@@ -9,7 +9,8 @@
-
+
+
@@ -18,14 +19,30 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
index 10119d56..2d479dc7 100644
--- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
+++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj
@@ -103,6 +103,9 @@
Resources\EgtBEAMWALL.ico
+
+ ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll
+
False
..\ExtLibs\EgtUILib.dll
@@ -117,9 +120,22 @@
..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll
+
+ ..\packages\Google.Protobuf.3.19.4\lib\net45\Google.Protobuf.dll
+
..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll
+
+ ..\packages\K4os.Compression.LZ4.1.2.6\lib\net46\K4os.Compression.LZ4.dll
+
+
+ ..\packages\K4os.Compression.LZ4.Streams.1.2.6\lib\net46\K4os.Compression.LZ4.Streams.dll
+
+
+ ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll
+
+
..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.DocumentObjectModel-wpf.dll
@@ -129,11 +145,11 @@
..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.RtfRendering-wpf.dll
-
- ..\ExtLibs\MySql.Data.dll
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll
-
- ..\ExtLibs\MySql.Data.Entity.EF6.dll
+
+ ..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll
..\packages\NLog.5.0.1\lib\net46\NLog.dll
@@ -144,11 +160,33 @@
..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\PdfSharp.Charting-wpf.dll
+
+ ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll
+
+
+ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
+
+
+
+
+
+
+ ..\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.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll
+
+
+
@@ -158,10 +196,16 @@
4.0
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll
+
+
+ ..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll
+
diff --git a/EgtBEAMWALL.ViewerOptimizer/packages.config b/EgtBEAMWALL.ViewerOptimizer/packages.config
index 9c9d040b..fde5244d 100644
--- a/EgtBEAMWALL.ViewerOptimizer/packages.config
+++ b/EgtBEAMWALL.ViewerOptimizer/packages.config
@@ -1,7 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file