Working on PPC.

21 files changed, 179 insertions, 39 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 99534891d..8da2e82bb 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 08269714c..5bacff962 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
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 32f4cc7be..eb5497bd8 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
@@ -21,17 +21,17 @@
             <TextBlock FontSize="{StaticResource TangoHeaderFontSize}" HorizontalAlignment="Center" Text="{Binding Job.Name,FallbackValue='Job Name'}"></TextBlock>
 
             <Grid Margin="0 80 0 0">
+
                 <touch:TouchRingProgress Width="364" Height="364" RingThickness="10">
                     <touch:TouchRingProgress.Style>
                         <Style TargetType="touch:TouchRingProgress">
+                            <Setter Property="Visibility" Value="Visible"></Setter>
                             <Setter Property="Foreground" Value="{StaticResource TangoPrimaryAccentBrush}"></Setter>
-                            <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressWithoutFinalization}"></Setter>
-                            <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressWithoutFinalization}"></Setter>
+                            <Setter Property="Maximum" Value="{Binding RunningJobStatus.TotalProgressMinusSettingUp}"></Setter>
+                            <Setter Property="Value" Value="{Binding RunningJobStatus.ProgressMinusSettingUp}"></Setter>
                             <Style.Triggers>
-                                <DataTrigger Binding="{Binding RunningJobStatus.IsFinalizing}" Value="True">
-                                    <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
-                                    <Setter Property="Maximum" Value="{Binding RunningJobStatus.FinalizingTotalProgress}"></Setter>
-                                    <Setter Property="Value" Value="{Binding RunningJobStatus.FinalizingProgress}"></Setter>
+                                <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="False">
+                                    <Setter Property="Visibility" Value="Visible"></Setter>
                                 </DataTrigger>
                                 <DataTrigger Binding="{Binding RunningJobStatus.IsCompleted}" Value="True">
                                     <Setter Property="Foreground" Value="{StaticResource TangoSuccessBrush}"></Setter>
@@ -47,16 +47,30 @@
                     </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>
+
                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                        <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
-                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
-                    </StackPanel>
 
-                    <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
-                                            <Run Text="{Binding RunningJobStatus.ProgressWithoutFinalization,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressWithoutFinalization,StringFormat=0,FallbackValue=0}"/>
+                    <StackPanel Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Completed</TextBlock>
+                        </StackPanel>
+
+                        <TextBlock FontSize="40" Margin="0 10 0 0" HorizontalAlignment="Center">
+                                            <Run Text="{Binding RunningJobStatus.ProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"></Run><Run Text="/" /><Run Text="{Binding RunningJobStatus.TotalProgressMinusSettingUp,StringFormat=0,FallbackValue=0}"/>
                                             <Run FontSize="16">m</Run>
-                    </TextBlock>
+                        </TextBlock>
+                    </StackPanel>
+
+                    <StackPanel Height="90" Visibility="{Binding RunningJobStatus.IsSettingUp,Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Image Source="../Images/JobProgressView/drop.png" Stretch="None" />
+                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Getting ready...</TextBlock>
+                        </StackPanel>
+                    </StackPanel>
 
                     <Rectangle Margin="0 10 0 0" Width="250" Stroke="{StaticResource TangoDividerBrush}" />
 
@@ -76,13 +90,24 @@
                 <StackPanel>
                     <Canvas Height="80" Margin="5 0">
                         <StackPanel>
-                            <Canvas.Left>
-                                <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">
-                                    <Binding Path="RunningJobStatus.CurrentUnitProgress" />
-                                    <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" />
-                                    <Binding RelativeSource="{RelativeSource AncestorType=Canvas}" Path="ActualWidth" />
-                                </MultiBinding>
-                            </Canvas.Left>
+                            <StackPanel.Style>
+                                <Style TargetType="StackPanel">
+                                    <Setter Property="Canvas.Left">
+                                        <Setter.Value>
+                                            <MultiBinding Converter="{StaticResource JobProgressToPositionConverter}">
+                                                <Binding Path="RunningJobStatus.CurrentUnitProgress" />
+                                                <Binding Path="RunningJobStatus.CurrentUnitTotalProgress" />
+                                                <Binding RelativeSource="{RelativeSource AncestorType=Canvas}" Path="ActualWidth" />
+                                            </MultiBinding>
+                                        </Setter.Value>
+                                    </Setter>
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                            <Setter Property="Canvas.Left" Value="0"></Setter>
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </StackPanel.Style>
                             <StackPanel Margin="-50 0 0 0">
                                 <ContentControl>
                                     <ContentControl.Style>
@@ -95,8 +120,8 @@
                                                                 <Style TargetType="TextBlock">
                                                                     <Setter Property="Text" Value="now dying"></Setter>
                                                                     <Style.Triggers>
