diff --git a/Vrh.OneMessage/App.config b/Vrh.OneMessage/App.config index 439887a..a91eab6 100644 --- a/Vrh.OneMessage/App.config +++ b/Vrh.OneMessage/App.config @@ -1,15 +1,18 @@ - + -
+
- + - + - + + + + \ No newline at end of file diff --git a/Vrh.OneMessage/Vrh.OneMessage.csproj b/Vrh.OneMessage/Vrh.OneMessage.csproj index bd7c7bd..398131d 100644 --- a/Vrh.OneMessage/Vrh.OneMessage.csproj +++ b/Vrh.OneMessage/Vrh.OneMessage.csproj @@ -62,8 +62,8 @@ ..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.OneMessage/packages.config b/Vrh.OneMessage/packages.config index 2512cb1..0761d2f 100644 --- a/Vrh.OneMessage/packages.config +++ b/Vrh.OneMessage/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Vrh.OneReport/App.config b/Vrh.OneReport/App.config index 85806b9..f18a3d7 100644 --- a/Vrh.OneReport/App.config +++ b/Vrh.OneReport/App.config @@ -1,31 +1,34 @@ - + -
+
- + - + - - + + - - + + - - + + - + + + + \ No newline at end of file diff --git a/Vrh.OneReport/Vrh.OneReport.csproj b/Vrh.OneReport/Vrh.OneReport.csproj index d6a52f8..f8ddb9a 100644 --- a/Vrh.OneReport/Vrh.OneReport.csproj +++ b/Vrh.OneReport/Vrh.OneReport.csproj @@ -103,8 +103,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.OneReport/packages.config b/Vrh.OneReport/packages.config index 40e297c..1115a36 100644 --- a/Vrh.OneReport/packages.config +++ b/Vrh.OneReport/packages.config @@ -10,5 +10,5 @@ - + \ No newline at end of file diff --git a/Vrh.Web.OneReport.Lib/App.config b/Vrh.Web.OneReport.Lib/App.config index f321fe8..3da641b 100644 --- a/Vrh.Web.OneReport.Lib/App.config +++ b/Vrh.Web.OneReport.Lib/App.config @@ -1,43 +1,43 @@ - + -
+
- + - + - - + + - - + + - - + + - - + + - + - + - + \ No newline at end of file diff --git a/Vrh.Web.OneReport.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md b/Vrh.Web.OneReport.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md index ead45c4..f79a434 100644 --- a/Vrh.Web.OneReport.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md +++ b/Vrh.Web.OneReport.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true) *** ### Version History: +#### 2.19.3 (2023.06.05) Patches: +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus. + #### 2.19.2 (2023.03.17) Patches: - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes lista egy elemét fogadja el beállításként, egyébként nem változik az értéke. diff --git a/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj b/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj index 4bbbe44..807b702 100644 --- a/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj +++ b/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj @@ -111,11 +111,11 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll True - - ..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.Web.OneReport.Lib/packages.config b/Vrh.Web.OneReport.Lib/packages.config index 0742352..f82be14 100644 --- a/Vrh.Web.OneReport.Lib/packages.config +++ b/Vrh.Web.OneReport.Lib/packages.config @@ -11,6 +11,6 @@ - - + + \ No newline at end of file diff --git a/Vrh.Web.Reporting/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md b/Vrh.Web.Reporting/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md index ead45c4..f79a434 100644 --- a/Vrh.Web.Reporting/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md +++ b/Vrh.Web.Reporting/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true) *** ### Version History: +#### 2.19.3 (2023.06.05) Patches: +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus. + #### 2.19.2 (2023.03.17) Patches: - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes lista egy elemét fogadja el beállításként, egyébként nem változik az értéke. diff --git a/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj b/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj index 1123bd9..0765643 100644 --- a/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj +++ b/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj @@ -137,14 +137,17 @@ ..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll - - ..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.TraceSource.4.0.0\lib\net46\System.Diagnostics.TraceSource.dll @@ -173,6 +176,9 @@ ..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + ..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll @@ -180,6 +186,9 @@ ..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + ..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll @@ -189,26 +198,35 @@ ..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll ..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll - - ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + + ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True ..\packages\System.Security.Claims.4.0.1\lib\net46\System.Security.Claims.dll - ..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll + True + True ..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - - ..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll + + ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True ..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll @@ -275,20 +293,20 @@ ..\packages\VRH.Log4Pro.WebTools.1.11.1\lib\net451\VRH.Log4Pro.WebTools.dll - - ..\packages\Vrh.Logger.2.9.4\lib\net451\Vrh.Logger.dll + + ..\packages\Vrh.Logger.2.10.0\lib\net451\Vrh.Logger.dll ..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\Vrh.Web.FileManager.1.5.1\lib\net462\Vrh.Web.FileManager.Lib.dll - - ..\packages\Vrh.Web.Membership.4.8.1\lib\net451\Vrh.Web.Membership.Lib.dll + + ..\packages\Vrh.Web.Membership.4.8.2\lib\net451\Vrh.Web.Membership.Lib.dll ..\packages\Vrh.Web.Menu.1.28.5\lib\net451\Vrh.Web.Menu.Lib.dll @@ -299,8 +317,8 @@ ..\packages\Vrh.WebForm.2.7.1\lib\net462\Vrh.WebForm.Lib.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll ..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll @@ -650,6 +668,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always @@ -782,51 +845,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -903,15 +921,13 @@ + - - Always - @@ -939,7 +955,6 @@ - @@ -1185,12 +1200,15 @@ - + + Always + + diff --git a/Vrh.Web.Reporting/Web.config b/Vrh.Web.Reporting/Web.config index de9ab1e..608907e 100644 --- a/Vrh.Web.Reporting/Web.config +++ b/Vrh.Web.Reporting/Web.config @@ -11,15 +11,17 @@ - + - - + + + + @@ -40,7 +42,7 @@ - + @@ -108,7 +110,7 @@ - + diff --git a/Vrh.Web.Reporting/packages.config b/Vrh.Web.Reporting/packages.config index fe38514..06e2888 100644 --- a/Vrh.Web.Reporting/packages.config +++ b/Vrh.Web.Reporting/packages.config @@ -51,11 +51,12 @@ + - + @@ -68,9 +69,11 @@ + + @@ -78,15 +81,16 @@ + - + - + - + @@ -101,15 +105,15 @@ - + - + - + - + \ No newline at end of file diff --git a/Vrh.Web.iScheduler.Lib/App.config b/Vrh.Web.iScheduler.Lib/App.config index ae17f95..9e7111f 100644 --- a/Vrh.Web.iScheduler.Lib/App.config +++ b/Vrh.Web.iScheduler.Lib/App.config @@ -128,4 +128,4 @@ - + \ No newline at end of file diff --git a/Vrh.Web.iScheduler.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md b/Vrh.Web.iScheduler.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md index ead45c4..f79a434 100644 --- a/Vrh.Web.iScheduler.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md +++ b/Vrh.Web.iScheduler.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true) *** ### Version History: +#### 2.19.3 (2023.06.05) Patches: +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus. + #### 2.19.2 (2023.03.17) Patches: - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes lista egy elemét fogadja el beállításként, egyébként nem változik az értéke. diff --git a/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj b/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj index 862a72d..ad53a63 100644 --- a/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj +++ b/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj @@ -46,30 +46,6 @@ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\Microsoft.AspNetCore.Hosting.2.2.7\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll - - - ..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll - - - ..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll - - - ..\packages\Microsoft.AspNetCore.Http.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll - - - ..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll - - - ..\packages\Microsoft.AspNetCore.Http.Extensions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll - - - ..\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll - - - ..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll - ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -139,9 +115,6 @@ ..\packages\Microsoft.Extensions.Logging.EventSource.6.0.0\lib\net461\Microsoft.Extensions.Logging.EventSource.dll - - ..\packages\Microsoft.Extensions.ObjectPool.2.2.0\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll - ..\packages\Microsoft.Extensions.Options.6.0.0\lib\net461\Microsoft.Extensions.Options.dll @@ -151,9 +124,6 @@ ..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll - - ..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll - ..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll @@ -292,14 +262,14 @@ ..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll ..\packages\WebGrease.1.6.0\lib\WebGrease.dll diff --git a/Vrh.Web.iScheduler.Lib/packages.config b/Vrh.Web.iScheduler.Lib/packages.config index c0b5b8f..205841a 100644 --- a/Vrh.Web.iScheduler.Lib/packages.config +++ b/Vrh.Web.iScheduler.Lib/packages.config @@ -8,14 +8,6 @@ - - - - - - - - @@ -39,11 +31,9 @@ - - @@ -70,8 +60,8 @@ - + - + \ No newline at end of file diff --git a/Vrh.Web.iScheduler.Report.Lib/App.config b/Vrh.Web.iScheduler.Report.Lib/App.config index f5700fc..8c164fe 100644 --- a/Vrh.Web.iScheduler.Report.Lib/App.config +++ b/Vrh.Web.iScheduler.Report.Lib/App.config @@ -1,47 +1,50 @@ - + -
+
- + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - + + + + \ No newline at end of file diff --git a/Vrh.Web.iScheduler.Report.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md b/Vrh.Web.iScheduler.Report.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md index ead45c4..f79a434 100644 --- a/Vrh.Web.iScheduler.Report.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md +++ b/Vrh.Web.iScheduler.Report.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true) *** ### Version History: +#### 2.19.3 (2023.06.05) Patches: +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus. + #### 2.19.2 (2023.03.17) Patches: - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes lista egy elemét fogadja el beállításként, egyébként nem változik az értéke. diff --git a/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj b/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj index 303ae05..7a9eca7 100644 --- a/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj +++ b/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj @@ -116,14 +116,14 @@ ..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.Web.iScheduler.Report.Lib/packages.config b/Vrh.Web.iScheduler.Report.Lib/packages.config index 9b86ff6..228826b 100644 --- a/Vrh.Web.iScheduler.Report.Lib/packages.config +++ b/Vrh.Web.iScheduler.Report.Lib/packages.config @@ -15,7 +15,7 @@ - + - + \ No newline at end of file diff --git a/Vrh.iScheduler.Report/App.config b/Vrh.iScheduler.Report/App.config index c4f577b..86437aa 100644 --- a/Vrh.iScheduler.Report/App.config +++ b/Vrh.iScheduler.Report/App.config @@ -1,35 +1,38 @@ - + -
+
- + - + - - + + - - + + - - + + - - + + - + + + + \ No newline at end of file diff --git a/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj b/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj index 954fe05..3340caf 100644 --- a/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj +++ b/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj @@ -117,8 +117,8 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.iScheduler.Report/packages.config b/Vrh.iScheduler.Report/packages.config index ae1901e..89edaec 100644 --- a/Vrh.iScheduler.Report/packages.config +++ b/Vrh.iScheduler.Report/packages.config @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/Vrh.iScheduler/Vrh.iScheduler.csproj b/Vrh.iScheduler/Vrh.iScheduler.csproj index 5ffcc5e..852513d 100644 --- a/Vrh.iScheduler/Vrh.iScheduler.csproj +++ b/Vrh.iScheduler/Vrh.iScheduler.csproj @@ -124,8 +124,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\Vrh.Logger.2.9.4\lib\net451\Vrh.Logger.dll + + ..\packages\Vrh.Logger.2.10.0\lib\net451\Vrh.Logger.dll ..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll @@ -133,8 +133,8 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.iScheduler/packages.config b/Vrh.iScheduler/packages.config index e131713..9c3b12c 100644 --- a/Vrh.iScheduler/packages.config +++ b/Vrh.iScheduler/packages.config @@ -20,8 +20,8 @@ - + - + \ No newline at end of file diff --git a/iSchedulerMonitor/SqlServerTypes/Loader.cs b/iSchedulerMonitor/SqlServerTypes/Loader.cs new file mode 100644 index 0000000..0dc61f6 --- /dev/null +++ b/iSchedulerMonitor/SqlServerTypes/Loader.cs @@ -0,0 +1,45 @@ +using System; +using System.IO; +using System.Runtime.InteropServices; + +namespace SqlServerTypes +{ + /// + /// Utility methods related to CLR Types for SQL Server + /// + internal class Utilities + { + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + private static extern IntPtr LoadLibrary(string libname); + + /// + /// Loads the required native assemblies for the current architecture (x86 or x64) + /// + /// + /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications + /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications. + /// + public static void LoadNativeAssemblies(string rootApplicationPath) + { + var nativeBinaryPath = IntPtr.Size > 4 + ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\") + : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\"); + + LoadNativeAssembly(nativeBinaryPath, "msvcr100.dll"); + LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial110.dll"); + } + + private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName) + { + var path = Path.Combine(nativeBinaryPath, assemblyName); + var ptr = LoadLibrary(path); + if (ptr == IntPtr.Zero) + { + throw new Exception(string.Format( + "Error loading {0} (ErrorCode: {1})", + assemblyName, + Marshal.GetLastWin32Error())); + } + } + } +} \ No newline at end of file diff --git a/iSchedulerMonitor/SqlServerTypes/readme.htm b/iSchedulerMonitor/SqlServerTypes/readme.htm new file mode 100644 index 0000000..0f9eade --- /dev/null +++ b/iSchedulerMonitor/SqlServerTypes/readme.htm @@ -0,0 +1,39 @@ + + + + Microsoft.SqlServer.Types + + + +
+

Action required to load native assemblies

+

+ To deploy an application that uses spatial data types to a machine that does not have 'System CLR Types for SQL Server' installed you also need to deploy the native assembly SqlServerSpatial110.dll. Both x86 (32 bit) and x64 (64 bit) versions of this assembly have been added to your project under the SqlServerTypes\x86 and SqlServerTypes\x64 subdirectories. The native assembly msvcr100.dll is also included in case the C++ runtime is not installed. +

+

+ You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture). +

