Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

2 files changed, 11 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
index abbfa0aa6..404faf4ab 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindow.xaml
@@ -48,6 +48,8 @@
 
                         <TextBlock FontSize="16" Margin="0 20 0 0">Comments</TextBlock>
                         <TextBox Height="70" Margin="0 5 0 0" Width="500" AcceptsReturn="True" TextWrapping="Wrap" Text="{Binding Comments,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+
+                        <CheckBox Margin="0 10 0 0" IsChecked="{Binding ForcedUpdate}">Forced Update</CheckBox>
                     </StackPanel>
 
                     <Grid DockPanel.Dock="Bottom">
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 622d3b0d0..11222e806 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -50,6 +50,14 @@ namespace Tango.MachineStudio.Publisher
             set { _comments = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _forcesUpdate;
+
+        public bool ForcedUpdate
+        {
+            get { return _forcesUpdate; }
+            set { _forcesUpdate = value; RaisePropertyChangedAuto(); }
+        }
+
         private String _currentVersion;
 
         public String CurrentVersion
@@ -135,6 +143,7 @@ namespace Tango.MachineStudio.Publisher
                         Password = Password,
                         Version = CurrentVersion.ToString(),
                         Comments = Comments,
+                        ForcedUpdate = ForcedUpdate,
                     });
 
                     tempFile = Path.Combine(Path.GetTempPath(), response.FileName);