Commit 674b4422b661bd9881bc96f10b53eedd458468ab
1 parent
aef194d8
- beépülők frissítése
Showing
22 changed files
with
294 additions
and
119 deletions
Show diff stats
Vrh.OneMessage/Vrh.OneMessage.csproj
@@ -62,8 +62,8 @@ | @@ -62,8 +62,8 @@ | ||
62 | <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> | 62 | <Reference Include="VRH.Common.EF, Version=3.0.0.0, Culture=neutral, processorArchitecture=MSIL"> |
63 | <HintPath>..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll</HintPath> | 63 | <HintPath>..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll</HintPath> |
64 | </Reference> | 64 | </Reference> |
65 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
66 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 65 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
66 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
67 | </Reference> | 67 | </Reference> |
68 | </ItemGroup> | 68 | </ItemGroup> |
69 | <ItemGroup> | 69 | <ItemGroup> |
Vrh.OneMessage/packages.config
@@ -2,5 +2,5 @@ | @@ -2,5 +2,5 @@ | ||
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.0" targetFramework="net45" /> | 4 | <package id="VRH.Common" version="3.0.0" targetFramework="net45" /> |
5 | - <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" /> | 5 | + <package id="Vrh.XmlProcessing" version="2.3.0" 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
@@ -103,8 +103,8 @@ | @@ -103,8 +103,8 @@ | ||
103 | <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | 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> | 104 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> |
105 | </Reference> | 105 | </Reference> |
106 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
107 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 106 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
107 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
108 | </Reference> | 108 | </Reference> |
109 | </ItemGroup> | 109 | </ItemGroup> |
110 | <ItemGroup> | 110 | <ItemGroup> |
Vrh.OneReport/packages.config
@@ -10,5 +10,5 @@ | @@ -10,5 +10,5 @@ | ||
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.0" targetFramework="net45" /> | 11 | <package id="VRH.Common" version="3.0.0" targetFramework="net45" /> |
12 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net45" /> | 12 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net45" /> |
13 | - <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" /> | 13 | + <package id="Vrh.XmlProcessing" version="2.3.0" 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
@@ -111,11 +111,11 @@ | @@ -111,11 +111,11 @@ | ||
111 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 111 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> |
112 | <Private>True</Private> | 112 | <Private>True</Private> |
113 | </Reference> | 113 | </Reference> |
114 | - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
115 | - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | 114 | + <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL"> |
115 | + <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | ||
116 | </Reference> | 116 | </Reference> |
117 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
118 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 117 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
118 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
119 | </Reference> | 119 | </Reference> |
120 | </ItemGroup> | 120 | </ItemGroup> |
121 | <ItemGroup> | 121 | <ItemGroup> |
Vrh.Web.OneReport.Lib/packages.config
@@ -11,6 +11,6 @@ | @@ -11,6 +11,6 @@ | ||
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.0" targetFramework="net451" /> | 12 | <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> |
13 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 13 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> |
14 | - <package id="Vrh.Web.Common.Lib" version="2.20.3" targetFramework="net462" /> | ||
15 | - <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" /> | 14 | + <package id="Vrh.Web.Common.Lib" version="2.21.2" targetFramework="net462" /> |
15 | + <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" /> | ||
16 | </packages> | 16 | </packages> |
17 | \ No newline at end of file | 17 | \ No newline at end of file |
Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/CurrentInput.cshtml
@@ -58,35 +58,40 @@ | @@ -58,35 +58,40 @@ | ||
58 | value="@(currentInput.Value)" | 58 | value="@(currentInput.Value)" |
59 | @(addattributes)> | 59 | @(addattributes)> |
60 | </div> | 60 | </div> |
61 | - break; | 61 | + break; |
62 | 62 | ||
63 | - case Vrh.WebForm.InputType.EnumList: | ||
64 | - case Vrh.WebForm.InputType.SQLList: | ||
65 | - case Vrh.WebForm.InputType.XMLList: | ||
66 | - case Vrh.WebForm.InputType.DATList: | ||
67 | - string inpselname = currentInput.Name + "SelectedName"; | ||
68 | - string multiname = currentInput.Name + "Multi"; | ||
69 | - ListType lsttype = ListType.Single; | ||
70 | - if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.EnumList)) | ||
71 | - { | ||
72 | - lsttype = currentInput.EnumList.Type; | ||
73 | - } | ||
74 | - else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.SQLList)) | ||
75 | - { | ||
76 | - lsttype = currentInput.SQLList.Type; | ||
77 | - } | ||
78 | - else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.XMLList)) | ||
79 | - { | ||
80 | - lsttype = currentInput.XMLList.Type; | ||
81 | - } | ||
82 | - else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.DATList)) | ||
83 | - { | ||
84 | - lsttype = currentInput.DATList.Type; | ||
85 | - } | 63 | + case Vrh.WebForm.InputType.EnumList: |
64 | + case Vrh.WebForm.InputType.SQLList: | ||
65 | + case Vrh.WebForm.InputType.XMLList: | ||
66 | + case Vrh.WebForm.InputType.ExternalList: | ||
67 | + case Vrh.WebForm.InputType.DATList: | ||
68 | + string inpselname = currentInput.Name + "SelectedName"; | ||
69 | + string multiname = currentInput.Name + "Multi"; | ||
70 | + SelectionMode lsttype = SelectionMode.Single; | ||
71 | + if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.EnumList)) | ||
72 | + { | ||
73 | + lsttype = currentInput.EnumList.Type; | ||
74 | + } | ||
75 | + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.SQLList)) | ||
76 | + { | ||
77 | + lsttype = currentInput.SQLList.Type; | ||
78 | + } | ||
79 | + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.ExternalList)) | ||
80 | + { | ||
81 | + lsttype = currentInput.ExternalSelectList.Type; | ||
82 | + } | ||
83 | + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.XMLList)) | ||
84 | + { | ||
85 | + lsttype = currentInput.XMLList.Type; | ||
86 | + } | ||
87 | + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.DATList)) | ||
88 | + { | ||
89 | + lsttype = currentInput.DATList.Type; | ||
90 | + } | ||
86 | 91 | ||
87 | - if (lsttype == ListType.Single || lsttype == ListType.SingleListOnly) | ||
88 | - { | ||
89 | - System.Diagnostics.Debug.WriteLine("List.Single: name={0}, default={1}", currentInput.Name, currentInput.ValueSelectedName); | 92 | + if (lsttype == SelectionMode.Single || lsttype == SelectionMode.SingleListOnly) |
93 | + { | ||
94 | + System.Diagnostics.Debug.WriteLine("List.Single: name={0}, default={1}", currentInput.Name, currentInput.ValueSelectedName); | ||
90 | <div class="form-group"> | 95 | <div class="form-group"> |
91 | <label for="@(inpselname)">@Html.Raw(currentInput.Label)</label> | 96 | <label for="@(inpselname)">@Html.Raw(currentInput.Label)</label> |
92 | <div class="input-group"> | 97 | <div class="input-group"> |
@@ -95,14 +100,14 @@ | @@ -95,14 +100,14 @@ | ||
95 | name="@(inpselname)" | 100 | name="@(inpselname)" |
96 | class="form-control" | 101 | class="form-control" |
97 | value="@(currentInput.ValueSelectedName)" | 102 | value="@(currentInput.ValueSelectedName)" |
98 | - @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == ListType.SingleListOnly ? "readonly" : "")> | 103 | + @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == SelectionMode.SingleListOnly ? "readonly" : "")> |
99 | <div class="input-group-append" onclick="AutoCompClickOnSearch('@(inpselname)')"> | 104 | <div class="input-group-append" onclick="AutoCompClickOnSearch('@(inpselname)')"> |
100 | <span class="input-group-text" id="@(inpselname)"><i class="fas fa-search fa-lg"></i></span> | 105 | <span class="input-group-text" id="@(inpselname)"><i class="fas fa-search fa-lg"></i></span> |
101 | </div> | 106 | </div> |
102 | </div> | 107 | </div> |
103 | </div> | 108 | </div> |
104 | } | 109 | } |
105 | - else if (lsttype == ListType.Multi || lsttype == ListType.MultiListOnly) | 110 | + else if (lsttype == SelectionMode.Multi || lsttype == SelectionMode.MultiListOnly) |
106 | { | 111 | { |
107 | <table class="multitable"> | 112 | <table class="multitable"> |
108 | @if (Model.ViewMode == ViewModes.Mobile) | 113 | @if (Model.ViewMode == ViewModes.Mobile) |
@@ -116,7 +121,7 @@ | @@ -116,7 +121,7 @@ | ||
116 | id="@(inpselname)" | 121 | id="@(inpselname)" |
117 | name="@(inpselname)" | 122 | name="@(inpselname)" |
118 | class="form-control" | 123 | class="form-control" |
119 | - value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == ListType.MultiListOnly ? "readonly" : "")> | 124 | + value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == SelectionMode.MultiListOnly ? "readonly" : "")> |
120 | <div class="input-group-append" onclick="AutoCompClickOnSearch('@(inpselname)')"> | 125 | <div class="input-group-append" onclick="AutoCompClickOnSearch('@(inpselname)')"> |
121 | <span class="input-group-text" id="@(inpselname)"><i class="fas fa-search fa-lg"></i></span> | 126 | <span class="input-group-text" id="@(inpselname)"><i class="fas fa-search fa-lg"></i></span> |
122 | </div> | 127 | </div> |
@@ -142,7 +147,7 @@ | @@ -142,7 +147,7 @@ | ||
142 | id="@(inpselname)" | 147 | id="@(inpselname)" |
143 | name="@(inpselname)" | 148 | name="@(inpselname)" |
144 | class="form-control" | 149 | class="form-control" |
145 | - value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == ListType.MultiListOnly ? "readonly" : "")> | 150 | + value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == SelectionMode.MultiListOnly ? "readonly" : "")> |
146 | <div class="input-group-append" onclick="AutoCompClickOnSearch('@(inpselname)')"> | 151 | <div class="input-group-append" onclick="AutoCompClickOnSearch('@(inpselname)')"> |
147 | <span class="input-group-text" id="@(inpselname)"><i class="fas fa-search fa-lg"></i></span> | 152 | <span class="input-group-text" id="@(inpselname)"><i class="fas fa-search fa-lg"></i></span> |
148 | </div> | 153 | </div> |
Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/Inputs.cshtml
@@ -60,15 +60,15 @@ | @@ -60,15 +60,15 @@ | ||
60 | } | 60 | } |
61 | else | 61 | else |
62 | { //Az autocomplete targetid-ja | 62 | { //Az autocomplete targetid-ja |
63 | - if (item.InputType == Vrh.WebForm.InputType.EnumList || item.InputType == Vrh.WebForm.InputType.DATList || | 63 | + if (item.InputType == Vrh.WebForm.InputType.EnumList || item.InputType == Vrh.WebForm.InputType.DATList || item.InputType == Vrh.WebForm.InputType.ExternalList || |
64 | item.InputType == Vrh.WebForm.InputType.SQLList || item.InputType == Vrh.WebForm.InputType.XMLList) | 64 | item.InputType == Vrh.WebForm.InputType.SQLList || item.InputType == Vrh.WebForm.InputType.XMLList) |
65 | { | 65 | { |
66 | - ListType listtype = Model.GetListType(item); | ||
67 | - if (listtype == ListType.Single || listtype == ListType.SingleListOnly) | 66 | + SelectionMode listtype = Model.GetSelectionMode(item); |
67 | + if (listtype == SelectionMode.Single || listtype == SelectionMode.SingleListOnly) | ||
68 | { | 68 | { |
69 | <input type="hidden" id="@(item.Name)" name="@(item.Name)" hidden value="@(item.Value)"> | 69 | <input type="hidden" id="@(item.Name)" name="@(item.Name)" hidden value="@(item.Value)"> |
70 | } | 70 | } |
71 | - else if (listtype == ListType.Multi || listtype == ListType.MultiListOnly) | 71 | + else if (listtype == SelectionMode.Multi || listtype == SelectionMode.MultiListOnly) |
72 | { | 72 | { |
73 | <input type="hidden" id="@(item.Name)" name="@(item.Name)" hidden value="@(item.Value.EndsWith(",") ? item.Value : item.Value + ",")"> | 73 | <input type="hidden" id="@(item.Name)" name="@(item.Name)" hidden value="@(item.Value.EndsWith(",") ? item.Value : item.Value + ",")"> |
74 | } | 74 | } |
@@ -518,10 +518,11 @@ | @@ -518,10 +518,11 @@ | ||
518 | || x.InputType == Vrh.WebForm.InputType.DATList | 518 | || x.InputType == Vrh.WebForm.InputType.DATList |
519 | || x.InputType == Vrh.WebForm.InputType.SQLList | 519 | || x.InputType == Vrh.WebForm.InputType.SQLList |
520 | || x.InputType == Vrh.WebForm.InputType.XMLList | 520 | || x.InputType == Vrh.WebForm.InputType.XMLList |
521 | + || x.InputType == Vrh.WebForm.InputType.ExternalList | ||
521 | ) | 522 | ) |
522 | ) | 523 | ) |
523 | { | 524 | { |
524 | - ListType listtype = ListType.Single; | 525 | + SelectionMode listtype = SelectionMode.Single; |
525 | string[] fltr = { "", "", "" }; | 526 | string[] fltr = { "", "", "" }; |
526 | string geturl = ""; | 527 | string geturl = ""; |
527 | if (item.InputType == Vrh.WebForm.InputType.EnumList) | 528 | if (item.InputType == Vrh.WebForm.InputType.EnumList) |
@@ -544,6 +545,13 @@ | @@ -544,6 +545,13 @@ | ||
544 | fltr[1] = item.SQLList.Filter2; | 545 | fltr[1] = item.SQLList.Filter2; |
545 | fltr[2] = item.SQLList.Filter3; | 546 | fltr[2] = item.SQLList.Filter3; |
546 | } | 547 | } |
548 | + else if (item.InputType == Vrh.WebForm.InputType.ExternalList) | ||
549 | + { | ||
550 | + listtype = item.ExternalSelectList.Type; | ||
551 | + fltr[0] = item.ExternalSelectList.Filter1; | ||
552 | + fltr[1] = item.ExternalSelectList.Filter2; | ||
553 | + fltr[2] = item.ExternalSelectList.Filter3; | ||
554 | + } | ||
547 | else if (item.InputType == Vrh.WebForm.InputType.XMLList) | 555 | else if (item.InputType == Vrh.WebForm.InputType.XMLList) |
548 | { | 556 | { |
549 | listtype = item.XMLList.Type; | 557 | listtype = item.XMLList.Type; |
@@ -553,8 +561,8 @@ | @@ -553,8 +561,8 @@ | ||
553 | { | 561 | { |
554 | geturl = Url.Action("GetSelectList", "WebForm", new { | 562 | geturl = Url.Action("GetSelectList", "WebForm", new { |
555 | area = "WebForm", | 563 | area = "WebForm", |
556 | - xml = Model.XmlConnectionString, | ||
557 | - sform = Model.Form.Name, | 564 | + webformxmlconnectionstring = Model.XmlConnectionString, |
565 | + webformname = Model.Form.Name, | ||
558 | inputname = item.Name, | 566 | inputname = item.Name, |
559 | }); | 567 | }); |
560 | geturl += "&query=@filter"; | 568 | geturl += "&query=@filter"; |
@@ -568,7 +576,7 @@ | @@ -568,7 +576,7 @@ | ||
568 | 576 | ||
569 | string listid = item.Name + "SelectedName"; | 577 | string listid = item.Name + "SelectedName"; |
570 | string targetid = item.Name; | 578 | string targetid = item.Name; |
571 | - if (listtype == ListType.Single || listtype == ListType.SingleListOnly) | 579 | + if (listtype == SelectionMode.Single || listtype == SelectionMode.SingleListOnly) |
572 | { | 580 | { |
573 | <text>MyAutoCompInit('@(listid)', '@(targetid)', '@(geturlraw)', '@fltr[0]', '@fltr[1]', '@fltr[2]', false);</text> | 581 | <text>MyAutoCompInit('@(listid)', '@(targetid)', '@(geturlraw)', '@fltr[0]', '@fltr[1]', '@fltr[2]', false);</text> |
574 | if (item.InputType == Vrh.WebForm.InputType.DATList && !String.IsNullOrEmpty(item.Value)) | 582 | if (item.InputType == Vrh.WebForm.InputType.DATList && !String.IsNullOrEmpty(item.Value)) |
@@ -577,7 +585,7 @@ | @@ -577,7 +585,7 @@ | ||
577 | <text>SetDATListDefaultValue(_url, '@(targetid)', $('#@(targetid)').val());</text> | 585 | <text>SetDATListDefaultValue(_url, '@(targetid)', $('#@(targetid)').val());</text> |
578 | } | 586 | } |
579 | } | 587 | } |
580 | - else if (listtype == ListType.Multi || listtype == ListType.MultiListOnly) | 588 | + else if (listtype == SelectionMode.Multi || listtype == SelectionMode.MultiListOnly) |
581 | { | 589 | { |
582 | <text>MyAutoCompInit('@(listid)', '@(targetid)', '@(geturlraw)', '@fltr[0]', '@fltr[1]', '@fltr[2]', true);</text> | 590 | <text>MyAutoCompInit('@(listid)', '@(targetid)', '@(geturlraw)', '@fltr[0]', '@fltr[1]', '@fltr[2]', true);</text> |
583 | } | 591 | } |
@@ -0,0 +1,166 @@ | @@ -0,0 +1,166 @@ | ||
1 | +.pagination { | ||
2 | + display: inline-block; | ||
3 | + padding-left: 0; | ||
4 | + margin: 20px 0; | ||
5 | + border-radius: 4px; | ||
6 | +} | ||
7 | + | ||
8 | +.pagination > li { | ||
9 | + display: inline; | ||
10 | +} | ||
11 | + | ||
12 | +.pagination > li > a, | ||
13 | +.pagination > li > span { | ||
14 | + position: relative; | ||
15 | + float: left; | ||
16 | + padding: 6px 12px; | ||
17 | + margin-left: -1px; | ||
18 | + line-height: 1.428571429; | ||
19 | + text-decoration: none; | ||
20 | + background-color: #ffffff; | ||
21 | + border: 1px solid #dddddd; | ||
22 | +} | ||
23 | + | ||
24 | +.pagination > li:first-child > a, | ||
25 | +.pagination > li:first-child > span { | ||
26 | + margin-left: 0; | ||
27 | + border-bottom-left-radius: 4px; | ||
28 | + border-top-left-radius: 4px; | ||
29 | +} | ||
30 | + | ||
31 | +.pagination > li:last-child > a, | ||
32 | +.pagination > li:last-child > span { | ||
33 | + border-top-right-radius: 4px; | ||
34 | + border-bottom-right-radius: 4px; | ||
35 | +} | ||
36 | + | ||
37 | +.pagination > li > a:hover, | ||
38 | +.pagination > li > span:hover, | ||
39 | +.pagination > li > a:focus, | ||
40 | +.pagination > li > span:focus { | ||
41 | + background-color: #eeeeee; | ||
42 | +} | ||
43 | + | ||
44 | +.pagination > .active > a, | ||
45 | +.pagination > .active > span, | ||
46 | +.pagination > .active > a:hover, | ||
47 | +.pagination > .active > span:hover, | ||
48 | +.pagination > .active > a:focus, | ||
49 | +.pagination > .active > span:focus { | ||
50 | + z-index: 2; | ||
51 | + color: #ffffff; | ||
52 | + cursor: default; | ||
53 | + background-color: #428bca; | ||
54 | + border-color: #428bca; | ||
55 | +} | ||
56 | + | ||
57 | +.pagination > .disabled > span, | ||
58 | +.pagination > .disabled > a, | ||
59 | +.pagination > .disabled > a:hover, | ||
60 | +.pagination > .disabled > a:focus { | ||
61 | + color: #999999; | ||
62 | + cursor: not-allowed; | ||
63 | + background-color: #ffffff; | ||
64 | + border-color: #dddddd; | ||
65 | +} | ||
66 | + | ||
67 | +.pagination-lg > li > a, | ||
68 | +.pagination-lg > li > span { | ||
69 | + padding: 10px 16px; | ||
70 | + font-size: 18px; | ||
71 | +} | ||
72 | + | ||
73 | +.pagination-lg > li:first-child > a, | ||
74 | +.pagination-lg > li:first-child > span { | ||
75 | + border-bottom-left-radius: 6px; | ||
76 | + border-top-left-radius: 6px; | ||
77 | +} | ||
78 | + | ||
79 | +.pagination-lg > li:last-child > a, | ||
80 | +.pagination-lg > li:last-child > span { | ||
81 | + border-top-right-radius: 6px; | ||
82 | + border-bottom-right-radius: 6px; | ||
83 | +} | ||
84 | + | ||
85 | +.pagination-sm > li > a, | ||
86 | +.pagination-sm > li > span { | ||
87 | + padding: 5px 10px; | ||
88 | + font-size: 12px; | ||
89 | +} | ||
90 | + | ||
91 | +.pagination-sm > li:first-child > a, | ||
92 | +.pagination-sm > li:first-child > span { | ||
93 | + border-bottom-left-radius: 3px; | ||
94 | + border-top-left-radius: 3px; | ||
95 | +} | ||
96 | + | ||
97 | +.pagination-sm > li:last-child > a, | ||
98 | +.pagination-sm > li:last-child > span { | ||
99 | + border-top-right-radius: 3px; | ||
100 | + border-bottom-right-radius: 3px; | ||
101 | +} | ||
102 | + | ||
103 | +.pager { | ||
104 | + padding-left: 0; | ||
105 | + margin: 20px 0; | ||
106 | + text-align: center; | ||
107 | + list-style: none; | ||
108 | +} | ||
109 | + | ||
110 | +.pager:before, | ||
111 | +.pager:after { | ||
112 | + display: table; | ||
113 | + content: " "; | ||
114 | +} | ||
115 | + | ||
116 | +.pager:after { | ||
117 | + clear: both; | ||
118 | +} | ||
119 | + | ||
120 | +.pager:before, | ||
121 | +.pager:after { | ||
122 | + display: table; | ||
123 | + content: " "; | ||
124 | +} | ||
125 | + | ||
126 | +.pager:after { | ||
127 | + clear: both; | ||
128 | +} | ||
129 | + | ||
130 | +.pager li { | ||
131 | + display: inline; | ||
132 | +} | ||
133 | + | ||
134 | +.pager li > a, | ||
135 | +.pager li > span { | ||
136 | + display: inline-block; | ||
137 | + padding: 5px 14px; | ||
138 | + background-color: #ffffff; | ||
139 | + border: 1px solid #dddddd; | ||
140 | + border-radius: 15px; | ||
141 | +} | ||
142 | + | ||
143 | +.pager li > a:hover, | ||
144 | +.pager li > a:focus { | ||
145 | + text-decoration: none; | ||
146 | + background-color: #eeeeee; | ||
147 | +} | ||
148 | + | ||
149 | +.pager .next > a, | ||
150 | +.pager .next > span { | ||
151 | + float: right; | ||
152 | +} | ||
153 | + | ||
154 | +.pager .previous > a, | ||
155 | +.pager .previous > span { | ||
156 | + float: left; | ||
157 | +} | ||
158 | + | ||
159 | +.pager .disabled > a, | ||
160 | +.pager .disabled > a:hover, | ||
161 | +.pager .disabled > a:focus, | ||
162 | +.pager .disabled > span { | ||
163 | + color: #999999; | ||
164 | + cursor: not-allowed; | ||
165 | + background-color: #ffffff; | ||
166 | +} | ||
0 | \ No newline at end of file | 167 | \ No newline at end of file |
Vrh.Web.Reporting/Vrh.Web.Reporting.csproj
@@ -290,17 +290,17 @@ | @@ -290,17 +290,17 @@ | ||
290 | <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | 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> | 291 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> |
292 | </Reference> | 292 | </Reference> |
293 | - <Reference Include="VRH.Log4Pro.WebTools, Version=1.12.5.0, Culture=neutral, processorArchitecture=MSIL"> | ||
294 | - <HintPath>..\packages\VRH.Log4Pro.WebTools.1.12.5\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath> | 293 | + <Reference Include="VRH.Log4Pro.WebTools, Version=1.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
294 | + <HintPath>..\packages\VRH.Log4Pro.WebTools.1.14.0\lib\net451\VRH.Log4Pro.WebTools.dll</HintPath> | ||
295 | </Reference> | 295 | </Reference> |
296 | - <Reference Include="Vrh.Logger, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
297 | - <HintPath>..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll</HintPath> | 296 | + <Reference Include="Vrh.Logger, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL"> |
297 | + <HintPath>..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll</HintPath> | ||
298 | </Reference> | 298 | </Reference> |
299 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 299 | <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> | 300 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
301 | </Reference> | 301 | </Reference> |
302 | - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
303 | - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | 302 | + <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL"> |
303 | + <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | ||
304 | </Reference> | 304 | </Reference> |
305 | <Reference Include="Vrh.Web.FileManager.Lib, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL"> | 305 | <Reference Include="Vrh.Web.FileManager.Lib, Version=1.7.0.0, Culture=neutral, processorArchitecture=MSIL"> |
306 | <HintPath>..\packages\Vrh.Web.FileManager.1.7.0\lib\net462\Vrh.Web.FileManager.Lib.dll</HintPath> | 306 | <HintPath>..\packages\Vrh.Web.FileManager.1.7.0\lib\net462\Vrh.Web.FileManager.Lib.dll</HintPath> |
@@ -311,11 +311,11 @@ | @@ -311,11 +311,11 @@ | ||
311 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 311 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
312 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> | 312 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
313 | </Reference> | 313 | </Reference> |
314 | - <Reference Include="Vrh.WebForm.Lib, Version=2.8.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
315 | - <HintPath>..\packages\Vrh.WebForm.2.8.3\lib\net462\Vrh.WebForm.Lib.dll</HintPath> | 314 | + <Reference Include="Vrh.WebForm.Lib, Version=2.9.0.0, Culture=neutral, processorArchitecture=MSIL"> |
315 | + <HintPath>..\packages\Vrh.WebForm.2.9.0\lib\net462\Vrh.WebForm.Lib.dll</HintPath> | ||
316 | </Reference> | 316 | </Reference> |
317 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
318 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 317 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
318 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
319 | </Reference> | 319 | </Reference> |
320 | <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL"> | 320 | <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> | 321 | <HintPath>..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll</HintPath> |
@@ -599,6 +599,7 @@ | @@ -599,6 +599,7 @@ | ||
599 | </Content> | 599 | </Content> |
600 | <Content Include="Content\Log4Pro_Base.css" /> | 600 | <Content Include="Content\Log4Pro_Base.css" /> |
601 | <Content Include="Content\Log4Pro_Base.min.css" /> | 601 | <Content Include="Content\Log4Pro_Base.min.css" /> |
602 | + <Content Include="Content\PagedList.css" /> | ||
602 | <Content Include="Content\regular.css" /> | 603 | <Content Include="Content\regular.css" /> |
603 | <Content Include="Content\regular.min.css" /> | 604 | <Content Include="Content\regular.min.css" /> |
604 | <Content Include="Content\Site.css" /> | 605 | <Content Include="Content\Site.css" /> |
@@ -666,10 +667,6 @@ | @@ -666,10 +667,6 @@ | ||
666 | <Content Include="Images\ajax-loader_black.gif" /> | 667 | <Content Include="Images\ajax-loader_black.gif" /> |
667 | <Content Include="Images\log4pro_cube.png" /> | 668 | <Content Include="Images\log4pro_cube.png" /> |
668 | <Content Include="Images\userlogo.jpg" /> | 669 | <Content Include="Images\userlogo.jpg" /> |
669 | - <Content Include="Areas\WebTools\Views\_ViewStart.cshtml" /> | ||
670 | - <Content Include="Areas\WebTools\Views\_LayoutNoMenu.cshtml" /> | ||
671 | - <Content Include="Areas\WebTools\Views\web.config" /> | ||
672 | - <Content Include="Areas\WebTools\Views\UserIsNotAuthenticated.cshtml" /> | ||
673 | <Content Include="Areas\Menu\Views\_ViewStart.cshtml" /> | 670 | <Content Include="Areas\Menu\Views\_ViewStart.cshtml" /> |
674 | <Content Include="Areas\Menu\Views\web.config" /> | 671 | <Content Include="Areas\Menu\Views\web.config" /> |
675 | <Content Include="Areas\Menu\Views\Shared\ErrorList.cshtml" /> | 672 | <Content Include="Areas\Menu\Views\Shared\ErrorList.cshtml" /> |
@@ -692,6 +689,10 @@ | @@ -692,6 +689,10 @@ | ||
692 | <Content Include="Areas\FileManager\Views\web.config" /> | 689 | <Content Include="Areas\FileManager\Views\web.config" /> |
693 | <Content Include="Areas\FileManager\Views\FileManager\Index.cshtml" /> | 690 | <Content Include="Areas\FileManager\Views\FileManager\Index.cshtml" /> |
694 | <Content Include="Areas\FileManager\Views\FileManager\Error.cshtml" /> | 691 | <Content Include="Areas\FileManager\Views\FileManager\Error.cshtml" /> |
692 | + <Content Include="Areas\WebTools\Views\_ViewStart.cshtml" /> | ||
693 | + <Content Include="Areas\WebTools\Views\_LayoutNoMenu.cshtml" /> | ||
694 | + <Content Include="Areas\WebTools\Views\web.config" /> | ||
695 | + <Content Include="Areas\WebTools\Views\UserIsNotAuthenticated.cshtml" /> | ||
695 | <Content Include="Areas\WebForm\Views\WebForm\WebForm.cshtml" /> | 696 | <Content Include="Areas\WebForm\Views\WebForm\WebForm.cshtml" /> |
696 | <Content Include="Areas\WebForm\Views\WebForm\Inputs.cshtml" /> | 697 | <Content Include="Areas\WebForm\Views\WebForm\Inputs.cshtml" /> |
697 | <Content Include="Areas\WebForm\Views\WebForm\Index.cshtml" /> | 698 | <Content Include="Areas\WebForm\Views\WebForm\Index.cshtml" /> |
@@ -882,18 +883,24 @@ | @@ -882,18 +883,24 @@ | ||
882 | <Content Include="App_Data\OneReport\Production3 - en-US.rdl" /> | 883 | <Content Include="App_Data\OneReport\Production3 - en-US.rdl" /> |
883 | <Content Include="App_Data\OneReport\Production3 - hu-HU.rdl" /> | 884 | <Content Include="App_Data\OneReport\Production3 - hu-HU.rdl" /> |
884 | <Content Include="App_Data\OneScripter\Test.ps" /> | 885 | <Content Include="App_Data\OneScripter\Test.ps" /> |
886 | + <Content Include="Scripts\vrh.bootstrap-datetimepicker.js" /> | ||
887 | + <Content Include="Scripts\vrh.bootstrap-datetimepicker.min.js" /> | ||
888 | + <Content Include="Scripts\vrh.commontools.js" /> | ||
889 | + <Content Include="Scripts\vrh.commontools.min.js" /> | ||
890 | + <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" /> | ||
891 | + <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" /> | ||
885 | <Content Include="Scripts\bootstrap4-toggle.min.js.map" /> | 892 | <Content Include="Scripts\bootstrap4-toggle.min.js.map" /> |
893 | + <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Common.Lib\ReadMe.md" /> | ||
894 | + <None Include="Vrh.NugetModuls.Documentations\Vrh.WebForm\ReadMe.md" /> | ||
895 | + <None Include="XmlParser.xml"> | ||
896 | + <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
897 | + </None> | ||
886 | <None Include="system.web.authentication.config" /> | 898 | <None Include="system.web.authentication.config" /> |
887 | <None Include="system.web.membership.config" /> | 899 | <None Include="system.web.membership.config" /> |
888 | <None Include="system.web.rolemanager.config" /> | 900 | <None Include="system.web.rolemanager.config" /> |
889 | <Content Include="Views\_ViewStart.cshtml" /> | 901 | <Content Include="Views\_ViewStart.cshtml" /> |
890 | <None Include="Vrh.NugetModuls.Documentations\VRH.Common\ReadMe.md" /> | 902 | <None Include="Vrh.NugetModuls.Documentations\VRH.Common\ReadMe.md" /> |
891 | - <Content Include="Scripts\vrh.bootstrap-datetimepicker.js" /> | ||
892 | - <Content Include="Scripts\vrh.bootstrap-datetimepicker.min.js" /> | ||
893 | - <Content Include="Scripts\vrh.commontools.js" /> | ||
894 | - <Content Include="Scripts\vrh.commontools.min.js" /> | ||
895 | <Content Include="SqlServerTypes\readme.htm" /> | 903 | <Content Include="SqlServerTypes\readme.htm" /> |
896 | - <None Include="Vrh.NugetModuls.Documentations\VRH.Log4Pro.WebTools\ReadMe.md" /> | ||
897 | <Content Include="Scripts\jquery-ui-1.13.2.js" /> | 904 | <Content Include="Scripts\jquery-ui-1.13.2.js" /> |
898 | <Content Include="Scripts\jquery-ui-1.13.2.min.js" /> | 905 | <Content Include="Scripts\jquery-ui-1.13.2.min.js" /> |
899 | <Content Include="WCFBehaviors.config" /> | 906 | <Content Include="WCFBehaviors.config" /> |
@@ -1151,20 +1158,14 @@ | @@ -1151,20 +1158,14 @@ | ||
1151 | <Content Include="webfonts\fa-brands-400.woff" /> | 1158 | <Content Include="webfonts\fa-brands-400.woff" /> |
1152 | <Content Include="webfonts\fa-brands-400.ttf" /> | 1159 | <Content Include="webfonts\fa-brands-400.ttf" /> |
1153 | <Content Include="webfonts\fa-brands-400.eot" /> | 1160 | <Content Include="webfonts\fa-brands-400.eot" /> |
1154 | - <Content Include="Vrh.NugetModuls.Documentations\Vrh.Logger\ReadMe.md" /> | ||
1155 | - <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Common.Lib\ReadMe.md" /> | ||
1156 | <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.FileManager\ReadMe.md" /> | 1161 | <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.FileManager\ReadMe.md" /> |
1157 | <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" /> | 1162 | <None Include="Vrh.NugetModuls.Documentations\Vrh.Web.Menu\ReadMe.md" /> |
1158 | - <None Include="Vrh.NugetModuls.Documentations\Vrh.WebForm\ReadMe.md" /> | ||
1159 | - <None Include="XmlParser.xml"> | ||
1160 | - <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
1161 | - </None> | 1163 | + <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" /> |
1162 | <Content Include="_CreateNewNuGetPackage\RunMeToUploadNuGetPackage.cmd" /> | 1164 | <Content Include="_CreateNewNuGetPackage\RunMeToUploadNuGetPackage.cmd" /> |
1163 | <Content Include="_CreateNewNuGetPackage\DoNotModify\UploadNuGetPackage.ps1" /> | 1165 | <Content Include="_CreateNewNuGetPackage\DoNotModify\UploadNuGetPackage.ps1" /> |
1164 | <Content Include="_CreateNewNuGetPackage\DoNotModify\New-NuGetPackage.ps1" /> | 1166 | <Content Include="_CreateNewNuGetPackage\DoNotModify\New-NuGetPackage.ps1" /> |
1165 | <Content Include="_CreateNewNuGetPackage\DoNotModify\CreateNuGetPackage.ps1" /> | 1167 | <Content Include="_CreateNewNuGetPackage\DoNotModify\CreateNuGetPackage.ps1" /> |
1166 | <Content Include="_CreateNewNuGetPackage\Config.ps1" /> | 1168 | <Content Include="_CreateNewNuGetPackage\Config.ps1" /> |
1167 | - <None Include="Vrh.NugetModuls.Documentations\Vrh.XmlProcessing\ReadMe.md" /> | ||
1168 | </ItemGroup> | 1169 | </ItemGroup> |
1169 | <ItemGroup> | 1170 | <ItemGroup> |
1170 | <Content Include="packages.config" /> | 1171 | <Content Include="packages.config" /> |
Vrh.Web.Reporting/packages.config
@@ -104,15 +104,15 @@ | @@ -104,15 +104,15 @@ | ||
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.0" targetFramework="net472" /> | 105 | <package id="VRH.Common" version="3.0.0" targetFramework="net472" /> |
106 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> | 106 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> |
107 | - <package id="VRH.Log4Pro.WebTools" version="1.12.5" targetFramework="net462" /> | ||
108 | - <package id="Vrh.Logger" version="3.1.0" targetFramework="net462" /> | 107 | + <package id="VRH.Log4Pro.WebTools" version="1.14.0" targetFramework="net462" /> |
108 | + <package id="Vrh.Logger" version="3.3.1" 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.20.3" targetFramework="net462" /> | 110 | + <package id="Vrh.Web.Common.Lib" version="2.21.2" 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.0" targetFramework="net462" /> | 112 | <package id="Vrh.Web.Menu" version="1.29.0" 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.8.3" targetFramework="net462" /> | ||
115 | - <package id="Vrh.XmlProcessing" version="2.0.7" targetFramework="net462" /> | 114 | + <package id="Vrh.WebForm" version="2.9.0" targetFramework="net462" /> |
115 | + <package id="Vrh.XmlProcessing" version="2.3.0" 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
@@ -262,14 +262,14 @@ | @@ -262,14 +262,14 @@ | ||
262 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 262 | <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> | 263 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
264 | </Reference> | 264 | </Reference> |
265 | - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
266 | - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | 265 | + <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL"> |
266 | + <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | ||
267 | </Reference> | 267 | </Reference> |
268 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 268 | <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> | 269 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
270 | </Reference> | 270 | </Reference> |
271 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
272 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 271 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
272 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
273 | </Reference> | 273 | </Reference> |
274 | <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> | 274 | <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> | 275 | <HintPath>..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath> |
Vrh.Web.iScheduler.Lib/packages.config
@@ -60,8 +60,8 @@ | @@ -60,8 +60,8 @@ | ||
60 | <package id="VRH.Common" version="3.0.0" targetFramework="net461" /> | 60 | <package id="VRH.Common" version="3.0.0" targetFramework="net461" /> |
61 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> | 61 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net461" /> |
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.20.3" targetFramework="net462" /> | 63 | + <package id="Vrh.Web.Common.Lib" version="2.21.2" 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.0.7" targetFramework="net462" /> | 65 | + <package id="Vrh.XmlProcessing" version="2.3.0" 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
@@ -116,14 +116,14 @@ | @@ -116,14 +116,14 @@ | ||
116 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 116 | <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> | 117 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
118 | </Reference> | 118 | </Reference> |
119 | - <Reference Include="Vrh.Web.Common.Lib, Version=2.20.3.0, Culture=neutral, processorArchitecture=MSIL"> | ||
120 | - <HintPath>..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | 119 | + <Reference Include="Vrh.Web.Common.Lib, Version=2.21.2.0, Culture=neutral, processorArchitecture=MSIL"> |
120 | + <HintPath>..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll</HintPath> | ||
121 | </Reference> | 121 | </Reference> |
122 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 122 | <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> | 123 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
124 | </Reference> | 124 | </Reference> |
125 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
126 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 125 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
126 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
127 | </Reference> | 127 | </Reference> |
128 | </ItemGroup> | 128 | </ItemGroup> |
129 | <ItemGroup> | 129 | <ItemGroup> |
Vrh.Web.iScheduler.Report.Lib/packages.config
@@ -15,7 +15,7 @@ | @@ -15,7 +15,7 @@ | ||
15 | <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> | 15 | <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> |
16 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 16 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> |
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.20.3" targetFramework="net462" /> | 18 | + <package id="Vrh.Web.Common.Lib" version="2.21.2" 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.0.7" targetFramework="net462" /> | 20 | + <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" /> |
21 | </packages> | 21 | </packages> |
22 | \ No newline at end of file | 22 | \ No newline at end of file |
Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj
@@ -117,8 +117,8 @@ | @@ -117,8 +117,8 @@ | ||
117 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 117 | <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> | 118 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
119 | </Reference> | 119 | </Reference> |
120 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
121 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 120 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
121 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
122 | </Reference> | 122 | </Reference> |
123 | </ItemGroup> | 123 | </ItemGroup> |
124 | <ItemGroup> | 124 | <ItemGroup> |
Vrh.iScheduler.Report/packages.config
@@ -16,5 +16,5 @@ | @@ -16,5 +16,5 @@ | ||
16 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 16 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> |
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.0.7" targetFramework="net462" /> | 19 | + <package id="Vrh.XmlProcessing" version="2.3.0" 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
@@ -124,8 +124,8 @@ | @@ -124,8 +124,8 @@ | ||
124 | <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | 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> | 125 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> |
126 | </Reference> | 126 | </Reference> |
127 | - <Reference Include="Vrh.Logger, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
128 | - <HintPath>..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll</HintPath> | 127 | + <Reference Include="Vrh.Logger, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL"> |
128 | + <HintPath>..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll</HintPath> | ||
129 | </Reference> | 129 | </Reference> |
130 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 130 | <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> | 131 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -133,8 +133,8 @@ | @@ -133,8 +133,8 @@ | ||
133 | <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"> |
134 | <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> |
135 | </Reference> | 135 | </Reference> |
136 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
137 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 136 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
137 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
138 | </Reference> | 138 | </Reference> |
139 | </ItemGroup> | 139 | </ItemGroup> |
140 | <ItemGroup> | 140 | <ItemGroup> |
Vrh.iScheduler/packages.config
@@ -20,8 +20,8 @@ | @@ -20,8 +20,8 @@ | ||
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.0" targetFramework="net451" /> | 21 | <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> |
22 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 22 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> |
23 | - <package id="Vrh.Logger" version="3.1.0" targetFramework="net462" /> | 23 | + <package id="Vrh.Logger" version="3.3.1" 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.0.7" targetFramework="net462" /> | 26 | + <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" /> |
27 | </packages> | 27 | </packages> |
28 | \ No newline at end of file | 28 | \ No newline at end of file |
iSchedulerMonitor/Plugins.Config.xml
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | -<Plugins StackSize="50"> | 2 | +<Plugins> |
3 | 3 | ||
4 | <Plugin Assembly="iSchedulerMonitor.dll" Type="iSchedulerMonitor.iSchedulerMonitorPlugin" Version="1.0.0" Singletone="false" AutoStart="true" PluginDirectory=""> | 4 | <Plugin Assembly="iSchedulerMonitor.dll" Type="iSchedulerMonitor.iSchedulerMonitorPlugin" Version="1.0.0" Singletone="false" AutoStart="true" PluginDirectory=""> |
5 | <Instance Id="instance1" Name="iSchedulerMonitorPlugin instance 1" /> | 5 | <Instance Id="instance1" Name="iSchedulerMonitorPlugin instance 1" /> |
6 | - </Plugin><Plugin Assembly="iSchedulerMonitor.dll" Type="iSchedulerMonitor.iSchedulerMonitor.ACPluginPlugin" Version="1.0.0" Singletone="false" AutoStart="true" PluginDirectory=""> | ||
7 | - <Instance Id="instance1" Name="iSchedulerMonitor.ACPluginPlugin instance 1" /> | ||
8 | </Plugin></Plugins> | 6 | </Plugin></Plugins> |
9 | \ No newline at end of file | 7 | \ No newline at end of file |
iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj
@@ -40,9 +40,6 @@ | @@ -40,9 +40,6 @@ | ||
40 | <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> | 40 | <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> |
41 | <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath> | 41 | <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath> |
42 | </Reference> | 42 | </Reference> |
43 | - <Reference Include="InstanceFactory.FromXML, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
44 | - <HintPath>..\packages\Vrh.ApplicationContainer.4.4.1\lib\net451\InstanceFactory.FromXML.dll</HintPath> | ||
45 | - </Reference> | ||
46 | <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> | 43 | <Reference Include="Microsoft.ReportViewer.Common, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> |
47 | <HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll</HintPath> | 44 | <HintPath>..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll</HintPath> |
48 | </Reference> | 45 | </Reference> |
@@ -100,8 +97,8 @@ | @@ -100,8 +97,8 @@ | ||
100 | <Reference Include="System.Data" /> | 97 | <Reference Include="System.Data" /> |
101 | <Reference Include="System.Net.Http" /> | 98 | <Reference Include="System.Net.Http" /> |
102 | <Reference Include="System.Xml" /> | 99 | <Reference Include="System.Xml" /> |
103 | - <Reference Include="Vrh.ApplicationContainer, Version=4.4.1.0, Culture=neutral, processorArchitecture=MSIL"> | ||
104 | - <HintPath>..\packages\Vrh.ApplicationContainer.4.4.1\lib\net451\Vrh.ApplicationContainer.dll</HintPath> | 100 | + <Reference Include="Vrh.ApplicationContainer, Version=5.0.2.0, Culture=neutral, processorArchitecture=MSIL"> |
101 | + <HintPath>..\packages\Vrh.ApplicationContainer.5.0.2\lib\net451\Vrh.ApplicationContainer.dll</HintPath> | ||
105 | </Reference> | 102 | </Reference> |
106 | <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"> |
107 | <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> |
@@ -118,8 +115,8 @@ | @@ -118,8 +115,8 @@ | ||
118 | <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> | 115 | <Reference Include="VRH.Log4Pro.MultiLanguageManager, Version=3.21.3.0, Culture=neutral, processorArchitecture=MSIL"> |
119 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> | 116 | <HintPath>..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll</HintPath> |
120 | </Reference> | 117 | </Reference> |
121 | - <Reference Include="Vrh.Logger, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL"> | ||
122 | - <HintPath>..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll</HintPath> | 118 | + <Reference Include="Vrh.Logger, Version=3.3.1.0, Culture=neutral, processorArchitecture=MSIL"> |
119 | + <HintPath>..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll</HintPath> | ||
123 | </Reference> | 120 | </Reference> |
124 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> | 121 | <Reference Include="Vrh.Membership, Version=4.14.0.0, Culture=neutral, processorArchitecture=MSIL"> |
125 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> | 122 | <HintPath>..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll</HintPath> |
@@ -133,8 +130,8 @@ | @@ -133,8 +130,8 @@ | ||
133 | <Reference Include="Vrh.Web.Providers, Version=2.0.2.0, Culture=neutral, processorArchitecture=MSIL"> | 130 | <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> | 131 | <HintPath>..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll</HintPath> |
135 | </Reference> | 132 | </Reference> |
136 | - <Reference Include="Vrh.XmlProcessing, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL"> | ||
137 | - <HintPath>..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll</HintPath> | 133 | + <Reference Include="Vrh.XmlProcessing, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL"> |
134 | + <HintPath>..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll</HintPath> | ||
138 | </Reference> | 135 | </Reference> |
139 | </ItemGroup> | 136 | </ItemGroup> |
140 | <ItemGroup> | 137 | <ItemGroup> |
iSchedulerMonitor/packages.config
@@ -12,13 +12,13 @@ | @@ -12,13 +12,13 @@ | ||
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.ApplicationContainer" version="4.4.1" targetFramework="net462" /> | 15 | + <package id="Vrh.ApplicationContainer" version="5.0.2" 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.0" targetFramework="net451" /> | 17 | <package id="VRH.Common" version="3.0.0" targetFramework="net451" /> |
18 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> | 18 | <package id="VRH.Log4Pro.MultiLanguageManager" version="3.21.3" targetFramework="net451" /> |
19 | - <package id="Vrh.Logger" version="3.1.0" targetFramework="net462" /> | 19 | + <package id="Vrh.Logger" version="3.3.1" 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.0.7" targetFramework="net462" /> | 23 | + <package id="Vrh.XmlProcessing" version="2.3.0" targetFramework="net462" /> |
24 | </packages> | 24 | </packages> |
25 | \ No newline at end of file | 25 | \ No newline at end of file |