Commit ef01ad2f8d460291706aebe72befd5447a73efa9

Authored by Schwirg László
1 parent e5780d0f

- beépülők frissítése

Vrh.OneMessage/App.config
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <configuration>
3 3 <configSections>
4 4 <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5   - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  5 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6 6 </configSections>
7 7 <entityFramework>
8 8 <providers>
9   - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
  9 + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
10 10 </providers>
11 11 </entityFramework>
12 12 <appSettings>
13   - <add key="VRH.XmlParser:root" value="~XmlParser.xml"/>
  13 + <add key="VRH.XmlParser:root" value="~XmlParser.xml" />
14 14 </appSettings>
15   -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
  15 + <startup>
  16 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
  17 + </startup>
  18 +</configuration>
16 19 \ No newline at end of file
... ...
Vrh.OneMessage/Vrh.OneMessage.csproj
... ... @@ -62,8 +62,8 @@
62 62 <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63 63 <HintPath>..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll</HintPath>
64 64 </Reference>
65   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
66   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  65 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  66 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
67 67 </Reference>
68 68 </ItemGroup>
69 69 <ItemGroup>
... ...
Vrh.OneMessage/packages.config
... ... @@ -2,5 +2,5 @@
2 2 <packages>
3 3 <package id="EntityFramework" version="6.4.4" targetFramework="net45" />
4 4 <package id="VRH.Common" version="3.0.0" targetFramework="net45" />
5   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net45" />
  5 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
6 6 </packages>
7 7 \ No newline at end of file
... ...
Vrh.OneReport/App.config
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <configuration>
3 3 <configSections>
4 4 <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5   - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  5 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6 6 </configSections>
7 7 <entityFramework>
8 8 <providers>
9   - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
  9 + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
10 10 </providers>
11 11 </entityFramework>
12 12 <appSettings>
13   - <add key="VRH.XmlParser:root" value="~XmlParser.xml"/>
  13 + <add key="VRH.XmlParser:root" value="~XmlParser.xml" />
14 14 </appSettings>
15 15 <runtime>
16 16 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
17 17 <dependentAssembly>
18   - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
19   - <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
  18 + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
  19 + <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
20 20 </dependentAssembly>
21 21 <dependentAssembly>
22   - <assemblyIdentity name="Microsoft.SqlServer.Types" publicKeyToken="89845dcd8080cc91" culture="neutral"/>
23   - <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0"/>
  22 + <assemblyIdentity name="Microsoft.SqlServer.Types" publicKeyToken="89845dcd8080cc91" culture="neutral" />
  23 + <bindingRedirect oldVersion="0.0.0.0-14.0.0.0" newVersion="14.0.0.0" />
24 24 </dependentAssembly>
25 25 <dependentAssembly>
26   - <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
27   - <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0"/>
  26 + <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  27 + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
28 28 </dependentAssembly>
29 29 </assemblyBinding>
30 30 </runtime>
31   -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
  31 + <startup>
  32 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
  33 + </startup>
  34 +</configuration>
32 35 \ No newline at end of file
... ...
Vrh.OneReport/Vrh.OneReport.csproj
... ... @@ -103,8 +103,8 @@
103 103 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
104 104 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
105 105 </Reference>
106   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
107   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  106 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  107 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
108 108 </Reference>
109 109 </ItemGroup>
110 110 <ItemGroup>
... ...
Vrh.OneReport/packages.config
... ... @@ -10,5 +10,5 @@
10 10 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" />
11 11 <package id="VRH.Common" version="3.0.0" targetFramework="net45" />
12 12 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net45" />
13   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net45" />
  13 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
14 14 </packages>
15 15 \ No newline at end of file
... ...
Vrh.Web.OneReport.Lib/App.config
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <configuration>
3 3 <configSections>
4 4 <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5   - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  5 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6 6 </configSections>
7 7 <entityFramework>
8 8 <defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
9 9 <parameters>
10   - <parameter value="mssqllocaldb"/>
  10 + <parameter value="mssqllocaldb" />
11 11 </parameters>
12 12 </defaultConnectionFactory>
13 13 <providers>
14   - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
  14 + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
15 15 </providers>
16 16 </entityFramework>
17 17 <runtime>
18 18 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
19 19 <dependentAssembly>
20   - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
21   - <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
  20 + <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  21 + <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
22 22 </dependentAssembly>
23 23 <dependentAssembly>
24   - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
25   - <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
  24 + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
  25 + <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
26 26 </dependentAssembly>
27 27 <dependentAssembly>
28   - <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
29   - <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234"/>
  28 + <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  29 + <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
30 30 </dependentAssembly>
31 31 <dependentAssembly>
32   - <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
33   - <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0"/>
  32 + <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  33 + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
34 34 </dependentAssembly>
35 35 </assemblyBinding>
36 36 </runtime>
37 37 <startup>
38   - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
  38 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
39 39 </startup>
40 40 <appSettings>
41   - <add key="VRH.XmlParser:root" value="~XmlParser.xml"/>
  41 + <add key="VRH.XmlParser:root" value="~XmlParser.xml" />
42 42 </appSettings>
43 43 -</configuration>
  44 +</configuration>
44 45 \ No newline at end of file
... ...
Vrh.Web.OneReport.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md
... ... @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true)
469 469  
470 470 ***
471 471 ### Version History:
  472 +#### 2.19.3 (2023.06.05) Patches:
  473 +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus.
  474 +
472 475 #### 2.19.2 (2023.03.17) Patches:
473 476 - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes
474 477 lista egy elemét fogadja el beállításként, egyébként nem változik az értéke.
... ...
Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj
... ... @@ -111,11 +111,11 @@
111 111 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
112 112 <Private>True</Private>
113 113 </Reference>
114   - <Reference Include="Vrh.Web.Common.Lib, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
115   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  114 + <Reference Include="Vrh.Web.Common.Lib, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
  115 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
116 116 </Reference>
117   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
118   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  117 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  118 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
119 119 </Reference>
120 120 </ItemGroup>
121 121 <ItemGroup>
... ...
Vrh.Web.OneReport.Lib/packages.config
... ... @@ -11,6 +11,6 @@
11 11 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" />
12 12 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
13 13 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
14   - <package id="Vrh.Web.Common.Lib" version="2.19.2" targetFramework="net451" />
15   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net451" />
  14 + <package id="Vrh.Web.Common.Lib" version="2.19.3" targetFramework="net462" />
  15 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
16 16 </packages>
17 17 \ No newline at end of file
... ...
Vrh.Web.Reporting/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md
... ... @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true)
469 469  
470 470 ***
471 471 ### Version History:
  472 +#### 2.19.3 (2023.06.05) Patches:
  473 +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus.
  474 +
