Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 41 insertions, 14 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 e172bbc91..a0632195d 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
@@ -36,7 +36,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>machine.ico</ApplicationIcon>
+    <ApplicationIcon>machine_new_small.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Dragablz, Version=0.0.3.197, Culture=neutral, processorArchitecture=MSIL">
@@ -351,6 +351,10 @@
       <Link>Tango.ColorLib_v2.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v3.dll">
+      <Link>Tango.ColorLib_v3.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="..\..\tcc\benchmarks\benchmarks_rgb_lab.csv">
       <Link>TCC\benchmarks_rgb_lab.csv</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -359,6 +363,24 @@
       <Link>TCC\template.bmp</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Resource Include="Images\login_white.png" />
+    <Resource Include="Images\login.png" />
+    <Resource Include="Images\active_directory.png" />
+    <Resource Include="Images\machinestudio_login.png" />
+    <Resource Include="Images\external-bridge-signalr.png" />
+    <Resource Include="machine_new_small.ico" />
+    <Resource Include="Images\Statuses\dyeing.png" />
+    <Resource Include="Images\Statuses\dyeing_Anim.gif" />
+    <Resource Include="Images\Statuses\error_Anim.gif" />
+    <Resource Include="Images\Statuses\getting_ready_Anim.gif" />
+    <Resource Include="Images\Statuses\machine-off.png" />
+    <Resource Include="Images\Statuses\machine_off_Anim.gif" />
+    <Resource Include="Images\Statuses\ready-to-dye.png" />
+    <Resource Include="Images\Statuses\Ready_Anim.gif" />
+    <Resource Include="Images\Statuses\service_Anim.gif" />
+    <Resource Include="Images\Statuses\shutdown_icon_Anim.gif" />
+    <Resource Include="Images\Statuses\standby.png" />
+    <Resource Include="Images\Statuses\standby_Anim.gif" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -384,6 +406,10 @@
       <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
       <Name>Tango.AutoComplete</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.AnimatedGif\Tango.AnimatedGif.csproj">
+      <Project>{d129789c-3096-4d0b-8dd7-fe24a4df4b21}</Project>
+      <Name>Tango.AnimatedGif</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.BL\Tango.BL.csproj">
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
@@ -428,6 +454,10 @@
       <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
       <Name>Tango.SharedUI</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Tango.SQLExaminer\Tango.SQLExaminer.csproj">
+      <Project>{e1e66ed9-597d-45fa-8048-de90a6930484}</Project>
+      <Name>Tango.SQLExaminer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Tango.TFS\Tango.TFS.csproj">
       <Project>{998f8471-dc1b-41b6-9d96-354e1b4e7a32}</Project>
       <Name>Tango.TFS</Name>
@@ -440,22 +470,18 @@
       <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="..\Modules\MachineStudio.Dispensers\Tango.MachineStudio.Dispensers.csproj">
       <Project>{f69da3a8-f823-461e-87cf-a9275abc0b15}</Project>
       <Name>Tango.MachineStudio.Dispensers</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.ActionLogs\Tango.MachineStudio.ActionLogs.csproj">
+      <Project>{447ecb9f-f730-47d6-8df8-d232bf4a0315}</Project>
+      <Name>Tango.MachineStudio.ActionLogs</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.Catalogs\Tango.MachineStudio.Catalogs.csproj">
       <Project>{7d0fce3c-9a37-439c-9f9f-b26cfd6a8a33}</Project>
       <Name>Tango.MachineStudio.Catalogs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Modules\Tango.MachineStudio.ColorCapture\Tango.MachineStudio.ColorCapture.csproj">
-      <Project>{1b87ca53-50bd-4c48-a8c7-fbb9f1419aff}</Project>
-      <Name>Tango.MachineStudio.ColorCapture</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.ColorLab\Tango.MachineStudio.ColorLab.csproj">
       <Project>{4d183aca-552b-4135-ae81-7c5a8e5fc3b1}</Project>
       <Name>Tango.MachineStudio.ColorLab</Name>
@@ -464,10 +490,6 @@
       <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>
-    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.Developer\Tango.MachineStudio.Developer.csproj">
       <Project>{ce4a0d11-08a2-4cd6-9908-d6c62e80d805}</Project>
       <Name>Tango.MachineStudio.Developer</Name>
@@ -488,6 +510,10 @@
       <Project>{d0186ac0-0fcf-4d3b-9619-54812b6e524b}</Project>
       <Name>Tango.MachineStudio.RML</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.Sites\Tango.MachineStudio.Sites.csproj">
+      <Project>{18a27902-9881-4556-8163-f6df2236a14d}</Project>
+      <Name>Tango.MachineStudio.Sites</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.Statistics\Tango.MachineStudio.Statistics.csproj">
       <Project>{8a65ad6a-a9b4-48c0-9301-4b7434b712f8}</Project>
       <Name>Tango.MachineStudio.Statistics</Name>
@@ -638,7 +664,8 @@ copy /Y "$(SolutionDir)Referenced Assemblies\vcruntime140d.dll" "$(TargetDir)"
 copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(TargetDir)"
 
 if $(ConfigurationName) == Release del *.xml
-if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\"</PostBuildEvent>
+if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)ProtoCompilers\"
+if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"</PostBuildEvent>
   </PropertyGroup>
   <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')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">