From a299149cf7ce3d0fa363fd53840dcf41bf794125 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 25 Jul 2018 10:39:16 +0300
Subject: Improved log manager referenced assemblies listing.

---
 .../MachineStudio/Tango.MachineStudio.UI/App.xaml.cs          |  2 ++
 .../StudioApplication/DefaultStudioApplicationManager.cs      |  2 --
 Software/Visual_Studio/Tango.Logging/LogManager.cs            | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index bdd341592..c0be40ad4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -50,6 +50,8 @@ namespace Tango.MachineStudio.UI
 
             LogManager.Log("Application Started...");
 
+            LogManager.LogReferencedAssemblies();
+
             base.OnStartup(e);
 
             LogManager.Categories.Clear();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index 4290a9b71..d33b12a17 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -56,8 +56,6 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     {
                         TangoIOC.Default.GetAllInstancesByBase<IStudioViewModel>().ToList().ForEach(x => x.OnApplicationStarted());
                     };
-
-                    LogManager.LogReferencedAssemblies();
                 });
             });
         }
diff --git a/Software/Visual_Studio/Tango.Logging/LogManager.cs b/Software/Visual_Studio/Tango.Logging/LogManager.cs
index c0a8409ef..7d339d6b6 100644
--- a/Software/Visual_Studio/Tango.Logging/LogManager.cs
+++ b/Software/Visual_Studio/Tango.Logging/LogManager.cs
@@ -216,9 +216,16 @@ namespace Tango.Logging
         {
             String log = "--------------------- Referenced Assemblies --------------------------" + Environment.NewLine + Environment.NewLine;
 
-            foreach (Assembly a in AppDomain.CurrentDomain.GetAssemblies())
+            string codeBase = typeof(LogManager).Assembly.CodeBase;
+            UriBuilder uri = new UriBuilder(codeBase);
+            string path = Uri.UnescapeDataString(uri.Path);
+            String folder = Path.GetDirectoryName(path);
+
+            foreach (var file in Directory.GetFiles(folder,"*.dll"))
             {
-                log += a.GetName().Name + ", v" + a.GetName().Version + Environment.NewLine;
+                FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(file);
+                string version = fvi.ProductVersion;
+                log += Path.GetFileNameWithoutExtension(file) + ", v" + version + Environment.NewLine;
             }
 
             log += Environment.NewLine + "--------------------- --------------------- --------------------------";
-- 
cgit v1.3.1


From 8f83b5cedf2a0af57836e2db227d88b50e612cb1 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 25 Jul 2018 13:15:26 +0300
Subject: Working on PPC.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1835008 -> 1835008 bytes
 .../Tango.PPC.Jobs/ViewModels/MainViewVM.cs        |  26 +++++++++---------
 .../Tango.PPC.Jobs/Views/JobProgressView.xaml      |  30 +++++++++++++++++++--
 .../NotificationItems/MessageNotificationItem.cs   |  22 +++++++++++++--
 .../MessageNotificationItemView.xaml               |  20 +++++---------
 .../Tango.Touch/Controls/TouchBusyIndicator.xaml   |   9 +++++++
 .../Tango.Touch/Controls/TouchNotificationBar.cs   |  11 ++++++++
 .../Tango.Touch/Controls/TouchNotificationBar.xaml |  21 +++++++++++++++
 9 files changed, 110 insertions(+), 29 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 0631305ae..07f036ee1 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 8ad8512db..55ff05c51 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
index 28ff1793b..389349f54 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/MainViewVM.cs
@@ -21,26 +21,28 @@ namespace Tango.PPC.Jobs.ViewModels
 
         private void MachineOperator_PrintingFailed(object sender, Integration.Operation.PrintingFailedEventArgs e)
         {
-            NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("Job failed. ({0})", e.Exception.Message), MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
-            {
-                NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
-                NavigationManager.ClearHistoryExcept<JobsView>();
-            }));
+            NotificationProvider.PushNotification(new MessageNotificationItem(
+                String.Format("'{0}' failed.", e.Job.Name),
+                String.Format("The job '{1}' has failed due to unexpected error.{0}{2}{0}{0}Tap to view this job details.", Environment.NewLine, e.Job.Name, e.Exception), MessageNotificationItem.MessageNotificationItemTypes.Error, () =>
+                 {
+                     NavigationManager.NavigateWithObject<JobsModule, JobView, Job>(e.Job);
+                     NavigationManager.ClearHistoryExcept<JobsView>();
+                 }));
         }
 
         private void MachineOperator_PrintingCompleted(object sender, Integration.Operation.PrintingEventArgs e)
         {
             if (e.Job.Designation == BL.Enumerations.JobDesignations.SampleDye)
             {
-                NotificationProvider.PushNotification(new MessageNotificationItem("Sample completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
-                {
-                    NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job, Intent = JobNavigationIntent.SampleDye });
-                    NavigationManager.ClearHistoryExcept<JobsView>();
-                }));
+                NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' sample dye completed successfully", e.Job.Name), "Tap to approve or repeat.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+                   {
+                       NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job, Intent = JobNavigationIntent.SampleDye });
+                       NavigationManager.ClearHistoryExcept<JobsView>();
+                   }));
             }
             else if (e.Job.Designation == BL.Enumerations.JobDesignations.FineTuning)
             {
-                NotificationProvider.PushNotification(new MessageNotificationItem("Fine tuning completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+                NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' fine tuning completed successfully", e.Job.Name), "Tap to approve or repeat.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
                 {
                     NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job, Intent = JobNavigationIntent.FineTuning });
                     NavigationManager.ClearHistoryExcept<JobsView>();
@@ -48,7 +50,7 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             else
             {
-                NotificationProvider.PushNotification(new MessageNotificationItem("Job completed successfully.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
+                NotificationProvider.PushNotification(new MessageNotificationItem(String.Format("'{0}' completed successfully", e.Job.Name), "Tap to view this job details.", MessageNotificationItem.MessageNotificationItemTypes.Success, () =>
                 {
                     NavigationManager.NavigateWithObject<JobsModule, JobView, JobNavigationObject>(new JobNavigationObject() { Job = e.Job });
                     NavigationManager.ClearHistoryExcept<JobsView>();
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
index eb5497bd8..612c850a3 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobProgressView.xaml
@@ -47,8 +47,34 @@
                     </touch:TouchRingProgress.Style>
                 </touch:TouchRingProgress>
 
-                <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" IsIndeterminate="{Binding RunningJobStatus.IsSettingUp}" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
-
+                <touch:TouchBusyIndicator Width="360" Height="360" StrokeThickness="10" Maximum="100" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                    <touch:TouchBusyIndicator.Style>
+                        <Style TargetType="touch:TouchBusyIndicator">
+                            <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
+                            <Setter Property="Value" Value="0"></Setter>
+                            <Setter Property="IsIndeterminate" Value="False"></Setter>
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
+                                    <Setter Property="Value" Value="0"></Setter>
+                                    <Setter Property="IsIndeterminate" Value="True"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
+                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsCanceled}" Value="True">
+                                    <Setter Property="Value" Value="99.9"></Setter>
+                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoWarningBrush}"></Setter>
+                                </DataTrigger>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsFailed}" Value="True">
+                                    <Setter Property="Value" Value="99.9"></Setter>
+                                    <Setter Property="IsIndeterminate" Value="False"></Setter>
+                                    <Setter Property="Foreground" Value="{StaticResource TangoErrorBrush}"></Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </touch:TouchBusyIndicator.Style>
                 </touch:TouchBusyIndicator>
 
                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
index 5e120ab8c..b7f206e7c 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItem.cs
@@ -23,6 +23,13 @@ namespace Tango.PPC.Common.Notifications.NotificationItems
             set { _message = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _expandedMessage;
+        public String ExpandedMessage
+        {
+            get { return _expandedMessage; }
+            set { _expandedMessage = value; RaisePropertyChangedAuto(); }
+        }
+
         private MessageNotificationItemTypes _messageType;
 
         public MessageNotificationItemTypes MessageType
@@ -41,14 +48,25 @@ namespace Tango.PPC.Common.Notifications.NotificationItems
 
         }
 
-        public MessageNotificationItem(String message, MessageNotificationItemTypes type, Action pressed) : this()
+        public MessageNotificationItem(String message, String expandedMessage, MessageNotificationItemTypes type, Action pressed) : this()
         {
             Message = message;
+            ExpandedMessage = expandedMessage;
             MessageType = type;
             Pressed += (_, __) => pressed?.Invoke();
         }
 
-        public MessageNotificationItem(String message, MessageNotificationItemTypes type) : this(message, type, null)
+        public MessageNotificationItem(String message, MessageNotificationItemTypes type, Action pressed) : this(message, null, type, pressed)
+        {
+
+        }
+
+        public MessageNotificationItem(String message, String expandedMessage, MessageNotificationItemTypes type) : this(message, expandedMessage, type, null)
+        {
+
+        }
+
+        public MessageNotificationItem(String message, MessageNotificationItemTypes type) : this(message, null, type)
         {
 
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
index 057e86a13..9b583a117 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Notifications/NotificationItems/MessageNotificationItemView.xaml
@@ -7,7 +7,7 @@
              xmlns:local="clr-namespace:Tango.PPC.Common.Notifications.NotificationItems"
              mc:Ignorable="d" 
              d:DesignHeight="60" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=local:MessageNotificationItem, IsDesignTimeCreatable=False}" MinHeight="60" Height="60" MaxHeight="150">
-    
+
     <ContentControl>
         <ContentControl.Style>
             <Style TargetType="ContentControl">
@@ -50,18 +50,12 @@
                     </Style>
                 </touch:TouchIcon.Style>
             </touch:TouchIcon>
-            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" Text="{Binding Message}" TextTrimming="CharacterEllipsis">
-                <TextBlock.Style>
-                    <Style TargetType="TextBlock">
-                        <Setter Property="TextWrapping" Value="NoWrap"></Setter>
-                        <Style.Triggers>
-                            <DataTrigger Binding="{Binding IsExpanded}" Value="True">
-                                <Setter Property="TextWrapping" Value="Wrap"></Setter>
-                            </DataTrigger>
-                        </Style.Triggers>
-                    </Style>
-                </TextBlock.Style>
-            </TextBlock>
+
+            <StackPanel Margin="10 0 0 0" VerticalAlignment="Center">
+                <TextBlock Text="{Binding Message}" TextTrimming="CharacterEllipsis" TextWrapping="Wrap"></TextBlock>
+
+                <TextBlock Margin="0 20 0 0" Text="{Binding ExpandedMessage}" TextWrapping="Wrap" Visibility="{Binding IsExpanded,Converter={StaticResource BooleanToVisibilityConverter}}"></TextBlock>
+            </StackPanel>
         </DockPanel>
     </ContentControl>
 </UserControl>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchBusyIndicator.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchBusyIndicator.xaml
index fa6a83d50..a3f26aa6e 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchBusyIndicator.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchBusyIndicator.xaml
@@ -131,6 +131,15 @@
                                 <RemoveStoryboard BeginStoryboardName="IsFullyIndeterminateStoryboard" />
                             </MultiTrigger.ExitActions>
                         </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsIndeterminate" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.EnterActions>
+                                <RemoveStoryboard BeginStoryboardName="IsIndeterminateStoryboard" />
+                                <RemoveStoryboard BeginStoryboardName="IsFullyIndeterminateStoryboard" />
+                            </MultiTrigger.EnterActions>
+                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
index 3cd3c1078..299844c1e 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.cs
@@ -39,6 +39,7 @@ namespace Tango.Touch.Controls
         private Grid _grid_container;
         private Grid _grid_mask;
         private ItemsControl _items_control;
+        private Grid _notification_counter_grid;
 
         static TouchNotificationBar()
         {
@@ -117,6 +118,7 @@ namespace Tango.Touch.Controls
             _grid_container = GetTemplateChild("PART_Grid_Container") as Grid;
             _grid_mask = GetTemplateChild("PART_GridMask") as Grid;
             _items_control = GetTemplateChild("PART_ItemsControl") as ItemsControl;
+            _notification_counter_grid = GetTemplateChild("PART_NotificationCounterGrid") as Grid;
 
             //border_notifications.IsManipulationEnabled = true;
             _border_drag.RegisterForPreviewMouseOrTouchDown(GridNotificationMouseDown);
@@ -161,6 +163,15 @@ namespace Tango.Touch.Controls
             _grid_mask.Opacity = _border_drag.ActualHeight / ActualHeight;
 
             ResizeNotifications();
+
+            if (e.NewSize.Height > CurrentMinHeight)
+            {
+                _notification_counter_grid.Visibility = Visibility.Hidden;
+            }
+            else
+            {
+                _notification_counter_grid.Visibility = Visibility.Visible;
+            }
         }
 
         private void ResizeNotifications()
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.xaml
index 6c511363e..15ea569a0 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNotificationBar.xaml
@@ -1,11 +1,14 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
                     xmlns:local="clr-namespace:Tango.Touch.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Resources/Colors.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+    <converters:GreaterThanToBooleanConverter x:Key="GreaterThanToBooleanConverter" />
+
     <Style TargetType="{x:Type local:TouchNotificationBar}">
         <Setter Property="Template">
             <Setter.Value>
@@ -41,6 +44,24 @@
                                             </ItemsControl>
                                         </Border>
                                     </Border>
+
+                                    <Grid x:Name="PART_NotificationCounterGrid" Canvas.Left="85" Canvas.Top="45" Width="32" Height="32" HorizontalAlignment="Left" VerticalAlignment="Bottom" IsHitTestVisible="False">
+                                        <Grid>
+                                            <Grid.Style>
+                                                <Style TargetType="Grid">
+                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                    <Style.Triggers>
+                                                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNotificationBar},Path=Notifications.Count,Converter={StaticResource GreaterThanToBooleanConverter},ConverterParameter=1}" Value="True">
+                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                        </DataTrigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Grid.Style>
+                                            <Ellipse Fill="White" StrokeThickness="1" Stroke="{StaticResource TangoPrimaryAccentBrush}">
+                                            </Ellipse>
+                                            <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Text="{Binding RelativeSource={RelativeSource AncestorType=local:TouchNotificationBar},Path=Notifications.Count}"></TextBlock>
+                                        </Grid>
+                                    </Grid>
                                 </Canvas>
                             </Grid>
                         </Grid>
-- 
cgit v1.3.1


From 064a839e731d7d96922b468330fab5c065609a01 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 25 Jul 2018 14:03:04 +0300
Subject: Implemented graphs auto range, pause & clear in tech board module.

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1835008 -> 1835008 bytes
 .../Editors/MultiGraphElementEditor.xaml           |   2 +-
 .../Editors/SingleGraphElementEditor.xaml          |   2 +-
 .../PropertiesTemplates/MultiGraphTemplate.xaml    |  33 +++++++++-------
 .../PropertiesTemplates/SingleGraphTemplate.xaml   |  33 +++++++++-------
 .../TechItems/MultiGraphItem.cs                    |  43 +++++++++++++++++++++
 .../TechItems/SingleGraphItem.cs                   |  43 +++++++++++++++++++++
 .../Controls/RealTimeGraphControl.xaml             |   2 +-
 .../Controls/RealTimeGraphControl.xaml.cs          |  10 +++++
 .../Controls/RealTimeGraphMultiControl.xaml        |   2 +-
 .../Controls/RealTimeGraphMultiControl.xaml.cs     |  12 ++++++
 .../FastGraphs/RealTimeGraphExLineErase.cs         |   9 +++++
 .../FastGraphs/RealTimeGraphExLineScroll.cs        |   9 +++++
 .../FastGraphs/RealTimeGraphExMultiLineErase.cs    |   9 +++++
 .../FastGraphs/RealTimeGraphExMultiLineScroll.cs   |   9 +++++
 .../RealTimeGraphEx/RealTimeGraphExBase.cs         |  16 ++++++++
 17 files changed, 204 insertions(+), 30 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 07f036ee1..77a4a37e1 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 55ff05c51..e749ff2d3 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
index a1197b9d9..4d1cc08e4 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/MultiGraphElementEditor.xaml
@@ -30,7 +30,7 @@
         <!--Content-->
         <Grid>
             <!--<Viewbox Stretch="Fill">-->
-            <controls:RealTimeGraphMultiControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" SensorUnits="{Binding TechMonitor.Units}">
+            <controls:RealTimeGraphMultiControl x:Name="InnerGraph" UseAutoRange="{Binding UseAutoRange}" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" SensorUnits="{Binding TechMonitor.Units}">
                 <controls:RealTimeGraphMultiControl.Style>
                     <Style TargetType="controls:RealTimeGraphMultiControl">
                         <Setter Property="Minimum" Value="{Binding TechMonitor.Min}"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
index c9e4c244b..4d80478c5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/SingleGraphElementEditor.xaml
@@ -30,7 +30,7 @@
         <!--Content-->
         <Grid>
             <!--<Viewbox Stretch="Fill">-->
-            <controls:RealTimeGraphControl x:Name="InnerGraph" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" Color="{Binding Color,Mode=OneWay}" SensorUnits="{Binding TechMonitor.Units}">
+            <controls:RealTimeGraphControl x:Name="InnerGraph" UseAutoRange="{Binding UseAutoRange}" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}" x:FieldModifier="public" EnableToolBar="False" SensorName="{Binding TechMonitor.Description}" Color="{Binding Color,Mode=OneWay}" SensorUnits="{Binding TechMonitor.Units}">
                 <controls:RealTimeGraphControl.Style>
                     <Style TargetType="controls:RealTimeGraphControl">
                         <Setter Property="Minimum" Value="{Binding TechMonitor.Min}"></Setter>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
index 6583e96e8..464c12bfd 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/MultiGraphTemplate.xaml
@@ -31,19 +31,26 @@
                 </StackPanel>
             </GroupBox>
 
-            <GroupBox Header="RANGE" Margin="0 10 0 0">
-                <StackPanel Margin="0 10">
-                    <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
-                        <StackPanel Margin="0 0 5 0">
-                            <TextBlock>Minimum</TextBlock>
-                            <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-10000" Maximum="10000" Value="{Binding Min}"></mahapps:NumericUpDown>
-                        </StackPanel>
-                        <StackPanel Margin="5 0 0 0">
-                            <TextBlock>Maximum</TextBlock>
-                            <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-10000" Maximum="10000" Value="{Binding Max}"></mahapps:NumericUpDown>
-                        </StackPanel>
-                    </UniformGrid>
-                    <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default</CheckBox>
+            <GroupBox Header="GRAPH" Margin="0 10 0 0">
+                <StackPanel>
+                    <StackPanel Margin="0 10" IsEnabled="{Binding UseAutoRange,Converter={StaticResource BooleanInverseConverter}}">
+                        <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
+                            <StackPanel Margin="0 0 5 0">
+                                <TextBlock>Minimum</TextBlock>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min}"></mahapps:NumericUpDown>
+                            </StackPanel>
+                            <StackPanel Margin="5 0 0 0">
+                                <TextBlock>Maximum</TextBlock>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max}"></mahapps:NumericUpDown>
+                            </StackPanel>
+                        </UniformGrid>
+                        <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default ranges</CheckBox>
+                    </StackPanel>
+
+                    <CheckBox IsChecked="{Binding UseAutoRange}">Use auto ranges</CheckBox>
+                    <CheckBox Margin="0 10 0 0" IsChecked="{Binding IsPaused}">Pause</CheckBox>
+
+                    <Button Margin="0 10" Command="{Binding ClearCommand}">CLEAR</Button>
                 </StackPanel>
             </GroupBox>
         </StackPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