472 475 #### 2.19.2 (2023.03.17) Patches:
473 476 - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes
474 477 lista egy elemét fogadja el beállításként, egyébként nem változik az értéke.
... ...
Vrh.Web.Reporting/Vrh.Web.Reporting.csproj
... ... @@ -137,14 +137,17 @@
137 137 <Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
138 138 <HintPath>..\packages\System.AppContext.4.1.0\lib\net46\System.AppContext.dll</HintPath>
139 139 </Reference>
  140 + <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
  141 + <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
  142 + </Reference>
140 143 <Reference Include="System.ComponentModel.Composition" />
141 144 <Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
142 145 <HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
143 146 </Reference>
144 147 <Reference Include="System.Data" />
145 148 <Reference Include="System.Data.DataSetExtensions" />
146   - <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
147   - <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
  149 + <Reference Include="System.Diagnostics.DiagnosticSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
  150 + <HintPath>..\packages\System.Diagnostics.DiagnosticSource.6.0.0\lib\net461\System.Diagnostics.DiagnosticSource.dll</HintPath>
148 151 </Reference>
149 152 <Reference Include="System.Diagnostics.TraceSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
150 153 <HintPath>..\packages\System.Diagnostics.TraceSource.4.0.0\lib\net46\System.Diagnostics.TraceSource.dll</HintPath>
... ... @@ -173,6 +176,9 @@
173 176 <HintPath>..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
174 177 </Reference>
175 178 <Reference Include="System.Linq" />
  179 + <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
  180 + <HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
  181 + </Reference>
176 182 <Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
177 183 <HintPath>..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
178 184 </Reference>
... ... @@ -180,6 +186,9 @@
180 186 <HintPath>..\packages\System.Net.Sockets.4.1.0\lib\net46\System.Net.Sockets.dll</HintPath>
181 187 </Reference>
182 188 <Reference Include="System.Numerics" />
  189 + <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
  190 + <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
  191 + </Reference>
183 192 <Reference Include="System.Reflection, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
184 193 <HintPath>..\packages\System.Reflection.4.1.0\lib\net462\System.Reflection.dll</HintPath>
185 194 </Reference>
... ... @@ -189,26 +198,35 @@
189 198 <Reference Include="System.Runtime, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
190 199 <HintPath>..\packages\System.Runtime.4.1.0\lib\net462\System.Runtime.dll</HintPath>
191 200 </Reference>
  201 + <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
  202 + <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
  203 + </Reference>
192 204 <Reference Include="System.Runtime.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
193 205 <HintPath>..\packages\System.Runtime.Extensions.4.1.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
194 206 </Reference>
195 207 <Reference Include="System.Runtime.InteropServices, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
196 208 <HintPath>..\packages\System.Runtime.InteropServices.4.1.0\lib\net462\System.Runtime.InteropServices.dll</HintPath>
197 209 </Reference>
198   - <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
199   - <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.0.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
  210 + <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
  211 + <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
  212 + <Private>True</Private>
  213 + <Private>True</Private>
200 214 </Reference>
201 215 <Reference Include="System.Security.Claims, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
202 216 <HintPath>..\packages\System.Security.Claims.4.0.1\lib\net46\System.Security.Claims.dll</HintPath>
203 217 </Reference>
204 218 <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
205   - <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
  219 + <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
  220 + <Private>True</Private>
  221 + <Private>True</Private>
206 222 </Reference>
207 223 <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
208 224 <HintPath>..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
209 225 </Reference>
210   - <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
211   - <HintPath>..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
  226 + <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
  227 + <HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
  228 + <Private>True</Private>
  229 + <Private>True</Private>
212 230 </Reference>
213 231 <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
214 232 <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
... ... @@ -275,20 +293,20 @@
275 293 <Reference Include="VRH.Log4Pro.WebTools, Version=1.11.1.0, Culture=neutral, processorArchitecture=MSIL">
276 294 <HintPath>..\packages\VRH.Log4Pro.WebTools.1.11.1\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath>
277 295 </Reference>
278   - <Reference Include="Vrh.Logger, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL">
279   - <HintPath>..\packages\Vrh.Logger.2.9.4\lib\net451\Vrh.Logger.dll</HintPath>
  296 + <Reference Include="Vrh.Logger, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL">
  297 + <HintPath>..\packages\Vrh.Logger.2.10.0\lib\net451\Vrh.Logger.dll</HintPath>
280 298 </Reference>
281 299 <Reference Include="Vrh.Membership, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
282 300 <HintPath>..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll</HintPath>
283 301 </Reference>
284   - <Reference Include="Vrh.Web.Common.Lib, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
285   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  302 + <Reference Include="Vrh.Web.Common.Lib, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
  303 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
286 304 </Reference>
287 305 <Reference Include="Vrh.Web.FileManager.Lib, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
288 306 <HintPath>..\packages\Vrh.Web.FileManager.1.5.1\lib\net462\Vrh.Web.FileManager.Lib.dll</HintPath>
289 307 </Reference>
290   - <Reference Include="Vrh.Web.Membership.Lib, Version=4.8.1.0, Culture=neutral, processorArchitecture=MSIL">
291   - <HintPath>..\packages\Vrh.Web.Membership.4.8.1\lib\net451\Vrh.Web.Membership.Lib.dll</HintPath>
  308 + <Reference Include="Vrh.Web.Membership.Lib, Version=4.8.2.0, Culture=neutral, processorArchitecture=MSIL">
  309 + <HintPath>..\packages\Vrh.Web.Membership.4.8.2\lib\net451\Vrh.Web.Membership.Lib.dll</HintPath>
