aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-06-20 11:30:48 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-06-20 11:30:48 +0300
commitf8f1f96b814391df201b1d8e1ef06c531233ef5c (patch)
treec6b8e4ae7a62bb9efd9109928a0241d1124e60cf /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer
parent65d898feb5cadb4bf421f03e40ef3f3109c881a6 (diff)
downloadTango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.tar.gz
Tango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.zip
Split assembly versions to Core, Machine Studio, PPC!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer')
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj6
-rw-r--r--Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/EmbroideryImportViewVM.cs1
2 files changed, 4 insertions, 3 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 5a81c358f..52a18a168 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -90,6 +90,9 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="..\..\..\Versioning\MachineStudio.cs">
+ <Link>MachineStudio.cs</Link>
+ </Compile>
<Compile Include="Converters\BrushStopLabToColorConverter.cs" />
<Compile Include="Converters\BrushStopCMYKToColorConverter.cs" />
<Compile Include="Converters\BrushStopToColorConverter.cs" />
@@ -131,9 +134,6 @@
<Compile Include="Views\MachineJobSelectionView.xaml.cs">
<DependentUpon>MachineJobSelectionView.xaml</DependentUpon>
</Compile>
- <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
- <Link>GlobalVersionInfo.cs</Link>
- </Compile>
<Compile Include="Views\RunningJobView.xaml.cs">
<DependentUpon>RunningJobView.xaml</DependentUpon>
</Compile>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/EmbroideryImportViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/EmbroideryImportViewVM.cs
index eaffab9e5..925515014 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/EmbroideryImportViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/EmbroideryImportViewVM.cs
@@ -8,6 +8,7 @@ using Tango.Core.Commands;
using Tango.EmbroideryUI;
using Tango.MachineStudio.Common.Notifications;
using Tango.PMR.Embroidery;
+using Tango.SharedUI;
namespace Tango.MachineStudio.Developer.ViewModels
{