Skip to content

Commit 08b39d9

Browse files
arkady15arkady15
authored
Merge pull request #75 from DevExpress-Examples/25.1.2-beta
fix build
2 parents 8fd75a3 + fa9cba5 commit 08b39d9

File tree

8 files changed

+77
-98
lines changed

8 files changed

+77
-98
lines changed

‎CS/Directory.Packages.props

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,57 +3,57 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="DevExpress.Blazor.PdfViewer" Version="25.1.2-beta-25133" />
7-
<PackageVersion Include="DevExpress.Document.Processor" Version="25.1.2-beta-25133" />
8-
<PackageVersion Include="DevExpress.Drawing.Skia" Version="25.1.2-beta-25133" />
9-
<PackageVersion Include="DevExpress.ExpressApp" Version="25.1.2-beta-25133" />
10-
<PackageVersion Include="DevExpress.ExpressApp.Api.EFCore.All" Version="25.1.2-beta-25133" />
11-
<PackageVersion Include="DevExpress.ExpressApp.Blazor" Version="25.1.2-beta-25133" />
12-
<PackageVersion Include="DevExpress.ExpressApp.Chart" Version="25.1.2-beta-25133" />
13-
<PackageVersion Include="DevExpress.ExpressApp.Chart.Win" Version="25.1.2-beta-25133" />
14-
<PackageVersion Include="DevExpress.ExpressApp.CodeAnalysis" Version="25.1.2-beta-25133" />
15-
<PackageVersion Include="DevExpress.ExpressApp.ConditionalAppearance" Version="25.1.2-beta-25133" />
16-
<PackageVersion Include="DevExpress.ExpressApp.Dashboards" Version="25.1.2-beta-25133" />
17-
<PackageVersion Include="DevExpress.ExpressApp.Dashboards.Blazor" Version="25.1.2-beta-25133" />
18-
<PackageVersion Include="DevExpress.ExpressApp.Dashboards.Win" Version="25.1.2-beta-25133" />
19-
<PackageVersion Include="DevExpress.ExpressApp.EFCore" Version="25.1.2-beta-25133" />
20-
<PackageVersion Include="DevExpress.ExpressApp.FileAttachment.Blazor" Version="25.1.2-beta-25133" />
21-
<PackageVersion Include="DevExpress.ExpressApp.FileAttachment.Win" Version="25.1.2-beta-25133" />
22-
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.AspNetCore.EFCore" Version="25.1.2-beta-25133" />
23-
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.Blazor.EFCore" Version="25.1.2-beta-25133" />
24-
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.EFCore" Version="25.1.2-beta-25133" />
25-
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.Win.EFCore" Version="25.1.2-beta-25133" />
26-
<PackageVersion Include="DevExpress.ExpressApp.Notifications" Version="25.1.2-beta-25133" />
27-
<PackageVersion Include="DevExpress.ExpressApp.Notifications.Win" Version="25.1.2-beta-25133" />
28-
<PackageVersion Include="DevExpress.ExpressApp.Objects" Version="25.1.2-beta-25133" />
29-
<PackageVersion Include="DevExpress.ExpressApp.Office" Version="25.1.2-beta-25133" />
30-
<PackageVersion Include="DevExpress.ExpressApp.Office.Blazor" Version="25.1.2-beta-25133" />
31-
<PackageVersion Include="DevExpress.ExpressApp.Office.Win" Version="25.1.2-beta-25133" />
32-
<PackageVersion Include="DevExpress.ExpressApp.PivotChart" Version="25.1.2-beta-25133" />
33-
<PackageVersion Include="DevExpress.ExpressApp.PivotChart.Win" Version="25.1.2-beta-25133" />
34-
<PackageVersion Include="DevExpress.ExpressApp.PivotGrid" Version="25.1.2-beta-25133" />
35-
<PackageVersion Include="DevExpress.ExpressApp.PivotGrid.Win" Version="25.1.2-beta-25133" />
36-
<PackageVersion Include="DevExpress.ExpressApp.ReportsV2" Version="25.1.2-beta-25133" />
37-
<PackageVersion Include="DevExpress.ExpressApp.ReportsV2.Blazor" Version="25.1.2-beta-25133" />
38-
<PackageVersion Include="DevExpress.ExpressApp.ReportsV2.Win" Version="25.1.2-beta-25133" />
39-
<PackageVersion Include="DevExpress.ExpressApp.Scheduler" Version="25.1.2-beta-25133" />
40-
<PackageVersion Include="DevExpress.ExpressApp.Scheduler.Blazor" Version="25.1.2-beta-25133" />
41-
<PackageVersion Include="DevExpress.ExpressApp.Scheduler.Win" Version="25.1.2-beta-25133" />
42-
<PackageVersion Include="DevExpress.ExpressApp.Security.AspNetCore.EFCore" Version="25.1.2-beta-25133" />
43-
<PackageVersion Include="DevExpress.ExpressApp.Security.EFCore.Extensions.Win" Version="25.1.2-beta-25133" />
44-
<PackageVersion Include="DevExpress.ExpressApp.TreeListEditors" Version="25.1.2-beta-25133" />
45-
<PackageVersion Include="DevExpress.ExpressApp.TreeListEditors.Win" Version="25.1.2-beta-25133" />
46-
<PackageVersion Include="DevExpress.ExpressApp.Validation" Version="25.1.2-beta-25133" />
47-
<PackageVersion Include="DevExpress.ExpressApp.Validation.Blazor" Version="25.1.2-beta-25133" />
48-
<PackageVersion Include="DevExpress.ExpressApp.Validation.Win" Version="25.1.2-beta-25133" />
49-
<PackageVersion Include="DevExpress.ExpressApp.ViewVariantsModule" Version="25.1.2-beta-25133" />
50-
<PackageVersion Include="DevExpress.ExpressApp.Win" Version="25.1.2-beta-25133" />
51-
<PackageVersion Include="DevExpress.ExpressApp.Win.Design" Version="25.1.2-beta-25133" />
52-
<PackageVersion Include="DevExpress.Persistent.Base" Version="25.1.2-beta-25133" />
53-
<PackageVersion Include="DevExpress.Persistent.BaseImpl.EFCore" Version="25.1.2-beta-25133" />
54-
<PackageVersion Include="DevExpress.RichEdit.Export" Version="25.1.2-beta-25133" />
55-
<PackageVersion Include="DevExpress.Win.Design" Version="25.1.2-beta-25133" />
56-
<PackageVersion Include="DevExpress.Win.Map" Version="25.1.2-beta-25133" />
6+
<PackageVersion Include="DevExpress.Blazor.PdfViewer" Version="25.1.2-beta" />
7+
<PackageVersion Include="DevExpress.Document.Processor" Version="25.1.2-beta" />
8+
<PackageVersion Include="DevExpress.Drawing.Skia" Version="25.1.2-beta" />
9+
<PackageVersion Include="DevExpress.ExpressApp" Version="25.1.2-beta" />
10+
<PackageVersion Include="DevExpress.ExpressApp.Api.EFCore.All" Version="25.1.2-beta" />
11+
<PackageVersion Include="DevExpress.ExpressApp.Blazor" Version="25.1.2-beta" />
12+
<PackageVersion Include="DevExpress.ExpressApp.Chart" Version="25.1.2-beta" />
13+
<PackageVersion Include="DevExpress.ExpressApp.Chart.Win" Version="25.1.2-beta" />
14+
<PackageVersion Include="DevExpress.ExpressApp.CodeAnalysis" Version="25.1.2-beta" />
15+
<PackageVersion Include="DevExpress.ExpressApp.ConditionalAppearance" Version="25.1.2-beta" />
16+
<PackageVersion Include="DevExpress.ExpressApp.Dashboards" Version="25.1.2-beta" />
17+
<PackageVersion Include="DevExpress.ExpressApp.Dashboards.Blazor" Version="25.1.2-beta" />
18+
<PackageVersion Include="DevExpress.ExpressApp.Dashboards.Win" Version="25.1.2-beta" />
19+
<PackageVersion Include="DevExpress.ExpressApp.EFCore" Version="25.1.2-beta" />
20+
<PackageVersion Include="DevExpress.ExpressApp.FileAttachment.Blazor" Version="25.1.2-beta" />
21+
<PackageVersion Include="DevExpress.ExpressApp.FileAttachment.Win" Version="25.1.2-beta" />
22+
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.AspNetCore.EFCore" Version="25.1.2-beta" />
23+
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.Blazor.EFCore" Version="25.1.2-beta" />
24+
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.EFCore" Version="25.1.2-beta" />
25+
<PackageVersion Include="DevExpress.ExpressApp.MultiTenancy.Win.EFCore" Version="25.1.2-beta" />
26+
<PackageVersion Include="DevExpress.ExpressApp.Notifications" Version="25.1.2-beta" />
27+
<PackageVersion Include="DevExpress.ExpressApp.Notifications.Win" Version="25.1.2-beta" />
28+
<PackageVersion Include="DevExpress.ExpressApp.Objects" Version="25.1.2-beta" />
29+
<PackageVersion Include="DevExpress.ExpressApp.Office" Version="25.1.2-beta" />
30+
<PackageVersion Include="DevExpress.ExpressApp.Office.Blazor" Version="25.1.2-beta" />
31+
<PackageVersion Include="DevExpress.ExpressApp.Office.Win" Version="25.1.2-beta" />
32+
<PackageVersion Include="DevExpress.ExpressApp.PivotChart" Version="25.1.2-beta" />
33+
<PackageVersion Include="DevExpress.ExpressApp.PivotChart.Win" Version="25.1.2-beta" />
34+
<PackageVersion Include="DevExpress.ExpressApp.PivotGrid" Version="25.1.2-beta" />
35+
<PackageVersion Include="DevExpress.ExpressApp.PivotGrid.Win" Version="25.1.2-beta" />
36+
<PackageVersion Include="DevExpress.ExpressApp.ReportsV2" Version="25.1.2-beta" />
37+
<PackageVersion Include="DevExpress.ExpressApp.ReportsV2.Blazor" Version="25.1.2-beta" />
38+
<PackageVersion Include="DevExpress.ExpressApp.ReportsV2.Win" Version="25.1.2-beta" />
39+
<PackageVersion Include="DevExpress.ExpressApp.Scheduler" Version="25.1.2-beta" />
40+
<PackageVersion Include="DevExpress.ExpressApp.Scheduler.Blazor" Version="25.1.2-beta" />
41+
<PackageVersion Include="DevExpress.ExpressApp.Scheduler.Win" Version="25.1.2-beta" />
42+
<PackageVersion Include="DevExpress.ExpressApp.Security.AspNetCore.EFCore" Version="25.1.2-beta" />
43+
<PackageVersion Include="DevExpress.ExpressApp.Security.EFCore.Extensions.Win" Version="25.1.2-beta" />
44+
<PackageVersion Include="DevExpress.ExpressApp.TreeListEditors" Version="25.1.2-beta" />
45+
<PackageVersion Include="DevExpress.ExpressApp.TreeListEditors.Win" Version="25.1.2-beta" />
46+
<PackageVersion Include="DevExpress.ExpressApp.Validation" Version="25.1.2-beta" />
47+
<PackageVersion Include="DevExpress.ExpressApp.Validation.Blazor" Version="25.1.2-beta" />
48+
<PackageVersion Include="DevExpress.ExpressApp.Validation.Win" Version="25.1.2-beta" />
49+
<PackageVersion Include="DevExpress.ExpressApp.ViewVariantsModule" Version="25.1.2-beta" />
50+
<PackageVersion Include="DevExpress.ExpressApp.Win" Version="25.1.2-beta" />
51+
<PackageVersion Include="DevExpress.ExpressApp.Win.Design" Version="25.1.2-beta" />
52+
<PackageVersion Include="DevExpress.Persistent.Base" Version="25.1.2-beta" />
53+
<PackageVersion Include="DevExpress.Persistent.BaseImpl.EFCore" Version="25.1.2-beta" />
54+
<PackageVersion Include="DevExpress.RichEdit.Export" Version="25.1.2-beta" />
55+
<PackageVersion Include="DevExpress.Win.Design" Version="25.1.2-beta" />
56+
<PackageVersion Include="DevExpress.Win.Map" Version="25.1.2-beta" />
5757
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
5858
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.WindowsForms" Version="8.0.91" />
5959
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0" />
@@ -65,6 +65,8 @@
6565
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
6666
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
6767
<PackageVersion Include="System.Drawing.Common" Version="8.0.15" />
68+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.10.0" />
6869
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
70+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0" />
6971
</ItemGroup>
7072
</Project>