292 310 </Reference>
293 311 <Reference Include="Vrh.Web.Menu.Lib, Version=1.28.5.0, Culture=neutral, processorArchitecture=MSIL">
294 312 <HintPath>..\packages\Vrh.Web.Menu.1.28.5\lib\net451\Vrh.Web.Menu.Lib.dll</HintPath>
... ... @@ -299,8 +317,8 @@
299 317 <Reference Include="Vrh.WebForm.Lib, Version=2.7.1.0, Culture=neutral, processorArchitecture=MSIL">
300 318 <HintPath>..\packages\Vrh.WebForm.2.7.1\lib\net462\Vrh.WebForm.Lib.dll</HintPath>
301 319 </Reference>
302   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
303   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  320 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  321 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
304 322 </Reference>
305 323 <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
306 324 <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath>
... ... @@ -650,6 +668,51 @@
650 668 <Content Include="Images\ajax-loader_black.gif" />
651 669 <Content Include="Images\log4pro_cube.png" />
652 670 <Content Include="Images\userlogo.jpg" />
  671 + <Content Include="Areas\UserAdministration\Views\_ViewStart.cshtml" />
  672 + <Content Include="Areas\UserAdministration\Views\web.config" />
  673 + <Content Include="Areas\UserAdministration\Views\User\Roles.cshtml" />
  674 + <Content Include="Areas\UserAdministration\Views\User\RoleGroups.cshtml" />
  675 + <Content Include="Areas\UserAdministration\Views\User\PasswordRenewal.cshtml" />
  676 + <Content Include="Areas\UserAdministration\Views\User\Manager.cshtml" />
  677 + <Content Include="Areas\UserAdministration\Views\User\EditorWithLayout.cshtml" />
  678 + <Content Include="Areas\UserAdministration\Views\User\Editor.cshtml" />
  679 + <Content Include="Areas\UserAdministration\Views\UsersToUserRoleGroups\_UsersToUserRoleGroups.cshtml" />
  680 + <Content Include="Areas\UserAdministration\Views\UsersToUserRoleGroups\Index.cshtml" />
  681 + <Content Include="Areas\UserAdministration\Views\UserAdministration\UsersRoles.cshtml" />
  682 + <Content Include="Areas\UserAdministration\Views\UserAdministration\SearchUser.cshtml" />
  683 + <Content Include="Areas\UserAdministration\Views\UserAdministration\Roles.cshtml" />
  684 + <Content Include="Areas\UserAdministration\Views\UserAdministration\Role.cshtml" />
  685 + <Content Include="Areas\UserAdministration\Views\UserAdministration\Password2.cshtml" />
  686 + <Content Include="Areas\UserAdministration\Views\UserAdministration\Password.cshtml" />
  687 + <Content Include="Areas\UserAdministration\Views\UserAdministration\Index.cshtml" />
  688 + <Content Include="Areas\UserAdministration\Views\UserAdministration\Details.cshtml" />
  689 + <Content Include="Areas\UserAdministration\Views\UserAdministration\CreateUser.cshtml" />
  690 + <Content Include="Areas\UserAdministration\Views\Shared\ValidationSummary.cshtml" />
  691 + <Content Include="Areas\UserAdministration\Views\Shared\ErrorList.cshtml" />
  692 + <Content Include="Areas\UserAdministration\Views\SecondaryUser\SecondaryFunction.cshtml" />
  693 + <Content Include="Areas\UserAdministration\Views\SecondaryUser\Manager.cshtml" />
  694 + <Content Include="Areas\UserAdministration\Views\SecondaryUser\Editor.cshtml" />
  695 + <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_RolesToUserRoleGroups.cshtml" />
  696 + <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_NewUserRoleGroupForm.cshtml" />
  697 + <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_EditUserRoleGroupForm.cshtml" />
  698 + <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_DeleteUserRoleGroupForm.cshtml" />
  699 + <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\Index.cshtml" />
  700 + <Content Include="Areas\UserAdministration\Views\Account\_SetPasswordPartial.cshtml" />
  701 + <Content Include="Areas\UserAdministration\Views\Account\_RemoveExternalLoginsPartial.cshtml" />
  702 + <Content Include="Areas\UserAdministration\Views\Account\_ExternalLoginsListPartial.cshtml" />
  703 + <Content Include="Areas\UserAdministration\Views\Account\_ChangePasswordPartial.cshtml" />
  704 + <Content Include="Areas\UserAdministration\Views\Account\Register.cshtml" />
  705 + <Content Include="Areas\UserAdministration\Views\Account\Manage.cshtml" />
  706 + <Content Include="Areas\UserAdministration\Views\Account\LogoutOnly.cshtml" />
  707 + <Content Include="Areas\UserAdministration\Views\Account\LoginPage.cshtml" />
  708 + <Content Include="Areas\UserAdministration\Views\Account\LogInOut.cshtml" />
  709 + <Content Include="Areas\UserAdministration\Views\Account\ExternalLoginFailure.cshtml" />
  710 + <Content Include="Areas\UserAdministration\Views\Account\ExternalLoginConfirmation.cshtml" />
  711 + <Content Include="Areas\UserAdministration\Views\Account\DirectAuthentication.cshtml" />
  712 + <Content Include="Areas\UAManyToMany\Views\web.config" />
  713 + <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_MultiSelectLists.cshtml" />
  714 + <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_Main.cshtml" />
  715 + <Content Include="Areas\UAManyToMany\Views\UAManyToMany\ManyToMany.cshtml" />
653 716 <None Include="LogConfig.xml">
654 717 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
655 718 </None>
... ... @@ -782,51 +845,6 @@
782 845 <Content Include="Content\bootstrap-reboot.css.map" />
783 846 <Content Include="Content\bootstrap-grid.min.css.map" />
784 847 <Content Include="Content\bootstrap-grid.css.map" />
785   - <Content Include="Areas\UserAdministration\Views\_ViewStart.cshtml" />
786   - <Content Include="Areas\UserAdministration\Views\web.config" />
787   - <Content Include="Areas\UserAdministration\Views\User\Roles.cshtml" />
788   - <Content Include="Areas\UserAdministration\Views\User\RoleGroups.cshtml" />
789   - <Content Include="Areas\UserAdministration\Views\User\PasswordRenewal.cshtml" />
790   - <Content Include="Areas\UserAdministration\Views\User\Manager.cshtml" />
791   - <Content Include="Areas\UserAdministration\Views\User\EditorWithLayout.cshtml" />
792   - <Content Include="Areas\UserAdministration\Views\User\Editor.cshtml" />
793   - <Content Include="Areas\UserAdministration\Views\UsersToUserRoleGroups\_UsersToUserRoleGroups.cshtml" />
794   - <Content Include="Areas\UserAdministration\Views\UsersToUserRoleGroups\Index.cshtml" />
795   - <Content Include="Areas\UserAdministration\Views\UserAdministration\UsersRoles.cshtml" />
796   - <Content Include="Areas\UserAdministration\Views\UserAdministration\SearchUser.cshtml" />
797   - <Content Include="Areas\UserAdministration\Views\UserAdministration\Roles.cshtml" />
798   - <Content Include="Areas\UserAdministration\Views\UserAdministration\Role.cshtml" />
799   - <Content Include="Areas\UserAdministration\Views\UserAdministration\Password2.cshtml" />
800   - <Content Include="Areas\UserAdministration\Views\UserAdministration\Password.cshtml" />
801   - <Content Include="Areas\UserAdministration\Views\UserAdministration\Index.cshtml" />
802   - <Content Include="Areas\UserAdministration\Views\UserAdministration\Details.cshtml" />
803   - <Content Include="Areas\UserAdministration\Views\UserAdministration\CreateUser.cshtml" />
804   - <Content Include="Areas\UserAdministration\Views\Shared\ValidationSummary.cshtml" />
805   - <Content Include="Areas\UserAdministration\Views\Shared\ErrorList.cshtml" />
806   - <Content Include="Areas\UserAdministration\Views\SecondaryUser\SecondaryFunction.cshtml" />
807   - <Content Include="Areas\UserAdministration\Views\SecondaryUser\Manager.cshtml" />
808   - <Content Include="Areas\UserAdministration\Views\SecondaryUser\Editor.cshtml" />
809   - <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_RolesToUserRoleGroups.cshtml" />
810   - <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_NewUserRoleGroupForm.cshtml" />
811   - <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_EditUserRoleGroupForm.cshtml" />
812   - <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\_DeleteUserRoleGroupForm.cshtml" />
813   - <Content Include="Areas\UserAdministration\Views\RolesToUserRoleGroups\Index.cshtml" />
814   - <Content Include="Areas\UserAdministration\Views\Account\_SetPasswordPartial.cshtml" />
815   - <Content Include="Areas\UserAdministration\Views\Account\_RemoveExternalLoginsPartial.cshtml" />
816   - <Content Include="Areas\UserAdministration\Views\Account\_ExternalLoginsListPartial.cshtml" />
817   - <Content Include="Areas\UserAdministration\Views\Account\_ChangePasswordPartial.cshtml" />
818   - <Content Include="Areas\UserAdministration\Views\Account\Register.cshtml" />
819   - <Content Include="Areas\UserAdministration\Views\Account\Manage.cshtml" />
820   - <Content Include="Areas\UserAdministration\Views\Account\LogoutOnly.cshtml" />
821   - <Content Include="Areas\UserAdministration\Views\Account\LoginPage.cshtml" />
822   - <Content Include="Areas\UserAdministration\Views\Account\LogInOut.cshtml" />
823   - <Content Include="Areas\UserAdministration\Views\Account\ExternalLoginFailure.cshtml" />
824   - <Content Include="Areas\UserAdministration\Views\Account\ExternalLoginConfirmation.cshtml" />
825   - <Content Include="Areas\UserAdministration\Views\Account\DirectAuthentication.cshtml" />
826   - <Content Include="Areas\UAManyToMany\Views\web.config" />
827   - <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_MultiSelectLists.cshtml" />
828   - <Content Include="Areas\UAManyToMany\Views\UAManyToMany\_Main.cshtml" />
829   - <Content Include="Areas\UAManyToMany\Views\UAManyToMany\ManyToMany.cshtml" />
830 848 <Content Include="Scripts\vrh.bootstrap-datetimepicker.js" />
831 849 <Content Include="Scripts\vrh.bootstrap-datetimepicker.min.js" />
832 850 <Content Include="Scripts\vrh.commontools.js" />
... ... @@ -903,15 +921,13 @@
903 921 <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" />
904 922 <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Common.Lib\ReadMe.md" />
905 923 <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.FileManager\ReadMe.md" />
  924 + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Membership\ReadMe.md" />
