diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/App.config b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/App.config
index 88fa402..bae5d6d 100644
--- a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/App.config
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/App.config
@@ -1,6 +1,6 @@
-
+
-
+
-
\ No newline at end of file
+
diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/DataPresenter.DataSources.OData.SampleApp.csproj b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/DataPresenter.DataSources.OData.SampleApp.csproj
index b8796da..59cf11e 100644
--- a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/DataPresenter.DataSources.OData.SampleApp.csproj
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/DataPresenter.DataSources.OData.SampleApp.csproj
@@ -9,7 +9,7 @@
Properties
DataPresenter.DataSources.OData.SampleApp
DataPresenter.DataSources.OData.SampleApp
- v4.5.2
+ v4.6.1
512
{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
4
@@ -18,6 +18,7 @@
SAK
SAK
SAK
+
AnyCPU
@@ -39,28 +40,59 @@
4
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.Controls.Editors.XamColorPicker.v19.2.dll
+
+ ..\packages\Infragistics.WPF.21.1.27\lib\net40\InfragisticsWPF.dll
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.DataPresenter.DataSources.Async.v19.2.dll
+
+ ..\packages\Infragistics.WPF.ColorPicker.21.1.27\lib\net40\InfragisticsWPF.Controls.Editors.XamColorPicker.dll
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.DataPresenter.v19.2.dll
+
+ ..\packages\Infragistics.WPF.Slider.21.1.27\lib\net40\InfragisticsWPF.Controls.Editors.XamSlider.dll
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.Editors.v19.2.dll
+
+ ..\packages\Infragistics.WPF.DataGrids.21.1.27\lib\net40\InfragisticsWPF.DataPresenter.dll
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.v19.2.dll
+
+ ..\packages\Infragistics.WPF.DataGrids.Async.21.1.27\lib\net40\InfragisticsWPF.DataPresenter.DataSources.Async.dll
+
+
+ ..\packages\Infragistics.WPF.DataVisualization.21.1.27\lib\net40\InfragisticsWPF.DataVisualization.dll
+
+
+ ..\packages\Infragistics.WPF.Editors.21.1.27\lib\net40\InfragisticsWPF.Editors.dll
+
+
+ ..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll
+
+
+ ..\packages\Microsoft.Data.OData.5.8.4\lib\net40\Microsoft.Data.OData.dll
+
+
+ ..\packages\Microsoft.OData.Core.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Core.dll
+
+
+ ..\packages\Microsoft.OData.Edm.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.OData.Edm.dll
+
+
+ ..\packages\Microsoft.Spatial.7.6.1\lib\portable-net45+win8+wpa81\Microsoft.Spatial.dll
+
+
+ ..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.Core.dll
+
+
+ ..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.Dynamic.dll
+
+
+ ..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.V3.Adapter.dll
+
+
+ ..\packages\Simple.OData.Client.5.10.0.1\lib\net452\Simple.OData.Client.V4.Adapter.dll
+
+ ..\packages\System.Spatial.5.8.4\lib\net40\System.Spatial.dll
+
@@ -111,6 +143,7 @@
ResXFileCodeGenerator
Resources.Designer.cs
+
SettingsSingleFileGenerator
Settings.Designer.cs
diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Resources.Designer.cs b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Resources.Designer.cs
index 045459d..8d92aea 100644
--- a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Resources.Designer.cs
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace DataPresenter.DataSources.OData.SampleApp.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Settings.Designer.cs b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Settings.Designer.cs
index 8fe6de1..a42939e 100644
--- a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Settings.Designer.cs
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace DataPresenter.DataSources.OData.SampleApp.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/packages.config b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/packages.config
new file mode 100644
index 0000000..a445a19
--- /dev/null
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.SampleApp/packages.config
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.csproj b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.csproj
index a894fae..335a90d 100644
--- a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.csproj
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData.csproj
@@ -32,17 +32,14 @@
4
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.DataPresenter.DataSources.Async.v19.2.dll
+
+ ..\packages\Infragistics.WPF.21.1.27\lib\net40\InfragisticsWPF.dll
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.DataVisualization.v19.2.dll
+
+ ..\packages\Infragistics.WPF.DataGrids.Async.21.1.27\lib\net40\InfragisticsWPF.DataPresenter.DataSources.Async.dll
-
- False
- ..\..\..\..\..\..\..\work\NetAdvantage\DEV\XAML\2019.2\Source\Build\InfragisticsWPF4.v19.2.dll
+
+ ..\packages\Infragistics.WPF.DataVisualization.21.1.27\lib\net40\InfragisticsWPF.DataVisualization.dll
..\packages\Microsoft.Data.Edm.5.8.4\lib\net40\Microsoft.Data.Edm.dll
diff --git a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/packages.config b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/packages.config
index e6468ea..2585e29 100644
--- a/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/packages.config
+++ b/DataPresenter.DataSources.OData/DataPresenter.DataSources.OData/packages.config
@@ -1,5 +1,8 @@
+
+
+