Commit 201ed7cb13586bd7fe717321864ca2fa1908f147
1 parent
3637b407
- beépülők frissítése
Showing
20 changed files
with
169 additions
and
140 deletions
Show diff stats
Vrh.OneMessage/Vrh.OneMessage.csproj
@@ -53,17 +53,20 @@ | @@ -53,17 +53,20 @@ | ||
53 | <Reference Include="System.Data" /> | 53 | <Reference Include="System.Data" /> |
54 | <Reference Include="System.Net.Http" /> | 54 | <Reference Include="System.Net.Http" /> |
55 | <Reference Include="System.Xml" /> | 55 | <Reference Include="System.Xml" /> |
56 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
57 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 56 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
57 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
58 | </Reference> | 58 | </Reference> |
59 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
60 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 59 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
60 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
61 | </Reference> | 61 | </Reference> |
62 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
63 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 62 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
63 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
64 | </Reference> | 64 | </Reference> |
65 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
66 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 65 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
66 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
67 | + </Reference> | ||
68 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> | ||
69 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
67 | </Reference> | 70 | </Reference> |
68 | </ItemGroup> | 71 | </ItemGroup> |
69 | <ItemGroup> | 72 | <ItemGroup> |
Vrh.OneMessage/packages.config
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="EntityFramework" version="6.4.4" targetFramework="net45" /> | 3 | <package id="EntityFramework" version="6.4.4" targetFramework="net45" /> |
4 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
5 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 4 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
5 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> | ||
6 | </packages> | 6 | </packages> |
7 | \ No newline at end of file | 7 | \ No newline at end of file |
Vrh.OneReport/Vrh.OneReport.csproj
@@ -91,20 +91,23 @@ | @@ -91,20 +91,23 @@ | ||
91 | <Reference Include="System.Data" /> | 91 | <Reference Include="System.Data" /> |
92 | <Reference Include="System.Net.Http" /> | 92 | <Reference Include="System.Net.Http" /> |
93 | <Reference Include="System.Xml" /> | 93 | <Reference Include="System.Xml" /> |
94 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
95 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 94 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
95 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
96 | </Reference> | 96 | </Reference> |
97 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
98 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 97 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
98 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
99 | </Reference> | 99 | </Reference> |
100 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
101 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 100 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
101 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
102 | </Reference> | 102 | </Reference> |
103 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
104 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 103 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
104 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
105 | </Reference> | 105 | </Reference> |
106 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
107 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 106 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> |
107 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
108 | + </Reference> | ||
109 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> | ||
110 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
108 | </Reference> | 111 | </Reference> |
109 | </ItemGroup> | 112 | </ItemGroup> |
110 | <ItemGroup> | 113 | <ItemGroup> |
Vrh.OneReport/packages.config
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | <package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net462" /> | 8 | <package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net462" /> |
9 | <package id="Microsoft.Web.Infrastructure" version="2.0.1" targetFramework="net45" /> | 9 | <package id="Microsoft.Web.Infrastructure" version="2.0.1" targetFramework="net45" /> |
10 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" /> | 10 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" /> |
11 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
12 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net45" /> | ||
13 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 11 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
12 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
13 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> | ||
14 | </packages> | 14 | </packages> |
15 | \ No newline at end of file | 15 | \ No newline at end of file |
Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj
@@ -98,24 +98,26 @@ | @@ -98,24 +98,26 @@ | ||
98 | <Reference Include="System.Data" /> | 98 | <Reference Include="System.Data" /> |
99 | <Reference Include="System.Net.Http" /> | 99 | <Reference Include="System.Net.Http" /> |
100 | <Reference Include="System.Xml" /> | 100 | <Reference Include="System.Xml" /> |
101 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
102 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 101 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
102 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
103 | </Reference> | 103 | </Reference> |
104 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
105 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 104 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
105 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
106 | </Reference> | 106 | </Reference> |
107 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
108 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 107 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
108 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
109 | </Reference> | 109 | </Reference> |
110 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
111 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
112 | - <Private>True</Private> | 110 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
111 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
112 | + </Reference> | ||
113 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> | ||
114 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
113 | </Reference> | 115 | </Reference> |
114 | <Reference Include="Vrh.Web.Common.Lib, Version=2.22.0.0, Culture=neutral, processorArchitecture=MSIL"> | 116 | <Reference Include="Vrh.Web.Common.Lib, Version=2.22.0.0, Culture=neutral, processorArchitecture=MSIL"> |
115 | <HintPath>..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | 117 | <HintPath>..\packages\Vrh.Web.Common.Lib.2.22.0\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> |
116 | </Reference> | 118 | </Reference> |
117 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
118 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 119 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
120 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
119 | </Reference> | 121 | </Reference> |
120 | </ItemGroup> | 122 | </ItemGroup> |
121 | <ItemGroup> | 123 | <ItemGroup> |
Vrh.Web.OneReport.Lib/packages.config
@@ -9,8 +9,8 @@ | @@ -9,8 +9,8 @@ | ||
9 | <package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net462" /> | 9 | <package id="Microsoft.SqlServer.Types" version="11.0.2" targetFramework="net462" /> |
10 | <package id="Microsoft.Web.Infrastructure" version="2.0.1" targetFramework="net451" /> | 10 | <package id="Microsoft.Web.Infrastructure" version="2.0.1" targetFramework="net451" /> |
11 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> | 11 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> |
12 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
13 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 12 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
13 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
14 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> | 14 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> |
15 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 15 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
16 | </packages> | 16 | </packages> |
17 | \ No newline at end of file | 17 | \ No newline at end of file |
Vrh.Web.Reporting/Vrh.Web.Reporting.csproj
@@ -278,23 +278,26 @@ | @@ -278,23 +278,26 @@ | ||
278 | <Reference Include="System.Net.Http.WebRequest"> | 278 | <Reference Include="System.Net.Http.WebRequest"> |
279 | </Reference> | 279 | </Reference> |
280 | <Reference Include="System.Xml.Linq" /> | 280 | <Reference Include="System.Xml.Linq" /> |
281 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
282 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 281 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
282 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
283 | </Reference> | 283 | </Reference> |
284 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
285 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 284 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
285 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
286 | </Reference> | 286 | </Reference> |
287 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
288 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 287 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
288 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
289 | </Reference> | 289 | </Reference> |
290 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
291 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 290 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
291 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
292 | </Reference> | 292 | </Reference> |
293 | - <Reference Include="VRH.Log4Pro.WebTools, Version=1.16.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
294 | - <HintPath>..\packages\VRH.Log4Pro.WebTools.1.16.1\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath> | 293 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> |
294 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
295 | </Reference> | 295 | </Reference> |
296 | - <Reference Include="Vrh.Logger, Version=3.4.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
297 | - <HintPath>..\packages\Vrh.Logger.3.4.7\lib\net451\Vrh.Logger.dll</HintPath> | 296 | + <Reference Include="VRH.Log4Pro.WebTools, Version=1.17.3.0, Culture=neutral, processorArchitecture=MSIL"> |
297 | + <HintPath>..\packages\VRH.Log4Pro.WebTools.1.17.3\lib\net462\VRH.Log4Pro.WebTools.dll</HintPath> | ||
298 | + </Reference> | ||
299 | + <Reference Include="Vrh.Logger, Version=3.4.8.0, Culture=neutral, processorArchitecture=MSIL"> | ||
300 | + <HintPath>..\packages\Vrh.Logger.3.4.8\lib\net462\Vrh.Logger.dll</HintPath> | ||
298 | </Reference> | 301 | </Reference> |
299 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 302 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
300 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 303 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -314,8 +317,8 @@ | @@ -314,8 +317,8 @@ | ||
314 | <Reference Include="Vrh.WebForm.Lib, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL"> | 317 | <Reference Include="Vrh.WebForm.Lib, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL"> |
315 | <HintPath>..\packages\Vrh.WebForm.2.10.0\lib\net462\Vrh.WebForm.Lib.dll</HintPath> | 318 | <HintPath>..\packages\Vrh.WebForm.2.10.0\lib\net462\Vrh.WebForm.Lib.dll</HintPath> |
316 | </Reference> | 319 | </Reference> |
317 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
318 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 320 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
321 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
319 | </Reference> | 322 | </Reference> |
320 | <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL"> | 323 | <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL"> |
321 | <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath> | 324 | <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath> |
@@ -888,9 +891,10 @@ | @@ -888,9 +891,10 @@ | ||
888 | <Content Include="Scripts\vrh.commontools.js" /> | 891 | <Content Include="Scripts\vrh.commontools.js" /> |
889 | <Content Include="Scripts\vrh.commontools.min.js" /> | 892 | <Content Include="Scripts\vrh.commontools.min.js" /> |
890 | <Content Include="Views\_ViewStart.cshtml" /> | 893 | <Content Include="Views\_ViewStart.cshtml" /> |
894 | + <Content Include="Scripts\bootstrap4-toggle.min.js.map" /> | ||
895 | + <None Include="Vrh.NugetModuls.Documentations\Vrh.Log4Pro.MultiLanguageManager\ReadMe.md" /> | ||
891 | <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" /> | 896 | <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" /> |
892 | <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" /> | 897 | <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" /> |
893 | - <Content Include="Scripts\bootstrap4-toggle.min.js.map" /> | ||
894 | <None Include="XmlParser.xml"> | 898 | <None Include="XmlParser.xml"> |
895 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> | 899 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
896 | </None> | 900 | </None> |
@@ -916,7 +920,6 @@ | @@ -916,7 +920,6 @@ | ||
916 | <Content Include="Scripts\jquery-3.6.4.slim.min.js" /> | 920 | <Content Include="Scripts\jquery-3.6.4.slim.min.js" /> |
917 | <Content Include="Scripts\jquery-3.6.4.slim.min.map" /> | 921 | <Content Include="Scripts\jquery-3.6.4.slim.min.map" /> |
918 | <Content Include="Scripts\jquery-3.6.4.min.map" /> | 922 | <Content Include="Scripts\jquery-3.6.4.min.map" /> |
919 | - <None Include="Vrh.NugetModuls.Documentations\Vrh.Log4Pro.MultiLanguageManager\ReadMe.md" /> | ||
920 | <None Include="Scripts\jquery.validate-vsdoc.js" /> | 923 | <None Include="Scripts\jquery.validate-vsdoc.js" /> |
921 | <Content Include="Scripts\jquery.validate.js" /> | 924 | <Content Include="Scripts\jquery.validate.js" /> |
922 | <Content Include="Scripts\jquery.validate.min.js" /> | 925 | <Content Include="Scripts\jquery.validate.min.js" /> |
Vrh.Web.Reporting/packages.config
@@ -102,17 +102,17 @@ | @@ -102,17 +102,17 @@ | ||
102 | <package id="System.Threading.Timer" version="4.0.1" targetFramework="net462" /> | 102 | <package id="System.Threading.Timer" version="4.0.1" targetFramework="net462" /> |
103 | <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net462" /> | 103 | <package id="System.Xml.ReaderWriter" version="4.0.11" targetFramework="net462" /> |
104 | <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net462" /> | 104 | <package id="System.Xml.XDocument" version="4.0.11" targetFramework="net462" /> |
105 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
106 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> | ||
107 | - <package id="VRH.Log4Pro.WebTools" version="1.16.1" targetFramework="net462" /> | ||
108 | - <package id="Vrh.Logger" version="3.4.7" targetFramework="net462" /> | 105 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
106 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
107 | + <package id="VRH.Log4Pro.WebTools" version="1.17.3" targetFramework="net462" /> | ||
108 | + <package id="Vrh.Logger" version="3.4.8" targetFramework="net462" /> | ||
109 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> | 109 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> |
110 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> | 110 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> |
111 | <package id="Vrh.Web.FileManager" version="1.7.0" targetFramework="net462" /> | 111 | <package id="Vrh.Web.FileManager" version="1.7.0" targetFramework="net462" /> |
112 | <package id="Vrh.Web.Menu" version="1.29.1" targetFramework="net462" /> | 112 | <package id="Vrh.Web.Menu" version="1.29.1" targetFramework="net462" /> |
113 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> | 113 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> |
114 | <package id="Vrh.WebForm" version="2.10.0" targetFramework="net462" /> | 114 | <package id="Vrh.WebForm" version="2.10.0" targetFramework="net462" /> |
115 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 115 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
116 | <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" /> | 116 | <package id="WebActivatorEx" version="2.2.0" targetFramework="net45" /> |
117 | <package id="WebGrease" version="1.6.0" targetFramework="net451" /> | 117 | <package id="WebGrease" version="1.6.0" targetFramework="net451" /> |
118 | </packages> | 118 | </packages> |
119 | \ No newline at end of file | 119 | \ No newline at end of file |
Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj
@@ -247,17 +247,20 @@ | @@ -247,17 +247,20 @@ | ||
247 | <Reference Include="System.Data" /> | 247 | <Reference Include="System.Data" /> |
248 | <Reference Include="System.Net.Http" /> | 248 | <Reference Include="System.Net.Http" /> |
249 | <Reference Include="System.Xml" /> | 249 | <Reference Include="System.Xml" /> |
250 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
251 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 250 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
251 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
252 | </Reference> | 252 | </Reference> |
253 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
254 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 253 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
254 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
255 | </Reference> | 255 | </Reference> |
256 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
257 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 256 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
257 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
258 | </Reference> | 258 | </Reference> |
259 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
260 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 259 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
260 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
261 | + </Reference> | ||
262 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> | ||
263 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
261 | </Reference> | 264 | </Reference> |
262 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 265 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
263 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 266 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -268,8 +271,8 @@ | @@ -268,8 +271,8 @@ | ||
268 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 271 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
269 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> | 272 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
270 | </Reference> | 273 | </Reference> |
271 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
272 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 274 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
275 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
273 | </Reference> | 276 | </Reference> |
274 | <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> | 277 | <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> |
275 | <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> | 278 | <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> |
Vrh.Web.iScheduler.Lib/packages.config
@@ -57,11 +57,11 @@ | @@ -57,11 +57,11 @@ | ||
57 | <package id="System.Text.Json" version="6.0.0" targetFramework="net461" /> | 57 | <package id="System.Text.Json" version="6.0.0" targetFramework="net461" /> |
58 | <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" /> | 58 | <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" /> |
59 | <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" /> | 59 | <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" /> |
60 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
61 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> | 60 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
61 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
62 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> | 62 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> |
63 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> | 63 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> |
64 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> | 64 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> |
65 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 65 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
66 | <package id="WebGrease" version="1.6.0" targetFramework="net45" /> | 66 | <package id="WebGrease" version="1.6.0" targetFramework="net45" /> |
67 | </packages> | 67 | </packages> |
68 | \ No newline at end of file | 68 | \ No newline at end of file |
Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj
@@ -101,17 +101,20 @@ | @@ -101,17 +101,20 @@ | ||
101 | <Reference Include="System.Data" /> | 101 | <Reference Include="System.Data" /> |
102 | <Reference Include="System.Net.Http" /> | 102 | <Reference Include="System.Net.Http" /> |
103 | <Reference Include="System.Xml" /> | 103 | <Reference Include="System.Xml" /> |
104 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
105 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 104 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
105 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
106 | </Reference> | 106 | </Reference> |
107 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
108 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 107 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
108 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
109 | </Reference> | 109 | </Reference> |
110 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
111 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 110 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
111 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
112 | </Reference> | 112 | </Reference> |
113 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
114 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 113 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
114 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
115 | + </Reference> | ||
116 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> | ||
117 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
115 | </Reference> | 118 | </Reference> |
116 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 119 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
117 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 120 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -122,8 +125,8 @@ | @@ -122,8 +125,8 @@ | ||
122 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 125 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
123 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> | 126 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
124 | </Reference> | 127 | </Reference> |
125 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
126 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 128 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
129 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
127 | </Reference> | 130 | </Reference> |
128 | </ItemGroup> | 131 | </ItemGroup> |
129 | <ItemGroup> | 132 | <ItemGroup> |
Vrh.Web.iScheduler.Report.Lib/packages.config
@@ -12,10 +12,10 @@ | @@ -12,10 +12,10 @@ | ||
12 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> | 12 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> |
13 | <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> | 13 | <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> |
14 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> | 14 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> |
15 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
16 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 15 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
16 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
17 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> | 17 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> |
18 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> | 18 | <package id="Vrh.Web.Common.Lib" version="2.22.0" targetFramework="net462" /> |
19 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> | 19 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> |
20 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 20 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
21 | </packages> | 21 | </packages> |
22 | \ No newline at end of file | 22 | \ No newline at end of file |
Vrh.iScheduler.Interface/Vrh.iScheduler.Interfaces.csproj
@@ -45,14 +45,17 @@ | @@ -45,14 +45,17 @@ | ||
45 | <Reference Include="System.Data" /> | 45 | <Reference Include="System.Data" /> |
46 | <Reference Include="System.Net.Http" /> | 46 | <Reference Include="System.Net.Http" /> |
47 | <Reference Include="System.Xml" /> | 47 | <Reference Include="System.Xml" /> |
48 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
49 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 48 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
49 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
50 | </Reference> | 50 | </Reference> |
51 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
52 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 51 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
52 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
53 | </Reference> | 53 | </Reference> |
54 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
55 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 54 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
55 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
56 | + </Reference> | ||
57 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
58 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
56 | </Reference> | 59 | </Reference> |
57 | </ItemGroup> | 60 | </ItemGroup> |
58 | <ItemGroup> | 61 | <ItemGroup> |
Vrh.iScheduler.Interface/packages.config
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | 3 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
4 | </packages> | 4 | </packages> |
5 | \ No newline at end of file | 5 | \ No newline at end of file |
Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj
@@ -99,17 +99,20 @@ | @@ -99,17 +99,20 @@ | ||
99 | <Reference Include="System.Data" /> | 99 | <Reference Include="System.Data" /> |
100 | <Reference Include="System.Net.Http" /> | 100 | <Reference Include="System.Net.Http" /> |
101 | <Reference Include="System.Xml" /> | 101 | <Reference Include="System.Xml" /> |
102 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
103 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 102 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
103 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
104 | </Reference> | 104 | </Reference> |
105 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
106 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 105 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
106 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
107 | </Reference> | 107 | </Reference> |
108 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
109 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 108 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
109 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
110 | </Reference> | 110 | </Reference> |
111 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
112 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 111 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
112 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
113 | + </Reference> | ||
114 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> | ||
115 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
113 | </Reference> | 116 | </Reference> |
114 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 117 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
115 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 118 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -117,8 +120,8 @@ | @@ -117,8 +120,8 @@ | ||
117 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 120 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
118 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> | 121 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
119 | </Reference> | 122 | </Reference> |
120 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
121 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 123 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
124 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
122 | </Reference> | 125 | </Reference> |
123 | </ItemGroup> | 126 | </ItemGroup> |
124 | <ItemGroup> | 127 | <ItemGroup> |
Vrh.iScheduler.Report/packages.config
@@ -12,9 +12,9 @@ | @@ -12,9 +12,9 @@ | ||
12 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> | 12 | <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net451" /> |
13 | <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> | 13 | <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> |
14 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> | 14 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> |
15 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
16 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 15 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
16 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
17 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> | 17 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> |
18 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> | 18 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> |
19 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 19 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
20 | </packages> | 20 | </packages> |
21 | \ No newline at end of file | 21 | \ No newline at end of file |
Vrh.iScheduler/Vrh.iScheduler.csproj
@@ -112,20 +112,23 @@ | @@ -112,20 +112,23 @@ | ||
112 | <Reference Include="System.Data" /> | 112 | <Reference Include="System.Data" /> |
113 | <Reference Include="System.Net.Http" /> | 113 | <Reference Include="System.Net.Http" /> |
114 | <Reference Include="System.Xml" /> | 114 | <Reference Include="System.Xml" /> |
115 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
116 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 115 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
116 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
117 | </Reference> | 117 | </Reference> |
118 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
119 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 118 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
119 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
120 | </Reference> | 120 | </Reference> |
121 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
122 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 121 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
122 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
123 | </Reference> | 123 | </Reference> |
124 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
125 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 124 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
125 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
126 | </Reference> | 126 | </Reference> |
127 | - <Reference Include="Vrh.Logger, Version=3.4.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
128 | - <HintPath>..\packages\Vrh.Logger.3.4.7\lib\net451\Vrh.Logger.dll</HintPath> | 127 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> |
128 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
129 | + </Reference> | ||
130 | + <Reference Include="Vrh.Logger, Version=3.4.8.0, Culture=neutral, processorArchitecture=MSIL"> | ||
131 | + <HintPath>..\packages\Vrh.Logger.3.4.8\lib\net462\Vrh.Logger.dll</HintPath> | ||
129 | </Reference> | 132 | </Reference> |
130 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 133 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
131 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 134 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -133,8 +136,8 @@ | @@ -133,8 +136,8 @@ | ||
133 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 136 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
134 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> | 137 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
135 | </Reference> | 138 | </Reference> |
136 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
137 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 139 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
140 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
138 | </Reference> | 141 | </Reference> |
139 | </ItemGroup> | 142 | </ItemGroup> |
140 | <ItemGroup> | 143 | <ItemGroup> |
Vrh.iScheduler/packages.config
@@ -18,10 +18,10 @@ | @@ -18,10 +18,10 @@ | ||
18 | <package id="Owin" version="1.0" targetFramework="net462" /> | 18 | <package id="Owin" version="1.0" targetFramework="net462" /> |
19 | <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> | 19 | <package id="PagedList" version="1.17.0.0" targetFramework="net451" /> |
20 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> | 20 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> |
21 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
22 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | ||
23 | - <package id="Vrh.Logger" version="3.4.7" targetFramework="net462" /> | 21 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
22 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
23 | + <package id="Vrh.Logger" version="3.4.8" targetFramework="net462" /> | ||
24 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> | 24 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> |
25 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> | 25 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> |
26 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 26 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
27 | </packages> | 27 | </packages> |
28 | \ No newline at end of file | 28 | \ No newline at end of file |
iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj
@@ -103,20 +103,23 @@ | @@ -103,20 +103,23 @@ | ||
103 | <Reference Include="Vrh.ApplicationContainer.Control.Contract, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL"> | 103 | <Reference Include="Vrh.ApplicationContainer.Control.Contract, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL"> |
104 | <HintPath>..\packages\Vrh.ApplicationContainer.Control.Contract.0.1.0\lib\net451\Vrh.ApplicationContainer.Control.Contract.dll</HintPath> | 104 | <HintPath>..\packages\Vrh.ApplicationContainer.Control.Contract.0.1.0\lib\net451\Vrh.ApplicationContainer.Control.Contract.dll</HintPath> |
105 | </Reference> | 105 | </Reference> |
106 | - <Reference Include="VRH.Common, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
107 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.dll</HintPath> | 106 | + <Reference Include="VRH.Common, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
107 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.dll</HintPath> | ||
108 | </Reference> | 108 | </Reference> |
109 | - <Reference Include="VRH.Common.COM, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
110 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.COM.dll</HintPath> | 109 | + <Reference Include="VRH.Common.COM, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
110 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.COM.dll</HintPath> | ||
111 | </Reference> | 111 | </Reference> |
112 | - <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
113 | - <HintPath>..\packages\VRH.Common.3.0.1\lib\net45\VRH.Common.EF.dll</HintPath> | 112 | + <Reference Include="VRH.Common.EF, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
113 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.EF.dll</HintPath> | ||
114 | </Reference> | 114 | </Reference> |
115 | - <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
116 | - <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 115 | + <Reference Include="VRH.Common.Log4ProIS, Version=4.1.3.0, Culture=neutral, processorArchitecture=MSIL"> |
116 | + <HintPath>..\packages\VRH.Common.4.1.3\lib\net462\VRH.Common.Log4ProIS.dll</HintPath> | ||
117 | </Reference> | 117 | </Reference> |
118 | - <Reference Include="Vrh.Logger, Version=3.4.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
119 | - <HintPath>..\packages\Vrh.Logger.3.4.7\lib\net451\Vrh.Logger.dll</HintPath> | 118 | + <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.4.0, Culture=neutral, processorArchitecture=MSIL"> |
119 | + <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.4\lib\net462\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | ||
120 | + </Reference> | ||
121 | + <Reference Include="Vrh.Logger, Version=3.4.8.0, Culture=neutral, processorArchitecture=MSIL"> | ||
122 | + <HintPath>..\packages\Vrh.Logger.3.4.8\lib\net462\Vrh.Logger.dll</HintPath> | ||
120 | </Reference> | 123 | </Reference> |
121 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 124 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
122 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 125 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -130,8 +133,8 @@ | @@ -130,8 +133,8 @@ | ||
130 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 133 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
131 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> | 134 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
132 | </Reference> | 135 | </Reference> |
133 | - <Reference Include="Vrh.XmlProcessing, Version=2.8.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
134 | - <HintPath>..\packages\Vrh.XmlProcessing.2.8.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 136 | + <Reference Include="Vrh.XmlProcessing, Version=2.9.4.0, Culture=neutral, processorArchitecture=MSIL"> |
137 | + <HintPath>..\packages\Vrh.XmlProcessing.2.9.4\lib\net462\Vrh.XmlProcessing.dll</HintPath> | ||
135 | </Reference> | 138 | </Reference> |
136 | </ItemGroup> | 139 | </ItemGroup> |
137 | <ItemGroup> | 140 | <ItemGroup> |
@@ -162,19 +165,19 @@ | @@ -162,19 +165,19 @@ | ||
162 | <Link>SqlServerTypes\x86\msvcr100.dll</Link> | 165 | <Link>SqlServerTypes\x86\msvcr100.dll</Link> |
163 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> | 166 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> |
164 | </Content> | 167 | </Content> |
165 | - <None Include="LogConfig.xml"> | 168 | + <None Include="XmlParser.xml"> |
166 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> | 169 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
167 | </None> | 170 | </None> |
168 | <None Include="ApplicationContainer.Config.xml"> | 171 | <None Include="ApplicationContainer.Config.xml"> |
169 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> | 172 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
170 | </None> | 173 | </None> |
174 | + <None Include="LogConfig.xml"> | ||
175 | + <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
176 | + </None> | ||
171 | <Content Include="SqlServerTypes\readme.htm" /> | 177 | <Content Include="SqlServerTypes\readme.htm" /> |
172 | <Content Include="SqlServerTypes\x64\SqlServerSpatial110.dll" /> | 178 | <Content Include="SqlServerTypes\x64\SqlServerSpatial110.dll" /> |
173 | <Content Include="SqlServerTypes\x86\SqlServerSpatial110.dll" /> | 179 | <Content Include="SqlServerTypes\x86\SqlServerSpatial110.dll" /> |
174 | <Content Include="iSchedulerMonitor.Config.xml" /> | 180 | <Content Include="iSchedulerMonitor.Config.xml" /> |
175 | - <None Include="XmlParser.xml"> | ||
176 | - <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
177 | - </None> | ||
178 | <None Include="Plugins.Config.xml"> | 181 | <None Include="Plugins.Config.xml"> |
179 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> | 182 | <CopyToOutputDirectory>Always</CopyToOutputDirectory> |
180 | </None> | 183 | </None> |
iSchedulerMonitor/packages.config
@@ -14,11 +14,11 @@ | @@ -14,11 +14,11 @@ | ||
14 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> | 14 | <package id="PagedList.Mvc" version="4.5.0.0" targetFramework="net451" /> |
15 | <package id="Vrh.ApplicationContainer" version="5.1.4" targetFramework="net462" /> | 15 | <package id="Vrh.ApplicationContainer" version="5.1.4" targetFramework="net462" /> |
16 | <package id="Vrh.ApplicationContainer.Control.Contract" version="0.1.0" targetFramework="net451" /> | 16 | <package id="Vrh.ApplicationContainer.Control.Contract" version="0.1.0" targetFramework="net451" /> |
17 | - <package id="VRH.Common" version="3.0.1" targetFramework="net462" /> | ||
18 | - <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | ||
19 | - <package id="Vrh.Logger" version="3.4.7" targetFramework="net462" /> | 17 | + <package id="VRH.Common" version="4.1.3" targetFramework="net462" /> |
18 | + <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.4" targetFramework="net462" /> | ||
19 | + <package id="Vrh.Logger" version="3.4.8" targetFramework="net462" /> | ||
20 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> | 20 | <package id="Vrh.Membership" version="4.14.0" targetFramework="net462" /> |
21 | <package id="VRH.Mockable.TimeProvider" version="1.0.0" targetFramework="net45" /> | 21 | <package id="VRH.Mockable.TimeProvider" version="1.0.0" targetFramework="net45" /> |
22 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> | 22 | <package id="VRH.Web.Providers" version="2.0.2" targetFramework="net451" requireReinstallation="true" /> |
23 | - <package id="Vrh.XmlProcessing" version="2.8.0" targetFramework="net462" /> | 23 | + <package id="Vrh.XmlProcessing" version="2.9.4" targetFramework="net462" /> |
24 | </packages> | 24 | </packages> |
25 | \ No newline at end of file | 25 | \ No newline at end of file |