906 925 <None Include="Vrh.NugetModuls.Documentations\Vrh.WebForm\ReadMe.md" />
907 926 <Content Include="WCFBehaviors.config" />
908 927 <Content Include="WCFBindings.config" />
909 928 <Content Include="WCFClients.config" />
910 929 <Content Include="WCFServices.config" />
911 930 <Content Include="WebIdentity.config" />
912   - <None Include="XmlParser.xml">
913   - <CopyToOutputDirectory>Always</CopyToOutputDirectory>
914   - </None>
915 931 <None Include="Scripts\jquery-3.6.4.intellisense.js" />
916 932 <Content Include="Scripts\jquery-3.6.4.js" />
917 933 <Content Include="Scripts\jquery-3.6.4.min.js" />
... ... @@ -939,7 +955,6 @@
939 955 <Content Include="Scripts\jquery-3.6.4.slim.min.map" />
940 956 <Content Include="Scripts\jquery-3.6.4.min.map" />
941 957 <None Include="Vrh.NugetModuls.Documentations\Vrh.Log4Pro.MultiLanguageManager\ReadMe.md" />
942   - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Membership\ReadMe.md" />
943 958 <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" />
944 959 <None Include="Scripts\jquery.validate-vsdoc.js" />
945 960 <Content Include="Scripts\jquery.validate.js" />
... ... @@ -1185,12 +1200,15 @@
1185 1200 <Content Include="webfonts\fa-brands-400.woff" />
1186 1201 <Content Include="webfonts\fa-brands-400.ttf" />
1187 1202 <Content Include="webfonts\fa-brands-400.eot" />
1188   - <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" />
  1203 + <None Include="XmlParser.xml">
  1204 + <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  1205 + </None>
1189 1206 <Content Include="_CreateNewNuGetPackage\RunMeToUploadNuGetPackage.cmd" />
1190 1207 <Content Include="_CreateNewNuGetPackage\DoNotModify\UploadNuGetPackage.ps1" />
1191 1208 <Content Include="_CreateNewNuGetPackage\DoNotModify\New-NuGetPackage.ps1" />
1192 1209 <Content Include="_CreateNewNuGetPackage\DoNotModify\CreateNuGetPackage.ps1" />
1193 1210 <Content Include="_CreateNewNuGetPackage\Config.ps1" />
  1211 + <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" />
1194 1212 </ItemGroup>
1195 1213 <ItemGroup>
1196 1214 <Content Include="packages.config" />
... ...
Vrh.Web.Reporting/Web.config
... ... @@ -11,15 +11,17 @@
11 11 <appSettings>
12 12 <add key="VRH.XmlParser:root" value="c:\Log4ProIS\Config\XmlParser.xml" />
13 13 <add key="owin:AutomaticAppStartup" value="false" />
14   - <add key="Vrh.Logger:Config" value="file=C:\Log4ProIS\CONFIG\LogConfig.xml;element=/Vrh.Web.Reporting;"/>
  14 + <add key="Vrh.Logger:Config" value="file=C:\Log4ProIS\CONFIG\LogConfig.xml;element=/Vrh.Web.Reporting;" />
15 15 <add key="VRH.MultiLanguageManager:connectionString" value="VRH.MultiLanguageManagerLOG4PRO:connectionString" />
16 16 <add key="VRH.MultiLanguageManager:DefaultLanguageCode" value="en-US" />
17 17 <add key="webpages:Version" value="3.0.0.0" />
18 18 <add key="webpages:Enabled" value="false" />
19 19 <add key="ClientValidationEnabled" value="true" />
20 20 <add key="UnobtrusiveJavaScriptEnabled" value="true" />
21   - <add key="enableSimpleMembership" value="false" />
22   - <add key="autoFormsAuthentication" value="false" />
  21 + <add key="enableSimpleMembership" value="false" />
  22 + <add key="autoFormsAuthentication" value="false" />
  23 + <add key="HangfireBootstrapper:disableautostart" value="false" />
  24 + <add key="HangfireBootstrapper:dbconnectionstring" value="MAINDBLOG4PRO" />
23 25 </appSettings>
24 26 <system.serviceModel>
25 27 <client configSource="WCFClients.config" />
... ... @@ -40,7 +42,7 @@
40 42 </providers>
41 43 </sessionState>
42 44 <membership configSource="system.web.membership.config" />
43   - <roleManager configSource="system.web.roleManager.config" />
  45 + <roleManager configSource="system.web.roleManager.config" />
44 46 <identity configSource="WebIdentity.config" />
45 47 <authentication configSource="system.web.authentication.config" />
46 48 </system.web>
... ... @@ -108,7 +110,7 @@
108 110 </dependentAssembly>
109 111 <dependentAssembly>
110 112 <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
111   - <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
  113 + <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
