diff --git a/Vrh.OneMessage/Vrh.OneMessage.csproj b/Vrh.OneMessage/Vrh.OneMessage.csproj index 877926b..a265557 100644 --- a/Vrh.OneMessage/Vrh.OneMessage.csproj +++ b/Vrh.OneMessage/Vrh.OneMessage.csproj @@ -62,8 +62,8 @@ ..\packages\VRH.Common.3.0.0\lib\net45\VRH.Common.EF.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.OneMessage/packages.config b/Vrh.OneMessage/packages.config index a359722..f2f53f3 100644 --- a/Vrh.OneMessage/packages.config +++ b/Vrh.OneMessage/packages.config @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Vrh.OneReport/Vrh.OneReport.csproj b/Vrh.OneReport/Vrh.OneReport.csproj index 84f6845..097b6e0 100644 --- a/Vrh.OneReport/Vrh.OneReport.csproj +++ b/Vrh.OneReport/Vrh.OneReport.csproj @@ -103,8 +103,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.OneReport/packages.config b/Vrh.OneReport/packages.config index 66c24fd..b1ffe81 100644 --- a/Vrh.OneReport/packages.config +++ b/Vrh.OneReport/packages.config @@ -10,5 +10,5 @@ - + \ No newline at end of file diff --git a/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj b/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj index 5d14aec..09eee3a 100644 --- a/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj +++ b/Vrh.Web.OneReport.Lib/Vrh.Web.OneReport.Lib.csproj @@ -111,11 +111,11 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll True - - ..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.Web.OneReport.Lib/packages.config b/Vrh.Web.OneReport.Lib/packages.config index fbb55de..4c207ef 100644 --- a/Vrh.Web.OneReport.Lib/packages.config +++ b/Vrh.Web.OneReport.Lib/packages.config @@ -11,6 +11,6 @@ - - + + \ No newline at end of file diff --git a/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/CurrentInput.cshtml b/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/CurrentInput.cshtml index c511a2f..cf11481 100644 --- a/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/CurrentInput.cshtml +++ b/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/CurrentInput.cshtml @@ -58,35 +58,40 @@ value="@(currentInput.Value)" @(addattributes)> - break; + break; - case Vrh.WebForm.InputType.EnumList: - case Vrh.WebForm.InputType.SQLList: - case Vrh.WebForm.InputType.XMLList: - case Vrh.WebForm.InputType.DATList: - string inpselname = currentInput.Name + "SelectedName"; - string multiname = currentInput.Name + "Multi"; - ListType lsttype = ListType.Single; - if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.EnumList)) - { - lsttype = currentInput.EnumList.Type; - } - else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.SQLList)) - { - lsttype = currentInput.SQLList.Type; - } - else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.XMLList)) - { - lsttype = currentInput.XMLList.Type; - } - else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.DATList)) - { - lsttype = currentInput.DATList.Type; - } + case Vrh.WebForm.InputType.EnumList: + case Vrh.WebForm.InputType.SQLList: + case Vrh.WebForm.InputType.XMLList: + case Vrh.WebForm.InputType.ExternalList: + case Vrh.WebForm.InputType.DATList: + string inpselname = currentInput.Name + "SelectedName"; + string multiname = currentInput.Name + "Multi"; + SelectionMode lsttype = SelectionMode.Single; + if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.EnumList)) + { + lsttype = currentInput.EnumList.Type; + } + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.SQLList)) + { + lsttype = currentInput.SQLList.Type; + } + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.ExternalList)) + { + lsttype = currentInput.ExternalSelectList.Type; + } + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.XMLList)) + { + lsttype = currentInput.XMLList.Type; + } + else if (Vrh.WebForm.InputType.Equals(currentInput.InputType, Vrh.WebForm.InputType.DATList)) + { + lsttype = currentInput.DATList.Type; + } - if (lsttype == ListType.Single || lsttype == ListType.SingleListOnly) - { - System.Diagnostics.Debug.WriteLine("List.Single: name={0}, default={1}", currentInput.Name, currentInput.ValueSelectedName); + if (lsttype == SelectionMode.Single || lsttype == SelectionMode.SingleListOnly) + { + System.Diagnostics.Debug.WriteLine("List.Single: name={0}, default={1}", currentInput.Name, currentInput.ValueSelectedName);
@@ -95,14 +100,14 @@ name="@(inpselname)" class="form-control" value="@(currentInput.ValueSelectedName)" - @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == ListType.SingleListOnly ? "readonly" : "")> + @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == SelectionMode.SingleListOnly ? "readonly" : "")>
} - else if (lsttype == ListType.Multi || lsttype == ListType.MultiListOnly) + else if (lsttype == SelectionMode.Multi || lsttype == SelectionMode.MultiListOnly) { @if (Model.ViewMode == ViewModes.Mobile) @@ -116,7 +121,7 @@ id="@(inpselname)" name="@(inpselname)" class="form-control" - value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == ListType.MultiListOnly ? "readonly" : "")> + value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == SelectionMode.MultiListOnly ? "readonly" : "")>
@@ -142,7 +147,7 @@ id="@(inpselname)" name="@(inpselname)" class="form-control" - value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == ListType.MultiListOnly ? "readonly" : "")> + value="" @(currentInput.ReadOnly ? "readonly" : "") @(lsttype == SelectionMode.MultiListOnly ? "readonly" : "")>
diff --git a/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/Inputs.cshtml b/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/Inputs.cshtml index 8474050..732b504 100644 --- a/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/Inputs.cshtml +++ b/Vrh.Web.Reporting/Areas/WebForm/Views/WebForm/Inputs.cshtml @@ -60,15 +60,15 @@ } else { //Az autocomplete targetid-ja - if (item.InputType == Vrh.WebForm.InputType.EnumList || item.InputType == Vrh.WebForm.InputType.DATList || + if (item.InputType == Vrh.WebForm.InputType.EnumList || item.InputType == Vrh.WebForm.InputType.DATList || item.InputType == Vrh.WebForm.InputType.ExternalList || item.InputType == Vrh.WebForm.InputType.SQLList || item.InputType == Vrh.WebForm.InputType.XMLList) { - ListType listtype = Model.GetListType(item); - if (listtype == ListType.Single || listtype == ListType.SingleListOnly) + SelectionMode listtype = Model.GetSelectionMode(item); + if (listtype == SelectionMode.Single || listtype == SelectionMode.SingleListOnly) { } - else if (listtype == ListType.Multi || listtype == ListType.MultiListOnly) + else if (listtype == SelectionMode.Multi || listtype == SelectionMode.MultiListOnly) { } @@ -518,10 +518,11 @@ || x.InputType == Vrh.WebForm.InputType.DATList || x.InputType == Vrh.WebForm.InputType.SQLList || x.InputType == Vrh.WebForm.InputType.XMLList + || x.InputType == Vrh.WebForm.InputType.ExternalList ) ) { - ListType listtype = ListType.Single; + SelectionMode listtype = SelectionMode.Single; string[] fltr = { "", "", "" }; string geturl = ""; if (item.InputType == Vrh.WebForm.InputType.EnumList) @@ -544,6 +545,13 @@ fltr[1] = item.SQLList.Filter2; fltr[2] = item.SQLList.Filter3; } + else if (item.InputType == Vrh.WebForm.InputType.ExternalList) + { + listtype = item.ExternalSelectList.Type; + fltr[0] = item.ExternalSelectList.Filter1; + fltr[1] = item.ExternalSelectList.Filter2; + fltr[2] = item.ExternalSelectList.Filter3; + } else if (item.InputType == Vrh.WebForm.InputType.XMLList) { listtype = item.XMLList.Type; @@ -553,8 +561,8 @@ { geturl = Url.Action("GetSelectList", "WebForm", new { area = "WebForm", - xml = Model.XmlConnectionString, - sform = Model.Form.Name, + webformxmlconnectionstring = Model.XmlConnectionString, + webformname = Model.Form.Name, inputname = item.Name, }); geturl += "&query=@filter"; @@ -568,7 +576,7 @@ string listid = item.Name + "SelectedName"; string targetid = item.Name; - if (listtype == ListType.Single || listtype == ListType.SingleListOnly) + if (listtype == SelectionMode.Single || listtype == SelectionMode.SingleListOnly) { MyAutoCompInit('@(listid)', '@(targetid)', '@(geturlraw)', '@fltr[0]', '@fltr[1]', '@fltr[2]', false); if (item.InputType == Vrh.WebForm.InputType.DATList && !String.IsNullOrEmpty(item.Value)) @@ -577,7 +585,7 @@ SetDATListDefaultValue(_url, '@(targetid)', $('#@(targetid)').val()); } } - else if (listtype == ListType.Multi || listtype == ListType.MultiListOnly) + else if (listtype == SelectionMode.Multi || listtype == SelectionMode.MultiListOnly) { MyAutoCompInit('@(listid)', '@(targetid)', '@(geturlraw)', '@fltr[0]', '@fltr[1]', '@fltr[2]', true); } diff --git a/Vrh.Web.Reporting/Content/PagedList.css b/Vrh.Web.Reporting/Content/PagedList.css new file mode 100644 index 0000000..d9b9f5d --- /dev/null +++ b/Vrh.Web.Reporting/Content/PagedList.css @@ -0,0 +1,166 @@ +.pagination { + display: inline-block; + padding-left: 0; + margin: 20px 0; + border-radius: 4px; +} + +.pagination > li { + display: inline; +} + +.pagination > li > a, +.pagination > li > span { + position: relative; + float: left; + padding: 6px 12px; + margin-left: -1px; + line-height: 1.428571429; + text-decoration: none; + background-color: #ffffff; + border: 1px solid #dddddd; +} + +.pagination > li:first-child > a, +.pagination > li:first-child > span { + margin-left: 0; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} + +.pagination > li:last-child > a, +.pagination > li:last-child > span { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.pagination > li > a:hover, +.pagination > li > span:hover, +.pagination > li > a:focus, +.pagination > li > span:focus { + background-color: #eeeeee; +} + +.pagination > .active > a, +.pagination > .active > span, +.pagination > .active > a:hover, +.pagination > .active > span:hover, +.pagination > .active > a:focus, +.pagination > .active > span:focus { + z-index: 2; + color: #ffffff; + cursor: default; + background-color: #428bca; + border-color: #428bca; +} + +.pagination > .disabled > span, +.pagination > .disabled > a, +.pagination > .disabled > a:hover, +.pagination > .disabled > a:focus { + color: #999999; + cursor: not-allowed; + background-color: #ffffff; + border-color: #dddddd; +} + +.pagination-lg > li > a, +.pagination-lg > li > span { + padding: 10px 16px; + font-size: 18px; +} + +.pagination-lg > li:first-child > a, +.pagination-lg > li:first-child > span { + border-bottom-left-radius: 6px; + border-top-left-radius: 6px; +} + +.pagination-lg > li:last-child > a, +.pagination-lg > li:last-child > span { + border-top-right-radius: 6px; + border-bottom-right-radius: 6px; +} + +.pagination-sm > li > a, +.pagination-sm > li > span { + padding: 5px 10px; + font-size: 12px; +} + +.pagination-sm > li:first-child > a, +.pagination-sm > li:first-child > span { + border-bottom-left-radius: 3px; + border-top-left-radius: 3px; +} + +.pagination-sm > li:last-child > a, +.pagination-sm > li:last-child > span { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; +} + +.pager { + padding-left: 0; + margin: 20px 0; + text-align: center; + list-style: none; +} + +.pager:before, +.pager:after { + display: table; + content: " "; +} + +.pager:after { + clear: both; +} + +.pager:before, +.pager:after { + display: table; + content: " "; +} + +.pager:after { + clear: both; +} + +.pager li { + display: inline; +} + +.pager li > a, +.pager li > span { + display: inline-block; + padding: 5px 14px; + background-color: #ffffff; + border: 1px solid #dddddd; + border-radius: 15px; +} + +.pager li > a:hover, +.pager li > a:focus { + text-decoration: none; + background-color: #eeeeee; +} + +.pager .next > a, +.pager .next > span { + float: right; +} + +.pager .previous > a, +.pager .previous > span { + float: left; +} + +.pager .disabled > a, +.pager .disabled > a:hover, +.pager .disabled > a:focus, +.pager .disabled > span { + color: #999999; + cursor: not-allowed; + background-color: #ffffff; +} \ No newline at end of file diff --git a/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj b/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj index 548b119..812fc70 100644 --- a/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj +++ b/Vrh.Web.Reporting/Vrh.Web.Reporting.csproj @@ -290,17 +290,17 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\VRH.Log4Pro.WebTools.1.12.5\lib\net451\VRH.Log4Pro.WebTools.dll + + ..\packages\VRH.Log4Pro.WebTools.1.14.0\lib\net451\VRH.Log4Pro.WebTools.dll - - ..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll + + ..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\Vrh.Web.FileManager.1.7.0\lib\net462\Vrh.Web.FileManager.Lib.dll @@ -311,11 +311,11 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.WebForm.2.8.3\lib\net462\Vrh.WebForm.Lib.dll + + ..\packages\Vrh.WebForm.2.9.0\lib\net462\Vrh.WebForm.Lib.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll ..\packages\WebActivatorEx.2.2.0\lib\net40\WebActivatorEx.dll @@ -599,6 +599,7 @@ + @@ -666,10 +667,6 @@ - - - - @@ -692,6 +689,10 @@ + + + + @@ -882,18 +883,24 @@ + + + + + + + + + + Always + - - - - - @@ -1151,20 +1158,14 @@ - - - - - Always - + - diff --git a/Vrh.Web.Reporting/packages.config b/Vrh.Web.Reporting/packages.config index 678b79e..a3da1c0 100644 --- a/Vrh.Web.Reporting/packages.config +++ b/Vrh.Web.Reporting/packages.config @@ -104,15 +104,15 @@ - - + + - + - - + + \ No newline at end of file diff --git a/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj b/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj index 17b7ea8..66386a5 100644 --- a/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj +++ b/Vrh.Web.iScheduler.Lib/Vrh.Web.iScheduler.Lib.csproj @@ -262,14 +262,14 @@ ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll ..\packages\WebGrease.1.6.0\lib\WebGrease.dll diff --git a/Vrh.Web.iScheduler.Lib/packages.config b/Vrh.Web.iScheduler.Lib/packages.config index 13746c9..bb724d4 100644 --- a/Vrh.Web.iScheduler.Lib/packages.config +++ b/Vrh.Web.iScheduler.Lib/packages.config @@ -60,8 +60,8 @@ - + - + \ No newline at end of file diff --git a/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj b/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj index 01a2cc4..e045928 100644 --- a/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj +++ b/Vrh.Web.iScheduler.Report.Lib/Vrh.Web.iScheduler.Report.Lib.csproj @@ -116,14 +116,14 @@ ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll - - ..\packages\Vrh.Web.Common.Lib.2.20.3\lib\net451\Vrh.Web.Common.Lib.dll + + ..\packages\Vrh.Web.Common.Lib.2.21.2\lib\net451\Vrh.Web.Common.Lib.dll ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.Web.iScheduler.Report.Lib/packages.config b/Vrh.Web.iScheduler.Report.Lib/packages.config index bae9f62..20484af 100644 --- a/Vrh.Web.iScheduler.Report.Lib/packages.config +++ b/Vrh.Web.iScheduler.Report.Lib/packages.config @@ -15,7 +15,7 @@ - + - + \ No newline at end of file diff --git a/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj b/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj index 3383ac1..beca627 100644 --- a/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj +++ b/Vrh.iScheduler.Report/Vrh.iScheduler.Report.csproj @@ -117,8 +117,8 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.iScheduler.Report/packages.config b/Vrh.iScheduler.Report/packages.config index c7761fe..f399793 100644 --- a/Vrh.iScheduler.Report/packages.config +++ b/Vrh.iScheduler.Report/packages.config @@ -16,5 +16,5 @@ - + \ No newline at end of file diff --git a/Vrh.iScheduler/Vrh.iScheduler.csproj b/Vrh.iScheduler/Vrh.iScheduler.csproj index 8abb8f5..a292650 100644 --- a/Vrh.iScheduler/Vrh.iScheduler.csproj +++ b/Vrh.iScheduler/Vrh.iScheduler.csproj @@ -124,8 +124,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll + + ..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll @@ -133,8 +133,8 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/Vrh.iScheduler/packages.config b/Vrh.iScheduler/packages.config index a033fba..a7bb470 100644 --- a/Vrh.iScheduler/packages.config +++ b/Vrh.iScheduler/packages.config @@ -20,8 +20,8 @@ - + - + \ No newline at end of file diff --git a/iSchedulerMonitor/Plugins.Config.xml b/iSchedulerMonitor/Plugins.Config.xml index 19584fd..b185854 100644 --- a/iSchedulerMonitor/Plugins.Config.xml +++ b/iSchedulerMonitor/Plugins.Config.xml @@ -1,8 +1,6 @@  - + - - \ No newline at end of file diff --git a/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj b/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj index 3ecadce..54338c1 100644 --- a/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj +++ b/iSchedulerMonitor/iSchedulerMonitor.ACPlugin.csproj @@ -40,9 +40,6 @@ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\Vrh.ApplicationContainer.4.4.1\lib\net451\InstanceFactory.FromXML.dll - ..\packages\Microsoft.Report.Viewer.11.0.0.0\lib\net\Microsoft.ReportViewer.Common.dll @@ -100,8 +97,8 @@ - - ..\packages\Vrh.ApplicationContainer.4.4.1\lib\net451\Vrh.ApplicationContainer.dll + + ..\packages\Vrh.ApplicationContainer.5.0.2\lib\net451\Vrh.ApplicationContainer.dll ..\packages\Vrh.ApplicationContainer.Control.Contract.0.1.0\lib\net451\Vrh.ApplicationContainer.Control.Contract.dll @@ -118,8 +115,8 @@ ..\packages\VRH.Log4Pro.MultiLanguageManager.3.21.3\lib\net45\VRH.Log4Pro.MultiLanguageManager.dll - - ..\packages\Vrh.Logger.3.1.0\lib\net451\Vrh.Logger.dll + + ..\packages\Vrh.Logger.3.3.1\lib\net451\Vrh.Logger.dll ..\packages\Vrh.Membership.4.14.0\lib\net451\Vrh.Membership.dll @@ -133,8 +130,8 @@ ..\packages\VRH.Web.Providers.2.0.2\lib\net451\Vrh.Web.Providers.dll - - ..\packages\Vrh.XmlProcessing.2.0.7\lib\net45\Vrh.XmlProcessing.dll + + ..\packages\Vrh.XmlProcessing.2.3.0\lib\net45\Vrh.XmlProcessing.dll diff --git a/iSchedulerMonitor/packages.config b/iSchedulerMonitor/packages.config index cc59ebc..40de5e0 100644 --- a/iSchedulerMonitor/packages.config +++ b/iSchedulerMonitor/packages.config @@ -12,13 +12,13 @@ - + - + - + \ No newline at end of file -- libgit2 0.21.2