merge tpf

1 files changed, 26 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
index d1bba995e..6fd23451d 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
+++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj
@@ -102,6 +102,7 @@
       <HintPath>..\packages\System.Data.SQLite.Linq.1.0.108.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
@@ -123,9 +124,11 @@
     <Compile Include="Logging\Parsing_TST.cs" />
     <Compile Include="MachineService\PPC_Controller_TST.cs" />
     <Compile Include="MachineStudio\MachineStudio_TST.cs" />
+    <Compile Include="Pulse\Pulse_TST.cs" />
     <Compile Include="RemoteRunner_TST.cs" />
     <Compile Include="SQLExaminer\SQLExaminer_TST.cs" />
     <Compile Include="Core\TemporaryManager_TST.cs" />
+    <Compile Include="TCC\TCC_TST.cs" />
     <Compile Include="TFS\TFS_TST.cs" />
     <Compile Include="Outlook_TST.cs" />
     <Compile Include="Embroidery\Embroidery_TST.cs" />
@@ -138,6 +141,12 @@
     <Content Include="AdvancedInstaller\DemoProject\DemoProject.aip">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="TCC\TCC Resources\bitmap.bmp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="TCC\TCC Resources\bitmap_ok.bmp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
@@ -174,6 +183,10 @@
       <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
       <Name>Tango.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tango.CSV\Tango.CSV.csproj">
+      <Project>{58e8825f-0c96-449c-b320-1e82b0aa876b}</Project>
+      <Name>Tango.CSV</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.DAL.Local\Tango.DAL.Local.csproj">
       <Project>{0e0eef3e-8f4e-4f23-9d19-479fd8d76c12}</Project>
       <Name>Tango.DAL.Local</Name>
@@ -202,6 +215,10 @@
       <Project>{40073806-914e-4e78-97ab-fa9639308ebe}</Project>
       <Name>Tango.Protobuf</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Tango.Pulse\Tango.Pulse.csproj">
+      <Project>{8435223D-DB6B-45E3-A08B-45B7416F8481}</Project>
+      <Name>Tango.Pulse</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.Scripting\Tango.Scripting.csproj">
       <Project>{401989e7-ae1e-4002-b0ee-9a9f63740b97}</Project>
       <Name>Tango.Scripting</Name>
@@ -230,6 +247,14 @@
       <Project>{5001990f-977b-48ff-b217-0236a5022ad8}</Project>
       <Name>Tango.Web</Name>
     </ProjectReference>
+    <ProjectReference Include="..\TCC\Tango.TCC.BL\Tango.TCC.BL.csproj">
+      <Project>{f209fae8-73f9-441b-97f4-0844a0279390}</Project>
+      <Name>Tango.TCC.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TCC\Tango.TCC.OpenCV.DLL\Tango.TCC.OpenCV.DLL.csproj">
+      <Project>{5d0d4053-cab3-4a4a-929e-37a76483bc22}</Project>
+      <Name>Tango.TCC.OpenCV.DLL</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Utilities\Tango.DBObservablesGenerator.CLI\Tango.DBObservablesGenerator.CLI.csproj">
       <Project>{ebb7cb9f-6af2-456b-a5dd-1b136b605d90}</Project>
       <Name>Tango.DBObservablesGenerator.CLI</Name>
@@ -264,7 +289,7 @@
   <Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net46\System.Data.SQLite.Core.targets')" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file