+

ASP.NET applications

+

+ For ASP.NET applications, add the following line of code to the Application_Start method in Global.asax.cs: + 

    SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));
+

+

Desktop applications

+

+ For desktop applications, add the following line of code to run before any spatial operations are performed: + 

    SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);
+

+
+ + \ No newline at end of file diff --git a/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj b/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj index afd852a..50b86d4 100644 --- a/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj +++ b/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj @@ -53,7 +53,7 @@ ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.WebForms.DLL - ..\packages\Microsoft.SqlServer.Types.11.0.0\lib\net20\Microsoft.SqlServer.Types.dll + ..\packages\Microsoft.SqlServer.Types.11.0.2\lib\net20\Microsoft.SqlServer.Types.dll ..\packages\Microsoft.Web.Infrastructure.2.0.1\lib\net40\Microsoft.Web.Infrastructure.dll @@ -118,8 +118,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\Vrh.Logger.2.9.4\lib\net451\Vrh.Logger.dll + + ..\packages\Vrh.Logger.2.10.0\lib\net451\Vrh.Logger.dll ..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll @@ -133,8 +133,8 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll @@ -142,6 +142,7 @@ + @@ -165,6 +166,15 @@ Always + + SqlServerTypes\x64\msvcr100.dll + PreserveNewest + + + SqlServerTypes\x86\msvcr100.dll + PreserveNewest + + diff --git a/iSchedulerMonitor/packages.config b/iSchedulerMonitor/packages.config index c68b8c7..e2f861a 100644 --- a/iSchedulerMonitor/packages.config +++ b/iSchedulerMonitor/packages.config @@ -7,7 +7,7 @@ - + @@ -16,9 +16,9 @@ - + - + \ No newline at end of file -- libgit2 0.21.2