diff --git a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj index 159b935..24aabb3 100644 --- a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj +++ b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Data/DevExpress.DevAV.Data.csproj @@ -1,67 +1,67 @@ - - - netcoreapp3.0 - Library - false - false - false - SAK - SAK - SAK - SAK - true - Debug;DebugTest;Release;Debug;RemoteDebug - DevExpress.DevAV - DevExpress.DevAV.v19.1.Data - - - ..\..\bin\ - TRACE;DEBUG;DEVAV;DXCORE3 - - - ..\..\bin\ - TRACE;DEVAV;DXCORE3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + netcoreapp3.0 + Library + false + false + false + SAK + SAK + SAK + SAK + true + Debug;Release + DevExpress.DevAV + DevExpress.DevAV.v19.1.Data + + + ..\..\bin\ + TRACE;DEBUG;DEVAV;DXCORE3 + + + ..\..\bin\ + TRACE;DEVAV;DXCORE3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj index 4a52d13..9a082bb 100644 --- a/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj +++ b/OutlookInspiredApp/DevExpress.DevAV/DevExpress.DevAV.Reports/DevExpress.DevAV.Reports.csproj @@ -1,147 +1,147 @@ - - - netcoreapp3.0 - Library - false - false - false - SAK - SAK - SAK - SAK - true - Debug;Release - DevExpress.DevAV.Reports - DevExpress.DevAV.v19.1.Reports - - - ..\..\bin\ - DEBUG;TRACE - - - ..\..\bin\ - TRACE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SalesRevenueAnalysisReport.cs - - - SalesRevenueReport.cs - - - FedExGroundLabel.cs - - - CustomerContactsDirectory.cs - - - CustomerLocationsDirectory.cs - - - CustomerProfile.cs - - - CustomerSalesDetail.cs - - - CustomerSalesDetailReport.cs - - - CustomerSalesSummary.cs - - - CustomerSalesSummaryReport.cs - - - EmployeeDirectory.cs - - - EmployeeProfile.cs - - - EmployeeSummary.cs - - - EmployeeTaskList.cs - - - ProductProfile.cs - - - ProductOrders.cs - - - ProductSalesSummary.cs - - - ProductTopSalesperson.cs - - - SalesAnalysis.cs - - - SalesAnalysisReport.cs - - - SalesInvoice.cs - - - SalesOrdersSummary.cs - - - SalesOrdersSummaryReport.cs - - - TaskListReport.cs - - - TaskDetailReport.cs - - - - - - - - - - + + + netcoreapp3.0 + Library + false + false + false + SAK + SAK + SAK + SAK + true + Debug;Release + DevExpress.DevAV.Reports + DevExpress.DevAV.v19.1.Reports + + + ..\..\bin\ + DEBUG;TRACE + + + ..\..\bin\ + TRACE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SalesRevenueAnalysisReport.cs + + + SalesRevenueReport.cs + + + FedExGroundLabel.cs + + + CustomerContactsDirectory.cs + + + CustomerLocationsDirectory.cs + + + CustomerProfile.cs + + + CustomerSalesDetail.cs + + + CustomerSalesDetailReport.cs + + + CustomerSalesSummary.cs + + + CustomerSalesSummaryReport.cs + + + EmployeeDirectory.cs + + + EmployeeProfile.cs + + + EmployeeSummary.cs + + + EmployeeTaskList.cs + + + ProductProfile.cs + + + ProductOrders.cs + + + ProductSalesSummary.cs + + + ProductTopSalesperson.cs + + + SalesAnalysis.cs + + + SalesAnalysisReport.cs + + + SalesInvoice.cs + + + SalesOrdersSummary.cs + + + SalesOrdersSummaryReport.cs + + + TaskListReport.cs + + + TaskDetailReport.cs + + + + + + + + + + \ No newline at end of file diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp.sln b/OutlookInspiredApp/DevExpress.OutlookInspiredApp.sln index 291beea..710432b 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp.sln +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp.sln @@ -12,35 +12,21 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - DebugTest|Any CPU = DebugTest|Any CPU Release|Any CPU = Release|Any CPU - RemoteDebug|Any CPU = RemoteDebug|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.DebugTest|Any CPU.ActiveCfg = DebugTest|Any CPU - {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.DebugTest|Any CPU.Build.0 = DebugTest|Any CPU {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.Release|Any CPU.Build.0 = Release|Any CPU - {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.RemoteDebug|Any CPU.ActiveCfg = RemoteDebug|Any CPU - {81BE8E61-B408-490D-BFB4-EFC2ABAC9B1F}.RemoteDebug|Any CPU.Build.0 = RemoteDebug|Any CPU {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.DebugTest|Any CPU.ActiveCfg = Debug|Any CPU - {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.DebugTest|Any CPU.Build.0 = Debug|Any CPU {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.Release|Any CPU.Build.0 = Release|Any CPU - {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.RemoteDebug|Any CPU.ActiveCfg = Debug|Any CPU - {0C1E2088-333A-4F3B-B1C5-4BC5DBFC3482}.RemoteDebug|Any CPU.Build.0 = Debug|Any CPU {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.DebugTest|Any CPU.ActiveCfg = DebugTest|Any CPU - {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.DebugTest|Any CPU.Build.0 = DebugTest|Any CPU {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.Release|Any CPU.Build.0 = Release|Any CPU - {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.RemoteDebug|Any CPU.ActiveCfg = Debug|Any CPU - {3932816E-D0B4-08A9-2715-8D5B7DC201D8}.RemoteDebug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj index 84d9d9b..a847e9a 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/DevExpress.OutlookInspiredApp.csproj @@ -4,7 +4,7 @@ netcoreapp3.0 WinExe False - Debug;Release;DebugTest + Debug;Release False False DevExpress.DevAV @@ -1237,9 +1237,9 @@ - - - + + + diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Customers/CustomerMapView.cs b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Customers/CustomerMapView.cs index 61cf53e..c5bd6f7 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Customers/CustomerMapView.cs +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Customers/CustomerMapView.cs @@ -60,7 +60,7 @@ ribbonControl.ApplicationDocumentCaption = customer.Name; } void UpdateChart(DevAV.MapItem salesItem) { - chart.Series[0].Colorizer = colorizer1; + chart.Series[0].View.Colorizer = colorizer1; chart.DataSource = ViewModel.GetSalesByCity(salesItem.City, ViewModel.Period).ToList(); } void UpdateColors() { diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Products/ProductMapView.cs b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Products/ProductMapView.cs index b146ab5..ba3d6da 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Products/ProductMapView.cs +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Products/ProductMapView.cs @@ -61,7 +61,7 @@ ribbonControl.ApplicationDocumentCaption = product.Name; } void UpdateChart(DevAV.MapItem salesItem) { - chart.Series[0].Colorizer = keyColorColorizer as DevExpress.XtraCharts.IColorizer; + chart.Series[0].View.Colorizer = keyColorColorizer as DevExpress.XtraCharts.IColorizer; chart.DataSource = ViewModel.GetSalesByCity(salesItem.City, ViewModel.Period).ToList(); } void UpdateColors() { diff --git a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Sales/OrderEditView.Designer.cs b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Sales/OrderEditView.Designer.cs index 596f0f5..447417d 100644 --- a/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Sales/OrderEditView.Designer.cs +++ b/OutlookInspiredApp/DevExpress.OutlookInspiredApp/Modules/Sales/OrderEditView.Designer.cs @@ -574,8 +574,8 @@ this.spreadsheetControl1.Location = new System.Drawing.Point(0, 141); this.spreadsheetControl1.MenuManager = this.ribbonControl; this.spreadsheetControl1.Name = "spreadsheetControl1"; - this.spreadsheetControl1.Options.Import.Csv.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Csv.Encoding"))); - this.spreadsheetControl1.Options.Import.Txt.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Txt.Encoding"))); + //this.spreadsheetControl1.Options.Import.Csv.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Csv.Encoding"))); + //this.spreadsheetControl1.Options.Import.Txt.Encoding = ((System.Text.Encoding)(resources.GetObject("spreadsheetControl1.Options.Import.Txt.Encoding"))); this.spreadsheetControl1.Options.View.ShowColumnHeaders = false; this.spreadsheetControl1.Options.View.ShowPrintArea = false; this.spreadsheetControl1.Options.View.ShowRowHeaders = false; diff --git a/StockMarketTraderApp/Devexpress.StockMarketTrader.csproj b/StockMarketTraderApp/Devexpress.StockMarketTrader.csproj index fbbd73a..f7fa1ea 100644 --- a/StockMarketTraderApp/Devexpress.StockMarketTrader.csproj +++ b/StockMarketTraderApp/Devexpress.StockMarketTrader.csproj @@ -8,8 +8,8 @@ - - + +