index 9e78eae0d..bb0db666c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/SingleGraphTemplate.xaml
@@ -31,19 +31,26 @@
                 </StackPanel>
             </GroupBox>
 
-            <GroupBox Header="RANGE" Margin="0 10 0 0">
-                <StackPanel Margin="0 10">
-                    <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
-                        <StackPanel Margin="0 0 5 0">
-                            <TextBlock>Minimum</TextBlock>
-                            <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-10000" Maximum="10000" Value="{Binding Min}"></mahapps:NumericUpDown>
-                        </StackPanel>
-                        <StackPanel Margin="5 0 0 0">
-                            <TextBlock>Maximum</TextBlock>
-                            <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-10000" Maximum="10000" Value="{Binding Max}"></mahapps:NumericUpDown>
-                        </StackPanel>
-                    </UniformGrid>
-                    <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default</CheckBox>
+            <GroupBox Header="GRAPH" Margin="0 10 0 0">
+                <StackPanel>
+                    <StackPanel Margin="0 10" IsEnabled="{Binding UseAutoRange,Converter={StaticResource BooleanInverseConverter}}">
+                        <UniformGrid Columns="2" Margin="0 5 0 0" IsEnabled="{Binding UseMinMax}">
+                            <StackPanel Margin="0 0 5 0">
+                                <TextBlock>Minimum</TextBlock>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="-1000000" Maximum="1000000" Value="{Binding Min}"></mahapps:NumericUpDown>
+                            </StackPanel>
+                            <StackPanel Margin="5 0 0 0">
+                                <TextBlock>Maximum</TextBlock>
+                                <mahapps:NumericUpDown HasDecimals="True" HorizontalContentAlignment="Center" BorderBrush="Gainsboro" Foreground="Gray" Margin="0 5 0 0" Minimum="{Binding Min}" Maximum="1000000" Value="{Binding Max}"></mahapps:NumericUpDown>
+                            </StackPanel>
+                        </UniformGrid>
+                        <CheckBox Margin="0 10 0 0" IsChecked="{Binding UseMinMax,Converter={StaticResource BooleanInverseConverter}}">Use default ranges</CheckBox>
+                    </StackPanel>
+
+                    <CheckBox IsChecked="{Binding UseAutoRange}">Use auto ranges</CheckBox>
+                    <CheckBox Margin="0 10 0 0" IsChecked="{Binding IsPaused}">Pause</CheckBox>
+
+                    <Button Margin="0 10" Command="{Binding ClearCommand}">CLEAR</Button>
                 </StackPanel>
             </GroupBox>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
