upgrade Xceed.WPF.Toolkit

2 years ago · 0fce48174c
5 changed files with 385 additions and 1080 deletions
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
@ -14,19 +14,116 @@

  ***********************************************************************************/

-#pragma warning disable 0436
-[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
-#pragma warning restore 0436
+#region Using directives
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Windows;
+using System.Windows.Markup;
+
+#endregion
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Xceed Toolkit for WPF")]
+[assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
+
+[assembly: AssemblyCompany("Xceed Software Inc.")]
+[assembly: AssemblyProduct("Xceed Toolkit for WPF")]
+[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
+[assembly: AssemblyCulture("")]
+
+
+// Needed to enable xbap scenarios
+[assembly: AllowPartiallyTrustedCallers]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant(true)]
+
+
+[assembly: InternalsVisibleTo("Xceed.Wpf.Toolkit.Themes.Office2007" + ",PublicKey=" +
+    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
+    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
+    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
+    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
+    "f92cbfb5")]
+
+[assembly: InternalsVisibleTo("Xceed.Wpf.Toolkit.Themes.Metro" + ",PublicKey=" +
+    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
+    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
+    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
+    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
+    "f92cbfb5")]
+
+[assembly: InternalsVisibleTo("Xceed.Wpf.Toolkit.Themes.Windows10" + ",PublicKey=" +
+    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
+    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
+    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
+    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
+    "f92cbfb5")]
+
+
+
+
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.SourceAssembly, //where theme specific resource dictionaries are located
+                                               //(used if a resource is not found in the page, 
+                                               // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+[assembly: XmlnsPrefix("http://schemas.xceed.com/wpf/xaml/toolkit", "xctk")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Media")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Utilities")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Chromes")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Attributes")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels")]
+
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile(@"sn.snk")]
+[assembly: AssemblyKeyName("")]
+#pragma warning restore 1699

 internal static class _XceedVersionInfo
 {
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "3.4";
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string Version = BaseVersion + 
-  ".0.0";
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string PublicKeyToken = "ba83ff368b7563c6";
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public const string BaseVersion = "3.4";
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public const string Version = BaseVersion +
+    ".0.0";
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+    public const string PublicKeyToken = "ba83ff368b7563c6";


 }
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@ -18,331 +18,333 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.IO;
 using System.Linq;
 using System.Runtime.Serialization;
-using System.Security;
-using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
+using System.Security;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 using Xceed.Wpf.Toolkit.PropertyGrid;

 namespace Xceed.Wpf.Toolkit
 {
-  public partial class CollectionControlDialogBase :
-    Window
-  {
-  }
-
-  /// <summary>
-  /// Interaction logic for CollectionControlDialog.xaml
-  /// </summary>
-  public partial class CollectionControlDialog : CollectionControlDialogBase
-  {
-    #region Private Members
-
-    private IList originalData = new List<object>();
-
-    #endregion
-
-    #region Properties
-
-    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IEnumerable ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public IEnumerable ItemsSource
-    {
-      get
-      {
-        return ( IEnumerable )GetValue( ItemsSourceProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public Type ItemsSourceType
+    public partial class CollectionControlDialogBase :
+      Window
    {
-      get
-      {
-        return ( Type )GetValue( ItemsSourceTypeProperty );
-      }
-      set
-      {
-        SetValue( ItemsSourceTypeProperty, value );
-      }
    }

-    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public IList<Type> NewItemTypes
+    /// <summary>
+    /// Interaction logic for CollectionControlDialog.xaml
+    /// </summary>
+    public partial class CollectionControlDialog : CollectionControlDialogBase
    {
-      get
-      {
-        return ( IList<Type> )GetValue( NewItemTypesProperty );
-      }
-      set
-      {
-        SetValue( NewItemTypesProperty, value );
-      }
-    }
+        #region Private Members

-    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlDialog ), new UIPropertyMetadata( false ) );
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( bool )GetValue( IsReadOnlyProperty );
-      }
-      set
-      {
-        SetValue( IsReadOnlyProperty, value );
-      }
-    }
+        private IList originalData = new List<object>();

-    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( CollectionControlDialog ), new UIPropertyMetadata( null ) );
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
-      }
-      set
-      {
-        SetValue( EditorDefinitionsProperty, value );
-      }
-    }
+        #endregion

-    public CollectionControl CollectionControl
-    {
-      get
-      {
-        return _collectionControl;
-      }
-    }
+        #region Properties

