Moved ExtendedObject & RelayCommand to SharedUI.

5 files changed, 6 insertions, 6 deletions

diff --git a/Software/Visual Studio/Tango.Core/Tango.Core.csproj b/Software/Visual Studio/Tango.Core/Tango.Core.csproj
index 1653d5cb9..7b469bfdc 100644
--- a/Software/Visual Studio/Tango.Core/Tango.Core.csproj
+++ b/Software/Visual Studio/Tango.Core/Tango.Core.csproj
@@ -49,8 +49,6 @@
     </Compile>
     <Compile Include="ExtensionMethods\StringExtensions.cs" />
     <Compile Include="Helpers\AssemblyHelper.cs" />
-    <Compile Include="Commands\RelayCommand.cs" />
-    <Compile Include="ExtendedObject.cs" />
     <Compile Include="Helpers\PathHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/Software/Visual Studio/Tango.Core/Commands/RelayCommand.cs b/Software/Visual Studio/Tango.SharedUI/Commands/RelayCommand.cs
index f57a8699f..39fe78352 100644
--- a/Software/Visual Studio/Tango.Core/Commands/RelayCommand.cs
+++ b/Software/Visual Studio/Tango.SharedUI/Commands/RelayCommand.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace Tango.Core.Commands
+namespace Tango.SharedUI.Commands
 {
     /// <summary>
     /// RelayCommand is a very easy-to-use implementation of ICommand. You can use a RelayCommand to expose viewmodel functionality as a command, and
diff --git a/Software/Visual Studio/Tango.Core/ExtendedObject.cs b/Software/Visual Studio/Tango.SharedUI/ExtendedObject.cs
index 1452f1f0d..8e00f2e61 100644
--- a/Software/Visual Studio/Tango.Core/ExtendedObject.cs
+++ b/Software/Visual Studio/Tango.SharedUI/ExtendedObject.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
-using Tango.Core.Commands;
+using Tango.SharedUI.Commands;
 
-namespace Tango.Core
+namespace Tango.SharedUI
 {
     /// <summary>
     /// Represents an extension to the standard core object with support for property and relay commands changed event.
diff --git a/Software/Visual Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual Studio/Tango.SharedUI/Tango.SharedUI.csproj
index 4c78bf44a..d01e7b2f3 100644
--- a/Software/Visual Studio/Tango.SharedUI/Tango.SharedUI.csproj
+++ b/Software/Visual Studio/Tango.SharedUI/Tango.SharedUI.csproj
@@ -48,12 +48,14 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="Commands\RelayCommand.cs" />
     <Compile Include="Converters\BooleanInverseConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\BooleanToVisibilityInverseConverter.cs" />
     <Compile Include="Converters\EnumToDescriptionConverter.cs" />
     <Compile Include="Converters\NullObjectToBooleanConverter.cs" />
     <Compile Include="Converters\PathToShortPathConverter.cs" />
+    <Compile Include="ExtendedObject.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Software/Visual Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs b/Software/Visual Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs
index d530b439c..a36292deb 100644
--- a/Software/Visual Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs
+++ b/Software/Visual Studio/Utilities/Tango.Protobuf.UI/MainWindow.xaml.cs
@@ -16,8 +16,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using Tango.Core.Commands;
 using Tango.Protobuf.Compilers;
+using Tango.SharedUI.Commands;
 
 namespace Tango.Protobuf.UI
 {