Skip to content

Commit b4e05ce

Browse files
author
DevExpressExampleBot
authored
Merge pull request #3 from SvetlanaPN/18.1.3+
fix ToBindingList issue
2 parents 636e9c0 + 282f7d9 commit b4e05ce

File tree

5 files changed

+49
-33
lines changed

5 files changed

+49
-33
lines changed

‎VB/XtraSchedulerEFTest/Form1.Designer.vb‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎VB/XtraSchedulerEFTest/Form1.vb‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Namespace XtraSchedulerEFTest
1111
Public Sub New()
1212
InitializeComponent()
1313

14-
schedulerStorage1.Appointments.CommitIdToDataSource = False
1514
schedulerStorage1.Appointments.ResourceSharing = True
1615
schedulerControl1.Storage.Resources.ColorSaving = ColorSavingType.ArgbColor
1716

@@ -54,9 +53,9 @@ Namespace XtraSchedulerEFTest
5453
context.EFAppointments.Load()
5554
context.EFResources.Load()
5655

57-
eFAppointmentBindingSource.DataSource = context.EFAppointments.Local.ToBindingList(Of EFAppointment)()
58-
eFResourceBindingSource.DataSource = context.EFResources.Local.ToBindingList(Of EFResource)()
59-
' #End Region ' #datainit
56+
eFAppointmentBindingSource.DataSource = context.EFAppointments.Local.ToBindingList()
57+
eFResourceBindingSource.DataSource = context.EFResources.Local.ToBindingList()
58+
' #End Region ' #datainit
6059

6160
End Sub
6261

‎VB/XtraSchedulerEFTest/XtraSchedulerEFTest.vbproj‎

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -7,10 +7,12 @@
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{774DF92E-B1E1-4F83-A55D-61ECC674F2D6}</ProjectGuid>
99
<OutputType>WinExe</OutputType>
10-
<RootNamespace></RootNamespace>
10+
<RootNamespace>
11+
</RootNamespace>
1112
<AssemblyName>XtraSchedulerEFTest</AssemblyName>
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<TargetFrameworkProfile></TargetFrameworkProfile>
14+
<TargetFrameworkProfile>
15+
</TargetFrameworkProfile>
1416
<FileAlignment>512</FileAlignment>
1517
<PublishUrl>publish\</PublishUrl>
1618
<Install>true</Install>
@@ -67,39 +69,53 @@
6769
<Import Include="System" />
6870
</ItemGroup>
6971
<ItemGroup>
70-
<Reference Include="DevExpress.Data.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
72+
<Reference Include="DevExpress.Data.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7173
<SpecificVersion>False</SpecificVersion>
7274
</Reference>
73-
<Reference Include="DevExpress.Printing.v15.2.Core, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
75+
<Reference Include="DevExpress.Pdf.v18.1.Core, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7476
<SpecificVersion>False</SpecificVersion>
7577
</Reference>
76-
<Reference Include="DevExpress.Utils.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
78+
<Reference Include="DevExpress.Office.v18.1.Core, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
7779
<SpecificVersion>False</SpecificVersion>
7880
</Reference>
79-
<Reference Include="DevExpress.XtraEditors.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
81+
<Reference Include="DevExpress.RichEdit.v18.1.Core, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8082
<SpecificVersion>False</SpecificVersion>
8183
</Reference>
82-
<Reference Include="DevExpress.XtraScheduler.v15.2.Reporting.Extensions, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
84+
<Reference Include="DevExpress.RichEdit.v18.1.Export, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8385
<SpecificVersion>False</SpecificVersion>
8486
</Reference>
85-
<Reference Include="DevExpress.XtraPrinting.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
87+
<Reference Include="DevExpress.Printing.v18.1.Core, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8688
<SpecificVersion>False</SpecificVersion>
8789
</Reference>
88-
<Reference Include="DevExpress.XtraBars.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
90+
<Reference Include="DevExpress.Utils.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
8991
<SpecificVersion>False</SpecificVersion>
9092
</Reference>
91-
<Reference Include="DevExpress.XtraScheduler.v15.2, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
93+
<Reference Include="DevExpress.XtraEditors.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9294
<SpecificVersion>False</SpecificVersion>
9395
</Reference>
94-
<Reference Include="DevExpress.XtraScheduler.v15.2.Core, Version=15.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
96+
<Reference Include="DevExpress.XtraScheduler.v18.1.Reporting.Extensions, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
9597
<SpecificVersion>False</SpecificVersion>
9698
</Reference>
97-
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
99+
<Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
100+
<SpecificVersion>False</SpecificVersion>
101+
</Reference>
102+
<Reference Include="DevExpress.XtraBars.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
98103
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll</HintPath>
100104
</Reference>
101-
<Reference Include="EntityFramework.SqlServer">
102-
<HintPath>..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
105+
<Reference Include="DevExpress.XtraGrid.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
106+
<SpecificVersion>False</SpecificVersion>
107+
</Reference>
108+
<Reference Include="DevExpress.XtraScheduler.v18.1, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
109+
<SpecificVersion>False</SpecificVersion>
110+
</Reference>
111+
<Reference Include="DevExpress.XtraScheduler.v18.1.Core, Version=18.1.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
112+
<SpecificVersion>False</SpecificVersion>
113+
</Reference>
114+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
115+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
116+
</Reference>
117+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
118+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
103119
</Reference>
104120
<Reference Include="System" />
105121
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -186,7 +202,8 @@
186202
</ItemGroup>
187203
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
188204
<PropertyGroup>
189-
<PostBuildEvent></PostBuildEvent>
205+
<PostBuildEvent>
206+
</PostBuildEvent>
190207
</PropertyGroup>
191208
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
192209
Other similar extension points exist, see Microsoft.Common.targets.
@@ -195,4 +212,4 @@
195212
<Target Name="AfterBuild">
196213
</Target>
197214
-->
198-
</Project>
215+
</Project>

‎VB/XtraSchedulerEFTest/app.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
5-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
6-
</configSections>
4+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
5+
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework">
99
<parameters>
10-
<parameter value="Data Source=(LocalDB)\v11.0; Integrated Security=True; MultipleActiveResultSets=True"/>
10+
<parameter value="Data Source=(LocalDB)\v11.0; Integrated Security=True; MultipleActiveResultSets=True" />
1111
</parameters>
1212
</defaultConnectionFactory>
1313
<providers>
14-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
14+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
1515
</providers>
1616
</entityFramework>
17-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
17+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

‎VB/XtraSchedulerEFTest/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="EFCodeFirst" version="0.8" />
4-
<package id="EntityFramework" version="6.1.1" targetFramework="net40-Client" />
4+
<package id="EntityFramework" version="6.2.0" targetFramework="net45" />
55
</packages>

0 commit comments

Comments
 (0)