-                                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsFinalizing}" Value="True">
-                                                                            <Setter Property="Text" Value="finalizing"></Setter>
+                                                                        <DataTrigger Binding="{Binding RunningJobStatus.IsSettingUp}" Value="True">
+                                                                            <Setter Property="Text" Value="getting ready"></Setter>
                                                                         </DataTrigger>
                                                                     </Style.Triggers>
                                                                 </Style>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
index 07022e7fb..d811a71db 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -78,6 +78,7 @@ namespace Tango.PPC.Common.Connection
 
                 await MachineOperator.Disconnect();
                 MachineOperator.Adapter = response.Adapter;
+                MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp;
                 await MachineOperator.Connect();
             }
             catch { }
diff --git a/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.BL/Properties/AssemblyInfo.cs
index a44f2a3af..808e44799 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.12.1536")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.13.1721")]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Core/Properties/AssemblyInfo.cs
index a2d51cf05..db89db099 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.13.1536")]
+[assembly: AssemblyVersion("2.0.14.1721")]
 [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 08934c967..c959ddf1c 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.12.1536")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
index d17a70b98..e1f0fc803 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs
@@ -30,6 +30,11 @@ namespace Tango.Integration.Operation
         Machine Machine { get; }
 
         /// <summary>
+        /// Gets or sets the job handling mode.
+        /// </summary>
+        JobHandlerModes JobHandlingMode { get; set; }
+
+        /// <summary>
         /// Gets the current machine status.
         /// </summary>
         MachineStatuses Status { get; }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index 6ddc14e3d..e34789fef 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -21,6 +21,7 @@ namespace Tango.Integration.Operation
         private String _lastStatusMessage;
         private int _last_unit;
         private bool _finalizing;
+        private JobHandlerModes _mode;
 
         #region Events
 
@@ -114,8 +115,10 @@ namespace Tango.Integration.Operation
         /// Initializes a new instance of the <see cref="JobHandler"/> class.
         /// </summary>
         /// <param name="cancelAction">The cancel action.</param>
-        internal JobHandler(Action cancelAction, Job job, ProcessParametersTable processParameters) : this()
+        internal JobHandler(Action cancelAction, Job job, ProcessParametersTable processParameters, JobHandlerModes mode) : this()
         {
+            _mode = mode;
+
             ProcessParameters = processParameters;
             Job = job;
 
@@ -137,11 +140,22 @@ namespace Tango.Integration.Operation
             Status.TotalProgress = Job.LengthIncludingNumberOfUnits + processParameters.DryerBufferLength;
             Status.FinalizingTotalProgress = processParameters.DryerBufferLength;
             Status.TotalProgressWithoutFinalization = Job.LengthIncludingNumberOfUnits;
-            Status.CurrentUnitTotalProgress = Job.Length;
             Status.Progress = 0;
             Status.RemainingTime = Status.TotalTime;
             Status.RemainingProgress = Status.TotalProgress;
             Status.CurrentUnitSegments = _effectiveSegments.ToList();
+            Status.SettingUpTotalProgress = processParameters.DryerBufferLength;
+            Status.TotalProgressMinusSettingUp = Job.LengthIncludingNumberOfUnits;
+            Status.IsSettingUp = true;
+
+            if (mode == JobHandlerModes.Finalization)
+            {
+                Status.CurrentUnitTotalProgress = Job.Length;
+            }
+            else
+            {
+                Status.CurrentUnitTotalProgress = Status.SettingUpTotalProgress;
+            }
 
             if (Job.EnableInterSegment && Job.NumberOfUnits > 1)
             {
@@ -222,7 +236,21 @@ namespace Tango.Integration.Operation
             Status.RemainingTime = Status.TotalTime - Job.TranslateProgressToTime(Status.Progress, ProcessParameters);
             Status.RemainingProgress = Status.TotalProgress - Status.Progress;
 
-            if (s.Progress < Job.LengthIncludingNumberOfUnits)
+            if (Status.SettingUpProgress < Status.SettingUpTotalProgress)
+            {
+                Status.SettingUpProgress += delta;
+            }
+            else
+            {
+                if (Status.IsSettingUp)
+                {
+                    Status.IsSettingUp = false;
+                }
+
+                Status.ProgressMinusSettingUp += delta;
+            }
+
+            if (s.Progress < Job.LengthIncludingNumberOfUnits || _mode == JobHandlerModes.SettingUp)
             {
                 Status.ProgressWithoutFinalization += delta;
 
@@ -239,7 +267,18 @@ namespace Tango.Integration.Operation
                 }
 
                 Status.CurrentUnitTotalProgress = Status.RemainingUnits > 1 && Job.EnableInterSegment ? Job.Length + (Job.InterSegmentLength) : Job.Length;
-                Status.CurrentUnitProgress += delta;
+
+                if (_mode == JobHandlerModes.Finalization)
+                {
+                    Status.CurrentUnitProgress += delta;
+                }
+                else
+                {
+                    if (!Status.IsSettingUp)
+                    {
+                        Status.CurrentUnitProgress += delta;
+                    }
+                }
 
                 if (Status.CurrentUnitProgress >= Status.CurrentUnitTotalProgress)
                 {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandlerModes.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandlerModes.cs
new file mode 100644
index 000000000..906bf5fcb
--- /dev/null
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandlerModes.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Integration.Operation
+{
+    public enum JobHandlerModes
+    {
+        Finalization,
+        SettingUp,
+    }
+}
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index bdfa8a218..88c753846 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -144,6 +144,11 @@ namespace Tango.Integration.Operation
 
         #region Properties
 
+        /// <summary>
+        /// Gets or sets the job handling mode.
+        /// </summary>
+        public JobHandlerModes JobHandlingMode { get; set; }
+
         private MachineStatuses _status;
         /// <summary>
         /// Gets the current machine status.
@@ -778,7 +783,7 @@ namespace Tango.Integration.Operation
                 {
                     LogManager.Log(ex, "Failed to cancel job.");
                 }
-            }, originalJob, processParameters);
+            }, originalJob, processParameters, JobHandlingMode);
 
             handler.StatusChanged += (x, s) =>
             {
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
index fa3b8bc07..8d4a79291 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/RunningJobStatus.cs
@@ -83,6 +83,46 @@ namespace Tango.Integration.Operation
             set { _progressWithoutFinalization = value; RaisePropertyChangedAuto(); }
         }
 