‎CS/OutlookInspired.Blazor.Server/Features/Maps/SalesMapItemDxChartListEditorController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected override void OnDeactivated() {
3131
private void ChartListEditorOnControlsCreated(object sender, EventArgs args) {
3232
_chartListEditor.ChartModel.CustomizeSeriesPoint = e
3333
=> e.PointAppearance.Color = ColorTranslator.FromHtml(e.Point.DataItems.Cast<MapItem>().First().Color);
34-
_chartListEditor.SettingsType = IsCustomer ? typeof(SalesProductChart) : typeof(SalesCustomerChart);
34+
_chartListEditor.SettingType = IsCustomer ? typeof(SalesProductChart) : typeof(SalesCustomerChart);
3535

3636
var mapItemListEditor = View.GetItems<ListPropertyEditor>()
3737
.Select(editor => editor.ListView?.Editor).OfType<MapItemListEditor>().First();

‎CS/OutlookInspired.Blazor.Server/Model.xafml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<NavigationItems NavigationStyle="Accordion" />
44
<Options UIType="TabbedMDI" RestoreTabbedMdiLayout="True" />
55
<SchemaModules>
6-
<SchemaModule Name="SchedulerBlazorModule" Version="24.2.1.0" IsNewNode="True" />
7-
<SchemaModule Name="SchedulerModuleBase" Version="24.2.1.0" IsNewNode="True" />
8-
<SchemaModule Name="SystemModule" Version="24.2.1.0" IsNewNode="True" />
6+
<SchemaModule Name="SchedulerBlazorModule" Version="25.1.2.0" IsNewNode="True" />
7+
<SchemaModule Name="SchedulerModuleBase" Version="25.1.2.0" IsNewNode="True" />
8+
<SchemaModule Name="SystemModule" Version="25.1.2.0" IsNewNode="True" />
99
</SchemaModules>
1010
<Views DefaultListEditor="DevExpress.ExpressApp.Blazor.Editors.DxGridListEditor">
1111
<DetailView Id="BlazorRichTextMailMergeObject_DetailView" Caption="Document">
@@ -62,7 +62,6 @@
6262
</DetailView>
6363
<ListView Id="Customer_ListView">
6464
<Columns>
65-
<ColumnInfo Id="Logo" Index="0" ImageEditorFixedWidth="0" ImageEditorFixedHeight="0" ImageEditorCustomHeight="30" MinWidth="30" Width="30" Caption=" " ToolTip="Logo" />
6665
<ColumnInfo Id="Name" Index="1">
6766
<Summary>
6867
<ColumnSummaryItem Id="Count" SummaryType="Count" IsNewNode="True" />
@@ -259,11 +258,9 @@
259258
</ListView>
260259
<ListView Id="Employee_Evaluations_ListView_Child" EditorTypeName="DevExpress.ExpressApp.Blazor.Editors.DxGridListEditor">
261260
<Columns>
262-
<ColumnInfo Id="Bonus" Index="-1" />
263261
<ColumnInfo Id="Description" Index="-1" />
264262
<ColumnInfo Id="EndOn" Index="-1" />
265263
<ColumnInfo Id="Manager" Index="-1" />
266-
<ColumnInfo Id="Raise" Index="-1" />
267264
<ColumnInfo Id="StartOn" Index="-1" SortIndex="0" SortOrder="Descending" />
268265
<ColumnInfo Id="Subject" Index="0" SortIndex="-1" SortOrder="None" />
269266
</Columns>
@@ -331,8 +328,7 @@
331328
</Layout>
332329
</DetailView>
333330
<ListView Id="Evaluation_ListView" SchedulerViewType="Month" SelectedIntervalEnd="2019-12-31" SelectedIntervalStart="2019-12-01" ResourceClass="OutlookInspired.Module.BusinessObjects.Employee" />
334-
<DashboardView Id="Opportunities" />
335-
<ListView Id="Opportunity_ListView" EditorTypeName="DevExpress.ExpressApp.Blazor.Editors.DxChartListEditor" SettingsTypeName="OutlookInspired.Blazor.Server.Charts.OpportunityPieChart" ChartType="DxPieChart" />
331+
<ListView Id="Opportunity_ListView" EditorTypeName="DevExpress.ExpressApp.Blazor.Editors.DxChartListEditor" SettingTypeName="OutlookInspired.Blazor.Server.Charts.OpportunityPieChart" ChartType="DxPieChart" />
336332
<DetailView Id="Order_DetailView">
337333
<Layout>
338334
<LayoutGroup Id="Main">
@@ -444,11 +440,11 @@
444440
</ListView>
445441
<ListView Id="Order_ListView_Detail" AutoExpandAllGroups="True">
446442
<Columns>
447-
<ColumnInfo Id="PaymentStatus" PropertyName="PaymentStatus" PropertyEditorType="OutlookInspired.Blazor.Server.Editors.EnumPropertyEditor" MinWidth="30" />
448-
<ColumnInfo Id="ShipmentStatus" PropertyName="ShipmentStatus" PropertyEditorType="OutlookInspired.Blazor.Server.Editors.EnumPropertyEditor" MinWidth="30" />
449443
<ColumnInfo Id="InvoiceNumber" Width="175" />
450444
<ColumnInfo Id="OrderDate" Width="137" />
451445
<ColumnInfo Id="ShipDate" Width="124" />
446+
<ColumnInfo Id="ShipmentStatus" PropertyName="ShipmentStatus" PropertyEditorType="OutlookInspired.Blazor.Server.Editors.EnumPropertyEditor" MinWidth="30" />
447+
<ColumnInfo Id="PaymentStatus" PropertyName="PaymentStatus" PropertyEditorType="OutlookInspired.Blazor.Server.Editors.EnumPropertyEditor" MinWidth="30" />
452448
</Columns>
453449
</ListView>
454450
<DetailView Id="Product_Brochure_DetailView">
@@ -558,7 +554,7 @@
558554
</LayoutGroup>
559555
</Layout>
560556
</DetailView>
561-
<ListView Id="Quote_ListView" DataAccessMode="Client" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Pivot.PivotGridListEditor" />
557+
<ListView Id="Quote_ListView" DataAccessMode="Client" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Pivot.PivotGridListEditor" />
562558
<ListView Id="QuoteAnalysis_ListView" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Pivot.PivotGridListEditor" />
563559
<ListView Id="QuoteMapItem_ListView" EditorTypeName="OutlookInspired.Blazor.Server.Editors.Maps.MapItemListEditor" />
564560
<ListView Id="ViewFilter_ListView" AllowEdit="False">

‎CS/OutlookInspired.Blazor.Server/OutlookInspired.Blazor.Server.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<PackageReference Include="DevExpress.ExpressApp.Validation.Blazor" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
2323
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" />
24-
25-
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis">
24+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
25+
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis">
2626
<PrivateAssets>all</PrivateAssets>
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2828
</PackageReference>

‎CS/OutlookInspired.Module/Model.DesignedDiffs.xafml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<LayoutManagerOptions RequiredFieldMark="*" />
4747
</Options>
4848
<SchemaModules>
49-
<SchemaModule Name="SchedulerModuleBase" Version="24.2.1.0" IsNewNode="True" />
50-
<SchemaModule Name="SystemModule" Version="24.2.1.0" IsNewNode="True" />
49+
<SchemaModule Name="SchedulerModuleBase" Version="25.1.2.0" IsNewNode="True" />
50+
<SchemaModule Name="SystemModule" Version="25.1.2.0" IsNewNode="True" />
5151
</SchemaModules>
5252
<Views>
5353
<DetailView Id="ApplicationUser_DetailView" FreezeLayout="True">
@@ -214,7 +214,7 @@
214214
<ColumnInfo Id="IsPurchaseAuthority" Index="5" />
215215
</Columns>
216216
</ListView>
217-
<ListView Id="Customer_ListView" MasterDetailMode="ListViewAndDetailView" DataAccessMode="Client" MasterDetailView="Customer_DetailView_Child" CustomizationFormEnabled="True">
217+
<ListView Id="Customer_ListView" MasterDetailMode="ListViewAndDetailView" DataAccessMode="Client" CustomizationFormEnabled="True" MasterDetailView="Customer_DetailView_Child">
218218
<SplitLayout RelativePosition="70" />
219219
<Variants Current="List">
220220
<Variant Id="List" ViewID="Customer_ListView" Caption="List" Index="0" IsNewNode="True" />

‎CS/OutlookInspired.Module/OutlookInspired.Module.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" />
141141
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" />
142142
<PackageReference Include="Microsoft.CodeAnalysis.Common" />
143+
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
143144
</ItemGroup>
144145
<ItemGroup>
145146
<None Update="UnusableNodes.xml">

0 commit comments

Comments
 (0)