index 029580a10..072720c4b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/MultiGraphItem.cs
@@ -5,6 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Serialization;
 using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.MachineStudio.Technician.Editors;
 using Tango.MachineStudio.Technician.Helpers;
 using Tango.SharedUI.Helpers;
@@ -81,6 +82,36 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _useMinMax = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _useAutoRange;
+        /// <summary>
+        /// Gets or sets a value indicating whether [use automatic range].
+        /// </summary>
+        public bool UseAutoRange
+        {
+            get { return _useAutoRange; }
+            set { _useAutoRange = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isPaused;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is paused.
+        /// </summary>
+        public bool IsPaused
+        {
+            get { return _isPaused; }
+            set
+            {
+                _isPaused = value; RaisePropertyChangedAuto();
+
+                if (Editor != null)
+                {
+                    Editor.InnerGraph.Controller.IsPaused = _isPaused;
+                }
+            }
+        }
+
+        public RelayCommand ClearCommand { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MultiGraphItem"/> class.
         /// </summary>
@@ -90,6 +121,14 @@ namespace Tango.MachineStudio.Technician.TechItems
             Name = "Multi Channel Graph";
             Description = "Multi channel real-time graph";
             Image = ResourceHelper.GetImageFromResources("Images/multi-graph.png");
+
+            ClearCommand = new RelayCommand(() => 
+            {
+                if (Editor != null)
+                {
+                    Editor.InnerGraph.Controller.Clear();
+                }
+            });
         }
 
         /// <summary>
@@ -109,6 +148,10 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             MultiGraphItem cloned = base.Clone() as MultiGraphItem;
             cloned.TechMonitor = TechMonitor;
+            cloned.Min = Min;
+            cloned.Max = Max;
+            cloned.UseMinMax = UseMinMax;
+            cloned.UseAutoRange = UseAutoRange;
             return cloned;
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
index 148368881..8a88aad7a 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/SingleGraphItem.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Windows.Media;
 using System.Xml.Serialization;
 using Tango.BL.Entities;
+using Tango.Core.Commands;
 using Tango.MachineStudio.Technician.Editors;
 using Tango.MachineStudio.Technician.Helpers;
 using Tango.SharedUI.Helpers;
@@ -81,6 +82,36 @@ namespace Tango.MachineStudio.Technician.TechItems
             set { _useMinMax = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _useAutoRange;
+        /// <summary>
+        /// Gets or sets a value indicating whether [use automatic range].
+        /// </summary>
+        public bool UseAutoRange
+        {
+            get { return _useAutoRange; }
+            set { _useAutoRange = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _isPaused;
+        /// <summary>
+        /// Gets or sets a value indicating whether this instance is paused.
+        /// </summary>
+        public bool IsPaused
+        {
+            get { return _isPaused; }
+            set
+            {
+                _isPaused = value; RaisePropertyChangedAuto();
+
+                if (Editor != null)
+                {
+                    Editor.InnerGraph.Controller.IsPaused = _isPaused;
+                }
+            }
+        }
+
+        public RelayCommand ClearCommand { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SingleGraphItem"/> class.
         /// </summary>
@@ -91,6 +122,14 @@ namespace Tango.MachineStudio.Technician.TechItems
             Description = "Single channel real-time graph";
             Image = ResourceHelper.GetImageFromResources("Images/single-graph.png");
             Color = Colors.DodgerBlue;
+
+            ClearCommand = new RelayCommand(() =>
+            {
+                if (Editor != null)
+                {
+                    Editor.InnerGraph.Controller.Clear();
+                }
+            });
         }
 
         /// <summary>
@@ -110,6 +149,10 @@ namespace Tango.MachineStudio.Technician.TechItems
         {
             SingleGraphItem cloned = base.Clone() as SingleGraphItem;
             cloned.TechMonitor = TechMonitor;
+            cloned.Min = Min;
+            cloned.Max = Max;
+            cloned.UseMinMax = UseMinMax;
+            cloned.UseAutoRange = UseAutoRange;
             return cloned;
         }
     }
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml
index fc36b28d3..f12a433df 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml
@@ -63,7 +63,7 @@
                     </StackPanel>
                 </Border>
                 <Border Grid.Column="1" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" Background="{DynamicResource graphBackground}" Margin="5 0 0 0">
-                    <graphEx:RealTimeGraphExLineErase x:Name="Graph" x:FieldModifier="public" Controller="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Controller}" Antialiased="True" RefreshRate="30" MarkerColor="{StaticResource graphsMarkerColor}" FillGraph="False" Stroke="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Color}" Minimum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Minimum}" Maximum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Maximum}">
+                    <graphEx:RealTimeGraphExLineErase x:Name="Graph" x:FieldModifier="public" UseAutoRange="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=UseAutoRange}" Controller="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Controller}" Antialiased="True" RefreshRate="30" MarkerColor="{StaticResource graphsMarkerColor}" FillGraph="False" Stroke="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Color}" Minimum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Minimum}" Maximum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Maximum}">
                         <graphEx:RealTimeGraphExLineErase.Components>
                             <components:MouseValueToolTip ToolTipTemplate="{StaticResource graphTooltipTemplate}" />
                             <components:GridLines Rows="4" Columns="6" GridBrush="{DynamicResource graphGridLinesBrush}"></components:GridLines>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml.cs
index dd9aa1414..2341c21c1 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphControl.xaml.cs
@@ -82,6 +82,16 @@ namespace Tango.MachineStudio.Common.Controls
 
 
 
+        public bool UseAutoRange
+        {
+            get { return (bool)GetValue(UseAutoRangeProperty); }
+            set { SetValue(UseAutoRangeProperty, value); }
+        }
+        public static readonly DependencyProperty UseAutoRangeProperty =
+            DependencyProperty.Register("UseAutoRange", typeof(bool), typeof(RealTimeGraphControl), new PropertyMetadata(false));
+
+
+
         public void InvalidateGraph()
         {
             InnerGraph.Clear();
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml
index 657cc2683..1e1a5b123 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml
@@ -63,7 +63,7 @@
                     </StackPanel>
                 </Border>
                 <Border Grid.Column="1" BorderThickness="1" BorderBrush="{StaticResource borderBrush}" Background="{DynamicResource graphBackground}" Margin="5 0 0 0">
-                    <graphEx:RealTimeGraphExMultiLineErase x:Name="Graph" x:FieldModifier="public" Controller="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Controller}" Antialiased="True" RefreshRate="30" MarkerColor="{StaticResource graphsMarkerColor}" FillGraph="False" Minimum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Minimum}" Maximum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Maximum}"  Stroke="DodgerBlue">
+                    <graphEx:RealTimeGraphExMultiLineErase x:Name="Graph" x:FieldModifier="public" UseAutoRange="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=UseAutoRange}" Controller="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Controller}" Antialiased="True" RefreshRate="30" MarkerColor="{StaticResource graphsMarkerColor}" FillGraph="False" Minimum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Minimum}" Maximum="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=Maximum}"  Stroke="DodgerBlue">
                         <graphEx:RealTimeGraphExMultiLineErase.Components>
                             <components:MouseValueToolTip ToolTipTemplate="{StaticResource graphTooltipTemplate}" />
                             <components:GridLines Rows="4" Columns="6" GridBrush="{DynamicResource graphGridLinesBrush}"></components:GridLines>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml.cs