112 114 </dependentAssembly>
113 115 <dependentAssembly>
114 116 <assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
... ...
Vrh.Web.Reporting/packages.config
... ... @@ -51,11 +51,12 @@
51 51 <package id="popper.js" version="1.16.1" targetFramework="net451" />
52 52 <package id="Respond" version="1.4.2" targetFramework="net451" />
53 53 <package id="System.AppContext" version="4.1.0" targetFramework="net462" />
  54 + <package id="System.Buffers" version="4.5.1" targetFramework="net462" />
54 55 <package id="System.Collections" version="4.0.11" targetFramework="net462" />
55 56 <package id="System.Collections.Concurrent" version="4.0.12" targetFramework="net462" />
56 57 <package id="System.Console" version="4.0.0" targetFramework="net462" />
57 58 <package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net462" />
58   - <package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net462" />
  59 + <package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net462" />
59 60 <package id="System.Diagnostics.Tools" version="4.0.1" targetFramework="net462" />
60 61 <package id="System.Diagnostics.TraceSource" version="4.0.0" targetFramework="net462" />
61 62 <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net462" />
... ... @@ -68,9 +69,11 @@
68 69 <package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net462" />
69 70 <package id="System.Linq" version="4.1.0" targetFramework="net462" />
70 71 <package id="System.Linq.Expressions" version="4.1.0" targetFramework="net462" />
  72 + <package id="System.Memory" version="4.5.4" targetFramework="net462" />
71 73 <package id="System.Net.Http" version="4.1.0" targetFramework="net462" />
72 74 <package id="System.Net.Primitives" version="4.0.11" targetFramework="net462" />
73 75 <package id="System.Net.Sockets" version="4.1.0" targetFramework="net462" />
  76 + <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
74 77 <package id="System.ObjectModel" version="4.0.12" targetFramework="net462" />
75 78 <package id="System.Reflection" version="4.1.0" targetFramework="net462" />
76 79 <package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net462" />
... ... @@ -78,15 +81,16 @@
78 81 <package id="System.Reflection.TypeExtensions" version="4.4.0" targetFramework="net462" />
79 82 <package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net462" />
80 83 <package id="System.Runtime" version="4.1.0" targetFramework="net462" />
  84 + <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
81 85 <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net462" />
82 86 <package id="System.Runtime.Handles" version="4.0.1" targetFramework="net462" />
83 87 <package id="System.Runtime.InteropServices" version="4.1.0" targetFramework="net462" />
84   - <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net462" />
  88 + <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
85 89 <package id="System.Runtime.Numerics" version="4.0.1" targetFramework="net462" />
86 90 <package id="System.Security.Claims" version="4.0.1" targetFramework="net462" />
87   - <package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net462" />
  91 + <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
88 92 <package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net462" />
89   - <package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net462" />
  93 + <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
90 94 <package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net462" />
91 95 <package id="System.Security.Principal.Windows" version="4.0.0" targetFramework="net462" />
92 96 <package id="System.ServiceProcess.ServiceController" version="4.1.0" targetFramework="net462" />
... ... @@ -101,15 +105,15 @@
101 105 <package id="VRH.Common" version="3.0.0" targetFramework="net472" />
102 106 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" />
103 107 <package id="VRH.Log4Pro.WebTools" version="1.11.1" targetFramework="net472" />
104   - <package id="Vrh.Logger" version="2.9.4" targetFramework="net462" />
  108 + <package id="Vrh.Logger" version="2.10.0" targetFramework="net462" />
105 109 <package id="Vrh.Membership" version="4.11.0" targetFramework="net461" />
106   - <package id="Vrh.Web.Common.Lib" version="2.19.2" targetFramework="net472" />
  110 + <package id="Vrh.Web.Common.Lib" version="2.19.3" targetFramework="net462" />
107 111 <package id="Vrh.Web.FileManager" version="1.5.1" targetFramework="net472" />
108   - <package id="Vrh.Web.Membership" version="4.8.1" targetFramework="net461" />
  112 + <package id="Vrh.Web.Membership" version="4.8.2" targetFramework="net462" />
109 113 <package id="Vrh.Web.Menu" version="1.28.5" targetFramework="net461" />
110 114 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
111 115 <package id="Vrh.WebForm" version="2.7.1" targetFramework="net472" />
112   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net472" />
  116 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
113 117 <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" />
114 118 <package id="WebGrease" version="1.6.0" targetFramework="net451" />
115 119 </packages>
116 120 \ No newline at end of file
... ...
Vrh.Web.iScheduler.Lib/App.config
... ... @@ -128,4 +128,4 @@
128 128 <appSettings>
129 129 <add key="VRH.XmlParser:root" value="~XmlParser.xml" />
130 130 </appSettings>
131 131 -</configuration>
  132 +</configuration>
132 133 \ No newline at end of file
... ...
Vrh.Web.iScheduler.Lib/Vrh.NugetModuls.Documentations/Vrh.Web.Common.Lib/ReadMe.md
... ... @@ -469,6 +469,9 @@ public RedisConnection(string redisConnectionString, bool isRequired = true)
469 469  
470 470 ***
471 471 ### Version History:
  472 +#### 2.19.3 (2023.06.05) Patches:
  473 +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus.
  474 +
472 475 #### 2.19.2 (2023.03.17) Patches:
473 476 - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes
474 477 lista egy elemét fogadja el beállításként, egyébként nem változik az értéke.
... ...
Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj
... ... @@ -46,30 +46,6 @@
46 46 <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
47 47 <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
48 48 </Reference>
49   - <Reference Include="Microsoft.AspNetCore.Hosting, Version=2.2.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
50   - <HintPath>..\packages\Microsoft.AspNetCore.Hosting.2.2.7\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
51   - </Reference>
52   - <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
53   - <HintPath>..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath>
54   - </Reference>
55   - <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
56   - <HintPath>..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath>
57   - </Reference>
58   - <Reference Include="Microsoft.AspNetCore.Http, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
59   - <HintPath>..\packages\Microsoft.AspNetCore.Http.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll</HintPath>
60   - </Reference>
61   - <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
62   - <HintPath>..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
63   - </Reference>
64   - <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
65   - <HintPath>..\packages\Microsoft.AspNetCore.Http.Extensions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll</HintPath>
66   - </Reference>
67   - <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
68   - <HintPath>..\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
69   - </Reference>
70   - <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
71   - <HintPath>..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
72   - </Reference>
73 49 <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
74 50 <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
75 51 </Reference>
... ... @@ -139,9 +115,6 @@
139 115 <Reference Include="Microsoft.Extensions.Logging.EventSource, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
140 116 <HintPath>..\packages\Microsoft.Extensions.Logging.EventSource.6.0.0\lib\net461\Microsoft.Extensions.Logging.EventSource.dll</HintPath>
141 117 </Reference>
142   - <Reference Include="Microsoft.Extensions.ObjectPool, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
143   - <HintPath>..\packages\Microsoft.Extensions.ObjectPool.2.2.0\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll</HintPath>
144   - </Reference>
145 118 <Reference Include="Microsoft.Extensions.Options, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
146 119 <HintPath>..\packages\Microsoft.Extensions.Options.6.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
147 120 </Reference>
... ... @@ -151,9 +124,6 @@
151 124 <Reference Include="Microsoft.Extensions.Primitives, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
152 125 <HintPath>..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
153 126 </Reference>
154   - <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
155   - <HintPath>..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
156   - </Reference>
157 127 <Reference Include="Microsoft.Owin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
158 128 <HintPath>..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
159 129 </Reference>
... ... @@ -292,14 +262,14 @@
292 262 <Reference Include="Vrh.Membership, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
293 263 <HintPath>..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll</HintPath>
294 264 </Reference>
295   - <Reference Include="Vrh.Web.Common.Lib, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
296   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  265 + <Reference Include="Vrh.Web.Common.Lib, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
  266 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
