Eureka Version Tag

4 files changed, 28 insertions, 9 deletions

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 22396cefe..9dcfebad9 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
@@ -42,6 +42,15 @@ namespace Tango.AzureUtils.UI.Controls
         public static readonly DependencyProperty PPCVersionTagProperty =
             DependencyProperty.Register("PPCVersionTag", typeof(String), typeof(WebAppPropertiesControl), new PropertyMetadata(null, (d, e) => (d as WebAppPropertiesControl).UpdateControl()));
 
+        public String EurekaVersionTag
+        {
+            get { return (String)GetValue(EurekaVersionTagProperty); }
+            set { SetValue(EurekaVersionTagProperty, value); }
+        }
+        public static readonly DependencyProperty EurekaVersionTagProperty =
+            DependencyProperty.Register("EurekaVersionTag", typeof(String), typeof(WebAppPropertiesControl), new PropertyMetadata(null, (d, e) => (d as WebAppPropertiesControl).UpdateControl()));
+
+
         public MachineServiceSettings Settings
         {
             get { return (MachineServiceSettings)GetValue(SettingsProperty); }
@@ -152,7 +161,7 @@ namespace Tango.AzureUtils.UI.Controls
                     var azure = await AzureUtilsAuthenticationFactory.AuthenticateOrGetAsync();
                     var databaseManager = new DatabaseManager(azure);
                     TangoVersion = await databaseManager.GetLatestPPCVersion(app, PPCVersionTag);
-                    EurekaVersion = await databaseManager.GetLatestEurekaVersion(app, PPCVersionTag);
+                    EurekaVersion = await databaseManager.GetLatestEurekaVersion(app, EurekaVersionTag);
                     MachineStudioVersion = await databaseManager.GetLatestMachineStudioVersion(app);
                     FseVersion = await databaseManager.GetLatestFSEVersion(app, FSEBuildVariants.FSE);
                     TwineRSMVersion = await databaseManager.GetLatestFSEVersion(app, FSEBuildVariants.TwineRSM);
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 fe82fb0b8..546ac31f2 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Views/EnvironmentUpgradeView.xaml
@@ -32,7 +32,7 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" WebApp="{Binding SelectedSourceApp}" />
+                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" EurekaVersionTag="{Binding Config.EurekaVersionTag}" WebApp="{Binding SelectedSourceApp}" />
                 </DockPanel>
             </GroupBox>
         </Grid>
@@ -59,6 +59,10 @@
                             <TextBlock FontSize="10">PPC Version Tag</TextBlock>
                             <TextBox x:Name="txtPPCVersionTag" Text="{Binding Config.PPCVersionTag,Mode=TwoWay,Delay=500,UpdateSourceTrigger=PropertyChanged}"></TextBox>
                         </StackPanel>
+                        <StackPanel Margin="0 10 0 0">
+                            <TextBlock FontSize="10">Twine X4 Version Tag</TextBlock>
+                            <TextBox x:Name="txtEurekaVersionTag" Text="{Binding Config.EurekaVersionTag,Mode=TwoWay,Delay=500,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                        </StackPanel>
                     </StackPanel>
                 </GroupBox>
 
@@ -82,7 +86,7 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" WebApp="{Binding SelectedTargetApp}" />
+                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" EurekaVersionTag="{Binding Config.EurekaVersionTag}" WebApp="{Binding SelectedTargetApp}" />
                 </DockPanel>
             </GroupBox>
         </Grid>
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
index e610efc2d..a3c074df9 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/EnvironmentManager.cs
@@ -333,8 +333,8 @@ namespace Tango.AzureUtils.Environment
             {
                 try
                 {
-                    await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.PPCVersionTag);
-                    await _storageManager.UpgradeEurekaStorage(sourceApp, targetApp, config.PPCVersionTag);
+                    await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
+                    await _storageManager.UpgradeEurekaStorage(sourceApp, targetApp, config.EurekaVersionTag);
                 }
                 catch (Exception ex)
                 {
@@ -403,8 +403,8 @@ namespace Tango.AzureUtils.Environment
             {
                 try
                 {
-                    await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.PPCVersionTag);
-                    await _databaseManager.UpgradeEurekaVersion(sourceApp, targetApp, config.PPCVersionTag);
+                    await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
+                    await _databaseManager.UpgradeEurekaVersion(sourceApp, targetApp, config.EurekaVersionTag);
                 }
                 catch (Exception ex)
                 {
@@ -476,7 +476,7 @@ namespace Tango.AzureUtils.Environment
             //Add Eureka storage versions.
             if (config.CopyEurekaStorageBlobs)
             {
-                await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.PPCVersionTag);
+                await _storageManager.ValidateEurekaStorageUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
             }
 
             //Add FSE storage versions.
@@ -506,7 +506,7 @@ namespace Tango.AzureUtils.Environment
             //Upgrade Eureka database version.
             if (config.UpgradeEurekaDatabaseVersion)
             {
-                await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.PPCVersionTag);
+                await _databaseManager.ValidateEurekaDatabaseUpgrade(sourceApp, targetApp, config.EurekaVersionTag);
             }
 
             //Upgrade FSE database version.
diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs
index 0dbaec3c0..c6769ef3f 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Environment/UpgradeEnvironmentConfiguration.cs
@@ -29,5 +29,11 @@ namespace Tango.AzureUtils.Environment
             set { _ppcVersionTag = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _eurekaVersionTag;
+        public String EurekaVersionTag
+        {
+            get { return _eurekaVersionTag.IsNotNullOrEmpty() ? _eurekaVersionTag : null; }
+            set { _eurekaVersionTag = value; RaisePropertyChangedAuto(); }
+        }
     }
 }