From cac3192ad6b01c5e1d54231122592e6fd83846ce Mon Sep 17 00:00:00 2001
From: Christopher Brown <christopher.brown@apdcomms.com>
Date: Fri, 15 Feb 2019 11:46:31 +0000
Subject: [PATCH] Removed DataGrid nuspec as no longer part of the free version
 of Toolkit after 3.5

---
 .../APD.Wpf.Xceed.DataGrid.nuspec             | 20 -------------------
 .../CollectionControlDialog.xaml              |  2 +-
 .../CollectionControlDialog.xaml.cs           | 10 +++++-----
 .../Xceed.Wpf.Toolkit.sln                     |  1 -
 4 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec

diff --git a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec b/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec
deleted file mode 100644
index 528a9125..00000000
--- a/ExtendedWPFToolkitSolution/APD.Wpf.Xceed.DataGrid.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>APD.Wpf.Xceed.DataGrid</id>
-    <version>0.0.0.0</version>
-    <title>APD Xceed DataGrid</title>
-    <description>Our fork of Xceed's DataGrid. Deliver robust apps that give your end-users a rich, fluid, high-performance experience. The only WPF datagrid with asynchronous data virtualization: your grid feels fast even with remote data sources!</description>
-    <authors>Xceed, APD Communications</authors>
-    <copyright>Xceed &amp; APD Communications</copyright>
-    <dependencies>
-      <!-- IMPORTANT: Change me if necessary after upgrading source! (Build number is defined in build definition) -->
-      <dependency id="APD.Wpf.Xceed.Toolkit" version="[3.5,3.6)" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="Src\Xceed.Wpf.DataGrid\bin\Release\PresentationFramework.Aero.dll" target="lib\net40" />
-    <file src="Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.dll" target="lib\net40" />
-    <file src="Src\Xceed.Wpf.DataGrid\bin\Release\Xceed.Wpf.DataGrid.pdb" target="lib\net40" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
index 8751a329..f6bc4725 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
@@ -29,7 +29,7 @@
          <RowDefinition Height="Auto" />
       </Grid.RowDefinitions>
 
-		<local:CollectionControl x:Name="_localCollectionControl"
+		<local:CollectionControl x:Name="_collectionControl"
                                ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
                                ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Mode=TwoWay}"
                                NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
index e1478728..db766804 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@@ -117,7 +117,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return _localCollectionControl;
+        return _collectionControl;
       }
     }
 
@@ -175,14 +175,14 @@ namespace Xceed.Wpf.Toolkit
         }
       }
 
-      _localCollectionControl.PersistChanges();
+      _collectionControl.PersistChanges();
       this.DialogResult = true;
       this.Close();
     }
 
     private void CancelButton_Click( object sender, RoutedEventArgs e )
     {
-      _localCollectionControl.PersistChanges( originalData );
+      _collectionControl.PersistChanges( originalData );
       this.DialogResult = false;
       this.Close();
     }
@@ -329,7 +329,7 @@ namespace Xceed.Wpf.Toolkit
 
     private bool AreDictionaryKeysValid()
     {
-      var keys = _localCollectionControl.Items.Select( x =>
+      var keys = _collectionControl.Items.Select( x =>
       {
         var keyType = x.GetType().GetProperty( "Key" );
         if( keyType != null )
@@ -339,7 +339,7 @@ namespace Xceed.Wpf.Toolkit
         return null;
       } );
 
-      return ( keys.Distinct().Count() == _localCollectionControl.Items.Count )
+      return ( keys.Distinct().Count() == _collectionControl.Items.Count )
              && keys.All( x => x != null );
     }
 
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
index 00e73cbd..c73ed013 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@@ -20,7 +20,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF30F776-A0FD-4859-8C86-67091294501C}"
 	ProjectSection(SolutionItems) = preProject
 		APD.Wpf.Xceed.AvalonDock.nuspec = APD.Wpf.Xceed.AvalonDock.nuspec
-		APD.Wpf.Xceed.DataGrid.nuspec = APD.Wpf.Xceed.DataGrid.nuspec
 		APD.Wpf.Xceed.ToolKit.Full.nuspec = APD.Wpf.Xceed.ToolKit.Full.nuspec
 		APD.Wpf.Xceed.Toolkit.nuspec = APD.Wpf.Xceed.Toolkit.nuspec
 	EndProjectSection