MERGE

1 files changed, 31 insertions, 5 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index df8b65fda..f48561e40 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -120,6 +120,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Notifications\TextInputBoxWindow.xaml.cs">
+      <DependentUpon>TextInputBoxWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="StudioApplication\DefaultStudioApplicationManager.cs" />
     <Compile Include="Authentication\DefaultAuthenticationProvider.cs" />
     <Compile Include="Modules\DefaultStudioModuleLoader.cs" />
@@ -157,6 +160,10 @@
     <Compile Include="Views\ShutdownView.xaml.cs">
       <DependentUpon>ShutdownView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Windows\ExceptionResolutions.cs" />
+    <Compile Include="Windows\ExceptionWindow.xaml.cs">
+      <DependentUpon>ExceptionWindow.xaml</DependentUpon>
+    </Compile>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -172,6 +179,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Notifications\TextInputBoxWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Notifications\MessageBoxWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -208,6 +219,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Windows\ExceptionWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -241,14 +256,14 @@
     <Resource Include="design.ico" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\SideChains\RealTimeGraphEx\RealTimeGraphEx.csproj">
+      <Project>{b9ae25d6-be35-492f-9079-21a7f3e6f7cc}</Project>
+      <Name>RealTimeGraphEx</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Core\Tango.Core.csproj">
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Tango.DAL.Observables\Tango.DAL.Observables.csproj">
-      <Project>{0ecd6da8-7aa6-48d9-8b65-279d176ad9af}</Project>
-      <Name>Tango.DAL.Observables</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Tango.DAL.Remote\Tango.DAL.Remote.csproj">
       <Project>{38197109-8610-4d3f-92b9-16d48df94d7c}</Project>
       <Name>Tango.DAL.Remote</Name>
@@ -277,6 +292,10 @@
       <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
       <Name>Tango.Transport</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.DataCapture\Tango.MachineStudio.DataCapture.csproj">
+      <Project>{fc337a7f-1214-41d8-9992-78092a3b961e}</Project>
+      <Name>Tango.MachineStudio.DataCapture</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.DB\Tango.MachineStudio.DB.csproj">
       <Project>{94f7acf8-55e1-4a02-b9bc-a818413fdbbf}</Project>
       <Name>Tango.MachineStudio.DB</Name>
@@ -297,6 +316,10 @@
       <Project>{12d0c43c-391f-4c74-92ab-82e9a9beeb9b}</Project>
       <Name>Tango.MachineStudio.Synchronization</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.Technician\Tango.MachineStudio.Technician.csproj">
+      <Project>{5d39c1e1-3ecd-4634-bd1b-2bcf71c54a15}</Project>
+      <Name>Tango.MachineStudio.Technician</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
       <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
@@ -312,12 +335,15 @@
     <Resource Include="Images\account.png" />
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Controls\" />
+    <Resource Include="Images\White-Abstract.png" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\external-bridge-tcp.png" />
     <Resource Include="Images\external-bridge-usb.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\exception.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>$(TargetDir)linkgen.exe -s "$(TargetPath)" -d "$(TargetDir)Utilities\Machine Studio.lnk"