297 267 </Reference>
298 268 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
299 269 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
300 270 </Reference>
301   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
302   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  271 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  272 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
303 273 </Reference>
304 274 <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
305 275 <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
... ...
Vrh.Web.iScheduler.Lib/packages.config
... ... @@ -8,14 +8,6 @@
8 8 <package id="Microsoft.AspNet.Razor" version="3.2.9" targetFramework="net461" />
9 9 <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
10 10 <package id="Microsoft.AspNet.WebPages" version="3.2.9" targetFramework="net461" />
11   - <package id="Microsoft.AspNetCore.Hosting" version="2.2.7" targetFramework="net461" />
12   - <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
13   - <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.2.0" targetFramework="net461" />
14   - <package id="Microsoft.AspNetCore.Http" version="2.2.0" targetFramework="net461" />
15   - <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" targetFramework="net461" />
16   - <package id="Microsoft.AspNetCore.Http.Extensions" version="2.2.0" targetFramework="net461" />
17   - <package id="Microsoft.AspNetCore.Http.Features" version="2.2.0" targetFramework="net461" />
18   - <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net461" />
19 11 <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
20 12 <package id="Microsoft.Extensions.Configuration" version="6.0.0" targetFramework="net461" />
21 13 <package id="Microsoft.Extensions.Configuration.Abstractions" version="6.0.0" targetFramework="net461" />
... ... @@ -39,11 +31,9 @@
39 31 <package id="Microsoft.Extensions.Logging.Debug" version="6.0.0" targetFramework="net461" />
40 32 <package id="Microsoft.Extensions.Logging.EventLog" version="6.0.0" targetFramework="net461" />
41 33 <package id="Microsoft.Extensions.Logging.EventSource" version="6.0.0" targetFramework="net461" />
42   - <package id="Microsoft.Extensions.ObjectPool" version="2.2.0" targetFramework="net461" />
43 34 <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
44 35 <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="6.0.0" targetFramework="net461" />
45 36 <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
46   - <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
47 37 <package id="Microsoft.Owin" version="3.0.0" targetFramework="net461" />
48 38 <package id="Microsoft.Owin.Host.SystemWeb" version="3.0.0" targetFramework="net461" />
49 39 <package id="Microsoft.Report.Viewer" version="11.0.0.0" targetFramework="net451" />
... ... @@ -70,8 +60,8 @@
70 60 <package id="VRH.Common" version="3.0.0" targetFramework="net461" />
71 61 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" />
72 62 <package id="Vrh.Membership" version="4.11.0" targetFramework="net461" />
73   - <package id="Vrh.Web.Common.Lib" version="2.19.2" targetFramework="net461" />
  63 + <package id="Vrh.Web.Common.Lib" version="2.19.3" targetFramework="net462" />
74 64 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
75   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net461" />
  65 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
76 66 <package id="WebGrease" version="1.6.0" targetFramework="net45" />
77 67 </packages>
78 68 \ No newline at end of file
... ...
Vrh.Web.iScheduler.Report.Lib/App.config
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <configuration>
3 3 <configSections>
4 4 <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5   - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  5 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6 6 </configSections>
7 7 <connectionStrings>
8   - <add name="VRH.iSchedulerReport:connectionString" connectionString="data source=192.168.77.150\SQLEXPRESS;initial catalog=LearALMNew;user id=sa;password=Vrh@54321;multipleactiveresultsets=True;Connection Timeout=3600" providerName="System.Data.SqlClient"/>
  8 + <add name="VRH.iSchedulerReport:connectionString" connectionString="data source=192.168.77.150\SQLEXPRESS;initial catalog=LearALMNew;user id=sa;password=Vrh@54321;multipleactiveresultsets=True;Connection Timeout=3600" providerName="System.Data.SqlClient" />
9 9 </connectionStrings>
10 10 <entityFramework>
11   - <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
  11 + <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
12 12 <providers>
13   - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
  13 + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
14 14 </providers>
15 15 </entityFramework>
16 16 <appSettings>
17   - <add key="VRH.XmlParser:root" value="~XmlParser.xml"/>
  17 + <add key="VRH.XmlParser:root" value="~XmlParser.xml" />
18 18 </appSettings>
19 19 <runtime>
20 20 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
21 21 <dependentAssembly>
22   - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
23   - <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/>
  22 + <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  23 + <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
24 24 </dependentAssembly>
25 25 <dependentAssembly>
26   - <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
27   - <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
  26 + <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  27 + <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
28 28 </dependentAssembly>
29 29 <dependentAssembly>
30   - <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
31   - <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
  30 + <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
  31 + <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
32 32 </dependentAssembly>
33 33 <dependentAssembly>
34   - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
35   - <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
  34 + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
  35 + <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
36 36 </dependentAssembly>
37 37 <dependentAssembly>
38   - <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
39   - <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
  38 + <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  39 + <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
40 40 </dependentAssembly>
41 41 <dependentAssembly>
42   - <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
43   - <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0"/>
  42 + <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  43 + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
44 44 </dependentAssembly>
45 45 </assemblyBinding>
46 46 </runtime>
47   -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
  47 + <startup>
  48 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
  49 + </startup>
  50 +</configuration>
48 51 \ No newline at end of file
... ...
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)
469 469  
470 470 ***
471 471 ### Version History:
  472 +#### 2.19.3 (2023.06.05) Patches:
  473 +- DataTables.Filter metódus módosítása. Enum összehasonlításkor volt típus konfliktus.
  474 +
472 475 #### 2.19.2 (2023.03.17) Patches:
473 476 - BaseController.ForcedLanguageCode mostantól csak a MultiLanguageManager.ActiveLanguageCodes
474 477 lista egy elemét fogadja el beállításként, egyébként nem változik az értéke.
... ...
Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj
... ... @@ -116,14 +116,14 @@
116 116 <Reference Include="Vrh.Membership, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
117 117 <HintPath>..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll</HintPath>
118 118 </Reference>
119   - <Reference Include="Vrh.Web.Common.Lib, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
120   - <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
  119 + <Reference Include="Vrh.Web.Common.Lib, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
  120 + <HintPath>..\packages\Vrh.Web.Common.Lib.2.19.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath>
