diff --git a/ENI2/App.config b/ENI2/App.config index 98e36de5..e6d09077 100644 --- a/ENI2/App.config +++ b/ENI2/App.config @@ -85,7 +85,7 @@ - + @@ -93,7 +93,7 @@ - + diff --git a/ENI2/ENI2.csproj b/ENI2/ENI2.csproj index 01994d9d..e49f99d9 100644 --- a/ENI2/ENI2.csproj +++ b/ENI2/ENI2.csproj @@ -36,8 +36,8 @@ 5.4.0.0 true publish.html - 1 - 7.2.7.1 + 2 + 7.2.7.2 false true true @@ -137,29 +137,29 @@ packages\ExcelDataReader.3.7.0\lib\net462\ExcelDataReader.dll - - packages\log4net.3.0.3\lib\net462\log4net.dll + + packages\log4net.3.0.4\lib\net462\log4net.dll - - packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Bcl.AsyncInterfaces.dll - - packages\Microsoft.Extensions.DependencyInjection.9.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.DependencyInjection.dll - - packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - packages\Microsoft.Extensions.Logging.9.0.1\lib\net462\Microsoft.Extensions.Logging.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Logging.dll - - packages\Microsoft.Extensions.Logging.Abstractions.9.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Logging.Abstractions.dll - - packages\Microsoft.Extensions.Options.9.0.1\lib\net462\Microsoft.Extensions.Options.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Options.dll - - packages\Microsoft.Extensions.Primitives.9.0.1\lib\net462\Microsoft.Extensions.Primitives.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\Microsoft.Extensions.Primitives.dll packages\Microsoft.Office.Interop.Excel.15.0.4795.1001\lib\net20\Microsoft.Office.Interop.Excel.dll @@ -193,8 +193,8 @@ packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\PdfSharp.WPFonts.dll - - packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Buffers.dll @@ -202,27 +202,27 @@ packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - packages\System.Diagnostics.DiagnosticSource.9.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Diagnostics.DiagnosticSource.dll - - packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Memory.dll - - packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Numerics.Vectors.dll - - packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Runtime.CompilerServices.Unsafe.dll - - packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.Threading.Tasks.Extensions.dll packages\PDFsharp-MigraDoc-GDI.6.1.1\lib\net472\System.ValueTuple.dll @@ -241,20 +241,20 @@ - - packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.dll + + packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.dll - - packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll + + packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll - - packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll + + packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll - - packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll + + packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll - - packages\Extended.Wpf.Toolkit.4.6.1\lib\net40\Xceed.Wpf.Toolkit.dll + + packages\Extended.Wpf.Toolkit.4.7.25103.5738\lib\net40\Xceed.Wpf.Toolkit.dll @@ -937,6 +937,7 @@ + Reference.svcmap @@ -1019,12 +1020,12 @@ - + Always @@ -1051,7 +1052,6 @@ - SettingsSingleFileGenerator diff --git a/ENI2/packages.config b/ENI2/packages.config index ba183d3a..05eea6b5 100644 --- a/ENI2/packages.config +++ b/ENI2/packages.config @@ -1,24 +1,21 @@  - - - - - - - - - - + + + + + + + + + - + diff --git a/bsmd.LockingService/bsmd.LockingService.csproj b/bsmd.LockingService/bsmd.LockingService.csproj index a832ad31..18d2d500 100644 --- a/bsmd.LockingService/bsmd.LockingService.csproj +++ b/bsmd.LockingService/bsmd.LockingService.csproj @@ -46,8 +46,8 @@ 4 - - ..\ENI2\packages\log4net.3.0.3\lib\net462\log4net.dll + + ..\ENI2\packages\log4net.3.0.4\lib\net462\log4net.dll diff --git a/bsmd.LockingService/bsmd.LockingService.csproj.user b/bsmd.LockingService/bsmd.LockingService.csproj.user index f74e64f4..6c90db82 100644 --- a/bsmd.LockingService/bsmd.LockingService.csproj.user +++ b/bsmd.LockingService/bsmd.LockingService.csproj.user @@ -2,7 +2,7 @@ true - Debug|Any CPU + Release|Any CPU diff --git a/bsmd.LockingService/packages.config b/bsmd.LockingService/packages.config index 2efad76e..fbd6f896 100644 --- a/bsmd.LockingService/packages.config +++ b/bsmd.LockingService/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/bsmd.database/bsmd.database.csproj b/bsmd.database/bsmd.database.csproj index 99465906..cdc95517 100644 --- a/bsmd.database/bsmd.database.csproj +++ b/bsmd.database/bsmd.database.csproj @@ -89,8 +89,8 @@ False - - ..\packages\log4net.3.0.3\lib\net462\log4net.dll + + ..\ENI2\packages\log4net.3.0.4\lib\net462\log4net.dll ..\ENI2\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/bsmd.database/packages.config b/bsmd.database/packages.config index ed96c890..21dbfcbd 100644 --- a/bsmd.database/packages.config +++ b/bsmd.database/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file