index 8e3b6b6e3..21054d94e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Controls/RealTimeGraphMultiControl.xaml.cs
@@ -68,6 +68,18 @@ namespace Tango.MachineStudio.Common.Controls
         public static readonly DependencyProperty MaximumProperty =
             DependencyProperty.Register("Maximum", typeof(double), typeof(RealTimeGraphMultiControl), new PropertyMetadata(100.0));
 
+
+
+        public bool UseAutoRange
+        {
+            get { return (bool)GetValue(UseAutoRangeProperty); }
+            set { SetValue(UseAutoRangeProperty, value); }
+        }
+        public static readonly DependencyProperty UseAutoRangeProperty =
+            DependencyProperty.Register("UseAutoRange", typeof(bool), typeof(RealTimeGraphMultiControl), new PropertyMetadata(false));
+
+
+
         public void InvalidateGraph()
         {
             InnerGraph.Clear();
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineErase.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineErase.cs
index f1902e662..b8810e32f 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineErase.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineErase.cs
@@ -110,6 +110,15 @@ namespace RealTimeGraphEx.FastGraphs
             {
                 var points = _graphController.dataSeries.Points.GetAndClearAllPoints();
 
+                if (_useAutoRange && points.Count > 0)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        Maximum = points.Concat(graphPolygon.GetPoints()).Max();
+                        Minimum = points.Concat(graphPolygon.GetPoints()).Min();
+                    });
+                }
+
                 if (!_isPaused)
                 {
 
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineScroll.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineScroll.cs
index a2260030c..1adf9a134 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineScroll.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExLineScroll.cs
@@ -144,6 +144,15 @@ namespace RealTimeGraphEx.FastGraphs
             {
                 var points = _graphController.dataSeries.Points.GetAndClearAllPoints();
 
+                if (_useAutoRange && points.Count > 0)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        Maximum = points.Concat(graphPolygon.GetPoints()).Max();
+                        Minimum = points.Concat(graphPolygon.GetPoints()).Min();
+                    });
+                }
+
                 if (!_isPaused)
                 {
 
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineErase.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineErase.cs
index fd5f27e99..d56b5533d 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineErase.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineErase.cs
@@ -90,6 +90,15 @@ namespace RealTimeGraphEx.FastGraphs
             {
                 var pointsCollection = _graphController.GetAndClearAllPoints();
 
+                if (_useAutoRange && pointsCollection.Count > 0)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        Maximum = pointsCollection.SelectMany(x => x).Concat(_graphPolygons.SelectMany(x => x.GetPoints())).Max();
+                        Minimum = pointsCollection.SelectMany(x => x).Concat(_graphPolygons.SelectMany(x => x.GetPoints())).Min();
+                    });
+                }
+
                 if (!_isPaused)
                 {
 
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineScroll.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineScroll.cs
index 2f911a6c4..7cd7f74f1 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineScroll.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/FastGraphs/RealTimeGraphExMultiLineScroll.cs
@@ -132,6 +132,15 @@ namespace RealTimeGraphEx.FastGraphs
             {
                 var pointsCollection = _graphController.GetAndClearAllPoints();
 
+                if (_useAutoRange && pointsCollection.Count > 0)
+                {
+                    Dispatcher.Invoke(() =>
+                    {
+                        Maximum = pointsCollection.SelectMany(x => x).Concat(_graphPolygons.SelectMany(x => x.GetPoints())).Max();
+                        Minimum = pointsCollection.SelectMany(x => x).Concat(_graphPolygons.SelectMany(x => x.GetPoints())).Min();
+                    });
+                }
+
                 if (!_isPaused)
                 {
 
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs
index a2060d10e..c5eaaf4af 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/RealTimeGraphExBase.cs
@@ -169,6 +169,8 @@ namespace RealTimeGraphEx
                 control.MinMaxChanged?.Invoke(control, new EventArgs());
             }));
 