+        private double _settingUpProgress;
+        /// <summary>
+        /// Gets or sets the setting up progress.
+        /// </summary>
+        public double SettingUpProgress
+        {
+            get { return _settingUpProgress; }
+            set { _settingUpProgress = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _settingUpTotalProgress;
+        /// <summary>
+        /// Gets or sets the setting up total progress.
+        /// </summary>
+        public double SettingUpTotalProgress
+        {
+            get { return _settingUpTotalProgress; }
+            set { _settingUpTotalProgress = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _progressMinusSettingUp;
+        /// <summary>
+        /// Gets or sets the progress minus setting up.
+        /// </summary>
+        public double ProgressMinusSettingUp
+        {
+            get { return _progressMinusSettingUp; }
+            set { _progressMinusSettingUp = value; RaisePropertyChangedAuto(); }
+        }
+
+        private double _totalProgressMinusSettingUp;
+        /// <summary>
+        /// Gets or sets the total progress minus setting up.
+        /// </summary>
+        public double TotalProgressMinusSettingUp
+        {
+            get { return _totalProgressMinusSettingUp; }
+            set { _totalProgressMinusSettingUp = value; RaisePropertyChangedAuto(); }
+        }
+
         private double _finalizingTotalProgress;
         /// <summary>
         /// Gets or sets the finalizing total progress.
@@ -183,6 +223,16 @@ namespace Tango.Integration.Operation
             set { _isFinalizing = value; RaisePropertyChangedAuto(); }
         }
 
+        private bool _isSettingUp;
+        /// <summary>
+        /// Gets or sets a value indicating whether the job progress is withing the range of zero to the dryer buffer length.
+        /// </summary>
+        public bool IsSettingUp
+        {
+            get { return _isSettingUp; }
+            set { _isSettingUp = value; RaisePropertyChangedAuto(); }
+        }
+
         private String _message;
         /// <summary>
         /// Gets or sets the message.
diff --git a/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Integration/Properties/AssemblyInfo.cs
index 7ec6dd065..c4dbacc0a 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.10.1536")]
+[assembly: AssemblyVersion("2.0.11.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
index 7f72e107a..3ec3eaf40 100644
--- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj
@@ -87,6 +87,7 @@
     <Compile Include="Operation\EmbeddedLogItem.cs" />
     <Compile Include="Operation\IMachineEventsStateProvider.cs" />
     <Compile Include="Operation\IMachineOperator.cs" />
+    <Compile Include="Operation\JobHandlerModes.cs" />
     <Compile Include="Operation\PrintingFailedEventArgs.cs" />
     <Compile Include="Operation\MachineOperator.cs" />
     <Compile Include="Operation\JobHandler.cs" />
@@ -147,7 +148,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ 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 7058d26a2..46e2a7b3f 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.16.1536")]
+[assembly: AssemblyVersion("2.0.17.1721")]
 [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 774bcdb36..e7bf2b52d 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.13.1536")]
+[assembly: AssemblyVersion("2.0.14.1721")]
 [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 50f0b2612..0ad2e625d 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.12.1536")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [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 ac3317beb..e6e5b2f46 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.12.1536")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [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 c52479659..dd1101268 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.12.1536")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Tango.Transport/Properties/AssemblyInfo.cs
index 1347f62e4..c3c6b1b15 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.10.1536")]
+[assembly: AssemblyVersion("2.0.11.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file
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 87212ed31..d7b3b255a 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.12.1536")]
+[assembly: AssemblyVersion("2.0.13.1721")]
 [assembly: ComVisible(false)]
\ No newline at end of file