121 121 </Reference>
122 122 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
123 123 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
124 124 </Reference>
125   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
126   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  125 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  126 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
127 127 </Reference>
128 128 </ItemGroup>
129 129 <ItemGroup>
... ...
Vrh.Web.iScheduler.Report.Lib/packages.config
... ... @@ -15,7 +15,7 @@
15 15 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
16 16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
17 17 <package id="Vrh.Membership" version="4.11.0" targetFramework="net451" />
18   - <package id="Vrh.Web.Common.Lib" version="2.19.2" targetFramework="net451" />
  18 + <package id="Vrh.Web.Common.Lib" version="2.19.3" targetFramework="net462" />
19 19 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
20   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net451" />
  20 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
21 21 </packages>
22 22 \ No newline at end of file
... ...
Vrh.iScheduler.Report/App.config
1   -<?xml version="1.0" encoding="utf-8"?>
  1 +<?xml version="1.0" encoding="utf-8"?>
2 2 <configuration>
3 3 <configSections>
4 4 <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5   - <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  5 + <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6 6 </configSections>
7 7 <entityFramework>
8 8 <providers>
9   - <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
  9 + <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
10 10 </providers>
11 11 </entityFramework>
12 12 <appSettings>
13   - <add key="VRH.XmlParser:root" value="~XmlParser.xml"/>
  13 + <add key="VRH.XmlParser:root" value="~XmlParser.xml" />
14 14 </appSettings>
15 15 <runtime>
16 16 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
17 17 <dependentAssembly>
18   - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
19   - <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0"/>
  18 + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
  19 + <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
20 20 </dependentAssembly>
21 21 <dependentAssembly>
22   - <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
23   - <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0"/>
  22 + <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  23 + <bindingRedirect oldVersion="0.0.0.0-2.0.1.0" newVersion="2.0.1.0" />
24 24 </dependentAssembly>
25 25 <dependentAssembly>
26   - <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
27   - <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
  26 + <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  27 + <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
28 28 </dependentAssembly>
29 29 <dependentAssembly>
30   - <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
31   - <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/>
  30 + <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
  31 + <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
32 32 </dependentAssembly>
33 33 </assemblyBinding>
34 34 </runtime>
35   -<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>
  35 + <startup>
  36 + <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
  37 + </startup>
  38 +</configuration>
36 39 \ No newline at end of file
... ...
Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj
... ... @@ -117,8 +117,8 @@
117 117 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
118 118 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
119 119 </Reference>
120   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
121   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  120 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  121 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
122 122 </Reference>
123 123 </ItemGroup>
124 124 <ItemGroup>
... ...
Vrh.iScheduler.Report/packages.config
... ... @@ -16,5 +16,5 @@
16 16 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
17 17 <package id="Vrh.Membership" version="4.11.0" targetFramework="net451" />
18 18 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
19   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net451" />
  19 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
20 20 </packages>
21 21 \ No newline at end of file
... ...
Vrh.iScheduler/Vrh.iScheduler.csproj
... ... @@ -124,8 +124,8 @@
124 124 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
125 125 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
126 126 </Reference>
127   - <Reference Include="Vrh.Logger, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL">
128   - <HintPath>..\packages\Vrh.Logger.2.9.4\lib\net451\Vrh.Logger.dll</HintPath>
  127 + <Reference Include="Vrh.Logger, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL">
  128 + <HintPath>..\packages\Vrh.Logger.2.10.0\lib\net451\Vrh.Logger.dll</HintPath>
129 129 </Reference>
130 130 <Reference Include="Vrh.Membership, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
131 131 <HintPath>..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll</HintPath>
... ... @@ -133,8 +133,8 @@
133 133 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
134 134 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
135 135 </Reference>
136   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
137   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  136 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  137 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
138 138 </Reference>
139 139 </ItemGroup>
140 140 <ItemGroup>
... ...
Vrh.iScheduler/packages.config
... ... @@ -20,8 +20,8 @@
20 20 <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" />
21 21 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
22 22 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
23   - <package id="Vrh.Logger" version="2.9.4" targetFramework="net462" />
  23 + <package id="Vrh.Logger" version="2.10.0" targetFramework="net462" />
24 24 <package id="Vrh.Membership" version="4.11.0" targetFramework="net451" />
25 25 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
26   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net451" />
  26 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
