diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 11:30:48 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-20 11:30:48 +0300 |
| commit | f8f1f96b814391df201b1d8e1ef06c531233ef5c (patch) | |
| tree | c6b8e4ae7a62bb9efd9109928a0241d1124e60cf /Software/Visual_Studio/MachineStudio | |
| parent | 65d898feb5cadb4bf421f03e40ef3f3109c881a6 (diff) | |
| download | Tango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.tar.gz Tango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.zip | |
Split assembly versions to Core, Machine Studio, PPC!
Diffstat (limited to 'Software/Visual_Studio/MachineStudio')
24 files changed, 48 insertions, 115 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj index 4fa4c1d9f..35326a44b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj @@ -69,8 +69,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> </Compile> <Compile Include="ViewModelLocator.cs" /> <Compile Include="ViewModels\CalibrationDataPointVM.cs" /> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj index de82ff366..1535c6dce 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj @@ -75,6 +75,9 @@ </Reference> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" /> <Compile Include="Converters\EntityFieldNameToFriendlyStringConverter.cs" /> <Compile Include="Converters\EventTypeActionsToStringConverter.cs" /> @@ -390,9 +393,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="Controls\DbTableView.xaml.cs"> <DependentUpon>DbTableView.xaml</DependentUpon> </Compile> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj index 004ee9bdf..99645a659 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj @@ -63,15 +63,15 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="Recording\DataRecording.cs" /> <Compile Include="ViewModelLocator.cs" /> <Compile Include="ViewModels\MainViewVM.cs" /> <Compile Include="Views\MainView.xaml.cs"> <DependentUpon>MainView.xaml</DependentUpon> </Compile> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="DataCaptureModule.cs" /> <Compile Include="Views\PlayingBarView.xaml.cs"> <DependentUpon>PlayingBarView.xaml</DependentUpon> 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 { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj index 8572d7839..2e2920af2 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj @@ -66,14 +66,14 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="ViewModelLocator.cs" /> <Compile Include="ViewModels\MainViewVM.cs" /> <Compile Include="Views\MainView.xaml.cs"> <DependentUpon>MainView.xaml</DependentUpon> </Compile> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="HardwareDesignerModule.cs" /> <Page Include="Views\MainView.xaml"> <SubType>Designer</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj index 1659a260e..a10d2aa75 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Tango.MachineStudio.Logging.csproj @@ -66,8 +66,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> </Compile> <Compile Include="ControlledObservableCollection.cs" /> <Compile Include="Controls\TimelineScrollViewer.cs" /> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj index b0d43c6df..03509da5d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj @@ -65,6 +65,9 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="AutoComplete\MachinesProvider.cs" /> <Compile Include="AutoComplete\MachineVersionsProvider.cs" /> <Compile Include="ViewModelLocator.cs" /> @@ -79,9 +82,6 @@ <Compile Include="Views\MainView.xaml.cs"> <DependentUpon>MainView.xaml</DependentUpon> </Compile> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="MachineDesignerModule.cs" /> <Page Include="Views\MachineVersionDialog.xaml"> <SubType>Designer</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs index f972eff9b..40358344d 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MachineVersionDialogVM.cs @@ -8,6 +8,7 @@ using Tango.BL.Entities; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.MachineDesigner.AutoComplete; using Tango.BL; +using Tango.SharedUI; namespace Tango.MachineStudio.MachineDesigner.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj index ca3e77628..a3618de3a 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj @@ -69,6 +69,9 @@ </ItemGroup> <ItemGroup> <None Include="Resources\CodeTabTemplate.cs" /> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="StubManager.cs" /> <Compile Include="StubOnExecuteParameters.cs" /> <Compile Include="StubsModuleSettings.cs" /> @@ -81,9 +84,6 @@ <SubType> </SubType> </Compile> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="StubsModule.cs" /> <Page Include="Views\MainView.xaml"> <SubType>Designer</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj index f38fe5dbf..41009b79f 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj @@ -90,6 +90,9 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="AutoComplete\MachinesProvider.cs" /> <Compile Include="Navigation\NavigationView.cs" /> <Compile Include="Navigation\SyncNavigationManager.cs" /> @@ -115,9 +118,6 @@ <Compile Include="Views\MenuView.xaml.cs"> <DependentUpon>MenuView.xaml</DependentUpon> </Compile> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="SynchronizationModule.cs" /> <Page Include="Views\DirectSynchronizationView.xaml"> <SubType>Designer</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj index f7bf69bc8..fb9b8869b 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj @@ -84,6 +84,9 @@ </Reference> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="Converters\MonitorsToMultiChannleMonitorsConverter.cs" /> <Compile Include="Converters\MonitorsToSingleChannleMonitorsConverter.cs" /> <Compile Include="Converters\SecondsToGraphPointsConverter.cs" /> @@ -207,9 +210,6 @@ <Compile Include="Views\MachineTechView.xaml.cs"> <DependentUpon>MachineTechView.xaml</DependentUpon> </Compile> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Page Include="Editors\ControllerElementEditor.xaml"> <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj index a27bb5715..cc9a60f30 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj @@ -69,8 +69,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> </Compile> <Compile Include="Navigation\UsersAndRolesNavigationManager.cs" /> <Compile Include="Navigation\UsersAndRolesNavigationView.cs" /> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs deleted file mode 100644 index c8d606efc..000000000 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/DialogViewVM.cs +++ /dev/null @@ -1,74 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Tango.Core.Commands; -using Tango.SharedUI; - -namespace Tango.MachineStudio.Common.Notifications -{ - /// <summary> - /// Represents a dialog view model base class. - /// </summary> - /// <seealso cref="Tango.SharedUI.ViewModel" /> - public abstract class DialogViewVM : ViewModel - { - public event Action Accepted; - public event Action Canceled; - - /// <summary> - /// Initializes a new instance of the <see cref="DialogViewVM"/> class. - /// </summary> - public DialogViewVM() - { - CanClose = true; - CloseCommand = new RelayCommand(Cancel, (x) => CanClose); - OKCommand = new RelayCommand(Accept, (x) => CanClose); - } - - private bool _canClose; - /// <summary> - /// Gets or sets a value indicating whether this dialog can be closed. - /// </summary> - public bool CanClose - { - get { return _canClose; } - set { _canClose = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); } - } - - /// <summary> - /// Gets or sets the close command. - /// </summary> - public RelayCommand CloseCommand { get; set; } - - /// <summary> - /// Gets or sets the ok command. - /// </summary> - public RelayCommand OKCommand { get; set; } - - /// <summary> - /// Called when the dialog has been shown. - /// </summary> - public virtual void OnShow() - { - - } - - /// <summary> - /// Invokes the <see cref="Accepted"/> event. - /// </summary> - protected virtual void Accept() - { - Accepted?.Invoke(); - } - - /// <summary> - /// Invokes the <see cref="Canceled"/> event. - /// </summary> - protected virtual void Cancel() - { - Canceled?.Invoke(); - } - } -} diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs index ce60715a8..a2cf609b1 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Notifications/INotificationProvider.cs @@ -7,6 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows; using System.Windows.Media; +using Tango.SharedUI; namespace Tango.MachineStudio.Common.Notifications { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj index a635e17ed..145d91461 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Tango.MachineStudio.Common.csproj @@ -72,6 +72,9 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> + <Compile Include="..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="AutoComplete\MachinesProvider.cs" /> <Compile Include="Automation\Developer.cs" /> <Compile Include="Automation\UI.cs" /> @@ -103,7 +106,6 @@ <Compile Include="MachineStudioSettings.cs" /> <Compile Include="Messages\MachineConnectionChangedMessage.cs" /> <Compile Include="Notifications\BarItem.cs" /> - <Compile Include="Notifications\DialogViewVM.cs" /> <Compile Include="Speech\DefaultSpeechProvider.cs" /> <Compile Include="Speech\ISpeechProvider.cs" /> <Compile Include="StudioApplication\IStudioApplicationManager.cs" /> @@ -135,9 +137,6 @@ <SubType>Designer</SubType> <Generator>MSBuild:Compile</Generator> </Page> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="Authentication\IAuthenticationProvider.cs" /> <Compile Include="Controls\MdiChild.cs" /> <Compile Include="Controls\MdiContainerControl.xaml.cs"> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj index 6f3276996..4d8ea2579 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Tango.MachineStudio.Publisher.csproj @@ -85,8 +85,8 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> </Compile> <Compile Include="App.xaml.cs"> <DependentUpon>App.xaml</DependentUpon> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs index cb36d8d29..6cff1ba17 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DefaultNotificationProvider.cs @@ -10,6 +10,7 @@ using Tango.MachineStudio.UI.Windows; using System.Windows.Media; using Tango.Core; using System.Collections.ObjectModel; +using Tango.SharedUI; namespace Tango.MachineStudio.UI.Notifications { 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 a9944a92d..b46b2a57a 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 @@ -133,6 +133,9 @@ <SubType>Designer</SubType> </ApplicationDefinition> <EmbeddedResource Include="Console\CodeTemplate.cs" /> + <Compile Include="..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> + </Compile> <Compile Include="Console\ConsoleManager.cs" /> <Compile Include="Console\ConsoleOnExecuteParameters.cs" /> <Compile Include="Console\ConsoleWindow.xaml.cs"> @@ -227,9 +230,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="App.xaml.cs"> <DependentUpon>App.xaml</DependentUpon> <SubType>Code</SubType> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs index 20c2e3afb..2b1acdbe6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineLoginViewVM.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using Tango.Core.Commands; using Tango.MachineStudio.Common.Notifications; +using Tango.SharedUI; namespace Tango.MachineStudio.UI.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs index ad4cfa96d..44cfc6788 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs @@ -9,6 +9,7 @@ using Tango.Core.Commands; using Tango.MachineStudio.Common; using Tango.MachineStudio.Common.Notifications; using Tango.Settings; +using Tango.SharedUI; namespace Tango.MachineStudio.UI.ViewModels { diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs index 9660db8a5..2935ff81b 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ReportIssueViewVM.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.UI.TFS; +using Tango.SharedUI; using Tango.SharedUI.Components; using Tango.TFS; diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ResolvedIssuesViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ResolvedIssuesViewVM.cs index 552880792..1b9055194 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ResolvedIssuesViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ResolvedIssuesViewVM.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using Tango.Core.Commands; using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.UI.TFS; +using Tango.SharedUI; using Tango.TFS; namespace Tango.MachineStudio.UI.ViewModels diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj index 37a6dbf63..039bcc399 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Tango.MachineStudio.Updater.csproj @@ -61,8 +61,8 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\MachineStudio.cs"> + <Link>MachineStudio.cs</Link> </Compile> <Compile Include="App.xaml.cs"> <DependentUpon>App.xaml</DependentUpon> |
