Browse Source

Moved ControlLocator out of Data namespace.

Steven Kirk 10 years ago
parent
commit
41cb6b68b6

+ 1 - 1
src/Markup/Perspex.Markup/Data/ControlLocator.cs → src/Markup/Perspex.Markup/ControlLocator.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using Perspex.Controls;
 
-namespace Perspex.Markup.Data
+namespace Perspex.Markup
 {
     /// <summary>
     /// Locates controls relative to other controls.

+ 1 - 1
src/Markup/Perspex.Markup/Perspex.Markup.csproj

@@ -42,7 +42,7 @@
     <Compile Include="Data\ExpressionNodeBuilder.cs" />
     <Compile Include="Data\ExpressionParseException.cs" />
     <Compile Include="Data\ExpressionSubject.cs" />
-    <Compile Include="Data\ControlLocator.cs" />
+    <Compile Include="ControlLocator.cs" />
     <Compile Include="Data\Plugins\PerspexPropertyAccessorPlugin.cs" />
     <Compile Include="Data\Plugins\InpcPropertyAccessorPlugin.cs" />
     <Compile Include="Data\Plugins\IPropertyAccessor.cs" />

+ 1 - 2
tests/Perspex.Markup.UnitTests/Data/ControlLocatorTests.cs → tests/Perspex.Markup.UnitTests/ControlLocatorTests.cs

@@ -5,10 +5,9 @@ using System;
 using System.Collections.Generic;
 using System.Reactive.Linq;
 using Perspex.Controls;
-using Perspex.Markup.Data;
 using Xunit;
 
-namespace Perspex.Markup.UnitTests.Data
+namespace Perspex.Markup.UnitTests
 {
     public class ControlLocatorTests
     {

+ 1 - 1
tests/Perspex.Markup.UnitTests/Perspex.Markup.UnitTests.csproj

@@ -77,7 +77,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Data\ControlLocatorTests.cs" />
+    <Compile Include="ControlLocatorTests.cs" />
     <Compile Include="Data\ExpressionNodeBuilderTests.cs" />
     <Compile Include="Data\ExpressionNodeBuilderTests_Errors.cs" />
     <Compile Include="Data\ExpressionObserverTests_Indexer.cs" />