X1 CI/CD Support.

3 files changed, 40 insertions, 8 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 2bb430014..71a157412 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/Controls/WebAppPropertiesControl.xaml
@@ -56,10 +56,10 @@
                 <TextBlock FontWeight="SemiBold">Machine Studio Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=MachineStudioVersion.Version}"></TextBlock>
 
-                <TextBlock FontWeight="SemiBold">PPC Application Version:</TextBlock>
+                <TextBlock FontWeight="SemiBold">TS-1800 Application Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=TangoVersion.VersionAndTag}"></TextBlock>
 
-                <TextBlock FontWeight="SemiBold">PPC Firmware Version::</TextBlock>
+                <TextBlock FontWeight="SemiBold">TS-1800 Firmware Version::</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=TangoVersion.FirmwareVersion}"></TextBlock>
 
                 <TextBlock FontWeight="SemiBold">Twine X4 Application Version:</TextBlock>
@@ -68,6 +68,12 @@
                 <TextBlock FontWeight="SemiBold">Twine X4 Firmware Version::</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=EurekaVersion.FirmwareVersion}"></TextBlock>
 
+                <TextBlock FontWeight="SemiBold">Twine X1 Application Version:</TextBlock>
+                <TextBlock Text="{Binding ElementName=control,Path=X1Version.VersionAndTag}"></TextBlock>
+
+                <TextBlock FontWeight="SemiBold">Twine X1 Firmware Version::</TextBlock>
+                <TextBlock Text="{Binding ElementName=control,Path=X1Version.FirmwareVersion}"></TextBlock>
+
                 <TextBlock FontWeight="SemiBold">Tango FSE Version:</TextBlock>
                 <TextBlock Text="{Binding ElementName=control,Path=FseVersion.Version}"></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 9dcfebad9..70561311f 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
@@ -50,6 +50,13 @@ namespace Tango.AzureUtils.UI.Controls
         public static readonly DependencyProperty EurekaVersionTagProperty =
             DependencyProperty.Register("EurekaVersionTag", typeof(String), typeof(WebAppPropertiesControl), new PropertyMetadata(null, (d, e) => (d as WebAppPropertiesControl).UpdateControl()));
 
+        public String X1VersionTag
+        {
+            get { return (String)GetValue(X1VersionTagProperty); }
+            set { SetValue(X1VersionTagProperty, value); }
+        }
+        public static readonly DependencyProperty X1VersionTagProperty =
+            DependencyProperty.Register("X1VersionTag", typeof(String), typeof(WebAppPropertiesControl), new PropertyMetadata(null, (d, e) => (d as WebAppPropertiesControl).UpdateControl()));
 
         public MachineServiceSettings Settings
         {
@@ -83,6 +90,18 @@ namespace Tango.AzureUtils.UI.Controls
         public static readonly DependencyProperty EurekaVersionProperty =
             DependencyProperty.Register("EurekaVersion", typeof(TangoVersion), typeof(WebAppPropertiesControl), new PropertyMetadata(null));
 
+
+
+        public TangoVersion X1Version
+        {
+            get { return (TangoVersion)GetValue(X1VersionProperty); }
+            set { SetValue(X1VersionProperty, value); }
+        }
+        public static readonly DependencyProperty X1VersionProperty =
+            DependencyProperty.Register("X1Version", typeof(TangoVersion), typeof(WebAppPropertiesControl), new PropertyMetadata(null));
+
+
+
         public FseVersion FseVersion
         {
             get { return (FseVersion)GetValue(FseVersionProperty); }
@@ -160,8 +179,9 @@ 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, EurekaVersionTag);
+                    TangoVersion = await databaseManager.GetLatestTangoVersion(app, MachineTypes.TS1800, PPCVersionTag);
+                    EurekaVersion = await databaseManager.GetLatestTangoVersion(app, MachineTypes.Eureka, EurekaVersionTag);
+                    X1Version = await databaseManager.GetLatestTangoVersion(app, MachineTypes.X1, X1VersionTag);
                     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 54a3e4876..fe00ce9b1 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}" EurekaVersionTag="{Binding Config.EurekaVersionTag}" WebApp="{Binding SelectedSourceApp}" />
+                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" EurekaVersionTag="{Binding Config.EurekaVersionTag}" X1VersionTag="{Binding Config.X1VersionTag}" WebApp="{Binding SelectedSourceApp}" />
                 </DockPanel>
             </GroupBox>
         </Grid>
@@ -45,10 +45,12 @@
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.SynchronizeDatabaseData}" >Upgrade Database Static Collections</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyMachineStudioStorageBlobs}" >Upgrade Machine Studio Blob Storage</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeMachineStudioDatabaseVersion}" >Upgrade Machine Studio Database Version</CheckBox>
-                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyPPCStorageBlobs}" >Upgrade PPC Blob Storage</CheckBox>
-                        <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.CopyPPCStorageBlobs}" >Upgrade TS-1800 Blob Storage</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradePPCDatabaseVersion}" >Upgrade TS-1800 Database Version</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyEurekaStorageBlobs}" >Upgrade Twine X4 Blob Storage</CheckBox>
                         <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeEurekaDatabaseVersion}" >Upgrade Twine X4 Database Version</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.CopyX1StorageBlobs}" >Upgrade Twine X1 Blob Storage</CheckBox>
+                        <CheckBox Click="OnConfigChanged" Margin="0 5 0 0" IsChecked="{Binding Config.UpgradeX1DatabaseVersion}" >Upgrade Twine X1 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.CopyTwineRSMStorageBlobs}" >Upgrade Twine Studio Blob Storage</CheckBox>
@@ -63,6 +65,10 @@
                             <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 Margin="0 10 0 0">
+                            <TextBlock FontSize="10">Twine X1 Version Tag</TextBlock>
+                            <TextBox x:Name="txtX1VersionTag" Text="{Binding Config.X1VersionTag,Mode=TwoWay,Delay=500,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                        </StackPanel>
                     </StackPanel>
                 </GroupBox>
 
@@ -86,7 +92,7 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" EurekaVersionTag="{Binding Config.EurekaVersionTag}" WebApp="{Binding SelectedTargetApp}" />
+                    <localControls:WebAppPropertiesControl VerticalAlignment="Top" Margin="0 20 0 0" PPCVersionTag="{Binding Config.PPCVersionTag}" EurekaVersionTag="{Binding Config.EurekaVersionTag}" X1VersionTag="{Binding Config.X1VersionTag}" WebApp="{Binding SelectedTargetApp}" />
                 </DockPanel>
             </GroupBox>
         </Grid>