diff --git a/Comprosser/DLL/ICSharpCode.Core.dll b/Comprosser/DLL/ICSharpCode.Core.dll new file mode 100644 index 0000000..2517366 Binary files /dev/null and b/Comprosser/DLL/ICSharpCode.Core.dll differ diff --git a/Comprosser/Data/DbHandler_local.cs b/Comprosser/Data/DbHandler_local.cs index 9e393b8..0ee9643 100644 --- a/Comprosser/Data/DbHandler_local.cs +++ b/Comprosser/Data/DbHandler_local.cs @@ -3,10 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Mesnac.Basic; -using Mesnac.Codd.Session; + using System.Data; using Mesnac.Compressor.Entity; using Mesnac.Compressor.Unity; +using Mesnac.Codd.Session; namespace Mesnac.Compressor.Data { diff --git a/Comprosser/Data/Mesnac.Compressor.Data.csproj b/Comprosser/Data/Mesnac.Compressor.Data.csproj index 7cd871f..68be412 100644 --- a/Comprosser/Data/Mesnac.Compressor.Data.csproj +++ b/Comprosser/Data/Mesnac.Compressor.Data.csproj @@ -34,11 +34,11 @@ - ..\Libraries\ICSharpCode.Core.dll + ..\DLL\ICSharpCode.Core.dll False - ..\Libraries\Mesnac.Codd.dll + ..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll diff --git a/Comprosser/FrmPrint/Form1.cs b/Comprosser/FrmPrint/Form1.cs index 3d44df9..bc5471f 100644 --- a/Comprosser/FrmPrint/Form1.cs +++ b/Comprosser/FrmPrint/Form1.cs @@ -5,7 +5,7 @@ using Mesnac.Compressor.Data; using Mesnac.HighWay.ATC.Common; using Mesnac.HighWay.ATC.SqlSugar; using Mesnac.HighWay.ATC.SqlSugar.serviceImpl; -using SqlSugar; +using Mesnac.HighWay.ATC.SqlSugar; using System; using System.Collections.Generic; using System.ComponentModel; @@ -27,6 +27,7 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button; using System.Collections; using System.Runtime.InteropServices; using System.Reflection.Emit; +using SqlSugar; namespace FrmPrint { diff --git a/Comprosser/FrmPrint/FrmPrint.csproj b/Comprosser/FrmPrint/FrmPrint.csproj index 83213b5..4582817 100644 --- a/Comprosser/FrmPrint/FrmPrint.csproj +++ b/Comprosser/FrmPrint/FrmPrint.csproj @@ -43,14 +43,14 @@ False - ..\Libraries\ICSharpCode.Core.dll + ..\DLL\ICSharpCode.Core.dll False - ..\Libraries\log4net\log4net.dll + ..\DLL\log4net.dll - ..\Libraries\Mesnac.Codd.dll + ..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll ..\..\Controls\Mesnac.Controls.Default\obj\Debug\Mesnac.Controls.Default.dll @@ -58,8 +58,8 @@ ..\..\Libraries\Mesnac.Docking\obj\Debug\Mesnac.Docking.dll - - ..\Mesnac.HighWay.ATC.SqlSugar\bin\Debug\SqlSugar.dll + + ..\..\packages\SqlSugar.5.1.4.193\lib\SqlSugar.dll @@ -116,6 +116,7 @@ PreserveNewest Designer + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Comprosser/FrmPrint/packages.config b/Comprosser/FrmPrint/packages.config new file mode 100644 index 0000000..e4175d3 --- /dev/null +++ b/Comprosser/FrmPrint/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Comprosser/Mesnac.HighWay.ATC.Common/Mesnac.HighWay.ATC.Common.csproj b/Comprosser/Mesnac.HighWay.ATC.Common/Mesnac.HighWay.ATC.Common.csproj index b186b8d..97d4b8b 100644 --- a/Comprosser/Mesnac.HighWay.ATC.Common/Mesnac.HighWay.ATC.Common.csproj +++ b/Comprosser/Mesnac.HighWay.ATC.Common/Mesnac.HighWay.ATC.Common.csproj @@ -41,10 +41,10 @@ ..\DLL\log4net.dll - ..\packages\Nancy.2.0.0\lib\net452\Nancy.dll + ..\DLL\Nancy.dll - - ..\Mesnac.HighWay.ATC.SqlSugar\bin\Debug\SqlSugar.dll + + ..\..\packages\SqlSugar.5.0.3\lib\SqlSugar.dll diff --git a/Comprosser/Mesnac.HighWay.ATC.Common/packages.config b/Comprosser/Mesnac.HighWay.ATC.Common/packages.config index f518cc3..8777aad 100644 --- a/Comprosser/Mesnac.HighWay.ATC.Common/packages.config +++ b/Comprosser/Mesnac.HighWay.ATC.Common/packages.config @@ -2,4 +2,5 @@ + \ No newline at end of file diff --git a/Comprosser/Mesnac.HighWay.ATC.SqlSugar/Mesnac.HighWay.ATC.SqlSugar.csproj b/Comprosser/Mesnac.HighWay.ATC.SqlSugar/Mesnac.HighWay.ATC.SqlSugar.csproj index e1ba33b..73b4a51 100644 --- a/Comprosser/Mesnac.HighWay.ATC.SqlSugar/Mesnac.HighWay.ATC.SqlSugar.csproj +++ b/Comprosser/Mesnac.HighWay.ATC.SqlSugar/Mesnac.HighWay.ATC.SqlSugar.csproj @@ -35,8 +35,8 @@ true - - ..\DLL\SqlSugar.dll + + ..\..\packages\SqlSugar.5.0.3\lib\SqlSugar.dll @@ -58,5 +58,8 @@ Mesnac.HighWay.ATC.Common + + + \ No newline at end of file diff --git a/Comprosser/Mesnac.HighWay.ATC.SqlSugar/packages.config b/Comprosser/Mesnac.HighWay.ATC.SqlSugar/packages.config new file mode 100644 index 0000000..24c1fc5 --- /dev/null +++ b/Comprosser/Mesnac.HighWay.ATC.SqlSugar/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Comprosser/PLCManager/PLCManager.csproj b/Comprosser/PLCManager/PLCManager.csproj index a9d7aba..7adda52 100644 --- a/Comprosser/PLCManager/PLCManager.csproj +++ b/Comprosser/PLCManager/PLCManager.csproj @@ -34,10 +34,10 @@ - ..\Libraries\ICSharpCode.Core.dll + ..\..\PlugInPlatform\ICSharpCode.Core\bin\Debug\ICSharpCode.Core.dll - ..\Libraries\Mesnac.Codd.dll + ..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll diff --git a/Comprosser/SocketProcess/SocketProcess.csproj b/Comprosser/SocketProcess/SocketProcess.csproj index e8d4e1b..ca0beb2 100644 --- a/Comprosser/SocketProcess/SocketProcess.csproj +++ b/Comprosser/SocketProcess/SocketProcess.csproj @@ -34,14 +34,14 @@ - ..\Libraries\ICSharpCode.Core.dll + ..\DLL\ICSharpCode.Core.dll - ..\Libraries\log4net\log4net.dll + ..\DLL\log4net.dll False - ..\..\..\..\..\2020\程序\中间件\云平台\dll\Mesnac.Log.dll + ..\DLL\Mesnac.Log.dll diff --git a/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj b/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj index 553f382..7da036c 100644 --- a/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj +++ b/Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj @@ -38,14 +38,14 @@ ..\..\Libraries\MXComponent\HslCommunication.dll - ..\..\Libraries\ICSharpCode.Core.dll + ..\..\Comprosser\DLL\ICSharpCode.Core.dll False ..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll - ..\Mesnac.Controls.Base.dll + ..\Mesnac.Controls.Base\bin\Debug\Mesnac.Controls.Base.dll ..\Mesnac.Controls.Feeding\bin\Debug\Mesnac.Controls.Feeding.dll diff --git a/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj b/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj index 4e642ce..8035ff5 100644 --- a/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj +++ b/Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Equips.Connection Mesnac.Equips.Connection - v4.5.2 + v4.0 512 @@ -19,7 +19,6 @@ - true @@ -29,7 +28,6 @@ DEBUG;TRACE prompt 4 - false pdbonly @@ -38,7 +36,6 @@ TRACE prompt 4 - false diff --git a/Equips/Mesnac.Equips/Mesnac.Equips.csproj b/Equips/Mesnac.Equips/Mesnac.Equips.csproj index 72a3b40..13eb63a 100644 --- a/Equips/Mesnac.Equips/Mesnac.Equips.csproj +++ b/Equips/Mesnac.Equips/Mesnac.Equips.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Equips Mesnac.Equips - v4.5.2 + v4.0 512 @@ -29,7 +29,6 @@ DEBUG;TRACE prompt 4 - false pdbonly @@ -38,7 +37,6 @@ TRACE prompt 4 - false diff --git a/Equips/Mesnac.Maths/Mesnac.Maths.csproj b/Equips/Mesnac.Maths/Mesnac.Maths.csproj index 5725cb0..cbdd806 100644 --- a/Equips/Mesnac.Maths/Mesnac.Maths.csproj +++ b/Equips/Mesnac.Maths/Mesnac.Maths.csproj @@ -1,5 +1,5 @@  - + Debug @@ -9,7 +9,7 @@ Properties Mesnac.Maths Mesnac.Maths - v4.5.2 + v4.0 512 @@ -19,7 +19,6 @@ - true @@ -29,7 +28,6 @@ DEBUG;TRACE prompt 4 - false pdbonly @@ -38,7 +36,6 @@ TRACE prompt 4 - false diff --git a/Libraries/Host/Host.csproj b/Libraries/Host/Host.csproj index 1de5cf9..11d27a9 100644 --- a/Libraries/Host/Host.csproj +++ b/Libraries/Host/Host.csproj @@ -10,7 +10,7 @@ Properties Host Host - v4.5.2 + v4.0 512 publish\ true diff --git a/Libraries/Loder/Loder.csproj b/Libraries/Loder/Loder.csproj index f3f95c9..2ea8404 100644 --- a/Libraries/Loder/Loder.csproj +++ b/Libraries/Loder/Loder.csproj @@ -10,7 +10,7 @@ Properties Loder Loder - v4.5.2 + v4.0 512 publish\ true diff --git a/Libraries/Mesnac.Codd/Mesnac.Codd.csproj b/Libraries/Mesnac.Codd/Mesnac.Codd.csproj index d6cc239..f2aa780 100644 --- a/Libraries/Mesnac.Codd/Mesnac.Codd.csproj +++ b/Libraries/Mesnac.Codd/Mesnac.Codd.csproj @@ -9,7 +9,7 @@ Properties Mesnac.Codd Mesnac.Codd - v4.5.2 + v4.0 512 diff --git a/Libraries/Mesnac.Communication/Mesnac.Communication.csproj b/Libraries/Mesnac.Communication/Mesnac.Communication.csproj index 35f2c85..a833f66 100644 --- a/Libraries/Mesnac.Communication/Mesnac.Communication.csproj +++ b/Libraries/Mesnac.Communication/Mesnac.Communication.csproj @@ -10,7 +10,7 @@ Properties Mesnac.Communication Mesnac.Communication - v4.5.2 + v4.0 512 diff --git a/Libraries/Mesnac.Docking/Mesnac.Docking.csproj b/Libraries/Mesnac.Docking/Mesnac.Docking.csproj index d3b2656..1b39db8 100644 --- a/Libraries/Mesnac.Docking/Mesnac.Docking.csproj +++ b/Libraries/Mesnac.Docking/Mesnac.Docking.csproj @@ -10,7 +10,7 @@ Properties Mesnac.Docking Mesnac.Docking - v4.5.2 + v4.0 512 diff --git a/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj b/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj index 6ad81dc..79c31a4 100644 --- a/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj +++ b/Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj @@ -10,7 +10,7 @@ Properties Mesnac.UI.ToolBox Mesnac.UI.ToolBox - v4.5.2 + v4.0 512 diff --git a/Libraries/OpcDaNet/OpcDaNet.csproj b/Libraries/OpcDaNet/OpcDaNet.csproj index 0f48e19..7e76d69 100644 --- a/Libraries/OpcDaNet/OpcDaNet.csproj +++ b/Libraries/OpcDaNet/OpcDaNet.csproj @@ -10,7 +10,7 @@ Properties OpcDaNet OpcDaNet - v4.5.2 + v4.0 512 diff --git a/Libraries/PropertyGridEx/PropertyGridEx.csproj b/Libraries/PropertyGridEx/PropertyGridEx.csproj index 1e4c8f8..1a81374 100644 --- a/Libraries/PropertyGridEx/PropertyGridEx.csproj +++ b/Libraries/PropertyGridEx/PropertyGridEx.csproj @@ -10,7 +10,7 @@ Properties PropertyGridEx PropertyGridEx - v4.5.2 + v4.0 512 diff --git a/Manager/BarTenderPrint/BarTenderPrint.csproj b/Manager/BarTenderPrint/BarTenderPrint.csproj index 6b84fa3..26b89f3 100644 --- a/Manager/BarTenderPrint/BarTenderPrint.csproj +++ b/Manager/BarTenderPrint/BarTenderPrint.csproj @@ -45,8 +45,8 @@ False Libary\Seagull.BarTender.Print.dll - - ..\..\Comprosser\Mesnac.HighWay.ATC.SqlSugar\bin\Debug\SqlSugar.dll + + ..\..\packages\SqlSugar.5.0.3\lib\SqlSugar.dll @@ -151,6 +151,7 @@ +