diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-03-28 15:41:26 +0200 |
| commit | 652ba187110a48e5a7887ece87d12b04e4eb8105 (patch) | |
| tree | 60f4841b0b38c574c3c284e45becaad43387e129 /Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj | |
| parent | 624f0125aa598d78ae9ea4797b3fdc6fbf77c55a (diff) | |
| parent | 924699be4aa943430937ed8cc45b7dae49030000 (diff) | |
| download | Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.tar.gz Tango-652ba187110a48e5a7887ece87d12b04e4eb8105.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj')
| -rw-r--r-- | Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index d1bba995e..3e5434c98 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> @@ -126,6 +127,7 @@ <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 +140,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 +182,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> @@ -230,6 +242,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> |