Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Namespace Refactoring to AvalonDock (reverting to original authoring in version 2.0 and earlier) #102

Merged
merged 13 commits into from
Dec 11, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Moved Xceed.Wpf.AvalonDock to AvalonDock along with unit test prject …
…and TestApp project (other projects are yet to be refactored)
  • Loading branch information
Dirkster99 committed Dec 11, 2019
commit e127a730a2d6a9e8e08536bc3f74ef54c6879b46
2 changes: 1 addition & 1 deletion source/AutomationTest/AvalonDockTest/AnchorablePaneTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Threading.Tasks;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;
using AvalonDockTest.TestHelpers;
using AvalonDockTest.views;

Expand Down
13 changes: 6 additions & 7 deletions source/AutomationTest/AvalonDockTest/AvalonDockTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@
<None Include="packages.config" />
<None Include="Testsettings.runsettings" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
<Name>Xceed.Wpf.AvalonDock</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="TestApp.xaml">
<Generator>MSBuild:Compile</Generator>
Expand All @@ -100,7 +94,12 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<ProjectReference Include="..\..\Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj">
<Project>{db81988f-e0f2-45a0-a1fd-8c37f3d35244}</Project>
<Name>AvalonDock</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

[TestClass]
public sealed class DockingUtilitiesTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Xceed.Wpf.AvalonDock.Layout.Serialization;
using AvalonDock.Layout.Serialization;
using AvalonDockTest.TestHelpers;
using AvalonDockTest.Views;

Expand Down
6 changes: 3 additions & 3 deletions source/AutomationTest/AvalonDockTest/LayoutAnchorableTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Xceed.Wpf.AvalonDock.Controls;
using Xceed.Wpf.AvalonDock.Converters;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Controls;
using AvalonDock.Converters;
using AvalonDock.Layout;

namespace AvalonDockTest
{
Expand Down
2 changes: 1 addition & 1 deletion source/AvalonDock.sln
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Projects", "Test Proje
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AvalonDock", "AvalonDock", "{B0EB64E3-2C25-46CC-BBB6-E38EF2584177}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock", "Components\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvalonDock", "Components\Xceed.Wpf.AvalonDock\AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Expression", "Components\Xceed.Wpf.AvalonDock.Themes.Expression\Xceed.Wpf.AvalonDock.Themes.Expression.csproj", "{488DD8F7-9D3C-4F53-BD1F-84A095D9BC10}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>Xceed.Wpf.AvalonDock</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<UseWPF>true</UseWPF>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.00</Version>
<AssemblyVersion>4.00</AssemblyVersion>
<FileVersion>4.00</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2019</Copyright>
<Description>This assembly implements a docking layout system for WPF.</Description>
<PackageProjectUrl>https://github.com/Dirkster99/AvalonDock</PackageProjectUrl>
<RepositoryUrl>https://github.com/Dirkster99/AvalonDock</RepositoryUrl>
<PackageId>Dirkster.AvalonDock</PackageId>
<Authors>https://github.com/Dirkster99/AvalonDock</Authors>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<DefineConstants />
</PropertyGroup>
<ItemGroup>
<Resource Include="**\*.png" />
</ItemGroup>
<!-- NuGet Packaging -->
<ItemGroup>
<None Include="LICENSE.txt" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.ca-ES.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<!--PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG</DefineConstants>
</PropertyGroup>-->
</Project>
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<RootNamespace>AvalonDock</RootNamespace>
<TargetFrameworks>netcoreapp3.0;net4</TargetFrameworks>
<UseWPF>true</UseWPF>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>4.00</Version>
<AssemblyVersion>4.00</AssemblyVersion>
<FileVersion>4.00</FileVersion>
<Company>Open Source</Company>
<Product>Dirkster.AvalonDock</Product>
<Copyright>2017-2019</Copyright>
<Description>This assembly implements a docking layout system for WPF.</Description>
<PackageProjectUrl>https://github.com/Dirkster99/AvalonDock</PackageProjectUrl>
<RepositoryUrl>https://github.com/Dirkster99/AvalonDock</RepositoryUrl>
<PackageId>Dirkster.AvalonDock</PackageId>
<Authors>https://github.com/Dirkster99/AvalonDock</Authors>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.0|AnyCPU'">
<DefineConstants />
</PropertyGroup>

<ItemGroup>
<Resource Include="**\*.png" />
</ItemGroup>

<!-- NuGet Packaging -->
<ItemGroup>
<None Include="LICENSE.txt" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.ca-ES.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>

<!--PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG</DefineConstants>
</PropertyGroup>-->
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public
using System;
using System.Windows.Input;

namespace Xceed.Wpf.AvalonDock.Commands
namespace AvalonDock.Commands
{
internal class RelayCommand : ICommand
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public

using System.Windows;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class AnchorablePaneControlOverlayArea : OverlayArea
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class AnchorablePaneDropTarget : DropTarget<LayoutAnchorablePaneControl>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows.Controls;
using System.Windows;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class AnchorablePaneTabPanel : Panel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Windows.Controls;
using System.Windows;
using System.Windows.Input;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class AnchorablePaneTitle : Control
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ This program is provided to you under the terms of the Microsoft Public

using System;
using System.Windows.Threading;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class AutoHideWindowManager
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This program is provided to you under the terms of the Microsoft Public
using System.Windows.Data;
using System.Windows.Threading;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class BindingHelper
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This program is provided to you under the terms of the Microsoft Public
using System.Windows.Controls;
using System.Windows.Data;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class ContextMenuEx : ContextMenu
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class DockingManagerDropTarget : DropTarget<DockingManager>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public

using System.Windows;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class DockingManagerOverlayArea : OverlayArea
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public

using System.Windows;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class DocumentPaneControlOverlayArea : OverlayArea
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class DocumentPaneDropAsAnchorableTarget : DropTarget<LayoutDocumentPaneControl>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class DocumentPaneDropTarget : DropTarget<LayoutDocumentPaneControl>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class DocumentPaneGroupDropTarget : DropTarget<LayoutDocumentPaneGroupControl>
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows.Controls;
using System.Windows;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class DocumentPaneTabPanel : Panel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ This program is provided to you under the terms of the Microsoft Public
using System.Collections.Generic;
using System.Linq;
using System.Windows;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal class DragService
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This program is provided to you under the terms of the Microsoft Public

using System.Windows;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public enum DropAreaType
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public
using System.Windows;
using System.Windows.Controls;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class DropDownButton : ToggleButton
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ This program is provided to you under the terms of the Microsoft Public
using System.Windows.Controls;
using System.Windows.Controls.Primitives;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
public class DropDownControlArea : UserControl
{
Expand Down
4 changes: 2 additions & 2 deletions source/Components/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ This program is provided to you under the terms of the Microsoft Public
using System.Linq;
using System.Windows;
using System.Windows.Media;
using Xceed.Wpf.AvalonDock.Layout;
using AvalonDock.Layout;
using System.Windows.Threading;

namespace Xceed.Wpf.AvalonDock.Controls
namespace AvalonDock.Controls
{
internal abstract class DropTarget<T> : DropTargetBase, IDropTarget where T : FrameworkElement
{
Expand Down
Loading