+
+
         /// <summary>
         /// Gets or sets the graph refresh rate in milliseconds (default 30, affects performance).
         /// </summary>
@@ -375,6 +377,18 @@ namespace RealTimeGraphEx
         public static readonly DependencyProperty MaxPointsProperty =
             DependencyProperty.Register("MaxPoints", typeof(int), typeof(RealTimeGraphExBase), new PropertyMetadata(1000, new PropertyChangedCallback(CrossModelChanged)));
 
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [use automatic range].
+        /// </summary>
+        public bool UseAutoRange
+        {
+            get { return (bool)GetValue(UseAutoRangeProperty); }
+            set { SetValue(UseAutoRangeProperty, value); }
+        }
+        public static readonly DependencyProperty UseAutoRangeProperty =
+            DependencyProperty.Register("UseAutoRange", typeof(bool), typeof(RealTimeGraphExBase), new PropertyMetadata(false, new PropertyChangedCallback(CrossModelChanged)));
+
         #endregion
 
         #region Cross Thread Fields
@@ -392,6 +406,7 @@ namespace RealTimeGraphEx
         protected bool _antialiased;
         protected bool _isPaused;
         protected bool _disableRendering;
+        protected bool _useAutoRange;
         #endregion
 
         #region Constructors
@@ -696,6 +711,7 @@ namespace RealTimeGraphEx
                 virtualMaximum = Maximum;
                 virtualStart = 0;
                 virtualEnd = gridMain.ActualWidth;