27 27 </packages>
28 28 \ No newline at end of file
... ...
iSchedulerMonitor/SqlServerTypes/Loader.cs 0 → 100644
... ... @@ -0,0 +1,45 @@
  1 +using System;
  2 +using System.IO;
  3 +using System.Runtime.InteropServices;
  4 +
  5 +namespace SqlServerTypes
  6 +{
  7 + /// <summary>
  8 + /// Utility methods related to CLR Types for SQL Server
  9 + /// </summary>
  10 + internal class Utilities
  11 + {
  12 + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
  13 + private static extern IntPtr LoadLibrary(string libname);
  14 +
  15 + /// <summary>
  16 + /// Loads the required native assemblies for the current architecture (x86 or x64)
  17 + /// </summary>
  18 + /// <param name="rootApplicationPath">
  19 + /// Root path of the current application. Use Server.MapPath(".") for ASP.NET applications
  20 + /// and AppDomain.CurrentDomain.BaseDirectory for desktop applications.
  21 + /// </param>
  22 + public static void LoadNativeAssemblies(string rootApplicationPath)
  23 + {
  24 + var nativeBinaryPath = IntPtr.Size > 4
  25 + ? Path.Combine(rootApplicationPath, @"SqlServerTypes\x64\")
  26 + : Path.Combine(rootApplicationPath, @"SqlServerTypes\x86\");
  27 +
  28 + LoadNativeAssembly(nativeBinaryPath, "msvcr100.dll");
  29 + LoadNativeAssembly(nativeBinaryPath, "SqlServerSpatial110.dll");
  30 + }
  31 +
  32 + private static void LoadNativeAssembly(string nativeBinaryPath, string assemblyName)
  33 + {
  34 + var path = Path.Combine(nativeBinaryPath, assemblyName);
  35 + var ptr = LoadLibrary(path);
  36 + if (ptr == IntPtr.Zero)
  37 + {
  38 + throw new Exception(string.Format(
  39 + "Error loading {0} (ErrorCode: {1})",
  40 + assemblyName,
  41 + Marshal.GetLastWin32Error()));
  42 + }
  43 + }
  44 + }
  45 +}
0 46 \ No newline at end of file
... ...
iSchedulerMonitor/SqlServerTypes/readme.htm 0 → 100644
... ... @@ -0,0 +1,39 @@
  1 +<html lang="en-US">
  2 +<head>
  3 + <meta charset="utf-8" />
  4 + <title>Microsoft.SqlServer.Types</title>
  5 + <style>
  6 + body {
  7 + background: #fff;
  8 + color: #505050;
  9 + margin: 20px;
  10 + }
  11 +
  12 + #main {
  13 + background: #efefef;
  14 + padding: 5px 30px;
  15 + }
  16 + </style>
  17 +</head>
  18 +<body>
  19 + <div id="main">
  20 + <h1>Action required to load native assemblies</h1>
  21 + <p>
  22 + 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.
  23 + </p>
  24 + <p>
  25 + You need to add code to load the correct one of these assemblies at runtime (depending on the current architecture).
  26 + </p>
  27 + <h2>ASP.NET applications</h2>
  28 + <p>
  29 + For ASP.NET applications, add the following line of code to the Application_Start method in Global.asax.cs:
  30 + <pre> SqlServerTypes.Utilities.LoadNativeAssemblies(Server.MapPath("~/bin"));</pre>
  31 + </p>
  32 + <h2>Desktop applications</h2>
  33 + <p>
  34 + For desktop applications, add the following line of code to run before any spatial operations are performed:
  35 + <pre> SqlServerTypes.Utilities.LoadNativeAssemblies(AppDomain.CurrentDomain.BaseDirectory);</pre>
  36 + </p>
  37 + </div>
  38 +</body>
  39 +</html>
0 40 \ No newline at end of file
... ...
iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj
... ... @@ -53,7 +53,7 @@
53 53 <HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.WebForms.DLL</HintPath>
54 54 </Reference>
55 55 <Reference Include="Microsoft.SqlServer.Types, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
56   - <HintPath>..\packages\Microsoft.SqlServer.Types.11.0.0\lib\net20\Microsoft.SqlServer.Types.dll</HintPath>
  56 + <HintPath>..\packages\Microsoft.SqlServer.Types.11.0.2\lib\net20\Microsoft.SqlServer.Types.dll</HintPath>
57 57 </Reference>
58 58 <Reference Include="Microsoft.Web.Infrastructure, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59 59 <HintPath>..\packages\Microsoft.Web.Infrastructure.2.0.1\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
... ... @@ -118,8 +118,8 @@
118 118 <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL">
119 119 <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath>
120 120 </Reference>
121   - <Reference Include="Vrh.Logger, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL">
122   - <HintPath>..\packages\Vrh.Logger.2.9.4\lib\net451\Vrh.Logger.dll</HintPath>
  121 + <Reference Include="Vrh.Logger, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL">
  122 + <HintPath>..\packages\Vrh.Logger.2.10.0\lib\net451\Vrh.Logger.dll</HintPath>
123 123 </Reference>
124 124 <Reference Include="Vrh.Membership, Version=4.11.0.0, Culture=neutral, processorArchitecture=MSIL">
125 125 <HintPath>..\packages\Vrh.Membership.4.11.0\lib\net451\Vrh.Membership.dll</HintPath>
... ... @@ -133,8 +133,8 @@
133 133 <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL">
134 134 <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath>
135 135 </Reference>
136   - <Reference Include="Vrh.XmlProcessing, Version=1.31.1.0, Culture=neutral, processorArchitecture=MSIL">
137   - <HintPath>..\packages\Vrh.XmlProcessing.1.31.1\lib\net45\Vrh.XmlProcessing.dll</HintPath>
  136 + <Reference Include="Vrh.XmlProcessing, Version=1.32.0.0, Culture=neutral, processorArchitecture=MSIL">
  137 + <HintPath>..\packages\Vrh.XmlProcessing.1.32.0\lib\net45\Vrh.XmlProcessing.dll</HintPath>
138 138 </Reference>
139 139 </ItemGroup>
140 140 <ItemGroup>
... ... @@ -142,6 +142,7 @@
142 142 <Compile Include="Monitor.cs" />
143 143 <Compile Include="MonitorPlugin.cs" />
144 144 <Compile Include="Properties\AssemblyInfo.cs" />
  145 + <Compile Include="SqlServerTypes\Loader.cs" />
145 146 </ItemGroup>
146 147 <ItemGroup>
147 148 <None Include="App.config" />
... ... @@ -165,6 +166,15 @@
165 166 <None Include="LogConfig.xml">
166 167 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
167 168 </None>
  169 + <Content Include="..\packages\Microsoft.SqlServer.Types.11.0.2\nativeBinaries\x64\msvcr100.dll">
  170 + <Link>SqlServerTypes\x64\msvcr100.dll</Link>
  171 + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  172 + </Content>
  173 + <Content Include="..\packages\Microsoft.SqlServer.Types.11.0.2\nativeBinaries\x86\msvcr100.dll">
  174 + <Link>SqlServerTypes\x86\msvcr100.dll</Link>
  175 + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
  176 + </Content>
  177 + <Content Include="SqlServerTypes\readme.htm" />
168 178 <Content Include="SqlServerTypes\x64\SqlServerSpatial110.dll" />
169 179 <Content Include="SqlServerTypes\x86\SqlServerSpatial110.dll" />
170 180 <Content Include="iSchedulerMonitor.Config.xml" />
... ...
iSchedulerMonitor/packages.config
... ... @@ -7,7 +7,7 @@
7 7 <package id="Microsoft.AspNet.Razor" version="3.2.9" targetFramework="net451" />
8 8 <package id="Microsoft.AspNet.WebPages" version="3.2.9" targetFramework="net451" />
9 9 <package id="Microsoft.Report.Viewer" version="11.0.0.0" targetFramework="net451" />
10   - <package id="Microsoft.SqlServer.Types" version="11.0.0" targetFramework="net451" />
  10 + <package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net462" />
11 11 <package id="Microsoft.Web.Infrastructure" version="2.0.1" targetFramework="net451" />
12 12 <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" />
13 13 <package id="PagedList" version="1.17.0.0" targetFramework="net451" />
... ... @@ -16,9 +16,9 @@
16 16 <package id="Vrh.ApplicationContainer.Control.Contract" version="0.1.0" targetFramework="net451" />
17 17 <package id="VRH.Common" version="3.0.0" targetFramework="net451" />
18 18 <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" />
19   - <package id="Vrh.Logger" version="2.9.4" targetFramework="net462" />
  19 + <package id="Vrh.Logger" version="2.10.0" targetFramework="net462" />
20 20 <package id="Vrh.Membership" version="4.11.0" targetFramework="net451" />
21 21 <package id="VRH.Mockable.TimeProvider" version="1.0.0" targetFramework="net45" />
22 22 <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" />
23   - <package id="Vrh.XmlProcessing" version="1.31.1" targetFramework="net451" />
  23 + <package id="Vrh.XmlProcessing" version="1.32.0" targetFramework="net462" />
24 24 </packages>
25 25 \ No newline at end of file
... ...