From ee697f7a3350d0a97bddee4de3a2ae4f9d285052 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 2 May 2018 17:36:54 +0300
Subject: merge

---
 .../Tango.MachineStudio.UI.csproj                  | 24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj')

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 8ab6bb188..5d685c112 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
@@ -131,6 +131,13 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <EmbeddedResource Include="Console\CodeTemplate.cs" />
+    <Compile Include="Console\ConsoleManager.cs" />
+    <Compile Include="Console\ConsoleOnExecuteParameters.cs" />
+    <Compile Include="Console\ConsoleWindow.xaml.cs">
+      <DependentUpon>ConsoleWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Console\ConsoleWindowVM.cs" />
     <Compile Include="Html\DefaultHtmlPresenter.cs" />
     <Compile Include="Html\HtmlWindow.xaml.cs">
       <DependentUpon>HtmlWindow.xaml</DependentUpon>
@@ -161,6 +168,7 @@
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\ModuleWindowVM.cs" />
     <Compile Include="ViewModels\ReportIssueViewVM.cs" />
+    <Compile Include="ViewModels\ResolvedIssuesViewVM.cs" />
     <Compile Include="ViewModels\ShutdownViewVM.cs" />
     <Compile Include="ViewModels\UpdateViewVM.cs" />
     <Compile Include="Views\ConnectedMachineView.xaml.cs">
@@ -190,6 +198,9 @@
     <Compile Include="Views\ReportIssueView.xaml.cs">
       <DependentUpon>ReportIssueView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\ResolvedIssuesView.xaml.cs">
+      <DependentUpon>ResolvedIssuesView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\ShutdownView.xaml.cs">
       <DependentUpon>ShutdownView.xaml</DependentUpon>
     </Compile>
@@ -203,6 +214,10 @@
     <Compile Include="Windows\ModuleWindow.xaml.cs">
       <DependentUpon>ModuleWindow.xaml</DependentUpon>
     </Compile>
+    <Page Include="Console\ConsoleWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Html\HtmlWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -270,6 +285,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\ResolvedIssuesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\ShutdownView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -355,6 +374,10 @@
       <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
       <Name>Tango.PMR</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.Scripting\Tango.Scripting.csproj">
+      <Project>{401989E7-AE1E-4002-B0EE-9A9F63740B97}</Project>
+      <Name>Tango.Scripting</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.Settings\Tango.Settings.csproj">
       <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
       <Name>Tango.Settings</Name>
@@ -460,6 +483,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Html\HTML Templates\Thread Break.html" />
+    <Resource Include="Images\bug-resolved.png" />
     <EmbeddedResource Include="TFS\SystemInformationTemplate.cshtml" />
     <Resource Include="Images\bug.png" />
   </ItemGroup>
-- 
cgit v1.3.1