diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-16 11:58:10 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-05-16 11:58:10 +0300 |
| commit | 30fcfa4100a9d00e887c6e17e32e427b05296ce7 (patch) | |
| tree | 0810375ae9424acca748b6538e7d1cf706dbb3a4 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 62b3546679aab27fc35b0955608c24ad37619258 (diff) | |
| parent | 4fdb3d2406b16a95e15fe24d6f562e666b3258af (diff) | |
| download | Tango-30fcfa4100a9d00e887c6e17e32e427b05296ce7.tar.gz Tango-30fcfa4100a9d00e887c6e17e32e427b05296ce7.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 91fdbf3aa..3cf0dce1a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.0.19.0")] +[assembly: AssemblyVersion("4.0.20.0")] [assembly: ComVisible(false)]
\ No newline at end of file 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 ede1bf828..2ca31a671 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 @@ -536,6 +536,14 @@ <Resource Include="Images\settings.png" /> </ItemGroup> <ItemGroup> + <Content Include="..\..\Build\TCC\Debug\Tango.TCC.ColorDetector.dll"> + <Link>Tango.TCC.ColorDetector.dll</Link> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </Content> + <Content Include="..\..\Build\TCC\Debug\Tango.TCC.ColorDetector.pdb"> + <Link>Tango.TCC.ColorDetector.pdb</Link> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </Content> <Resource Include="Images\firmware_upgrade.png" /> <Resource Include="Images\external-bridge-emulator.png" /> <EmbeddedResource Include="..\..\Versioning\ChangeLog.txt"> |