upgrade Xceed.Wpf.AvalonDock

2 years ago · 2715c76b58
4 changed files with 73 additions and 407 deletions
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
@ -14,19 +14,72 @@

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

-#pragma warning disable 0436
-[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
-#pragma warning restore 0436
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Markup;
+
+// 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 - AvalonDock")]
+[assembly: AssemblyDescription("This assembly implements the Xceed.Wpf.AvalonDock namespace, a docking layout system for the Windows Presentation Framework.")]
+
+[assembly: AssemblyCompany("Xceed Software Inc.")]
+[assembly: AssemblyProduct("Xceed Toolkit for WPF - AvalonDock")]
+[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
+[assembly: AssemblyCulture("")]
+
+
+
+// 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)]
+
+//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.None, //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/avalondock", "xcad")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Controls")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Converters")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Layout")]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes")]
+
+//#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.AvalonDock/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
@ -1,76 +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
-
-  ***********************************************************************************/
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-using System.Windows.Markup;
-using System;
-
-// 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 - AvalonDock" )]
-[assembly: AssemblyDescription( "This assembly implements the Xceed.Wpf.AvalonDock namespace, a docking layout system for the Windows Presentation Framework." )]
-
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
-[assembly: AssemblyCulture( "" )]
-
-
-
-// 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 )]
-
-//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.None, //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/avalondock", "xcad" )]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock" )]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Controls" )]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Converters" )]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Layout" )]
-[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )]
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
-[assembly: AssemblyKeyName( "" )]
-#pragma warning restore 1699
-
-
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
@ -1,318 +1,20 @@
-<?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>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.AvalonDock</RootNamespace>
-    <AssemblyName>Xceed.Wpf.AvalonDock</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</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>net8.0-windows</TargetFramework>
+    <OutputType>Library</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
  </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>
    <DocumentationFile>
    </DocumentationFile>
  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
-  </PropertyGroup>
  <PropertyGroup>
    <AssemblyOriginatorKeyFile>
    </AssemblyOriginatorKeyFile>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <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="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyVersionInfo.cs" />
-    <Compile Include="AssemblyVersionInfoCommon.cs" />
-    <Compile Include="Commands\RelayCommand.cs" />
-    <Compile Include="Controls\AnchorablePaneControlOverlayArea.cs" />
-    <Compile Include="Controls\AnchorablePaneDropTarget.cs" />
-    <Compile Include="Controls\AnchorablePaneTabPanel.cs" />
-    <Compile Include="Controls\AnchorablePaneTitle.cs" />
-    <Compile Include="Controls\AutoHideWindowManager.cs" />
-    <Compile Include="Controls\BindingHelper.cs" />
-    <Compile Include="Controls\ContextMenuEx.cs" />
-    <Compile Include="Controls\FullWeakDictionary.cs" />
-    <Compile Include="Controls\DocumentPaneDropAsAnchorableTarget.cs" />
-    <Compile Include="Controls\DocumentPaneGroupDropTarget.cs" />
-    <Compile Include="Controls\DropDownButton.cs" />
-    <Compile Include="Controls\DropDownControlArea.cs" />
-    <Compile Include="Controls\DropTargetBase.cs" />
-    <Compile Include="Controls\WeakDictionary.cs" />
-    <Compile Include="Controls\WindowActivateEventArgs.cs" />
-    <Compile Include="Controls\WindowHookHandler.cs" />
-    <Compile Include="Controls\FocusElementManager.cs" />
-    <Compile Include="Controls\LayoutAnchorableItem.cs" />
-    <Compile Include="Controls\LayoutDocumentItem.cs" />
-    <Compile Include="Controls\LayoutItem.cs" />
-    <Compile Include="Controls\MenuItemEx.cs" />
-    <Compile Include="Controls\NavigatorWindow.cs" />
-    <Compile Include="Controls\ReentrantFlag.cs" />
-    <Compile Include="Controls\Shell\Standard\ComGuids.cs" />
-    <Compile Include="Controls\Shell\Standard\Debug.cs" />
-    <Compile Include="Controls\Shell\Standard\DoubleUtil.cs" />
-    <Compile Include="Controls\Shell\Standard\DpiHelper.cs" />
-    <Compile Include="Controls\Shell\Standard\ErrorCodes.cs" />
-    <Compile Include="Controls\Shell\Standard\MessageWindow.cs" />
-    <Compile Include="Controls\Shell\Standard\NativeMethods.cs" />
-    <Compile Include="Controls\Shell\Standard\ShellProvider.cs" />
-    <Compile Include="Controls\Shell\Standard\StreamHelper.cs" />
-    <Compile Include="Controls\Shell\Standard\Utilities.cs" />
-    <Compile Include="Controls\Shell\Standard\Verify.cs" />
-    <Compile Include="Controls\Shell\SystemCommands.cs" />
-    <Compile Include="Controls\Shell\SystemParameters2.cs" />
-    <Compile Include="Controls\Shell\WindowChrome.cs" />
-    <Compile Include="Controls\Shell\WindowChromeWorker.cs" />
-    <Compile Include="Converters\ActivateCommandLayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\AnchorableContextMenuHideVisibilityConverter.cs" />
-    <Compile Include="Converters\AutoHideCommandLayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\HideCommandLayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\InverseBoolToVisibilityConverter.cs" />
-    <Compile Include="Converters\LayoutItemFromLayoutModelConverter.cs" />
-    <Compile Include="Converters\NullToDoNothingConverter.cs" />
-    <Compile Include="Converters\UriSourceToBitmapImageConverter.cs" />
-    <Compile Include="DocumentClosedEventArgs.cs" />
-    <Compile Include="DocumentClosingEventArgs.cs" />
-    <Compile Include="Extentions.cs" />
-    <Compile Include="LayoutEventArgs.cs" />
-    <Compile Include="Layout\AnchorableShowStrategy.cs" />
-    <Compile Include="Layout\AnchorSide.cs" />
-    <Compile Include="Controls\DockingManagerDropTarget.cs" />
-    <Compile Include="Controls\DockingManagerOverlayArea.cs" />
-    <Compile Include="Controls\DocumentPaneControlOverlayArea.cs" />
-    <Compile Include="Controls\DocumentPaneDropTarget.cs" />
-    <Compile Include="Controls\DocumentPaneTabPanel.cs" />
-    <Compile Include="Controls\DragService.cs" />
-    <Compile Include="Controls\DropArea.cs" />
-    <Compile Include="Controls\DropTarget.cs" />
-    <Compile Include="Controls\DropTargetType.cs" />
-    <Compile Include="Controls\Extentions.cs" />
-    <Compile Include="Controls\IDropTarget.cs" />
-    <Compile Include="Controls\LayoutAnchorableControl.cs" />
-    <Compile Include="Controls\LayoutAnchorableFloatingWindowControl.cs" />
-    <Compile Include="Controls\LayoutAnchorablePaneControl.cs" />
-    <Compile Include="Controls\LayoutAnchorablePaneGroupControl.cs" />
-    <Compile Include="Controls\LayoutAnchorableTabItem.cs" />
-    <Compile Include="Controls\LayoutAnchorControl.cs" />
-    <Compile Include="Controls\LayoutAnchorGroupControl.cs" />
-    <Compile Include="Controls\LayoutAnchorSideControl.cs" />
-    <Compile Include="Controls\LayoutDocumentControl.cs" />
-    <Compile Include="Controls\LayoutDocumentFloatingWindowControl.cs" />
-    <Compile Include="Controls\LayoutDocumentPaneControl.cs" />
-    <Compile Include="Controls\LayoutDocumentPaneGroupControl.cs" />
-    <Compile Include="Controls\LayoutDocumentTabItem.cs" />
-    <Compile Include="Controls\LayoutFloatingWindowControl.cs" />
-    <Compile Include="Controls\LayoutGridControl.cs" />
-    <Compile Include="Controls\LayoutGridResizerControl.cs" />
-    <Compile Include="Controls\LayoutPanelControl.cs" />
-    <Compile Include="Controls\OverlayArea.cs" />
-    <Compile Include="Controls\OverlayWindow.cs" />
-    <Compile Include="Controls\OverlayWindowDropTarget.cs" />
-    <Compile Include="Controls\OverlayWindowDropTargetType.cs" />
-    <Compile Include="Controls\TransformExtentions.cs" />
-    <Compile Include="Converters\AnchorSideToAngleConverter.cs" />
-    <Compile Include="Converters\AnchorSideToOrientationConverter.cs" />
-    <Compile Include="Converters\BoolToVisibilityConverter.cs" />
-    <Compile Include="DockingManager.cs" />
-    <Compile Include="Layout\ChildrenTreeChangedEventArgs.cs" />
-    <Compile Include="Layout\Extentions.cs" />
-    <Compile Include="Layout\ILayoutAnchorablePane.cs" />
-    <Compile Include="Layout\ILayoutContainer.cs" />
-    <Compile Include="Layout\ILayoutContentSelector.cs" />
-    <Compile Include="Layout\ILayoutControl.cs" />
-    <Compile Include="Layout\ILayoutDocumentPane.cs" />
-    <Compile Include="Layout\ILayoutElement.cs" />
-    <Compile Include="Layout\ILayoutElementWithVisibility.cs" />
-    <Compile Include="Layout\ILayoutGroup.cs" />
-    <Compile Include="Layout\ILayoutOrientableElement.cs" />
-    <Compile Include="Layout\ILayoutPane.cs" />
-    <Compile Include="Layout\ILayoutPanelElement.cs" />
-    <Compile Include="Layout\ILayoutPaneSerializable.cs" />
-    <Compile Include="Layout\ILayoutPositionableElement.cs" />
-    <Compile Include="Layout\ILayoutPreviousContainer.cs" />
-    <Compile Include="Layout\ILayoutRoot.cs" />
-    <Compile Include="Controls\IOverlayWindow.cs" />
-    <Compile Include="Controls\IOverlayWindowArea.cs" />
-    <Compile Include="Controls\IOverlayWindowDropTarget.cs" />
-    <Compile Include="Controls\IOverlayWindowHost.cs" />
-    <Compile Include="Layout\ILayoutUpdateStrategy.cs" />
-    <Compile Include="Layout\LayoutAnchorable.cs" />
-    <Compile Include="Layout\LayoutAnchorableFloatingWindow.cs" />
-    <Compile Include="Layout\LayoutAnchorablePane.cs" />
-    <Compile Include="Layout\LayoutAnchorablePaneGroup.cs" />
-    <Compile Include="Layout\LayoutAnchorGroup.cs" />
-    <Compile Include="Layout\LayoutAnchorSide.cs" />
-    <Compile Include="Controls\LayoutAutoHideWindowControl.cs" />
-    <Compile Include="Layout\LayoutContent.cs" />
-    <Compile Include="Layout\LayoutDocument.cs" />
-    <Compile Include="Layout\LayoutDocumentFloatingWindow.cs" />
-    <Compile Include="Layout\LayoutDocumentPane.cs" />
-    <Compile Include="Layout\LayoutDocumentPaneGroup.cs" />
-    <Compile Include="Layout\LayoutElement.cs" />
-    <Compile Include="Layout\LayoutElementEventArgs.cs" />
-    <Compile Include="Layout\LayoutFloatingWindow.cs" />
-    <Compile Include="Layout\LayoutGroup.cs" />
-    <Compile Include="Layout\LayoutGroupBase.cs" />
-    <Compile Include="Layout\LayoutPanel.cs" />
-    <Compile Include="Layout\LayoutPositionableGroup.cs" />
-    <Compile Include="Layout\LayoutRoot.cs" />
-    <Compile Include="Layout\Serialization\LayoutSerializationCallbackEventArgs.cs" />
-    <Compile Include="Layout\Serialization\LayoutSerializer.cs" />
-    <Compile Include="Layout\Serialization\XmlLayoutSerializer.cs" />
-    <Compile Include="MathHelper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.de.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.de.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.es.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.es.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.fr.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.fr.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.hu.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.hu.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.it.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.it.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.pt-BR.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.pt-BR.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.ro.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.ro.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.ru.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.ru.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.sv.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.sv.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Resources.zh-Hans.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.zh-Hans.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Themes\DictionaryTheme.cs" />
-    <Compile Include="Themes\GenericTheme.cs" />
-    <Compile Include="Themes\Theme.cs" />
-    <Compile Include="Win32Helper.cs" />
-    <Compile Include="WindowHelper.cs" />
-    <EmbeddedResource Include="Properties\Resources.hu.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.hu.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.it.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.it.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.fr.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.es.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.es.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.pt-BR.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.pt-BR.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.ru.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.ru.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.de.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.sv.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.sv.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.zh-Hans.resx">
-      <SubType>Designer</SubType>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.zh-Hans.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.ro.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.ro.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
    <AppDesigner Include="Properties\" />
  </ItemGroup>
  <ItemGroup>
@ -346,23 +48,10 @@
    <Resource Include="Themes\Generic\Images\PinRestore.png" />
  </ItemGroup>
  <ItemGroup>
-    <Page Include="Themes\generic.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
+    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72e591d6-8f83-4d8c-8f67-9c325e623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.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
@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit", "Src\Xc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock", "Src\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock", "Src\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{8976E4A6-FF5F-44C5-AC57-FEDA249DD199}"
 EndProject