From aa2170bb476e627ae3aaccb8f5835b1b9331c82a Mon Sep 17 00:00:00 2001 From: Roy Date: Sat, 19 Nov 2022 05:44:57 +0200 Subject: Twine RSM --- .../TwineRSM Installer.aip | 1789 +++ .../TwineStudio Installer.aip | 1789 --- .../Controls/WebAppPropertiesControl.xaml | 4 +- .../Controls/WebAppPropertiesControl.xaml.cs | 12 +- .../Views/EnvironmentUpgradeView.xaml | 4 +- .../Environment/EnvironmentManager.cs | 30 +- .../Environment/UpgradeEnvironmentConfiguration.cs | 4 +- .../Tango.FSE.Diagnostics.csproj | 4 +- .../Tango.FSE.Firmware/Tango.FSE.Firmware.csproj | 4 +- .../Tango.FSE.Insights/Tango.FSE.Insights.csproj | 4 +- .../Tango.FSE.Insights_znyi0sci_wpftmp.csproj | 4 +- .../Tango.FSE.MachineConfiguration.csproj | 4 +- .../Tango.FSE.PPCConsole.csproj | 4 +- .../Tango.FSE.PPCConsole/Views/MainView.xaml | 6 +- .../Help/proc-doc.chm | Bin 279973 -> 340557 bytes .../Tango.FSE.Procedures.Documentation.shfbproj | 2 +- .../Tango.FSE.Procedures.csproj | 4 +- .../Tango.FSE.Statistics.csproj | 4 +- .../Tango.FSE.Statistics/ViewModels/MainViewVM.cs | 2 +- .../Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj | 4 +- .../Tango.FSE.UsersAndRoles.csproj | 4 +- .../ViewModels/UserDetailsViewVM.cs | 2 +- .../FSE/Tango.FSE.BL/BuildProvider.cs | 2 +- .../Tango.FSE.BL/Services/OrganizationsService.cs | 2 +- .../FSE/Tango.FSE.BL/Tango.FSE.BL.csproj | 4 +- .../FSE/Tango.FSE.Common/Build/IBuildProvider.cs | 4 +- .../FSE/Tango.FSE.Common/Tango.FSE.Common.csproj | 8 +- .../FSE/Tango.FSE.Publisher.UI/MainWindow.xaml | 2 +- .../FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs | 6 +- .../FSE/Tango.FSE.UI/Build/DefaultBuildProvider.cs | 8 +- .../Tango.FSE.UI/Panes/MachineConnectionPane.xaml | 10 +- .../Tango.FSE.UI/Panes/MachineConnectionPaneVM.cs | 6 +- .../Visual_Studio/FSE/Tango.FSE.UI/Post_Build.bat | 32 +- .../FSE/Tango.FSE.UI/Properties/AssemblyInfo.cs | 2 +- .../FSE/Tango.FSE.UI/Tango.FSE.UI.csproj | 8 +- .../FSE/Tango.FSE.UI/Views/LayoutView.xaml | 4 +- .../FSE/Tango.FSE.Web/Messages/BuildVariants.cs | 4 +- .../FSE/Tango.FSE.Web/Tango.FSE.Web.csproj | 4 +- .../Tango.BL/Enumerations/FSEBuildVariants.cs | 4 +- .../Tango.BL/Enumerations/Permissions.cs | 6 +- .../Visual_Studio/Tango.BL/Enumerations/Roles.cs | 6 +- .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 166 +- Software/Visual_Studio/Tango.sln | 12762 ++++++++++++++++++- .../Controllers/FSEController.cs | 4 +- .../Controllers/FSEDownloadsController.cs | 2 +- .../Properties/AssemblyInfo.cs | 2 +- 46 files changed, 14746 insertions(+), 1996 deletions(-) create mode 100644 Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip delete mode 100644 Software/Visual_Studio/Advanced Installer Projects/TwineStudio Installer.aip (limited to 'Software/Visual_Studio') diff --git a/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip new file mode 100644 index 000000000..2829d5df1 --- /dev/null +++ b/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip @@ -0,0 +1,1789 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Advanced Installer Projects/TwineStudio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/TwineStudio Installer.aip deleted file mode 100644 index 340209966..000000000 --- a/Software/Visual_Studio/Advanced Installer Projects/TwineStudio Installer.aip +++ /dev/null @@ -1,1789 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml index 209a4c1aa..aadd7a6d8 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml @@ -65,8 +65,8 @@ Tango FSE Version: - Twine Studio Version: - + Twine RSM Version: + Machine Service Version: diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs index a6b0d12d7..a0e01e160 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml.cs @@ -60,13 +60,13 @@ namespace Tango.AzureUtils.UI.Controls - public FseVersion TwineStudioVersion + public FseVersion TwineRSMVersion { - get { return (FseVersion)GetValue(TwineStudioVersionProperty); } - set { SetValue(TwineStudioVersionProperty, value); } + get { return (FseVersion)GetValue(TwineRSMVersionProperty); } + set { SetValue(TwineRSMVersionProperty, value); } } - public static readonly DependencyProperty TwineStudioVersionProperty = - DependencyProperty.Register("TwineStudioVersion", typeof(FseVersion), typeof(WebAppPropertiesControl), new PropertyMetadata(null)); + public static readonly DependencyProperty TwineRSMVersionProperty = + DependencyProperty.Register("TwineRSMVersion", typeof(FseVersion), typeof(WebAppPropertiesControl), new PropertyMetadata(null)); @@ -127,7 +127,7 @@ namespace Tango.AzureUtils.UI.Controls TangoVersion = await databaseManager.GetLatestPPCVersion(app); MachineStudioVersion = await databaseManager.GetLatestMachineStudioVersion(app); FseVersion = await databaseManager.GetLatestFSEVersion(app, FSEBuildVariants.FSE); - TwineStudioVersion = await databaseManager.GetLatestFSEVersion(app, FSEBuildVariants.TwineStudio); + TwineRSMVersion = await databaseManager.GetLatestFSEVersion(app, FSEBuildVariants.TwineRSM); FtpManager ftpManager = new FtpManager(azure); MachineServiceVersion = await ftpManager.GetMachineServiceVersion(app); diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml index 2dfab2ff6..249dbabc6 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml @@ -49,8 +49,8 @@ Upgrade PPC Database Version Upgrade FSE Blob Storage Upgrade FSE Database Version - Upgrade Twine Studio Blob Storage - Upgrade Twine Studio Database Version + Upgrade Twine RSM Blob Storage + Upgrade Twine RSM Database Version Upgrade Machine Service diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs index ece5f04cd..4806bc8c8 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs @@ -342,17 +342,17 @@ namespace Tango.AzureUtils.Environment } } - //Add Twine Studio storage versions. - if (config.CopyTwineStudioStorageBlobs) + //Add Twine RSM storage versions. + if (config.CopyTwineRSMStorageBlobs) { try { - await _storageManager.ValidateFSEStorageUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineStudio); - await _storageManager.UpgradeFSEStorage(sourceApp, targetApp, FSEBuildVariants.TwineStudio); + await _storageManager.ValidateFSEStorageUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineRSM); + await _storageManager.UpgradeFSEStorage(sourceApp, targetApp, FSEBuildVariants.TwineRSM); } catch (Exception ex) { - await RequestConfirmation($"Issues encountered with upgrading Twine Studio storage versions.\n{ex.FlattenMessage()}\nDo you wish to continue?"); + await RequestConfirmation($"Issues encountered with upgrading Twine RSM storage versions.\n{ex.FlattenMessage()}\nDo you wish to continue?"); } } @@ -399,16 +399,16 @@ namespace Tango.AzureUtils.Environment } //Upgrade FSE database version. - if (config.UpgradeTwineStudioDatabaseVersion) + if (config.UpgradeTwineRSMDatabaseVersion) { try { - await _databaseManager.ValidateFSEDatabaseUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineStudio); - await _databaseManager.UpgradeFSEVersion(sourceApp, targetApp, FSEBuildVariants.TwineStudio); + await _databaseManager.ValidateFSEDatabaseUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineRSM); + await _databaseManager.UpgradeFSEVersion(sourceApp, targetApp, FSEBuildVariants.TwineRSM); } catch (Exception ex) { - await RequestConfirmation($"Issues encountered with upgrading Twine Studio database versions.\n{ex.FlattenMessage()}\nDo you wish to continue?"); + await RequestConfirmation($"Issues encountered with upgrading Twine RSM database versions.\n{ex.FlattenMessage()}\nDo you wish to continue?"); } } @@ -451,10 +451,10 @@ namespace Tango.AzureUtils.Environment await _storageManager.ValidateFSEStorageUpgrade(sourceApp, targetApp, FSEBuildVariants.FSE); } - //Add Twine Studio storage versions. - if (config.CopyTwineStudioStorageBlobs) + //Add Twine RSM storage versions. + if (config.CopyTwineRSMStorageBlobs) { - await _storageManager.ValidateFSEStorageUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineStudio); + await _storageManager.ValidateFSEStorageUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineRSM); } //Upgrade machine studio database version. @@ -475,10 +475,10 @@ namespace Tango.AzureUtils.Environment await _databaseManager.ValidateFSEDatabaseUpgrade(sourceApp, targetApp, FSEBuildVariants.FSE); } - //Upgrade Twine Studio database version. - if (config.UpgradeTwineStudioDatabaseVersion) + //Upgrade Twine RSM database version. + if (config.UpgradeTwineRSMDatabaseVersion) { - await _databaseManager.ValidateFSEDatabaseUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineStudio); + await _databaseManager.ValidateFSEDatabaseUpgrade(sourceApp, targetApp, FSEBuildVariants.TwineRSM); } } diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs index 6243b65a0..44cde7731 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs @@ -16,8 +16,8 @@ namespace Tango.AzureUtils.Environment public bool UpgradePPCDatabaseVersion { get; set; } public bool CopyFSEStorageBlobs { get; set; } public bool UpgradeFSEDatabaseVersion { get; set; } - public bool CopyTwineStudioStorageBlobs { get; set; } - public bool UpgradeTwineStudioDatabaseVersion { get; set; } + public bool CopyTwineRSMStorageBlobs { get; set; } + public bool UpgradeTwineRSMDatabaseVersion { get; set; } public bool CopyMachineServiceFiles { get; set; } } } diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj index dfe7cc101..c6ba79753 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Diagnostics/Tango.FSE.Diagnostics.csproj @@ -35,7 +35,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -44,7 +44,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj index 4e4aa75ae..d99844efa 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Firmware/Tango.FSE.Firmware.csproj @@ -35,7 +35,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -44,7 +44,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj index c2dfeb2a6..70a938940 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights.csproj @@ -37,7 +37,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -46,7 +46,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj index d09860120..300916443 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Tango.FSE.Insights_znyi0sci_wpftmp.csproj @@ -37,7 +37,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -46,7 +46,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj index 51e9dc119..a40822a8a 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.MachineConfiguration/Tango.FSE.MachineConfiguration.csproj @@ -34,7 +34,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -43,7 +43,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj index cbf76444d..e6104f060 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Tango.FSE.PPCConsole.csproj @@ -35,7 +35,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -44,7 +44,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml index 919d47132..2e2c1e0d0 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.PPCConsole/Views/MainView.xaml @@ -33,10 +33,10 @@ - - + + - + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm index d93bb617a..77e3dff8f 100644 Binary files a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm differ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj index 8c01285b0..585cb6cf9 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Tango.FSE.Procedures.Documentation.shfbproj @@ -241,7 +241,7 @@ copy /Y "$(OutputPath)proc-doc.chm" "$(SolutionDir)Build\FSE\$(Configuration)" - if $(Configuration) == TS copy /Y "$(OutputPath)proc-doc.chm" "$(SolutionDir)Build\Twine Studio\Release\" + if $(Configuration) == TS copy /Y "$(OutputPath)proc-doc.chm" "$(SolutionDir)Build\Twine RSM\Release\" OnBuildSuccess diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj index f310eaf63..1c2638abb 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Tango.FSE.Procedures.csproj @@ -38,7 +38,7 @@ 1591 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -47,7 +47,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj index ac7c32b57..ede305fb7 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Tango.FSE.Statistics.csproj @@ -34,7 +34,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -43,7 +43,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs index b5b0ebd27..2b46ad72f 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs @@ -372,7 +372,7 @@ namespace Tango.FSE.Statistics.ViewModels stop.JobIndex = _currentJobIndex; stop.SegmentIndex = job.Job.Segments.IndexOf(jobSegment) + 1; stop.ThreadName = rmlName; - stop.IsAdvancedMode = !BuildProvider.IsTwineStudio && CurrentUser.HasRole(Roles.FSEAdvancedTechnician); + stop.IsAdvancedMode = !BuildProvider.IsTwineRSM && CurrentUser.HasRole(Roles.FSEAdvancedTechnician); stop.ColorSpace = jobStop.ColorSpace; diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj index 7d38491cb..095ad3cb3 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/Tango.FSE.Upgrade.csproj @@ -35,7 +35,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -44,7 +44,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj index 20e2b1fe1..edcab2f65 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/Tango.FSE.UsersAndRoles.csproj @@ -34,7 +34,7 @@ 4 - ..\..\..\Build\Twine Studio\Release\ + ..\..\..\Build\Twine RSM\Release\ TRACE true pdbonly @@ -43,7 +43,7 @@ MinimumRecommendedRules.ruleset - ..\..\..\Build\Twine Studio\Debug\ + ..\..\..\Build\Twine RSM\Debug\ DEBUG;TRACE false pdbonly diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs index 78731ad15..a8d824a22 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.UsersAndRoles/ViewModels/UserDetailsViewVM.cs @@ -204,7 +204,7 @@ namespace Tango.FSE.UsersAndRoles.ViewModels collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.FSETwineDeveloper), Roles.FSETechnician, Roles.FSEAdvancedTechnician, Roles.FSETwineTechnician) { IsVisible = CurrentUser.HasRole(Roles.FSETwineDeveloper) }); } - collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.TwineStudioUser))); + collection.Add(new RoleModel(roles.SingleOrDefault(x => x.RoleEnum == Roles.TwineRSMUser))); collection.ToList().ForEach(x => x.IsSelected = user.FSERoles.Any(y => y.Code == x.Role.Code)); RolesCollection = collection; diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs index ae7c716d2..94f2867cf 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs @@ -14,7 +14,7 @@ namespace Tango.FSE.BL static BuildProvider() { #if TS - Build = BuildVariants.TwineStudio; + Build = BuildVariants.TwineRSM; #endif } } diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs index 417f1bd2f..7337ac9a5 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs @@ -76,7 +76,7 @@ namespace Tango.FSE.BL.Services using (ObservablesContext db = ObservablesContext.CreateDefault()) { return db.Roles - .Where(x => x.Code >= 1000 && x.Code < 3000) //Only FSE & Twine Studio + .Where(x => x.Code >= 1000 && x.Code < 3000) //Only FSE & Twine RSM .Include(x => x.RolesPermissions) .Include(x => x.RolesPermissions.Select(y => y.Permission)) .ToList(); diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj index 34f514c23..cfa983d77 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj @@ -32,7 +32,7 @@ 4 - ..\..\Build\Twine Studio\Release\ + ..\..\Build\Twine RSM\Release\ TRACE;TS true pdbonly @@ -41,7 +41,7 @@ MinimumRecommendedRules.ruleset - ..\..\Build\Twine Studio\Debug\ + ..\..\Build\Twine RSM\Debug\ TRACE;TS true pdbonly diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs index ee99f24d1..ccf44dfcd 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Build/IBuildProvider.cs @@ -9,13 +9,13 @@ namespace Tango.FSE.Common.Build public enum BuildVariants { FSE, - TwineStudio + TwineRSM } public interface IBuildProvider { BuildVariants CurrentBuild { get; } String BuildName { get; } - bool IsTwineStudio { get; } + bool IsTwineRSM { get; } } } diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj index 2c7e2f586..95ee0b2f5 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj @@ -39,9 +39,9 @@ 1591 - ..\..\Build\Twine Studio\Release\ + ..\..\Build\Twine RSM\Release\ TRACE - ..\..\Build\Twine Studio\Release\Tango.FSE.Common.xml + ..\..\Build\Twine RSM\Release\Tango.FSE.Common.xml true 1591 pdbonly @@ -50,9 +50,9 @@ MinimumRecommendedRules.ruleset - ..\..\Build\Twine Studio\Debug\ + ..\..\Build\Twine RSM\Debug\ DEBUG;TRACE - ..\..\Build\Twine Studio\Debug\Tango.FSE.Common.xml + ..\..\Build\Twine RSM\Debug\Tango.FSE.Common.xml false 1591 pdbonly diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml index cb99015a9..57119d1fe 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindow.xaml @@ -6,7 +6,7 @@ xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:local="clr-namespace:Tango.FSE.Publisher.UI" mc:Ignorable="d" - Title="Tango FSE/Twine Studio Publisher" Height="600" Width="400" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}"> + Title="Tango FSE/Twine RSM Publisher" Height="600" Width="400" d:DataContext="{d:DesignInstance Type=local:MainWindowVM, IsDesignTimeCreatable=False}">