diff --git a/Nuvolar.Base/Nuvolar.Base.csproj b/Nuvolar.Base/Nuvolar.Base.csproj index 26afbfe..3f4ae95 100644 --- a/Nuvolar.Base/Nuvolar.Base.csproj +++ b/Nuvolar.Base/Nuvolar.Base.csproj @@ -9,8 +9,9 @@ Properties Nuvolar.Base Nuvolar.Base - v4.6.1 + v4.5.2 512 + true @@ -32,7 +33,7 @@ x86 - + ..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll diff --git a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj index cd8f347..94b385b 100644 --- a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj +++ b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -15,7 +15,7 @@ 3.5 - v4.0 + v4.5.2 publish\ true @@ -46,6 +46,7 @@ prompt 4 x86 + false none @@ -55,6 +56,7 @@ prompt 4 AnyCPU + false true @@ -64,6 +66,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false bin\x64\Release\ @@ -72,124 +75,131 @@ x64 prompt MinimumRecommendedRules.ruleset + false bin\R64\ + false bin\x64\R64\ + false - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + False - + + False - - + False - + + False - - + False - - False - - + False False - - + + False + False + + + False - + False - + False - + False - + False - + False - + False - + False - - + + False - + False - + False - + False - - - + False - - - - + + + False - + + + + False - + + False + + diff --git a/Nuvolar.Module.CSharp/Properties/licenses.licx b/Nuvolar.Module.CSharp/Properties/licenses.licx index b02c666..e69de29 100644 --- a/Nuvolar.Module.CSharp/Properties/licenses.licx +++ b/Nuvolar.Module.CSharp/Properties/licenses.licx @@ -1,3 +0,0 @@ -DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.ExpressApp.ViewController, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.ExpressApp.WindowController, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj b/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj index a9e5f55..f774d62 100644 --- a/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj +++ b/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,7 +10,7 @@ Properties Nuvolar.Module.Win.CSharp Nuvolar.Module.Win.CSharp - v4.0 + v4.5.2 @@ -46,6 +46,7 @@ prompt 4 x86 + false none @@ -54,6 +55,7 @@ TRACE prompt 4 + false true @@ -62,6 +64,7 @@ full AnyCPU prompt + false true @@ -71,6 +74,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false bin\x64\Release\ @@ -79,6 +83,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false true @@ -88,57 +93,59 @@ x64 prompt MinimumRecommendedRules.ruleset + false - + False - + False False - + False - + False - + False - + False - + False - + False - + False - + False - + False - - - + + + + False - - - - - - - - - - + + + + + + + + + + ..\packages\MySql.Data.6.9.12\lib\net40\MySql.Data.dll diff --git a/Nuvolar.Module.Win.CSharp/Properties/licenses.licx b/Nuvolar.Module.Win.CSharp/Properties/licenses.licx index 3aea0a8..e69de29 100644 --- a/Nuvolar.Module.Win.CSharp/Properties/licenses.licx +++ b/Nuvolar.Module.Win.CSharp/Properties/licenses.licx @@ -1,5 +0,0 @@ -DevExpress.ExpressApp.ModuleBase, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.ExpressApp.WindowController, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.Xpo.XPCollection, DevExpress.Xpo.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraScheduler.SchedulerControl, DevExpress.XtraScheduler.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Nuvolar.Module.Win/My Project/licenses.licx b/Nuvolar.Module.Win/My Project/licenses.licx index 2cc1b23..e69de29 100644 --- a/Nuvolar.Module.Win/My Project/licenses.licx +++ b/Nuvolar.Module.Win/My Project/licenses.licx @@ -1 +0,0 @@ -DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj b/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj index 2e1cac3..7709eac 100644 --- a/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj +++ b/Nuvolar.Module.Win/Nuvolar.Module.Win.vbproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -18,7 +18,7 @@ SAK SAK SAK - v4.0 + v4.5.2 4.0 @@ -112,6 +112,7 @@ x64 false AllRules.ruleset + false true @@ -122,6 +123,7 @@ x64 false AllRules.ruleset + false true @@ -133,6 +135,7 @@ full x64 AllRules.ruleset + false true @@ -142,126 +145,133 @@ pdbonly x64 AllRules.ruleset + false bin\R64\ + false bin\x64\R64\ + false - - - - - - - - + + + + + + + + False - - - + + + False - + False - + False - + False - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + False - + False - + False - + False - + False - + + False + + False False - - + + False - + False - + False - - - - + + + + False - + False - - - - - - + False - + + + + + + False - + False - - - - - - - - - - - - - - - - - - - - - + + False + + + + + + + + + + + + + + + + + + + + + C:\Program Files (x86)\Exontrol\ExG2antt.NET\Sample\exontrol.exg2antt.dll @@ -462,9 +472,7 @@ ServiceFinderVC.vb - - Component - + InventoryVC.vb @@ -699,9 +707,7 @@ DeliveryNoteOutVC.vb - - Component - + CRMEstateVC.vb @@ -736,9 +742,7 @@ OfferInRowsVC.vb - - Component - + OfferOutHeaderVC.vb @@ -748,9 +752,7 @@ OfferOutRowsVC.vb - - Component - + OffersOutPrintVC.vb @@ -766,21 +768,15 @@ ContractRowsFreeVC.vb - - Component - + ProductFinderVC.vb - - Component - + InventoryVC_ListView.vb - - Component - + StorageIn_VC.vb @@ -790,9 +786,7 @@ Subcontractor_VC.vb - - Component - + WorksheetVC.vb @@ -808,15 +802,11 @@ Worksheet_VC_ListView.vb - - Component - + CentralListViewVC.vb - - Component - + DragAndDropBusinessDirectory_VC.vb @@ -844,9 +834,7 @@ SplitterVC.vb - - Component - + @@ -878,9 +866,7 @@ DisableGridColumnsVC.vb - - Component - + ViewFilterContainerVC.vb @@ -954,9 +940,7 @@ GLRowsDivideVC.vb - - Component - + LiquidAssetsBallanceVC.vb @@ -1051,9 +1035,7 @@ OrderInRowsOtherVC.vb - - Component - + OrderOutVC.vb @@ -1076,9 +1058,7 @@ OrderVC.vb - - Component - + ContractsVC.vb @@ -1189,9 +1169,7 @@ HTMLEditorVC.vb - - Component - + SQLImportsVC.vb @@ -1283,9 +1261,7 @@ CustomRoleEditorVC.vb - - Component - + @@ -1298,9 +1274,7 @@ GridAutoWidthVC.vb - - Component - + ViewHintControllerVC.vb @@ -1316,9 +1290,7 @@ InLineEditVC.vb - - Component - + LogOnDB.vb @@ -1329,9 +1301,7 @@ MasterDetailVC.vb - - Component - + RichTextViewVC.vb @@ -1432,9 +1402,7 @@ StorageTransactionsVC.vb - - Component - + QuestionVC.vb @@ -1460,9 +1428,7 @@ WinGroupFooterViewController.vb - - Component - + WinModule.vb diff --git a/Nuvolar.Module/Functional Tests/Config.xml b/Nuvolar.Module/Functional Tests/Config.xml index e1a95f7..987c640 100644 --- a/Nuvolar.Module/Functional Tests/Config.xml +++ b/Nuvolar.Module/Functional Tests/Config.xml @@ -24,8 +24,8 @@ - - + + diff --git a/Nuvolar.Module/My Project/licenses.licx b/Nuvolar.Module/My Project/licenses.licx index f1ab4b8..8b13789 100644 --- a/Nuvolar.Module/My Project/licenses.licx +++ b/Nuvolar.Module/My Project/licenses.licx @@ -1,3 +1 @@ -DevExpress.ExpressApp.ViewController, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.ExpressApp.SystemModule.SystemModule, DevExpress.ExpressApp.v17.2, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/Nuvolar.Module/Nuvolar.Module.vbproj b/Nuvolar.Module/Nuvolar.Module.vbproj index 67618f7..caa3050 100644 --- a/Nuvolar.Module/Nuvolar.Module.vbproj +++ b/Nuvolar.Module/Nuvolar.Module.vbproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -18,7 +18,7 @@ SAK SAK SAK - v4.0 + v4.5.2 4.0 @@ -113,6 +113,7 @@ None AnyCPU AllRules.ruleset + false true @@ -124,6 +125,7 @@ x64 false AllRules.ruleset + false true @@ -134,6 +136,7 @@ x64 false AllRules.ruleset + false true @@ -145,6 +148,7 @@ full x64 AllRules.ruleset + false true @@ -154,6 +158,7 @@ None x64 AllRules.ruleset + false true @@ -163,87 +168,92 @@ None x64 AllRules.ruleset + false - - + + False - - - - + + + + False False - + False False - + False False - + False False - + False False - + False False - - - - - - - + + + + + + False False - + False False - + False False - - False - - - + False False - + + False + + + False False - - + False False - - - - - - - - - - - - - + + + + False + False + + + + + + + + + + + + + + ..\packages\Microsoft.Office.Interop.Excel.14.0.0.1\lib\net20\Microsoft.Office.Interop.Excel.dll True @@ -1476,9 +1486,7 @@ DBV_Dashboard_VC.vb - - Component - + @@ -1936,9 +1944,7 @@ LookupLinkController.vb - - Component - + SetDefaultCountryHungaryVC.vb @@ -1954,9 +1960,7 @@ ListViewProcess.vb - - Component - + LockObjectBeforeEditVC.vb @@ -1998,9 +2002,7 @@ RoundingController.vb - - Component - + @@ -2014,9 +2016,7 @@ TabEnterVC.vb - - Component - + diff --git a/Nuvolar.WIN.Company/Nuvolar.Win.Company.vbproj b/Nuvolar.WIN.Company/Nuvolar.Win.Company.vbproj index 81c2f44..8fc2a55 100644 --- a/Nuvolar.WIN.Company/Nuvolar.Win.Company.vbproj +++ b/Nuvolar.WIN.Company/Nuvolar.Win.Company.vbproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -20,7 +20,7 @@ SAK SAK SAK - v4.0 + v4.5.2 4.0 @@ -117,6 +117,7 @@ x64 false AllRules.ruleset + false true @@ -127,6 +128,7 @@ x64 false AllRules.ruleset + false true @@ -138,6 +140,7 @@ full x64 AllRules.ruleset + false true @@ -147,173 +150,182 @@ pdbonly x64 AllRules.ruleset + false - + False True - - - + + + False - - - + + + False True - + False True - + False True - + False True - + True - - - + + + True - + True - + False True - + True - + True - - + + True - + True - - - + + + True - + True - + True - + True - + True - + False True - + False True - + False True - + False True - + False True - + False True - + False True - - True - - + False True - + + True + + False True - + False True - - - - + False True - + + + + False True - - - - - - True - - + False True - + False True - + + + + + + True + + False True - + False True - + False True - - - - - - - - - - - - + + False + True + + + False + True + + + + + + + + + + + + + ..\packages\Npgsql.2.2.7\lib\net40\Mono.Security.dll True diff --git a/Nuvolar.Web.Company/Controls/DashboardViewer.aspx b/Nuvolar.Web.Company/Controls/DashboardViewer.aspx index c300103..f1f2dbd 100644 --- a/Nuvolar.Web.Company/Controls/DashboardViewer.aspx +++ b/Nuvolar.Web.Company/Controls/DashboardViewer.aspx @@ -1,6 +1,6 @@ <%@ Page Language="vb" AutoEventWireup="false" CodeBehind="DashboardViewer.aspx.vb" Inherits=".DashboardViewer" %> -<%@ Register assembly="DevExpress.Dashboard.v17.2.Web, Version=17.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.DashboardWeb" tagprefix="dx" %> +<%@ Register assembly="DevExpress.Dashboard.v20.1.Web.WebForms, Version=20.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" namespace="DevExpress.DashboardWeb" tagprefix="dx" %> diff --git a/Nuvolar.Web.Company/Default.aspx b/Nuvolar.Web.Company/Default.aspx index 839bf6b..c1694c4 100644 --- a/Nuvolar.Web.Company/Default.aspx +++ b/Nuvolar.Web.Company/Default.aspx @@ -1,8 +1,8 @@ <%@ Page Language="VB" AutoEventWireup="true" Inherits="Default" EnableViewState="false" ValidateRequest="false" CodeBehind="Default.aspx.vb" %> -<%@ Register Assembly="DevExpress.ExpressApp.Web.v17.2" Namespace="DevExpress.ExpressApp.Web.Templates" +<%@ Register Assembly="DevExpress.ExpressApp.Web.v20.1" Namespace="DevExpress.ExpressApp.Web.Templates" TagPrefix="cc3" %> -<%@ Register Assembly="DevExpress.ExpressApp.Web.v17.2" Namespace="DevExpress.ExpressApp.Web.Controls" +<%@ Register Assembly="DevExpress.ExpressApp.Web.v20.1" Namespace="DevExpress.ExpressApp.Web.Controls" TagPrefix="cc4" %> diff --git a/Nuvolar.Web.Company/Login.aspx b/Nuvolar.Web.Company/Login.aspx index de69b89..686750a 100644 --- a/Nuvolar.Web.Company/Login.aspx +++ b/Nuvolar.Web.Company/Login.aspx @@ -1,11 +1,11 @@ <%@ Page Language="C#" AutoEventWireup="true" Inherits="LoginPage" CodeBehind="Login.aspx.cs" %> -<%@ Register Assembly="DevExpress.ExpressApp.Web.v17.2" Namespace="DevExpress.ExpressApp.Web.Templates.ActionContainers" +<%@ Register Assembly="DevExpress.ExpressApp.Web.v20.1" Namespace="DevExpress.ExpressApp.Web.Templates.ActionContainers" TagPrefix="cc2" %> -<%@ Register Assembly="DevExpress.ExpressApp.Web.v17.2" Namespace="DevExpress.ExpressApp.Web.Templates.Controls" +<%@ Register Assembly="DevExpress.ExpressApp.Web.v20.1" Namespace="DevExpress.ExpressApp.Web.Templates.Controls" TagPrefix="tc" %> -<%@ Register Assembly="DevExpress.ExpressApp.Web.v17.2" Namespace="DevExpress.ExpressApp.Web.Controls" +<%@ Register Assembly="DevExpress.ExpressApp.Web.v20.1" Namespace="DevExpress.ExpressApp.Web.Controls" TagPrefix="cc4" %> -<%@ Register Assembly="DevExpress.ExpressApp.Web.v17.2" Namespace="DevExpress.ExpressApp.Web.Templates" +<%@ Register Assembly="DevExpress.ExpressApp.Web.v20.1" Namespace="DevExpress.ExpressApp.Web.Templates" TagPrefix="cc3" %> diff --git a/Nuvolar.Web.Company/Web.Config b/Nuvolar.Web.Company/Web.Config index 9c28b67..2c2a46c 100644 --- a/Nuvolar.Web.Company/Web.Config +++ b/Nuvolar.Web.Company/Web.Config @@ -9,10 +9,10 @@ -
-
-
-
+
+
+
+
@@ -44,36 +44,36 @@ - - + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,13 +140,14 @@ - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -139,28 +141,29 @@ - - - - - - - + + + + + + + + - - + + - + - + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,13 +140,14 @@ - - - - - - - + + + + + + + +