Twine RSM

5 files changed, 27 insertions, 27 deletions

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 @@
                 <TextBlock FontWeight="SemiBold">Tango FSE Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=FseVersion.Version}"></TextBlock>
 
-                <TextBlock FontWeight="SemiBold">Twine Studio Version:</TextBlock>
-                <TextBlock Text="{Binding ElementName=control,Path=TwineStudioVersion.Version}"></TextBlock>
+                <TextBlock FontWeight="SemiBold">Twine RSM Version:</TextBlock>
+                <TextBlock Text="{Binding ElementName=control,Path=TwineRSMVersion.Version}"></TextBlock>
 
                 <TextBlock FontWeight="SemiBold">Machine Service Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=MachineServiceVersion}"></TextBlock>
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 @@
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradePPCDatabaseVersion}" >Upgrade PPC Database Version</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyFSEStorageBlobs}" >Upgrade FSE Blob Storage</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeFSEDatabaseVersion}" >Upgrade FSE Database Version</CheckBox>
-                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyTwineStudioStorageBlobs}" >Upgrade Twine Studio Blob Storage</CheckBox>
-                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeTwineStudioDatabaseVersion}" >Upgrade Twine Studio Database Version</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyTwineRSMStorageBlobs}" >Upgrade Twine RSM Blob Storage</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeTwineRSMDatabaseVersion}" >Upgrade Twine RSM Database Version</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyMachineServiceFiles}" >Upgrade Machine Service</CheckBox>
                     </StackPanel>
                 </GroupBox>
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; }
     }
 }