-    #endregion //Properties
+        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register("ItemsSource", typeof(IEnumerable), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
+        public IEnumerable ItemsSource
+        {
+            get
+            {
+                return (IEnumerable)GetValue(ItemsSourceProperty);
+            }
+            set
+            {
+                SetValue(ItemsSourceProperty, value);
+            }
+        }

-    #region Constructors
+        public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register("ItemsSourceType", typeof(Type), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
+        public Type ItemsSourceType
+        {
+            get
+            {
+                return (Type)GetValue(ItemsSourceTypeProperty);
+            }
+            set
+            {
+                SetValue(ItemsSourceTypeProperty, value);
+            }
+        }

-    public CollectionControlDialog()
-    {
-      InitializeComponent();
-    }
+        public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register("NewItemTypes", typeof(IList), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
+        public IList<Type> NewItemTypes
+        {
+            get
+            {
+                return (IList<Type>)GetValue(NewItemTypesProperty);
+            }
+            set
+            {
+                SetValue(NewItemTypesProperty, value);
+            }
+        }

-    public CollectionControlDialog( Type itemsourceType )
-      : this()
-    {
-      ItemsSourceType = itemsourceType;
-    }
+        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register("IsReadOnly", typeof(bool), typeof(CollectionControlDialog), new UIPropertyMetadata(false));
+        public bool IsReadOnly
+        {
+            get
+            {
+                return (bool)GetValue(IsReadOnlyProperty);
+            }
+            set
+            {
+                SetValue(IsReadOnlyProperty, value);
+            }
+        }

-    public CollectionControlDialog( Type itemsourceType, IList<Type> newItemTypes )
-      : this( itemsourceType )
-    {
-      NewItemTypes = newItemTypes;
-    }
+        public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register("EditorDefinitions", typeof(EditorDefinitionCollection), typeof(CollectionControlDialog), new UIPropertyMetadata(null));
+        public EditorDefinitionCollection EditorDefinitions
+        {
+            get
+            {
+                return (EditorDefinitionCollection)GetValue(EditorDefinitionsProperty);
+            }
+            set
+            {
+                SetValue(EditorDefinitionsProperty, value);
+            }
+        }

-    #endregion //Constructors
+        public CollectionControl CollectionControl
+        {
+            get
+            {
+                return _collectionControl;
+            }
+        }

-    #region Overrides
+        #endregion //Properties

-    protected override void OnSourceInitialized( EventArgs e )
-    {
-      base.OnSourceInitialized( e );
+        #region Constructors

-      //Backup data if case "Cancel" is clicked.
-      if( this.ItemsSource != null )
-      {
-        foreach( var item in this.ItemsSource )
+        public CollectionControlDialog()
        {
-          originalData.Add( this.Clone( item ) );
+            InitializeComponent();
        }
-      }
-    }

-    #endregion
-
-    #region Event Handlers
+        public CollectionControlDialog(Type itemsourceType)
+          : this()
+        {
+            ItemsSourceType = itemsourceType;
+        }

-    private void OkButton_Click( object sender, RoutedEventArgs e )
-    {
-      if( this.ItemsSource is IDictionary )
-      {
-        if( !this.AreDictionaryKeysValid() )
+        public CollectionControlDialog(Type itemsourceType, IList<Type> newItemTypes)
+          : this(itemsourceType)
        {
-          MessageBox.Show( "All dictionary items should have distinct non-null Key values.", "Warning" );
-          return;
+            NewItemTypes = newItemTypes;
        }
-      }

-      _collectionControl.PersistChanges();
-      this.DialogResult = true;
-      this.Close();
-    }
+        #endregion //Constructors

-    private void CancelButton_Click( object sender, RoutedEventArgs e )
-    {
-      _collectionControl.PersistChanges( originalData );
-      this.DialogResult = false;
-      this.Close();
-    }
+        #region Overrides

-    #endregion //Event Hanlders
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            base.OnSourceInitialized(e);

-    #region Private Methods
+            //Backup data if case "Cancel" is clicked.
+            if (this.ItemsSource != null)
+            {
+                foreach (var item in this.ItemsSource)
+                {
+                    originalData.Add(this.Clone(item));
+                }
+            }
+        }

-    [SecuritySafeCritical]
-    private object Clone( object source )
-    {
-      if( source == null )
-        return null;
+        #endregion

-      object result = null;
-      var sourceType = source.GetType();
+        #region Event Handlers

-      if( source is Array )
-      {
-        using( var stream = new MemoryStream() )
-        {
-          var formatter = new BinaryFormatter();
-          formatter.Serialize( stream, source );
-          stream.Seek( 0, SeekOrigin.Begin );
-          result = ( Array )formatter.Deserialize( stream );
-        }
-      }
-      // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
-      else if( ( this.ItemsSource is IDictionary )
-        && sourceType.IsGenericType
-        && typeof( KeyValuePair<,> ).IsAssignableFrom( sourceType.GetGenericTypeDefinition() ) )
-      {
-        result = this.GenerateEditableKeyValuePair( source );
-      }
-      else
-      {
-        // Initialized a new object with default values
-        try
+        private void OkButton_Click(object sender, RoutedEventArgs e)
        {
-          result = FormatterServices.GetUninitializedObject( sourceType );
-        }
-        catch( Exception )
-        {
-        }
+            if (this.ItemsSource is IDictionary)
+            {
+                if (!this.AreDictionaryKeysValid())
+                {
+                    MessageBox.Show("All dictionary items should have distinct non-null Key values.", "Warning");
+                    return;
+                }
+            }

-        var constructor = sourceType.GetConstructor( Type.EmptyTypes );
-        if( constructor != null )
-        {
-          constructor.Invoke( result, null );
+            _collectionControl.PersistChanges();
+            this.DialogResult = true;
+            this.Close();
        }
-        else
+
+        private void CancelButton_Click(object sender, RoutedEventArgs e)
        {
-          result = source;
+            _collectionControl.PersistChanges(originalData);
+            this.DialogResult = false;
+            this.Close();
        }
-      }
-      Debug.Assert( result != null );
-      if( result != null )
-      {
-        var properties = sourceType.GetProperties();

-        foreach( var propertyInfo in properties )
+        #endregion //Event Hanlders
+
+        #region Private Methods
+
+        [SecuritySafeCritical]
+        private object Clone(object source)
        {
-          var parameters = propertyInfo.GetIndexParameters();
-          var index = parameters.GetLength( 0 ) == 0 ? null : new object[] { parameters.GetLength( 0 ) - 1 };
-          var propertyInfoValue = propertyInfo.GetValue( source, index );
-
-          if( propertyInfo.CanWrite )
-          {
-            // Look for nested object
-            if( propertyInfo.PropertyType.IsClass
-              && ( propertyInfo.PropertyType != typeof( Transform ) )
-              && !propertyInfo.PropertyType.Equals( typeof( string ) ) )
+            if (source == null)
+                return null;
+
+            object result = null;
+            var sourceType = source.GetType();
+
+            if (source is Array)
            {
-              // We have a Collection/List of T.
-              if( propertyInfo.PropertyType.IsGenericType )
-              {
-                // Clone sub-objects if the T are non-primitive types objects. 
-                var arg = propertyInfo.PropertyType.GetGenericArguments().FirstOrDefault();
-                if( ( arg != null ) && !arg.IsPrimitive && !arg.Equals( typeof( String ) ) && !arg.IsEnum )
+                using (var stream = new MemoryStream())
                {
-                  var nestedObject = this.Clone( propertyInfoValue );
-                  propertyInfo.SetValue( result, nestedObject, null );
+#pragma warning disable SYSLIB0011 // Type or member is obsolete
+                    var formatter = new BinaryFormatter();
+#pragma warning restore SYSLIB0011 // Type or member is obsolete
+                    formatter.Serialize(stream, source);
+                    stream.Seek(0, SeekOrigin.Begin);
+                    result = (Array)formatter.Deserialize(stream);
                }
-                else
+            }
+            // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
+            else if ((this.ItemsSource is IDictionary)
+              && sourceType.IsGenericType
+              && typeof(KeyValuePair<,>).IsAssignableFrom(sourceType.GetGenericTypeDefinition()))
+            {
+                result = this.GenerateEditableKeyValuePair(source);
+            }
+            else
+            {
+                // Initialized a new object with default values
+                try
+                {
+                    result = FormatterServices.GetUninitializedObject(sourceType);
+                }
+                catch (Exception)
+                {
+                }
+
+                var constructor = sourceType.GetConstructor(Type.EmptyTypes);
+                if (constructor != null)
                {
-                  // copy object if the T are primitive types objects.
-                  propertyInfo.SetValue( result, propertyInfoValue, null );
+                    constructor.Invoke(result, null);
                }
-              }
-              else
-              {
-                var nestedObject = this.Clone( propertyInfoValue );
-                if( nestedObject != null )
+                else
                {
-                  // For T object included in List/Collections, Add it to the List/Collection of T.
-                  if( index != null )
-                  {
-                    result.GetType().GetMethod( "Add" ).Invoke( result, new[] { nestedObject } );
-                  }
-                  else
-                  {
-                    propertyInfo.SetValue( result, nestedObject, null );
-                  }
+                    result = source;
                }
-              }
            }
-            else
+            Debug.Assert(result != null);
+            if (result != null)
            {
-              // For T object included in List/Collections, Add it to the List/Collection of T.
-              if( index != null )
-              {
-                result.GetType().GetMethod( "Add" ).Invoke( result, new[] { propertyInfoValue } );
-              }
-              else
-              {
-                // copy regular object
-                propertyInfo.SetValue( result, propertyInfoValue, null );
-              }
+                var properties = sourceType.GetProperties();
+
+                foreach (var propertyInfo in properties)
+                {
+                    var parameters = propertyInfo.GetIndexParameters();
+                    var index = parameters.GetLength(0) == 0 ? null : new object[] { parameters.GetLength(0) - 1 };
+                    var propertyInfoValue = propertyInfo.GetValue(source, index);
+
+                    if (propertyInfo.CanWrite)
+                    {
+                        // Look for nested object
+                        if (propertyInfo.PropertyType.IsClass
+                          && (propertyInfo.PropertyType != typeof(Transform))
+                          && !propertyInfo.PropertyType.Equals(typeof(string)))
+                        {
+                            // We have a Collection/List of T.
+                            if (propertyInfo.PropertyType.IsGenericType)
+                            {
+                                // Clone sub-objects if the T are non-primitive types objects. 
+                                var arg = propertyInfo.PropertyType.GetGenericArguments().FirstOrDefault();
+                                if ((arg != null) && !arg.IsPrimitive && !arg.Equals(typeof(String)) && !arg.IsEnum)
+                                {
+                                    var nestedObject = this.Clone(propertyInfoValue);
+                                    propertyInfo.SetValue(result, nestedObject, null);
+                                }
+                                else
+                                {
+                                    // copy object if the T are primitive types objects.
+                                    propertyInfo.SetValue(result, propertyInfoValue, null);
+                                }
+                            }
+                            else
+                            {
+                                var nestedObject = this.Clone(propertyInfoValue);
+                                if (nestedObject != null)
+                                {
+                                    // For T object included in List/Collections, Add it to the List/Collection of T.
+                                    if (index != null)
+                                    {
+                                        result.GetType().GetMethod("Add").Invoke(result, new[] { nestedObject });
+                                    }
+                                    else
+                                    {
+                                        propertyInfo.SetValue(result, nestedObject, null);
+                                    }
+                                }
+                            }
+                        }
+                        else
+                        {
+                            // For T object included in List/Collections, Add it to the List/Collection of T.
+                            if (index != null)
+                            {
+                                result.GetType().GetMethod("Add").Invoke(result, new[] { propertyInfoValue });
+                            }
+                            else
+                            {
+                                // copy regular object
+                                propertyInfo.SetValue(result, propertyInfoValue, null);
+                            }
+                        }
+                    }
+                }
            }
-          }
+
+            return result;
        }
-      }

-      return result;
-    }
+        private object GenerateEditableKeyValuePair(object source)
+        {
+            var sourceType = source.GetType();
+            if ((sourceType.GetGenericArguments() == null) || (sourceType.GetGenericArguments().GetLength(0) != 2))
+                return null;

-    private object GenerateEditableKeyValuePair( object source )
-    {
-      var sourceType = source.GetType();
-      if( ( sourceType.GetGenericArguments() == null ) || ( sourceType.GetGenericArguments().GetLength( 0 ) != 2 ) )
-        return null;
-
-      var propInfoKey = sourceType.GetProperty( "Key" );
-      var propInfoValue = sourceType.GetProperty( "Value" );
-      if( ( propInfoKey != null ) && ( propInfoValue != null ) )
-      {
-        return ListUtilities.CreateEditableKeyValuePair( propInfoKey.GetValue( source, null )
-                                                          , sourceType.GetGenericArguments()[ 0 ]
-                                                          , propInfoValue.GetValue( source, null )
-                                                          , sourceType.GetGenericArguments()[ 1 ] );
-      }
-      return null;
-    }
+            var propInfoKey = sourceType.GetProperty("Key");
+            var propInfoValue = sourceType.GetProperty("Value");
+            if ((propInfoKey != null) && (propInfoValue != null))
+            {
+                return ListUtilities.CreateEditableKeyValuePair(propInfoKey.GetValue(source, null)
+                                                                  , sourceType.GetGenericArguments()[0]
+                                                                  , propInfoValue.GetValue(source, null)
+                                                                  , sourceType.GetGenericArguments()[1]);
+            }
+            return null;
+        }

-    private bool AreDictionaryKeysValid()
-    {
-      var keys = _collectionControl.Items.Select( x =>
-      {
-        var keyType = x.GetType().GetProperty( "Key" );
-        if( keyType != null )
+        private bool AreDictionaryKeysValid()
        {
-          return keyType.GetValue( x, null );
+            var keys = _collectionControl.Items.Select(x =>
+            {
+                var keyType = x.GetType().GetProperty("Key");
+                if (keyType != null)
+                {
+                    return keyType.GetValue(x, null);
+                }
+                return null;
+            });
+
+            return (keys.Distinct().Count() == _collectionControl.Items.Count)
+                   && keys.All(x => x != null);
        }
-        return null;
-      } );

-      return ( keys.Distinct().Count() == _collectionControl.Items.Count )
-             && keys.All( x => x != null );
+        #endregion
    }
-
-    #endregion
-  }
 }
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@ -1,120 +0,0 @@
-/*************************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  ***********************************************************************************/
-
-#region Using directives
-
-using System;
-using System.Globalization;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Windows;
-using System.Windows.Markup;
-
-#endregion
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyDescription("This assembly implements various Windows Presentation Framework controls.")]
-
-[assembly: AssemblyCompany("Xceed Software Inc.")]
-[assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
-[assembly: AssemblyCulture( "" )]
-
-
-// Needed to enable xbap scenarios
-[assembly: AllowPartiallyTrustedCallers]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-
-
-[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Office2007" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Metro" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-[assembly: InternalsVisibleTo( "Xceed.Wpf.Toolkit.Themes.Windows10" + ",PublicKey=" +
-    "0024000004800000940000000602000000240000525341310004000001000100d59d8147eb2015" +
-    "ca98a92da860fd766d101271d8c2f545894870fd6183255737d79347bbf5250291ae75651e1150" +
-    "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
-    "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
-    "f92cbfb5")]
-
-
-
-
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.SourceAssembly, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
-)]
-
-[assembly: XmlnsPrefix("http://schemas.xceed.com/wpf/xaml/toolkit", "xctk")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters" )]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input" )]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Media")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Utilities")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Chromes")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Attributes")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Commands")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Converters")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.PropertyGrid.Editors")]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Zoombox" )]
-[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Panels" )]
-
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
-[assembly: AssemblyKeyName( "" )]
-#pragma warning restore 1699
-
-
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@ -1,678 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{72E591D6-8F83-4D8C-8F67-9C325E623234}</ProjectGuid>
+    <TargetFramework>net8.0-windows</TargetFramework>
    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
-    <AssemblyName>Xceed.Wpf.Toolkit</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
  </PropertyGroup>
  <PropertyGroup>
    <StartupObject />
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="UIAutomationProvider" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="BusyIndicator\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="BusyIndicator\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="IconButton\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="IconButton\Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ButtonSpinner\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ButtonSpinner\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CalculatorUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CalculatorUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Calculator\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Calculator\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CheckComboBox\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CheckListBox\Themes\Aero2.NormalColor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CheckListBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ChildWindow\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ChildWindow\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Chromes\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Chromes\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CollectionControl\Implementation\CollectionControlDialog.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="CollectionControl\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CollectionControl\Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="ColorCanvas\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ColorCanvas\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ColorPicker\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="ColorPicker\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="CheckComboBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Aero2\SelectorItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Aero2\WindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Generic\SelectorItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Primitives\Themes\Generic\WindowControl.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimePicker\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimePicker\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimeUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DateTimeUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DropDownButton\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="DropDownButton\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Magnifier\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MessageBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MessageBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MultiLineTextEditor\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NumericUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NumericUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pie\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pie\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PropertyGrid\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="PropertyGrid\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RangeSlider\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RangeSlider\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RichTextBoxFormatBar\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SplitButton\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="SplitButton\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Brushes.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Buttons.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero2\Glyphs.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Aero\Buttons_NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\classic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Brushes.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Buttons.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Themes\Generic\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic\Glyphs.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\luna.homestead.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\luna.metallic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\luna.normalcolor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\royale.normalcolor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimePicker\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimePicker\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimeSpanUpDown\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="TimeSpanUpDown\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkComboBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkComboBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkTextBox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="WatermarkTextBox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Wizard\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Wizard\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Zoombox\Themes\Aero2.NormalColor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Zoombox\Themes\Generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyVersionInfo.cs" />
-    <Compile Include="AssemblyVersionInfoCommon.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectBehaviorEnum.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.cs" />
-    <Compile Include="AutoSelectTextBox\Implementation\QueryMoveFocusEventArgs.cs" />
-    <Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
-    <Compile Include="BusyIndicator\Implementation\Converters\ProgressBarWidthConverter.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorPickerTabItem.cs" />
-    <Compile Include="Core\Converters\ColorModeToTabItemSelectedConverter.cs" />
-    <Compile Include="Primitives\SelectAllSelectorItem.cs" />
-    <Compile Include="Primitives\SelectAllSelector.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\PropertyItemEditorConverter.cs" />
-    <Compile Include="Core\LocationEnum.cs" />
-    <Compile Include="IconButton\Implementation\IconButton.cs" />
-    <Compile Include="ButtonSpinner\Implementation\ButtonSpinner.cs" />
-    <Compile Include="CalculatorUpDown\Implementation\CalculatorUpDown.cs" />
-    <Compile Include="Calculator\Implementation\Calculator.cs" />
-    <Compile Include="Calculator\Implementation\CalculatorCommands.cs" />
-    <Compile Include="CheckListBox\Implementation\CheckListBox.cs" />
-    <Compile Include="ChildWindow\Implementation\ChildWindow.cs" />
-    <Compile Include="ChildWindow\Implementation\WindowStartupLocation.cs" />
-    <Compile Include="ChildWindow\Implementation\WindowState.cs" />
-    <Compile Include="ButtonSpinner\Implementation\SpinDirection.cs" />
-    <Compile Include="ButtonSpinner\Implementation\SpinEventArgs.cs" />
-    <Compile Include="ButtonSpinner\Implementation\Spinner.cs" />
-    <Compile Include="ButtonSpinner\Implementation\ValidSpinDirections.cs" />
-    <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
-    <Compile Include="CheckComboBox\Implementation\CheckComboBox.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControl.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControlButton.cs" />
-    <Compile Include="CollectionControl\Implementation\CollectionControlDialog.xaml.cs">
-      <DependentUpon>CollectionControlDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CollectionControl\Implementation\Converters\NewItemTypesComboBoxConverter.cs" />
-    <Compile Include="CollectionControl\Implementation\ItemAddingEventArgs.cs" />
-    <Compile Include="CollectionControl\Implementation\ItemDeletingEventArgs.cs" />
-    <Compile Include="CollectionControl\Implementation\ItemEventArgs.cs" />
-    <Compile Include="CollectionControl\Implementation\PrimitiveTypeCollectionControl.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorSorter.cs" />
-    <Compile Include="Core\CancelRoutedEventArgs.cs" />
-    <Compile Include="Core\Converters\AditionConverter.cs" />
-    <Compile Include="Core\Converters\CenterTitleConverter.cs" />
-    <Compile Include="Core\Converters\ColorBlendConverter.cs" />
-    <Compile Include="Core\Converters\CornerRadiusToDoubleConverter.cs" />
-    <Compile Include="Core\Converters\HalfConverter.cs" />
-    <Compile Include="Core\Converters\IntToThicknessConverter.cs" />
-    <Compile Include="Core\Converters\NullToBoolConverter.cs" />
-    <Compile Include="Core\Converters\ThicknessSideRemovalConverter.cs" />
-    <Compile Include="Core\Converters\ThicknessToDoubleConverter.cs" />
-    <Compile Include="Core\EditableKeyValuePair.cs" />
-    <Compile Include="Primitives\DateTimePickerBase.cs" />
-    <Compile Include="Core\Utilities\DateTimeUtilities.cs" />
-    <Compile Include="PropertyGrid\Implementation\CategoryGroupStyleSelector.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\IsDefaultCategoryConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\IsStringEmptyConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\SourceComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\TrimmedTextBlock.cs" />
-    <Compile Include="Core\Converters\WindowContentBorderMarginConverter.cs" />
-    <Compile Include="Core\Converters\WindowControlBackgroundConverter.cs" />
-    <Compile Include="Core\Input\IValidateInput.cs" />
-    <Compile Include="Core\Input\InputValidationErrorEventArgs.cs" />
-    <Compile Include="Core\Media\Animation\AnimationRate.cs" />
-    <Compile Include="Core\Media\Animation\AnimationRateConverter.cs" />
-    <Compile Include="Core\Media\Animation\IterativeAnimationEquation.cs" />
-    <Compile Include="Core\Media\Animation\IterativeAnimationEquationDelegate.cs" />
-    <Compile Include="Core\Media\Animation\IterativeEquationConverter.cs" />
-    <Compile Include="Core\Media\Animation\PennerEquation.cs" />
-    <Compile Include="Core\Media\Animation\PennerEquations.cs" />
-    <Compile Include="Core\Media\WindowColors.cs" />
-    <Compile Include="Primitives\CachedTextInfo.cs" />
-    <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
-    <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
-    <Compile Include="Core\Converters\CalculatorMemoryToVisibilityConverter.cs" />
-    <Compile Include="Core\Converters\RoundedValueConverter.cs" />
-    <Compile Include="Core\Converters\VisibilityToBoolConverter.cs" />
-    <Compile Include="Core\Converters\WizardPageButtonVisibilityConverter.cs" />
-    <Compile Include="Core\ErrorMessages.cs" />
-    <Compile Include="Core\IndexChangedEventArgs.cs" />
-    <Compile Include="Core\IndexChangedEventHandler.cs" />
-    <Compile Include="Core\Input\KeyModifier.cs" />
-    <Compile Include="Core\Input\KeyModifierCollection.cs" />
-    <Compile Include="Core\Input\KeyModifierCollectionConverter.cs" />
-    <Compile Include="Core\InvalidContentException.cs" />
-    <Compile Include="Core\InvalidTemplateException.cs" />
-    <Compile Include="Primitives\DateTimeUpDownBase.cs" />
-    <Compile Include="Primitives\HsvColor.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
-    <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
-    <Compile Include="Primitives\MouseWheelActiveTriggerEnum.cs" />
-    <Compile Include="Primitives\WindowContainer.cs" />
-    <Compile Include="Primitives\WindowControl.cs" />
-    <Compile Include="Core\Utilities\ChangeTypeHelper.cs" />
-    <Compile Include="Core\Utilities\FontUtilities.cs" />
-    <Compile Include="Core\Utilities\GeneralUtilities.cs" />
-    <Compile Include="Core\Utilities\KeyboardUtilities.cs" />
-    <Compile Include="Core\Utilities\ListUtilities.cs" />
-    <Compile Include="Core\Utilities\PropertyChangedExt.cs" />
-    <Compile Include="Core\Utilities\RoutedEventHelper.cs" />
-    <Compile Include="Core\Utilities\WeakEventListener.cs" />
-    <Compile Include="Core\Utilities\WindowUtilities.cs" />
-    <Compile Include="Core\VersionResourceDictionary.cs" />
-    <Compile Include="Core\WeakCollectionChangedWrapper.cs" />
-    <Compile Include="NumericUpDown\Implementation\AllowedSpecialValuesEnum.cs" />
-    <Compile Include="Panels\AnimatorConverter.cs" />
-    <Compile Include="Panels\Animators.cs" />
-    <Compile Include="Panels\ChildEnteredEventArgs.cs" />
-    <Compile Include="Panels\ChildEnteredEventHandler.cs" />
-    <Compile Include="Panels\ChildEnteringEventArgs.cs" />
-    <Compile Include="Panels\ChildEnteringEventHandler.cs" />
-    <Compile Include="Panels\ChildExitedEventArgs.cs" />
-    <Compile Include="Panels\ChildExitedEventHandler.cs" />
-    <Compile Include="Panels\ChildExitingEventArgs.cs" />
-    <Compile Include="Panels\ChildExitingEventHandler.cs" />
-    <Compile Include="Panels\DoubleAnimator.cs" />
-    <Compile Include="Panels\IterativeAnimator.cs" />
-    <Compile Include="Panels\PanelBase.cs" />
-    <Compile Include="Primitives\Selector.cs" />
-    <Compile Include="Primitives\SelectorItem.cs" />
-    <Compile Include="Primitives\ShapeBase.cs" />
-    <Compile Include="Primitives\ValueRangeTextBox.cs" />
-    <Compile Include="Core\PropertyChangedEventArgs.cs" />
-    <Compile Include="Core\PropertyChangedEventHandler.cs" />
-    <Compile Include="Core\QueryTextFromValueEventArgs.cs" />
-    <Compile Include="Core\QueryValueFromTextEventArgs.cs" />
-    <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
-    <Compile Include="Core\Utilities\ColorUtilities.cs" />
-    <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
-    <Compile Include="Core\Converters\ColorToSolidColorBrushConverter.cs" />
-    <Compile Include="Core\Converters\InverseBoolConverter.cs" />
-    <Compile Include="Core\Converters\SolidColorBrushToColorConverter.cs" />
-    <Compile Include="Core\Utilities\ContextMenuUtilities.cs" />
-    <Compile Include="Core\Utilities\TreeHelper.cs" />
-    <Compile Include="Core\Utilities\ValueChangeHelper.cs" />
-    <Compile Include="Core\Utilities\DoubleHelper.cs" />
-    <Compile Include="Core\Utilities\EllipseHelper.cs" />
-    <Compile Include="Core\Utilities\PointHelper.cs" />
-    <Compile Include="Core\Utilities\RectHelper.cs" />
-    <Compile Include="Core\Utilities\ReflectionHelper.cs" />
-    <Compile Include="Core\Utilities\ResourceHelper.cs" />
-    <Compile Include="Core\Utilities\Segment.cs" />
-    <Compile Include="Core\Utilities\VisualTreeHelperEx.cs" />
-    <Compile Include="DateTimePicker\Implementation\DateTimePicker.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeFormat.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeInfo.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
-    <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
-    <Compile Include="DropDownButton\Implementation\DropDownButton.cs" />
-    <Compile Include="Magnifier\Implementation\FrameType.cs" />
-    <Compile Include="MaskedTextBox\Implementation\AutoCompletingMaskEventArgs.cs" />
-    <Compile Include="MaskedTextBox\Implementation\InsertKeyModeEnum.cs" />
-    <Compile Include="MaskedTextBox\Implementation\MaskedTextBox.cs" />
-    <Compile Include="MaskedTextBox\Implementation\MaskFormatEnum.cs" />
-    <Compile Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.cs" />
-    <Compile Include="NumericUpDown\Implementation\ByteUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\CommonNumericUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\DecimalUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\DoubleUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\SByteUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\SingleUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
-    <Compile Include="Core\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
-    <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
-    <Compile Include="Magnifier\Implementation\Magnifier.cs" />
-    <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
-    <Compile Include="Magnifier\Implementation\MagnifierManager.cs" />
-    <Compile Include="Primitives\InputBase.cs" />
-    <Compile Include="Obselete\MaskedTextBox\Implementation\MaskedTextBox.cs" />
-    <Compile Include="MessageBox\Implementation\MessageBox.cs" />
-    <Compile Include="NumericUpDown\Implementation\LongUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\NumericUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\ShortUpDown.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="NumericUpDown\Implementation\UIntegerUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\ULongUpDown.cs" />
-    <Compile Include="NumericUpDown\Implementation\UShortUpDown.cs" />
-    <Compile Include="Panels\AnimationPanel.cs" />
-    <Compile Include="Panels\RandomPanel.cs" />
-    <Compile Include="Panels\ScrollHelper.cs" />
-    <Compile Include="Panels\SwitchPanel.cs" />
-    <Compile Include="Panels\SwitchPresenter.cs" />
-    <Compile Include="Panels\SwitchTemplate.cs" />
-    <Compile Include="Panels\WrapPanel.cs" />
-    <Compile Include="Pie\Implementation\Pie.cs" />
-    <Compile Include="Pie\Implementation\PieModeEnum.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="BusyIndicator\Implementation\VisualStates.BusyIndicator.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\CategoryOrderAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\NewItemTypesAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ObjectToUIElementConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
-    <Compile Include="PropertyGrid\Implementation\CommonPropertyExceptionValidationRule.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ListConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\SelectedObjectConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\EditorTimeSpanConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\CustomPropertyItem.cs" />
-    <Compile Include="PropertyGrid\Implementation\Definitions\EditorTemplateDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\Definitions\PropertyDefinitionBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Definitions\EditorDefinitionBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\MaskedTextBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionBaseCollection.cs" />
-    <Compile Include="PropertyGrid\Implementation\FilterInfo.cs" />
-    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelperBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinitionBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\UpDownEditors.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TextBoxEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
-    <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
-    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyContainer.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemsControl.cs" />
-    <Compile Include="PropertyGrid\Implementation\ContainerHelperBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemBase.cs" />
-    <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
-    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelper.cs" />
-    <Compile Include="PropertyGrid\Implementation\StringConstants.cs" />
-    <Compile Include="PropertyGrid\Implementation\TargetPropertyType.cs" />
-    <Compile Include="RangeSlider\Implementation\Converters\SliderThumbWidthConverter.cs" />
-    <Compile Include="RangeSlider\Implementation\RangeSlider.cs" />
-    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
-    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.cs" />
-    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
-    <Compile Include="Core\UIElementAdorner.cs" />
-    <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
-    <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
-    <Compile Include="RichTextBox\RichTextBox.cs" />
-    <Compile Include="Primitives\UpDownBase.cs" />
-    <Compile Include="SplitButton\Implementation\SplitButton.cs" />
-    <Compile Include="Primitives\Themes\ResourceKeys.cs" />
-    <Compile Include="StyleableWindow\Implementation\Converters\StyleableWindowClippingBorderConverter.cs" />
-    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
-    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
-    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
-    <Compile Include="TimePicker\Implementation\TimeItem.cs" />
-    <Compile Include="TimePicker\Implementation\TimePicker.cs" />
-    <Compile Include="TimeSpanUpDown\Implementation\TimeSpanUpDown.cs" />
-    <Compile Include="VisualStates.cs" />
-    <Compile Include="MessageBox\Implementation\VisualStates.MessageBox.cs" />
-    <Compile Include="WatermarkComboBox\Implementation\WatermarkComboBox.cs" />
-    <Compile Include="WatermarkPasswordBox\Implementation\WatermarkPasswordBox.cs" />
-    <Compile Include="WatermarkTextBox\Implementation\WatermarkTextBox.cs" />
-    <Compile Include="Wizard\Implementation\WizardCommands.cs" />
-    <Compile Include="Wizard\Implementation\WizardPage.cs" />
-    <Compile Include="Wizard\Implementation\Wizard.cs" />
-    <Compile Include="Wizard\Implementation\WizardPageButtonVisibility.cs" />
-    <Compile Include="Wizard\Implementation\WizardPageType.cs" />
    <AppDesigner Include="Properties\" />
-    <Compile Include="Zoombox\Zoombox.cs" />
-    <Compile Include="Zoombox\ZoomboxCursors.cs" />
-    <Compile Include="Zoombox\ZoomboxView.cs" />
-    <Compile Include="Zoombox\ZoomboxViewChangedEventArgs.cs" />
-    <Compile Include="Zoombox\ZoomboxViewChangedEventHandler.cs" />
-    <Compile Include="Zoombox\ZoomboxViewConverter.cs" />
-    <Compile Include="Zoombox\ZoomboxViewException.cs" />
-    <Compile Include="Zoombox\ZoomboxViewFinderDisplay.cs" />
-    <Compile Include="Zoombox\ZoomboxViewKind.cs" />
-    <Compile Include="Zoombox\ZoomboxViewStack.cs" />
-    <Compile Include="Zoombox\ZoomboxViewStackMode.cs" />
-    <Compile Include="Zoombox\ZoomboxZoomOn.cs" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="MessageBox\Icons\Error48.png" />
@ -741,12 +79,6 @@
    <Resource Include="Zoombox\Resources\Zoom.cur" />
    <Resource Include="Zoombox\Resources\ZoomRelative.cur" />
  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Core\ErrorMessages.resx">
-      <DependentUpon>ErrorMessages.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
  <ItemGroup>
    <Resource Include="CollectionControl\Images\Delete16.png" />
  </ItemGroup>
@ -782,17 +114,11 @@
    <Resource Include="Themes\Generic\Images\restore_pressed.png" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="PropertyGrid\Implementation\Definitions\DefinitionBase.cs" />
+    <Resource Include="CollectionControl\Images\Duplicate.png" />
  </ItemGroup>
  <ItemGroup>
-    <Resource Include="CollectionControl\Images\Duplicate.png" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit.LiveExplorer", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
 EndProject