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 | |
| parent | 65d898feb5cadb4bf421f03e40ef3f3109c881a6 (diff) | |
| download | Tango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.tar.gz Tango-f8f1f96b814391df201b1d8e1ef06c531233ef5c.zip | |
Split assembly versions to Core, Machine Studio, PPC!
Diffstat (limited to 'Software')
72 files changed, 149 insertions, 207 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 236bcd37f..67a3ae8b2 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex 074cddc2d..929904d97 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf 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> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj index 83c3216d9..810191efe 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj @@ -86,8 +86,8 @@ </Page> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\Versioning\PPCVersionInfo.cs"> - <Link>PPCVersionInfo.cs</Link> + <Compile Include="..\..\..\Versioning\PPC.cs"> + <Link>PPC.cs</Link> </Compile> <Compile Include="Converters\JobCollectionToCategoryCountConverter.cs" /> <Compile Include="Converters\JobToPieImageConverter.cs" /> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj index 3aeafb1e0..0d4e79212 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Tango.PPC.Synchronization.csproj @@ -74,8 +74,8 @@ </Page> </ItemGroup> <ItemGroup> - <Compile Include="..\..\..\Versioning\PPCVersionInfo.cs"> - <Link>PPCVersionInfo.cs</Link> + <Compile Include="..\..\..\Versioning\PPC.cs"> + <Link>PPC.cs</Link> </Compile> <Compile Include="MyModule.cs" /> <Compile Include="Properties\AssemblyInfo.cs"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index 322624496..addff8dc9 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -89,8 +89,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\PPCVersionInfo.cs"> - <Link>PPCVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\PPC.cs"> + <Link>PPC.cs</Link> </Compile> <Compile Include="IPPCView.cs" /> <Compile Include="Modules\IPPCModuleLoader.cs" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index bc6e35761..2f6491be3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -92,8 +92,8 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </ApplicationDefinition> - <Compile Include="..\..\Versioning\PPCVersionInfo.cs"> - <Link>PPCVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\PPC.cs"> + <Link>PPC.cs</Link> </Compile> <Compile Include="Authentication\DefaultAuthenticationProvider.cs" /> <Compile Include="Converters\NotificationItemConverter.cs" /> diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index e4859b493..46698502f 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -78,8 +78,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Attributes\JobStatusAttribute.cs" /> <Compile Include="Dispensing\DispenserStepDivisions.cs" /> diff --git a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj index 2c1bae3d9..422b5f1ff 100644 --- a/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj +++ b/Software/Visual_Studio/Tango.BrushPicker/Tango.BrushPicker.csproj @@ -57,8 +57,8 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Converters\BrushToGradientStopsConverter.cs" /> <Compile Include="Implementation\AlphaSelector.cs" /> diff --git a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj index 1773852f7..da8a33bf4 100644 --- a/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj +++ b/Software/Visual_Studio/Tango.CircularGauge/Tango.CircularGauge.csproj @@ -78,8 +78,8 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="CircularGaugeControl.cs"> <SubType>Code</SubType> diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj index ff83f8ce4..d292d2357 100644 --- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj +++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj @@ -57,8 +57,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Class.cs" /> <Compile Include="CodeFile.cs" /> diff --git a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj index adebcacf7..400511023 100644 --- a/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj +++ b/Software/Visual_Studio/Tango.ColorPicker/Tango.ColorPicker.csproj @@ -105,8 +105,8 @@ </Page> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Chromes\Implementation\ButtonChrome.cs" /> <Compile Include="ColorBlendConverter.cs" /> diff --git a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj index eee82d1b7..1b541c07e 100644 --- a/Software/Visual_Studio/Tango.Core/Tango.Core.csproj +++ b/Software/Visual_Studio/Tango.Core/Tango.Core.csproj @@ -58,8 +58,8 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Commands\RelayCommand.cs" /> <Compile Include="ConcurrentList.cs" /> diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj index b9c5a8b2d..9c4c3c225 100644 --- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj +++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj @@ -63,8 +63,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="DB\ACTION_TYPES.cs"> <DependentUpon>LocalADO.tt</DependentUpon> diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj index b91163282..da79b0882 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj +++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj @@ -63,8 +63,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="DB\ACTION_TYPES.cs"> <DependentUpon>RemoteADO.tt</DependentUpon> diff --git a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj index 0eb8d366e..f760a1489 100644 --- a/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj +++ b/Software/Visual_Studio/Tango.Documents/Tango.Documents.csproj @@ -56,11 +56,9 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> - </ItemGroup> - <ItemGroup> <Compile Include="ExcelReader.cs" /> <Compile Include="Properties\AssemblyInfo.cs"> <SubType> diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj index 771ed8079..8d267b703 100644 --- a/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj +++ b/Software/Visual_Studio/Tango.DragAndDrop/Tango.DragAndDrop.csproj @@ -64,8 +64,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="DragAndDropService.cs" /> <Compile Include="DraggingSurface.cs" /> diff --git a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj index 8b8e8d802..5cb0f7b1d 100644 --- a/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj +++ b/Software/Visual_Studio/Tango.Editors/Tango.Editors.csproj @@ -59,8 +59,8 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="BrushExtensions.cs" /> <Compile Include="EnumExtensions.cs" /> diff --git a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj index e369c8488..6dc62dbac 100644 --- a/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj +++ b/Software/Visual_Studio/Tango.Emulations/Tango.Emulations.csproj @@ -46,8 +46,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="EmulatorBase.cs" /> <Compile Include="Emulators\MachineEmulator.cs" /> diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index 32ad179a9..d054ca89a 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -73,8 +73,8 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Diagnostics\DiagnosticsFileEvent.cs" /> <Compile Include="Diagnostics\DiagnosticsFilePlayer.cs" /> diff --git a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj index f1dd3307c..d406ec41a 100644 --- a/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj +++ b/Software/Visual_Studio/Tango.Logging/Tango.Logging.csproj @@ -45,8 +45,8 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="ApplicationCrashedEventArgs.cs" /> <Compile Include="ConsoleLogger.cs" /> diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 204286f60..dc78dc8a3 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -44,8 +44,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="ColorLab\CalibrationData.cs" /> <Compile Include="ColorLab\CalibrationPoint.cs" /> diff --git a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj index f45a082e4..0298bd48d 100644 --- a/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj +++ b/Software/Visual_Studio/Tango.Protobuf/Tango.Protobuf.csproj @@ -41,8 +41,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="CompilerException.cs" /> <Compile Include="CompilerFactory.cs" /> diff --git a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj index 16bff8c03..2bb3e4b2a 100644 --- a/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj +++ b/Software/Visual_Studio/Tango.Scripting/Tango.Scripting.csproj @@ -137,8 +137,8 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="CompilerError.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> diff --git a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj index 63cc65639..a6ff42efb 100644 --- a/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj +++ b/Software/Visual_Studio/Tango.Serialization/Tango.Serialization.csproj @@ -46,8 +46,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="BinaryDataSerializer.cs" /> <Compile Include="CryptographyHelper.cs" /> diff --git a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj index 6cfa77c3a..4dacf4660 100644 --- a/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj +++ b/Software/Visual_Studio/Tango.Settings/Tango.Settings.csproj @@ -43,8 +43,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="SettingsBase.cs" /> diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj index 02698a3b0..3b78e7d16 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj +++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj @@ -54,8 +54,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Components\SelectedObject.cs" /> <Compile Include="Components\SelectedObjectCollection.cs" /> diff --git a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj index 015affaf3..00895f19b 100644 --- a/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj +++ b/Software/Visual_Studio/Tango.Stubs/Tango.Stubs.csproj @@ -61,8 +61,8 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="AvailableStub.cs" /> <Compile Include="IStub.cs" /> diff --git a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj index a083b682a..23f318b16 100644 --- a/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj +++ b/Software/Visual_Studio/Tango.Synchronization/Tango.Synchronization.csproj @@ -62,8 +62,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Conversion\ColumnSchema.cs" /> <Compile Include="Conversion\DatabaseSchema.cs" /> diff --git a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj index 554636eba..4c061f760 100644 --- a/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj +++ b/Software/Visual_Studio/Tango.TFS/Tango.TFS.csproj @@ -196,8 +196,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Area.cs" /> <Compile Include="Attachment.cs" /> diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj index a8febc75c..a59cbf0f9 100644 --- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj +++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj @@ -56,6 +56,9 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> + </Compile> <Compile Include="Controls\MessageBoxVM.cs" /> <Compile Include="Controls\TouchCheckBox.cs" /> <Compile Include="Controls\TouchComboBox.cs" /> @@ -178,9 +181,6 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="Components\AttachedEventsManager.cs" /> <Compile Include="Components\Ripple.cs" /> <Compile Include="Components\TransformationHelper.cs" /> diff --git a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj index ce50f0311..1ac3bf41e 100644 --- a/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj +++ b/Software/Visual_Studio/Tango.Transport/Tango.Transport.csproj @@ -62,8 +62,8 @@ <Reference Include="WindowsBase" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Adapters\UsbSerialBaudRates.cs" /> <Compile Include="Adapters\UsbTransportAdapter.cs" /> diff --git a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj index 8af97771c..a0034f874 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj +++ b/Software/Visual_Studio/Tango.UnitTesting/Tango.UnitTesting.csproj @@ -87,8 +87,8 @@ </Reference> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="DependencyInjection_TST.cs" /> <Compile Include="Logging_TST.cs" /> diff --git a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj index cb08ec0f9..bee112411 100644 --- a/Software/Visual_Studio/Tango.Video/Tango.Video.csproj +++ b/Software/Visual_Studio/Tango.Video/Tango.Video.csproj @@ -66,8 +66,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="CaptureDevice.cs" /> <Compile Include="Device.cs" /> diff --git a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj index fb377bbcd..aafa0a47c 100644 --- a/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj +++ b/Software/Visual_Studio/Tango.Visuals/Tango.Visuals.csproj @@ -49,8 +49,8 @@ <Reference Include="PresentationFramework" /> </ItemGroup> <ItemGroup> - <Compile Include="..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="AnalogSwitch\AnalogSwitch.xaml.cs"> <DependentUpon>AnalogSwitch.xaml</DependentUpon> diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index 5bf792876..7ace11c42 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -7,8 +7,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Protobuf", "Tango.Pro EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Versioning", "Versioning", "{E53A5748-F312-4A70-AB93-53249749D359}" ProjectSection(SolutionItems) = preProject - Versioning\GlobalVersionInfo.cs = Versioning\GlobalVersionInfo.cs - Versioning\PPCVersionInfo.cs = Versioning\PPCVersionInfo.cs + Versioning\Core.cs = Versioning\Core.cs + Versioning\MachineStudio.cs = Versioning\MachineStudio.cs + Versioning\PPC.cs = Versioning\PPC.cs EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Core", "Tango.Core\Tango.Core.csproj", "{A34EE0F0-649D-41C8-8489-B6F1CC6924EE}" diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj index 73b66321b..ece87e07b 100644 --- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/Tango.DBObservablesGenerator.CLI.csproj @@ -52,8 +52,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="ObservablesGenerator.cs" /> <Compile Include="Program.cs" /> diff --git a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj index 061bed515..726230dff 100644 --- a/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EmbroideryViewer/Tango.EmbroideryViewer.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\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="App.xaml.cs"> <DependentUpon>App.xaml</DependentUpon> diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj index fe2f7934f..9af97cb56 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Tango.MachineEM.UI.csproj @@ -77,8 +77,8 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </ApplicationDefinition> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="ViewModels\MainViewVM.cs" /> <Compile Include="Views\MainView.xaml.cs"> diff --git a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj index b242b0c06..24b819578 100644 --- a/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PMRGenerator.CLI/Tango.PMRGenerator.CLI.csproj @@ -49,8 +49,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> diff --git a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj index 5a5a17017..7f22be160 100644 --- a/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.PortsListGenerator/Tango.PortsListGenerator.csproj @@ -49,8 +49,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj index fdee6d04f..a1beff465 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Tango.Protobuf.CLI.csproj @@ -45,8 +45,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Options.cs" /> <Compile Include="Program.cs" /> diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj index c39abb2fb..fea98f586 100644 --- a/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.UI/Tango.Protobuf.UI.csproj @@ -80,8 +80,8 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </Page> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="App.xaml.cs"> <DependentUpon>App.xaml</DependentUpon> diff --git a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj index 1f2a36176..53a48b393 100644 --- a/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.ShortcutGenerator.CLI/Tango.ShortcutGenerator.CLI.csproj @@ -45,8 +45,8 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> </Compile> <Compile Include="Options.cs" /> <Compile Include="Program.cs" /> diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj index 78bc4f44e..f7b02de3e 100644 --- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Tango.Stubs.CLI.csproj @@ -54,9 +54,6 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="..\..\Versioning\GlobalVersionInfo.cs"> - <Link>GlobalVersionInfo.cs</Link> - </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj index 57251e5ea..0183fd92a 100644 --- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj +++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Tango.TransportRouter.UI.csproj @@ -66,6 +66,9 @@ <Generator>MSBuild:Compile</Generator> <SubType>Designer</SubType> </ApplicationDefinition> + <Compile Include="..\..\Versioning\Core.cs"> + <Link>Core.cs</Link> + </Compile> <Compile Include="ViewModels\MainViewVM.cs" /> <Compile Include="Views\MainView.xaml.cs"> <DependentUpon>MainView.xaml</DependentUpon> @@ -74,9 +77,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/Versioning/Core.cs b/Software/Visual_Studio/Versioning/Core.cs new file mode 100644 index 000000000..bec2da6bb --- /dev/null +++ b/Software/Visual_Studio/Versioning/Core.cs @@ -0,0 +1,13 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + + +[assembly: AssemblyProduct("Tango Core")] + +[assembly: AssemblyCompany("Twine")] +[assembly: AssemblyCopyright("Copyright © Twine LTD 2017")] +[assembly: AssemblyTrademark("Twine LTD")] + +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs b/Software/Visual_Studio/Versioning/MachineStudio.cs index 9d96df6aa..d32477775 100644 --- a/Software/Visual_Studio/Versioning/GlobalVersionInfo.cs +++ b/Software/Visual_Studio/Versioning/MachineStudio.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyProduct("Tango")] +[assembly: AssemblyProduct("Tango Machine Studio")] [assembly: AssemblyCompany("Twine")] [assembly: AssemblyCopyright("Copyright © Twine LTD 2017")] diff --git a/Software/Visual_Studio/Versioning/PPCVersionInfo.cs b/Software/Visual_Studio/Versioning/PPC.cs index bf45acb20..bf45acb20 100644 --- a/Software/Visual_Studio/Versioning/PPCVersionInfo.cs +++ b/Software/Visual_Studio/Versioning/PPC.cs |