+                _useAutoRange = UseAutoRange;
                 RenderOptions.SetEdgeMode(this, _antialiased ? EdgeMode.Unspecified : EdgeMode.Aliased);
 
             }, DispatcherPriority.Send);
-- 
cgit v1.3.1


From f98fc42ef7f1fc1d5570ebfed71d65894fafe1d5 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 25 Jul 2018 14:19:42 +0300
Subject: Machine Studio v2.0.9

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 1835008 -> 1835008 bytes
 .../Tango.Embroidery/Tango.Embroidery.vcxproj      |   1 +
 .../Tango.EmbroideryUI/Properties/AssemblyInfo.cs  |   2 +-
 .../libEmbroideryTest/libEmbroideryTest.vcxproj    |   1 +
 .../visualstudio/libEmbroideryVS2008.vcxproj       |   1 +
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.MachineStudio.Publisher/MainWindowVM.cs  |   3 ++-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.MachineStudio.UI/App.xaml.cs             |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Native/Tango.ColorLib/Tango.ColorLib.vcxproj   |   1 +
 .../Tango.Emulations.Native.vcxproj                |   1 +
 .../Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj |   1 +
 .../Tango.PPC.Jobs/Properties/AssemblyInfo.cs      |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.PPC.Common/Properties/AssemblyInfo.cs    |   2 +-
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../RealTimeGraphEx/Properties/AssemblyInfo.cs     |   2 +-
 .../Tango.AutoComplete/Properties/AssemblyInfo.cs  |   2 +-
 .../Tango.AnimatedGif/Properties/AssemblyInfo.cs   |   2 +-
 .../Tango.BL/Properties/AssemblyInfo.cs            |   2 +-
 .../Tango.BrushPicker/Properties/AssemblyInfo.cs   |   2 +-
 .../Tango.CircularGauge/Properties/AssemblyInfo.cs |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.ColorPicker/Properties/AssemblyInfo.cs   |   2 +-
 .../Tango.Core/Properties/AssemblyInfo.cs          |   2 +-
 .../Tango.DAL.Local/Properties/AssemblyInfo.cs     |   2 +-
 .../Tango.DAL.Remote/Properties/AssemblyInfo.cs    |   2 +-
 .../Tango.Documents/Properties/AssemblyInfo.cs     |   2 +-
 .../Tango.DragAndDrop/Properties/AssemblyInfo.cs   |   2 +-
 .../Tango.Editors/Properties/AssemblyInfo.cs       |   2 +-
 .../Tango.Emulations/Properties/AssemblyInfo.cs    |   2 +-
 .../Tango.Hive/Properties/AssemblyInfo.cs          |   2 +-
 .../Tango.Integration/Properties/AssemblyInfo.cs   |   2 +-
 .../Tango.Logging/Properties/AssemblyInfo.cs       |   2 +-
 .../Tango.PMR/Properties/AssemblyInfo.cs           |   2 +-
 .../Tango.Protobuf/Properties/AssemblyInfo.cs      |   2 +-
 .../Tango.Scripting/Properties/AssemblyInfo.cs     |   2 +-
 .../Tango.Serialization/Properties/AssemblyInfo.cs |   2 +-
 .../Tango.Settings/Properties/AssemblyInfo.cs      |   2 +-
 .../Tango.SharedUI/Properties/AssemblyInfo.cs      |   2 +-
 .../Tango.Stubs/Properties/AssemblyInfo.cs         |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.TFS/Properties/AssemblyInfo.cs           |   2 +-
 .../Tango.Touch/Properties/AssemblyInfo.cs         |   2 +-
 .../Tango.Transport/Properties/AssemblyInfo.cs     |   2 +-
 .../Tango.Video/Properties/AssemblyInfo.cs         |   2 +-
 .../Tango.Visuals/Properties/AssemblyInfo.cs       |   2 +-
 .../Tango.BugReporter/Properties/AssemblyInfo.cs   |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.HashGenerator/Properties/AssemblyInfo.cs |   2 +-
 .../Tango.ILMerge.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../Tango.Protobuf.CLI/Properties/AssemblyInfo.cs  |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.Stubs.CLI/Properties/AssemblyInfo.cs     |   2 +-
 .../Tango.Stubs.UI/Properties/AssemblyInfo.cs      |   2 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.UITests/Properties/AssemblyInfo.cs       |   2 +-
 72 files changed, 71 insertions(+), 64 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 77a4a37e1..7aede2f90 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index e749ff2d3..16e9ae4a6 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj
index e952e009a..71cb4c8b5 100644
--- a/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj
+++ b/Software/Visual_Studio/Embroidery/Tango.Embroidery/Tango.Embroidery.vcxproj
@@ -184,6 +184,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
index 240417f19..c5ae109fa 100644
--- a/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Embroidery/Tango.EmbroideryUI/Properties/AssemblyInfo.cs
@@ -44,5 +44,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.1341")]
+[assembly: AssemblyVersion("1.0.4.1407")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj
index 3dc534eca..24b9ba8dd 100644
--- a/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj
+++ b/Software/Visual_Studio/Embroidery/libEmbroideryTest/libEmbroideryTest.vcxproj
@@ -163,6 +163,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj
index b0e5c9085..8d15fc0d0 100644
--- a/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj
+++ b/Software/Visual_Studio/Embroidery/project-files/visualstudio/libEmbroideryVS2008.vcxproj
@@ -299,6 +299,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
index 66855f3d2..17c753cc1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Color Lab Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
index 990bdc4d4..404c1519f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio DB Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
index 32b18163d..309c4922e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Data Capturing Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
index 68e82d986..87753b6c6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Developer Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
index 5e7ed037e..a77506fd7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Hardware Designer Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
index 7fdb1934c..66e744ea5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Logging/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Logging Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
index 6de4d55f1..ec4ca0566 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Machine Designer Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
index d6b116c3c..77fb1b687 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Stubs Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
index 45fbbad27..2370d4b01 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Synchronization Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
index 8a5dfaecb..ed3f8dfb8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Technician Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
index fafffd539..10a43ead9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
index 50c27507f..e62d12b87 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Common Components")]
-[assembly: AssemblyVersion("2.0.9.1321")]
+[assembly: AssemblyVersion("2.0.11.1411")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
index 00bd895f3..8d2d617f0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/MainWindowVM.cs
@@ -2,6 +2,7 @@
 using Ionic.Zip;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -124,7 +125,7 @@ namespace Tango.MachineStudio.Publisher
 
         private void UpdateVersions()
         {
-            CurrentVersion = typeof(MainWindowVM).Assembly.GetName().Version.ToString();
+            CurrentVersion = FileVersionInfo.GetVersionInfo(Core.Helpers.AssemblyHelper.GetCurrentAssemblyFolder() + "\\Tango.MachineStudio.UI.exe").ProductVersion;
             LatestVersion = _client.GetLatestVersion();
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
index e1e39d3aa..404cc4ae4 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Publisher/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio Publish Utility")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.2.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
index c0be40ad4..99a6174a8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs
@@ -28,7 +28,7 @@ namespace Tango.MachineStudio.UI
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    public partial class App : Application
+    public partial class App : Application 
     {
         private WpfGlobalExceptionTrapper exceptionTrapper;
         private LogManager LogManager = LogManager.Default;
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 20e399b44..5f541f597 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("2.0.8.18204")]
+[assembly: AssemblyVersion("2.0.9.18206")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
index 98e607dad..4297b7f9c 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Updater/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Machine Studio Updater Utility")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
index 4c1bfb188..b232943d2 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj
@@ -210,6 +210,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj b/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj
index 0c3da294e..cfde88dc6 100644
--- a/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.Emulations.Native/Tango.Emulations.Native.vcxproj
@@ -202,6 +202,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj b/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj
index 980e926cc..06ba06587 100644
--- a/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj
+++ b/Software/Visual_Studio/Native/Tango.ProtoTest/Tango.ProtoTest.vcxproj
@@ -158,6 +158,7 @@
   </ImportGroup>
   <ProjectExtensions>
     <VisualStudio>
+      <UserProperties BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
index ff46f9c9f..523281b9e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Jobs Module")]
-[assembly: AssemblyVersion("2.0.3.1536")]
+[assembly: AssemblyVersion("2.0.4.1407")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
index 7252dea6d..52774bee8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Module")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
index 254e25c85..3f5a630f6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Properties/AssemblyInfo.cs
@@ -8,7 +8,7 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Common Library")]
-[assembly: AssemblyVersion("2.0.3.1536")]
+[assembly: AssemblyVersion("2.0.4.1407")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index a55e18b30..8554905d2 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango Panel PC Application")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
diff --git a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
index 2eb4047d6..9d9b7d061 100644
--- a/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/ICSharpCode.AvalonEdit/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@ using System.Windows.Markup;
 [assembly: AssemblyCompany("ic#code")]
 [assembly: AssemblyProduct("SharpDevelop")]
 [assembly: AssemblyCopyright("2000-2013 AlphaSierraPapa for the SharpDevelop Team")]
-[assembly: AssemblyVersion("1.0.11.1536")]
+[assembly: AssemblyVersion("1.0.12.1411")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 [assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2243:AttributeStringLiteralsShouldParseCorrectly",
diff --git a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
index e4578b5db..0441103ba 100644
--- a/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/RealTimeGraphEx/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.7.1321")]
+[assembly: AssemblyVersion("1.0.9.1411")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
index ec7ac1e3e..5df39cd7c 100644
--- a/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/SideChains/Tango.AutoComplete/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@ using System.Windows.Markup;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.7.1321")]
+[assembly: AssemblyVersion("1.0.9.1411")]
 [assembly: AssemblyFileVersion("1.0.0.8")]
diff --git a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
index e548e7917..ae9836ae2 100644
--- a/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.AnimatedGif/Properties/AssemblyInfo.cs
@@ -6,6 +6,6 @@ using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Tango - GIF Animation Library")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.4.1536")]
+[assembly: AssemblyVersion("2.0.5.1407")]
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
index 808e44799..03f7c9da5 100644
--- a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
@@ -4,4 +4,4 @@ using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Business logic components")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.0.13.1721")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.15.1411")]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
index 42ad5696d..feb78d5a1 100644
--- a/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.BrushPicker/Properties/AssemblyInfo.cs
@@ -16,7 +16,7 @@ using System.Windows;
 using System.Windows.Markup;
 
 [assembly: AssemblyTitle("Tango - Brush Picker Control")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly)]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
diff --git a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
index 7f1d9fb5f..58e9b0bf3 100644
--- a/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.CircularGauge/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Circular Gauge Control")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
index 8fa5894a3..9de0fff27 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Code Generation Components")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
index 808d2eca6..7c6b3f741 100644
--- a/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.ColorPicker/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Color Picker Control")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.9.1411")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
index db89db099..186628b13 100644
--- a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Core Components")]
-[assembly: AssemblyVersion("2.0.14.1721")]
+[assembly: AssemblyVersion("2.0.16.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
index cfcb9ceab..473c9b0b8 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Local Data Access Layer")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
index c959ddf1c..90c6d8ff1 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Remote Data Access Layer")]
-[assembly: AssemblyVersion("2.0.13.1721")]
+[assembly: AssemblyVersion("2.0.15.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs
index 9171a955d..51720ea68 100644
--- a/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Documents/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Documents Library")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
index 8b7968bf4..a490d0fb3 100644
--- a/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.DragAndDrop/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Drag & Drop Components")]
-[assembly: AssemblyVersion("2.0.11.1536")]
+[assembly: AssemblyVersion("2.0.13.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
index e0144a2c1..5f9c81aee 100644
--- a/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Editors/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Visual Diagram Editing Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.9.1411")]
 [assembly: ComVisible(false)]
 
 
diff --git a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
index f23444bc9..f4385784a 100644
--- a/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Emulations/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Emulation Components")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
index 0a2d10a13..17431f6d7 100644
--- a/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Hive/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Hive UI Components")]
-[assembly: AssemblyVersion("2.0.8.1536")]
+[assembly: AssemblyVersion("2.0.9.1407")]
 
 [assembly:ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
index c4dbacc0a..4bdd97f00 100644
--- a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
-[assembly: AssemblyVersion("2.0.11.1721")]
+[assembly: AssemblyVersion("2.0.13.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
index 46e2a7b3f..834fd5419 100644
--- a/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Logging/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Logging Library")]
-[assembly: AssemblyVersion("2.0.17.1721")]
+[assembly: AssemblyVersion("2.0.19.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
index e7bf2b52d..3dedad62c 100644
--- a/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.PMR/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Message Repository")]
-[assembly: AssemblyVersion("2.0.14.1721")]
+[assembly: AssemblyVersion("2.0.16.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
index 0ad2e625d..21be4e283 100644
--- a/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Protobuf/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Components")]
-[assembly: AssemblyVersion("2.0.13.1721")]
+[assembly: AssemblyVersion("2.0.15.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
index c675c1cc5..d28d9ccf5 100644
--- a/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Scripting/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Roslyn Scripting Components")]
-[assembly: AssemblyVersion("2.0.11.1536")]
+[assembly: AssemblyVersion("2.0.13.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
index e6e5b2f46..cc507873f 100644
--- a/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Serialization/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Serialization Components")]
-[assembly: AssemblyVersion("2.0.13.1721")]
+[assembly: AssemblyVersion("2.0.15.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
index dd1101268..fe1eb27cc 100644
--- a/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Settings/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Global Settings")]
-[assembly: AssemblyVersion("2.0.13.1721")]
+[assembly: AssemblyVersion("2.0.15.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
index 6d98d4c35..27ee43517 100644
--- a/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.SharedUI/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Shared UI Components")]
-[assembly: AssemblyVersion("2.0.11.1536")]
+[assembly: AssemblyVersion("2.0.13.1411")]
 
 [assembly: ComVisible(false)]
 
diff --git a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
index 24ed4f910..7f53fad49 100644
--- a/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Stubs/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs Collection")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
index 3147ded90..ce4b90578 100644
--- a/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Synchronization/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - DataBase Synchronization Components")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
index 5e1ff4586..009d62401 100644
--- a/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.TFS/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - VSTS API Library")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
index 00cdb87dd..ff906391d 100644
--- a/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Touch/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows;
 
 [assembly: AssemblyTitle("Tango - Touch Components")]
-[assembly: AssemblyVersion("2.0.4.1536")]
+[assembly: AssemblyVersion("2.0.5.1407")]
 [assembly: ComVisible(false)]
 
 [assembly:ThemeInfo(
diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
index c3c6b1b15..6dcf62316 100644
--- a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Transport Components")]
-[assembly: AssemblyVersion("2.0.11.1721")]
+[assembly: AssemblyVersion("2.0.13.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
index 1f99e5619..e1751b70a 100644
--- a/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Video/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Video Components")]
-[assembly: AssemblyVersion("2.0.7.1321")]
+[assembly: AssemblyVersion("2.0.9.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
index 83d8af87f..70fd7b52d 100644
--- a/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Tango.Visuals/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Exotic Visual Elements")]
-[assembly: AssemblyVersion("2.0.5.1321")]
+[assembly: AssemblyVersion("2.0.6.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs
index 781dd4f24..6f3bbcd4d 100644
--- a/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.BugReporter/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
diff --git a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs
index 296f5d574..13cf0417d 100644
--- a/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.CatalogGenerator/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
diff --git a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs
index 82d9269fb..3de562d87 100644
--- a/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.HashGenerator/Properties/AssemblyInfo.cs
@@ -25,4 +25,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
diff --git a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs
index 01aee5c39..e701b6cbf 100644
--- a/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.ILMerge.UI/Properties/AssemblyInfo.cs
@@ -44,4 +44,4 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
diff --git a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
index d7b3b255a..353778c4d 100644
--- a/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Protobuf.CLI/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Protobuf Compilation CLI")]
-[assembly: AssemblyVersion("2.0.13.1721")]
+[assembly: AssemblyVersion("2.0.14.1411")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs
index 9c10a6f93..f166d9b1a 100644
--- a/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.RemoteRunner.UI/Properties/AssemblyInfo.cs
@@ -44,4 +44,4 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs
index fce5b22fe..ed2a326d9 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.CLI/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs execution command prompt utility")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
index 0c6882dea..e3fc56565 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Stubs execution GUI utility")]
-[assembly: AssemblyVersion("3.1.*")]
+[assembly: AssemblyVersion("3.1.1.1407")]
 
diff --git a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs
index f7ad5809f..159a803f0 100644
--- a/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.TransportRouter.UI/Properties/AssemblyInfo.cs
@@ -3,5 +3,5 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("Tango - Transport Routing Utility")]
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.0.1.1407")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs
index f69c6194f..a635cd768 100644
--- a/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Utilities/Tango.UITests/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.1.1407")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-- 
cgit v1.3.1