From 0dc25cb0764bd559922e0123ec95e5f8e823ff3d Mon Sep 17 00:00:00 2001
From: SvetlanaPN <26325291+SvetlanaPN@users.noreply.github.com>
Date: Thu, 1 Nov 2018 17:35:04 +0300
Subject: [PATCH 1/3] fix ToBindingList issue
---
VB/XtraSchedulerEFTest/Form1.Designer.vb | 6 +++---
VB/XtraSchedulerEFTest/Form1.vb | 7 +++----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/VB/XtraSchedulerEFTest/Form1.Designer.vb b/VB/XtraSchedulerEFTest/Form1.Designer.vb
index 943ed0f..f1ea2b1 100644
--- a/VB/XtraSchedulerEFTest/Form1.Designer.vb
+++ b/VB/XtraSchedulerEFTest/Form1.Designer.vb
@@ -27,7 +27,7 @@
Dim timeRuler1 As New DevExpress.XtraScheduler.TimeRuler()
Dim timeRuler2 As New DevExpress.XtraScheduler.TimeRuler()
Me.schedulerControl1 = New DevExpress.XtraScheduler.SchedulerControl()
- Me.schedulerStorage1 = New DevExpress.XtraScheduler.SchedulerStorage(Me.components)
+ Me.schedulerStorage1 = New DevExpress.XtraScheduler.SchedulerDataStorage(Me.components)
Me.eFAppointmentBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.eFResourceBindingSource = New System.Windows.Forms.BindingSource(Me.components)
Me.panelControl1 = New DevExpress.XtraEditors.PanelControl()
@@ -47,7 +47,7 @@
Me.schedulerControl1.Name = "schedulerControl1"
Me.schedulerControl1.Size = New System.Drawing.Size(776, 466)
Me.schedulerControl1.Start = New Date(1753, 1, 1, 0, 0, 0, 0)
- Me.schedulerControl1.Storage = Me.schedulerStorage1
+ Me.schedulerControl1.DataStorage = Me.schedulerStorage1
Me.schedulerControl1.TabIndex = 0
Me.schedulerControl1.Text = "schedulerControl1"
Me.schedulerControl1.Views.DayView.TimeRulers.Add(timeRuler1)
@@ -123,7 +123,7 @@
#End Region
Private schedulerControl1 As DevExpress.XtraScheduler.SchedulerControl
- Private schedulerStorage1 As DevExpress.XtraScheduler.SchedulerStorage
+ Private schedulerStorage1 As DevExpress.XtraScheduler.SchedulerDataStorage
Private panelControl1 As DevExpress.XtraEditors.PanelControl
Private WithEvents btnCreateAppointment As DevExpress.XtraEditors.SimpleButton
Private eFAppointmentBindingSource As System.Windows.Forms.BindingSource
diff --git a/VB/XtraSchedulerEFTest/Form1.vb b/VB/XtraSchedulerEFTest/Form1.vb
index a950c6d..b62a526 100644
--- a/VB/XtraSchedulerEFTest/Form1.vb
+++ b/VB/XtraSchedulerEFTest/Form1.vb
@@ -11,7 +11,6 @@ Namespace XtraSchedulerEFTest
Public Sub New()
InitializeComponent()
- schedulerStorage1.Appointments.CommitIdToDataSource = False
schedulerStorage1.Appointments.ResourceSharing = True
schedulerControl1.Storage.Resources.ColorSaving = ColorSavingType.ArgbColor
@@ -54,9 +53,9 @@ Namespace XtraSchedulerEFTest
context.EFAppointments.Load()
context.EFResources.Load()
- eFAppointmentBindingSource.DataSource = context.EFAppointments.Local.ToBindingList(Of EFAppointment)()
- eFResourceBindingSource.DataSource = context.EFResources.Local.ToBindingList(Of EFResource)()
-' #End Region ' #datainit
+ eFAppointmentBindingSource.DataSource = context.EFAppointments.Local.ToBindingList()
+ eFResourceBindingSource.DataSource = context.EFResources.Local.ToBindingList()
+ ' #End Region ' #datainit
End Sub
From 1ce409886d37d8f68e9658348c2f3b3e50ef93b1 Mon Sep 17 00:00:00 2001
From: SvetlanaPN <26325291+SvetlanaPN@users.noreply.github.com>
Date: Thu, 1 Nov 2018 17:37:19 +0300
Subject: [PATCH 2/3] fix ToBindingList issue
---
.../XtraSchedulerEFTest.vbproj | 53 ++++++++++++-------
1 file changed, 35 insertions(+), 18 deletions(-)
diff --git a/VB/XtraSchedulerEFTest/XtraSchedulerEFTest.vbproj b/VB/XtraSchedulerEFTest/XtraSchedulerEFTest.vbproj
index c948cf6..9c2dbde 100644
--- a/VB/XtraSchedulerEFTest/XtraSchedulerEFTest.vbproj
+++ b/VB/XtraSchedulerEFTest/XtraSchedulerEFTest.vbproj
@@ -1,4 +1,4 @@
-
+
Debug
@@ -7,10 +7,12 @@
2.0
{774DF92E-B1E1-4F83-A55D-61ECC674F2D6}
WinExe
-
+
+
XtraSchedulerEFTest
v4.5
-
+
+
512
publish\
true
@@ -67,39 +69,53 @@
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
+ False
+
+
False
- ..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll
-
- ..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll
+
+ False
+
+
+ False
+
+
+ False
+
+
+ ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll
+
+
+ ..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll
@@ -186,7 +202,8 @@
-
+
+
-
+
\ No newline at end of file
From 282f7d957d1a2a863768cb24b4cdfc97ff344b00 Mon Sep 17 00:00:00 2001
From: SvetlanaPN <26325291+SvetlanaPN@users.noreply.github.com>
Date: Thu, 1 Nov 2018 18:07:45 +0300
Subject: [PATCH 3/3] fix ToBindingList issue
---
VB/XtraSchedulerEFTest/app.config | 14 +++++++-------
VB/XtraSchedulerEFTest/packages.config | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/VB/XtraSchedulerEFTest/app.config b/VB/XtraSchedulerEFTest/app.config
index 8725b60..3d89bc1 100644
--- a/VB/XtraSchedulerEFTest/app.config
+++ b/VB/XtraSchedulerEFTest/app.config
@@ -1,17 +1,17 @@
-
+
-
-
-
+
+
+
-
+
-
+
-
+
diff --git a/VB/XtraSchedulerEFTest/packages.config b/VB/XtraSchedulerEFTest/packages.config
index 4936aa5..f578137 100644
--- a/VB/XtraSchedulerEFTest/packages.config
+++ b/VB/XtraSchedulerEFTest/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file