From c2945492e7c4d168c36b632d1f28dd8ca569b5ac Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 22 Apr 2019 19:49:09 +0300
Subject: Improved ExternalBridge discovery greatly! Implemented volume
 gradient generation!

---
 .../Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index db9d9dbae..0299940d3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1386,7 +1386,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                     InvokeUI(() =>
                     {
-                        _notification.ShowError("Job failed. " + ex.Message);
+                        _notification.ShowError("Job failed. " + ex.FlattenMessage());
                         StopRecordingIfInProgress();
                     });
                 };
-- 
cgit v1.3.1


From 46f5f70e6055234bce3e9a105ab1ba86248b1713 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 22 Apr 2019 22:46:43 +0300
Subject: Implemented Volume color space gradients. Implemented volume
 gradients on PPC. Improved job running aspects on PPC.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 .../Build/Shortcuts/Machine Studio.lnk             | Bin 1581 -> 1516 bytes
 .../ViewModels/MainViewVM.cs                       |  30 +++++--
 .../Views/JobView.xaml                             |   2 +-
 .../Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml  |   6 +-
 .../Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs |   2 +-
 .../Tango.PPC.Jobs/Views/JobProgressView.xaml      |   2 +-
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  |   8 +-
 .../Visual_Studio/Tango.BL/Entities/BrushStop.cs   |  80 +++++++++---------
 .../DefaultGradientGenerationConfiguration.cs      |  18 +++-
 .../Operation/IGradientGenerationConfiguration.cs  |   5 ++
 .../Tango.Integration/Operation/JobHandler.cs      |   2 +-
 .../Tango.Integration/Operation/MachineOperator.cs |  92 +++++++++++++++++----
 14 files changed, 174 insertions(+), 73 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 84785d8cf..87b59afc3 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 5e10994a1..79746966d 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index bd3a3933b..19334a605 100644
Binary files a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk and b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 0299940d3..4d8ec954e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -966,9 +966,23 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         private void MachineOperator_PreparingJobProgress(object sender, PreparingJobProgressEventArgs e)
         {
-            if (_preparingTaskItem != null)
+            var percent = (e.Progress / e.Total * 100d);
+
+            if (_preparingTaskItem == null && percent == 0)
+            {
+                _preparingTaskItem = _notification.PushTaskItem("Preparing job for printing...");
+            }
+            else if (percent == 100)
             {
-                _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+                _preparingTaskItem.Pop();
+                _preparingTaskItem = null;
+            }
+            else
+            {
+                if (_preparingTaskItem != null)
+                {
+                    _preparingTaskItem.Message = $"Preparing job for printing {(e.Progress / e.Total * 100d).ToString("0.0")}%...";
+                }
             }
         }
 
@@ -1327,11 +1341,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 if (resumeFunc == null)
                 {
-                    using (var item = _notification.PushTaskItem("Preparing job for printing..."))
-                    {
-                        _preparingTaskItem = item;
-                        JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
-                    }
+                    JobHandler = await MachineOperator.Print(ActiveJob, SelectedProcessParametersTable);
                 }
                 else
                 {
@@ -1408,6 +1418,12 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                 JobHandler.Canceled += (x, y) =>
                 {
+                    if (_preparingTaskItem != null)
+                    {
+                        _preparingTaskItem.Pop();
+                        _preparingTaskItem = null;
+                    }
+
                     LogManager.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     _eventLogger.Log(String.Format("Job {0} has been canceled.", RunningJob.Name));
                     StopRecordingIfInProgress();
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index bfa951c3b..a5d137e67 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -1220,7 +1220,7 @@
                                     </Grid>
 
                                     <Grid DockPanel.Dock="Right" Margin="0 0 10 0">
-                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                        <StackPanel Orientation="Horizontal" Visibility="{Binding IsJobRunning,Converter={StaticResource BooleanToVisibilityInverseConverter}}" IsEnabled="{Binding MachineOperator.CanPrint}">
                                             <Button Height="60" Width="280" Command="{Binding StartJobCommand}" Click="OnJobStartClick">
                                                 <StackPanel Orientation="Horizontal">
                                                     <materialDesign:PackIcon VerticalAlignment="Center" Width="32" Height="32" Kind="ClockFast" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
index be151678d..fd0a63456 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/JobSummeryViewer.xaml
@@ -31,9 +31,9 @@
                         <Grid x:Name="grid">
                             <Grid.Width>
                                 <MultiBinding Converter="{StaticResource SegmentLengthToWidthConverter}">
-                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Length" IsAsync="True"></Binding>
-                                    <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth" IsAsync="True"></Binding>
-                                    <Binding Path="LengthWithFactor" IsAsync="True"></Binding>
+                                    <Binding RelativeSource="{RelativeSource AncestorType=UserControl}" Path="DataContext.Length"></Binding>
+                                    <Binding RelativeSource="{RelativeSource AncestorType=ItemsControl}" Path="ActualWidth"></Binding>
+                                    <Binding Path="LengthWithFactor"></Binding>
                                 </MultiBinding>
                             </Grid.Width>
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
index 3e8c6f280..d37ce7583 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobProgressViewVM.cs
@@ -100,7 +100,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             base.OnNavigatedFrom();
 
-            if (MachineProvider.MachineOperator.IsPrinting)
+            if (MachineProvider.MachineOperator.IsPrinting && _handler != null && !_handler.IsCanceled)
             {
                 NotificationProvider.PushAppBarItem<JobProgressAppBarItem>().Pressed += (_, __) =>
                 {
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 e44d194bd..037fac09c 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
@@ -203,7 +203,7 @@
                     <Grid>
                         <controls:RunningJobViewer Height="30" Width="600" DisplayMarkers="False" IsActive="True" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" />
 
-                        <TextBlock Margin="0 0 -40 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
+                        <TextBlock Margin="0 0 -50 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" HorizontalAlignment="Right">
                             <Run Text="x"></Run><Run Text="{Binding RunningJobStatus.RemainingUnits}"></Run>
                         </TextBlock>
                     </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index cb12805f5..02e4cb6eb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -138,7 +138,7 @@
                                 <ColumnDefinition Width="2*" />
                             </Grid.ColumnDefinitions>
 
-                            <touch:TouchNumericTextBox Value="{Binding OffsetMeters,IsAsync=True}" HasDecimalPoint="True" StringFormat="0.0" Maximum="{Binding Segment.Length,IsAsync=True}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
+                            <touch:TouchNumericTextBox Value="{Binding OffsetMeters}" HasDecimalPoint="True" StringFormat="0.0" Maximum="{Binding Segment.Length,IsAsync=True}" KeyboardContainer="{Binding ElementName=Container}"></touch:TouchNumericTextBox>
                             <!--<touch:TouchSlider Grid.Column="1" Height="30" Margin="10 0 0 -23" Maximum="{Binding Segment.Length}" Value="{Binding OffsetMeters}" />-->
                         </Grid>
                     </DockPanel>
@@ -284,7 +284,7 @@
                                         </Canvas>
                                         <DockPanel LastChildFill="False" Margin="0 20 0 0">
                                             <controls:FastTextBlock VerticalAlignment="Bottom" DockPanel.Dock="Left" Text="Length (m):"></controls:FastTextBlock>
-                                            <touch:TouchNumericTextBox Width="180" DockPanel.Dock="Right" Value="{Binding Length,IsAsync=True}" StringFormat="0.0" AutoCalculateJogStep="False" HasDecimalPoint="True" Minimum="1" Maximum="100000" KeyboardContainer="{Binding ElementName=Container}" />
+                                            <touch:TouchNumericTextBox Width="180" DockPanel.Dock="Right" Value="{Binding Length}" StringFormat="0.0" AutoCalculateJogStep="False" HasDecimalPoint="True" Minimum="1" Maximum="100000" KeyboardContainer="{Binding ElementName=Container}" />
                                         </DockPanel>
                                     </StackPanel>
                                 </DockPanel>
@@ -478,12 +478,12 @@
                                                     </StackPanel.Style>
                                                     <UniformGrid Columns="2" Rows="1">
                                                         <DockPanel Margin="0 0 10 0">
-                                                            <TextBlock Text="Number of units:" VerticalAlignment="Center"></TextBlock>
+                                                            <TextBlock Text="Number of units:" VerticalAlignment="Bottom"></TextBlock>
                                                             <touch:TouchNumericTextBox Margin="20 0 0 0" Value="{Binding Job.NumberOfUnits}" Minimum="1" Maximum="10000" JoggingFactor="0.01" />
                                                         </DockPanel>
 
                                                         <DockPanel Margin="10 0 0 0">
-                                                            <TextBlock Text="Number of heads:" VerticalAlignment="Center"></TextBlock>
+                                                            <TextBlock Text="Number of heads:" VerticalAlignment="Bottom"></TextBlock>
                                                             <touch:TouchNumericTextBox Margin="20 0 0 0" Value="{Binding Job.NumberOfHeads}" Minimum="1" Maximum="1000" JoggingFactor="0.1" />
                                                         </DockPanel>
                                                     </UniformGrid>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
index 6738ad99c..10f9bc0ac 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs
@@ -459,51 +459,53 @@ namespace Tango.BL.Entities
         {
             Task.Factory.StartNew(() =>
             {
-                Rgb rgb = new Rgb(Red, Green, Blue);
-                Cmyk cmyk = new Cmyk(Cyan, Magenta, Yellow, Black);
-                Lab lab = new Lab(L, A, B);
-                Rgb rgb_twine = new Rgb(255, 255, 255);
-
-                if (ColorCatalog != null)
+                if (ColorSpace != null)
                 {
-                    rgb_twine = new Rgb(ColorCatalog.Red, ColorCatalog.Green, ColorCatalog.Blue);
-                }
+                    Rgb rgb = new Rgb(Red, Green, Blue);
+                    Cmyk cmyk = new Cmyk(Cyan, Magenta, Yellow, Black);
+                    Lab lab = new Lab(L, A, B);
+                    Rgb rgb_twine = new Rgb(255, 255, 255);
 
-                switch ((ColorSpaces)ColorSpace.Code)
-                {
-                    case ColorSpaces.RGB:
-                        cmyk = rgb.To<Cmyk>();
-                        lab = rgb.To<Lab>();
-                        break;
-                    case ColorSpaces.CMYK:
-                        rgb = cmyk.To<Rgb>();
-                        lab = cmyk.To<Lab>();
-                        break;
-                    case ColorSpaces.LAB:
-                        rgb = lab.To<Rgb>();
-                        cmyk = lab.To<Cmyk>();
-                        break;
-                    case ColorSpaces.Twine:
-                        cmyk = rgb_twine.To<Cmyk>();
-                        lab = rgb_twine.To<Lab>();
-                        rgb = rgb_twine;
-                        Validate(null);
-                        break;
-                }
+                    if (ColorCatalog != null)
+                    {
+                        rgb_twine = new Rgb(ColorCatalog.Red, ColorCatalog.Green, ColorCatalog.Blue);
+                    }
 
-                _red = (int)rgb.R;
-                _green = (int)rgb.G;
-                _blue = (int)rgb.B;
+                    switch ((ColorSpaces)ColorSpace.Code)
+                    {
+                        case ColorSpaces.RGB:
+                            cmyk = rgb.To<Cmyk>();
+                            lab = rgb.To<Lab>();
+                            break;
+                        case ColorSpaces.CMYK:
+                            rgb = cmyk.To<Rgb>();
+                            lab = cmyk.To<Lab>();
+                            break;
+                        case ColorSpaces.LAB:
+                            rgb = lab.To<Rgb>();
+                            cmyk = lab.To<Cmyk>();
+                            break;
+                        case ColorSpaces.Twine:
+                            cmyk = rgb_twine.To<Cmyk>();
+                            lab = rgb_twine.To<Lab>();
+                            rgb = rgb_twine;
+                            Validate(null);
+                            break;
+                    }
 
-                _cyan = cmyk.C;
-                _magenta = cmyk.M;
-                _yellow = cmyk.Y;
-                _black = cmyk.K;
+                    _red = (int)rgb.R;
+                    _green = (int)rgb.G;
+                    _blue = (int)rgb.B;
 
-                _l = lab.L;
-                _a = lab.A;
-                _b = lab.B;
+                    _cyan = cmyk.C;
+                    _magenta = cmyk.M;
+                    _yellow = cmyk.Y;
+                    _black = cmyk.K;
 
+                    _l = lab.L;
+                    _a = lab.A;
+                    _b = lab.B;
+                }
                 onComplete?.Invoke();
             });
         }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
index 68fd14ac2..41c23a747 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/DefaultGradientGenerationConfiguration.cs
@@ -25,6 +25,8 @@ namespace Tango.Integration.Operation
             public double OffsetPercent { get; set; }
         }
 
+        private bool aborted;
+
         private bool _isEnabled;
         /// <summary>
         /// Gets or sets a value indicating whether to generate the gradient steps.
@@ -63,6 +65,8 @@ namespace Tango.Integration.Operation
         /// <returns></returns>
         public List<BrushStop> Generate(Segment segment, Job job, ProcessParametersTable processParameters, Action<PreparingJobProgressEventArgs> progress = null)
         {
+            aborted = false;
+
             //var stops = TangoColorConverter.CreateSegmentLinearGradient(segment, processParameters, ResolutionCM);
 
             List<BrushStop> stops = new List<BrushStop>();
@@ -88,6 +92,8 @@ namespace Tango.Integration.Operation
 
             for (double cm = 0; cm <= segment.Length; cm += (ResolutionCM / 100d))
             {
+                if (aborted) return stops;
+
                 double offset = (double)cm / segment.Length;
 
                 if (colorSpace == ColorSpaces.RGB || colorSpace == ColorSpaces.LAB || colorSpace == ColorSpaces.CMYK)
@@ -133,7 +139,7 @@ namespace Tango.Integration.Operation
                 progress?.Invoke(new PreparingJobProgressEventArgs()
                 {
                     Job = job,
-                    Total = job.Length,
+                    Total = job.Segments.Sum(x => x.Length),
                     Progress = previousSegmentsLength + cm,
                 });
             }
@@ -144,7 +150,7 @@ namespace Tango.Integration.Operation
             progress?.Invoke(new PreparingJobProgressEventArgs()
             {
                 Job = job,
-                Total = job.Length,
+                Total = job.Segments.Sum(x => x.Length),
                 Progress = previousSegmentsLength + segment.Length,
             });
 
@@ -236,5 +242,13 @@ namespace Tango.Integration.Operation
 
             return color;
         }
+
+        /// <summary>
+        /// Aborts the current generation.
+        /// </summary>
+        public void AbortCurrentGeneration()
+        {
+            aborted = true;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs b/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs
index 510b0149d..be0f7fad3 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/IGradientGenerationConfiguration.cs
@@ -31,5 +31,10 @@ namespace Tango.Integration.Operation
         /// <param name="progress">Progress callback.</param>
         /// <returns></returns>
         List<BrushStop> Generate(Segment segment, Job job, ProcessParametersTable processParameters, Action<PreparingJobProgressEventArgs> progress = null);
+
+        /// <summary>
+        /// Aborts the current generation.
+        /// </summary>
+        void AbortCurrentGeneration();
     }
 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
index ed008cae8..1bc1ae662 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/JobHandler.cs
@@ -296,7 +296,7 @@ namespace Tango.Integration.Operation
             }
             else
             {
-                if (Status.IsSettingUp)
+                if (Status.IsSettingUp && Status.Progress > 0)
                 {
                     Status.IsSettingUp = false;
                 }
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index dd0872898..d820db7e4 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1290,7 +1290,7 @@ namespace Tango.Integration.Operation
 
                 job = job.Clone();
 
-                int max = job.OrderedSegments.Last().SegmentIndex;
+                int max = job.OrderedSegments.Last().SegmentIndex  + 1;
 
                 var segments = job.OrderedSegments.ToList();
 
@@ -1332,23 +1332,29 @@ namespace Tango.Integration.Operation
                 processParameters.MapPrimitivesTo(process);
                 ticket.ProcessParameters = process;
 
-                foreach (var segment in job.OrderedSegments)
-                {
-                    ticket.Segments.Add(CreatePMRJobSegment(segment, job, processParameters));
-                }
-
-                request.JobTicket = ticket.Clone();
-
                 JobHandler handler = null;
 
+                bool canceled = false;
+                bool requestSent = false;
+
                 handler = new JobHandler(async () =>
                 {
                     try
                     {
-                        var result = await SendRequest<AbortJobRequest, AbortJobResponse>(new AbortJobRequest());
-                        PrintingAborted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
-                        PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, originalJob));
-                        handler.RaiseCanceled();
+                        if (!canceled)
+                        {
+                            canceled = true;
+                            GradientGenerationConfiguration.AbortCurrentGeneration();
+
+                            if (requestSent)
+                            {
+                                var result = await SendRequest<AbortJobRequest, AbortJobResponse>(new AbortJobRequest());
+                            }
+
+                            PrintingAborted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
+                            PrintingEnded?.Invoke(this, new PrintingEventArgs(handler, originalJob));
+                            handler.RaiseCanceled();
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -1367,14 +1373,58 @@ namespace Tango.Integration.Operation
                     return handler;
                 }
 
-                request.JobTicket.UploadStrategy = JobUploadStrategy;
-
                 ThreadFactory.StartNew(async () =>
                 {
                     Status = MachineStatuses.GettingReady;
                     RunningJob = originalJob;
                     PrintingStarted?.Invoke(this, new PrintingEventArgs(handler, originalJob));
 
+                    Thread.Sleep(100);
+
+                    handler.RaiseStatusReceived(new JobStatus()
+                    {
+                        CurrentSegmentIndex = 0,
+                        Progress = 0,
+                        Message = "Preparing Job...",
+                    });
+
+                    foreach (var segment in originalJob.OrderedSegments)
+                    {
+                        ticket.Segments.Add(CreatePMRJobSegment(segment, originalJob, processParameters));
+
+                        if (handler.IsCanceled)
+                        {
+                            Status = MachineStatuses.ReadyToDye;
+                            return;
+                        }
+                    }
+
+                    if (handler.IsCanceled)
+                    {
+                        Status = MachineStatuses.ReadyToDye;
+                        return;
+                    }
+
+                    var segs = new List<JobSegment>();
+
+                    for (int i = 0; i < job.NumberOfUnits; i++)
+                    {
+                        foreach (var s in ticket.Segments)
+                        {
+                            var cloned = s.Clone();
+                            segs.Add(cloned);
+                        }
+                    }
+
+                    if (segs.Count > 0)
+                    {
+                        ticket.Segments.Clear();
+                        ticket.Segments.AddRange(segs);
+                    }
+
+                    request.JobTicket = ticket.Clone();
+                    request.JobTicket.UploadStrategy = JobUploadStrategy;
+
                     if (JobUploadStrategy == JobUploadStrategy.JobDescriptionFile)
                     {
                         try
@@ -1384,6 +1434,13 @@ namespace Tango.Integration.Operation
                             JobDescriptionFile jobDescriptionFile = new JobDescriptionFile(ticket.Segments);
                             MemoryStream ms = jobDescriptionFile.ToStream();
 
+                            handler.RaiseStatusReceived(new JobStatus()
+                            {
+                                CurrentSegmentIndex = 0,
+                                Progress = 0,
+                                Message = "Uploading job description file...",
+                            });
+
                             var storage = CreateStorageManager();
 
                             var storageInfo = await storage.GetStorageDrive();
@@ -1414,6 +1471,12 @@ namespace Tango.Integration.Operation
                         }
                     }
 
+                    if (handler.IsCanceled)
+                    {
+                        Status = MachineStatuses.ReadyToDye;
+                        return;
+                    }
+
                     LogRequestSent(request);
                     bool responseLogged = false;
 
@@ -1423,6 +1486,7 @@ namespace Tango.Integration.Operation
 
                         if (!responseLogged)
                         {
+                            requestSent = true;
                             responseLogged = true;
                             LogResponseReceived(response.Message);
                         }
-- 
cgit v1.3.1


From afca405892ace809c498c010a2d4484bec5adf11 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 24 Apr 2019 14:01:40 +0300
Subject: Implemented USB adapter finalizer. Added exception logging for USB
 adapter disconnection error. Added Volume color space icon to PPC.
 Implemented KeepAlive suppression on StorageAPI. Suppressed KeepAlive when
 uploading job. Implemented keep alive skipping when arrived responses queue
 is busy.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/TCC/TCC.mdf                            | Bin 8388608 -> 8388608 bytes
 Software/DB/TCC/TCC_log.ldf                        | Bin 8388608 -> 8388608 bytes
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../ViewModels/MainViewVM.cs                       |  22 +++++-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Converters/ColorSpaceToImageConverter.cs       |   2 +
 .../Tango.PPC.Jobs/Images/NewJob/volume.png        | Bin 0 -> 1857 bytes
 .../Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj   |   5 +-
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  |  17 +++++
 .../PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml   |   4 +-
 .../PPCApplication/DefaultPPCApplicationManager.cs |   1 +
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../Tango.Core/Threading/ActionTimer.cs            |   9 ++-
 .../ExternalBridge/ExternalBridgeScanner.cs        |   2 +
 .../Tango.Integration/Operation/MachineOperator.cs |   3 +
 .../Tango.Integration/Storage/StorageManager.cs    |  81 ++++++++++++++++++++-
 .../Adapters/UsbTransportAdapter.cs                |  28 ++++++-
 .../Tango.Transport/TransporterBase.cs             |   9 ++-
 21 files changed, 169 insertions(+), 18 deletions(-)
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/NewJob/volume.png

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index b41adb74f..bf9a9caf8 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index 2c244f90c..ddbaac9a2 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf
index f5902c028..9a07550ca 100644
Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ
diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf
index c47eeefb7..6463bbdf7 100644
Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 548dda3df..8a4044ddb 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 550ccbeae..842b98d81 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.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 4d8ec954e..e03c64a54 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1307,6 +1307,8 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// </summary>
         private async void StartJob(Func<Job, JobHandler> resumeFunc = null)
         {
+            SettingsManager.Default.Save();
+
             LogManager.Log(String.Format("Starting job {0}...", ActiveJob.Name));
             if (MachineOperator == null || MachineOperator.State != TransportComponentState.Connected)
             {
@@ -1766,6 +1768,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
                         InvalidateRelayCommands();
 
                         _disable_gamut_check = false;
+
+                        _settings.LastSelectedMachineGuid = SelectedMachine != null ? SelectedMachine.Guid : null;
+                        _settings.LastSelectedJobGuid = SelectedMachineJob != null ? SelectedMachineJob.Guid : null;
+
+                        _settings.Save();
                     });
 
                     SegmentsCollectionView = CollectionViewSource.GetDefaultView(ActiveJob.Segments);
@@ -2003,6 +2010,11 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
                     SelectedSegments.ToList().ForEach(x =>
                     {
+                        if (ActiveJob.Segments.Count == 1)
+                        {
+                            _notification.ShowInfo("A job must contain at least one segment.");
+                            return;
+                        }
                         ActiveJob.Segments.Remove(x);
                         x.DefferedDelete(_activeJobDbContext);
                     });
@@ -2130,12 +2142,17 @@ namespace Tango.MachineStudio.Developer.ViewModels
         {
             if (SelectedBrushStop != null && SelectedSegment != null)
             {
-                if (_notification.ShowQuestion("Are you sure you want to delete the selected colors?"))
+                if (_notification.ShowQuestion("Are you sure you want to delete the selected brush stops?"))
                 {
                     LogManager.Log(String.Format("Removing {0} brush stops...", SelectedBrushStops.Count));
 
                     SelectedBrushStops.ToList().ForEach(x =>
                     {
+                        if (SelectedSegment.BrushStops.Count == 1)
+                        {
+                            _notification.ShowInfo("A job segment must contain at least one brush stop.");
+                            return;
+                        }
                         SelectedSegment.BrushStops.Remove(x);
                         x.DefferedDelete(_activeJobDbContext);
                     });
@@ -2422,8 +2439,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
 
         public override void OnShuttingDown()
         {
-            _settings.LastSelectedMachineGuid = SelectedMachine != null ? SelectedMachine.Guid : null;
-            _settings.LastSelectedJobGuid = SelectedMachineJob != null ? SelectedMachineJob.Guid : null;
+
         }
 
         #endregion
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 eff1f2521..e50641d8d 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("4.0.11.0")]
+[assembly: AssemblyVersion("4.0.12.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToImageConverter.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToImageConverter.cs
index a74a87d28..c2790ee6d 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToImageConverter.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Converters/ColorSpaceToImageConverter.cs
@@ -26,6 +26,8 @@ namespace Tango.PPC.Jobs.Converters
                         return ResourceHelper.GetImageFromResources("Images/NewJob/lab.png");
                     case ColorSpaces.Twine:
                         return ResourceHelper.GetImageFromResources("Images/NewJob/twine.png");
+                    case ColorSpaces.Volume:
+                        return ResourceHelper.GetImageFromResources("Images/NewJob/volume.png");
                     default:
                         return ResourceHelper.GetImageFromResources("Images/NewJob/coats.png");
                 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/NewJob/volume.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/NewJob/volume.png
new file mode 100644
index 000000000..434e704ca
Binary files /dev/null and b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/NewJob/volume.png differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
index 5b7e97c93..6e61e9330 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Tango.PPC.Jobs.csproj
@@ -406,10 +406,13 @@
   <ItemGroup>
     <Resource Include="Images\jobs.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\NewJob\volume.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" 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/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index 75c4e9578..0f8434663 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -531,6 +531,23 @@
                                                     </UniformGrid>
                                                 </StackPanel>
 
+                                                <StackPanel>
+                                                    <StackPanel.Style>
+                                                        <Style TargetType="StackPanel" BasedOn="{StaticResource Level2Container}">
+                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                            <Style.Triggers>
+                                                                <DataTrigger Binding="{Binding Job.JobType}" Value="{x:Static enumerations:JobTypes.Embroidery}">
+                                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                                </DataTrigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </StackPanel.Style>
+                                                    <DockPanel Margin="0 0 10 0">
+                                                        <TextBlock Text="Repetitions:" VerticalAlignment="Bottom"></TextBlock>
+                                                        <touch:TouchNumericTextBox Width="200" HorizontalAlignment="Left" Margin="20 0 0 0" Value="{Binding Job.NumberOfUnits}" Minimum="1" Maximum="10000" JoggingFactor="0.01" />
+                                                    </DockPanel>
+                                                </StackPanel>
+
                                                 <!--<DockPanel Style="{StaticResource Level2Container}">
                                                 <TextBlock Text="Color Catalog/Space:" VerticalAlignment="Center"></TextBlock>
                                                 <touch:TouchComboBox Margin="20 0 0 0" ItemsSource="{Binding ColorSpaces}" SelectedItem="{Binding Job.ColorSpace}" DisplayMemberPath="Name" Title="Select Color Catalog/Space" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml
index 8a90b03a0..7e5ca7507 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ScreenLockView.xaml
@@ -18,8 +18,8 @@
                 <touch:TouchButton Command="{Binding OKCommand}" Style="{StaticResource TangoMessageBoxButton}" DockPanel.Dock="Right" Width="120" Height="50" VerticalAlignment="Bottom">OK</touch:TouchButton>
             </StackPanel>
             <DockPanel>
-                <touch:TouchIcon Foreground="{StaticResource TangoErrorBrush}" Icon="Lock" VerticalAlignment="Top" Height="70"></touch:TouchIcon>
-                <StackPanel Margin="10 0 0 0">
+                <touch:TouchIcon Foreground="{StaticResource TangoErrorBrush}" Icon="Lock" VerticalAlignment="Top" Height="65"></touch:TouchIcon>
+                <StackPanel Margin="20 0 0 0">
                     <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">Screen Locked</TextBlock>
                     <TextBlock Margin="0 10 0 0" TextWrapping="Wrap">Please enter the password to unlock the screen.</TextBlock>
                     <touch:TouchTextBox x:Name="txtPassword" Margin="0 30 40 0" IsPassword="True" KeyboardAction="Go" Text="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 1550e97e1..ef2b8aeee 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -367,6 +367,7 @@ namespace Tango.PPC.UI.PPCApplication
                     if (_screenLockTimer != null)
                     {
                         _screenLockTimer.Dispose();
+                        _screenLockTimer = null;
                     }
 
                     if (settings.EnableLockScreen)
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 a0db99ffb..1f4f36e0b 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 PPC Application")]
-[assembly: AssemblyVersion("1.0.9.0")]
+[assembly: AssemblyVersion("1.0.10.0")]
diff --git a/Software/Visual_Studio/Tango.Core/Threading/ActionTimer.cs b/Software/Visual_Studio/Tango.Core/Threading/ActionTimer.cs
index f16e7739c..eda115047 100644
--- a/Software/Visual_Studio/Tango.Core/Threading/ActionTimer.cs
+++ b/Software/Visual_Studio/Tango.Core/Threading/ActionTimer.cs
@@ -33,9 +33,12 @@ namespace Tango.Core.Threading
         /// <param name="action">The action.</param>
         public void ResetReplace(Action action)
         {
-            _timer.Stop();
-            _action = action;
-            _timer.Start();
+            if (_timer != null)
+            {
+                _timer.Stop();
+                _action = action;
+                _timer.Start();
+            }
         }
 
         private void _timer_Elapsed(object sender, ElapsedEventArgs e)
diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
index 2f63ca3b3..b84942643 100644
--- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
+++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeScanner.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO.Ports;
 using System.Linq;
@@ -130,6 +131,7 @@ namespace Tango.Integration.ExternalBridge
         /// <summary>
         /// TCP discovery thread method.
         /// </summary>
+        [DebuggerStepThrough]
         private void TcpDiscoveryThreadMethod()
         {
             while (IsStarted)
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 4f7c4c619..ea3e6b8a0 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1457,6 +1457,9 @@ namespace Tango.Integration.Operation
 
                             var storage = CreateStorageManager();
 
+                            //Suppress keep alive while job uploads.
+                            storage.SuppressKeepAliveWhileFileUploads = true;
+
                             var storageInfo = await storage.GetStorageDrive();
                             var root_folder = await storage.GetRootFolder();
 
diff --git a/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs b/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs
index 6f04cd0f3..623e331d0 100644
--- a/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs
+++ b/Software/Visual_Studio/Tango.Integration/Storage/StorageManager.cs
@@ -32,6 +32,9 @@ namespace Tango.Integration.Storage
         }
 
         private StorageFolder _currentFolder;
+        /// <summary>
+        /// Gets or sets the current folder.
+        /// </summary>
         public StorageFolder CurrentFolder
         {
             get { return _currentFolder; }
@@ -39,12 +42,20 @@ namespace Tango.Integration.Storage
         }
 
         private StorageDrive _storageDrive;
+        /// <summary>
+        /// Gets or sets the storage drive.
+        /// </summary>
         public StorageDrive StorageDrive
         {
             get { return _storageDrive; }
             set { _storageDrive = value; RaisePropertyChangedAuto(); }
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to disable the transporter keep alive mechanism while a file is being uploaded.
+        /// </summary>
+        public bool SuppressKeepAliveWhileFileUploads { get; set; }
+
         #endregion
 
         #region Constructor
@@ -107,6 +118,12 @@ namespace Tango.Integration.Storage
 
         #endregion
 
+        #region Public Methods
+
+        /// <summary>
+        /// Gets the storage drive information.
+        /// </summary>
+        /// <returns></returns>
         public async Task<StorageDrive> GetStorageDrive()
         {
             EnsureTransporter();
@@ -134,6 +151,10 @@ namespace Tango.Integration.Storage
             return StorageDrive;
         }
 
+        /// <summary>
+        /// Gets the root folder of the current storage driver.
+        /// </summary>
+        /// <returns></returns>
         public Task<StorageFolder> GetRootFolder()
         {
             return GetFolder(new StorageFolder()
@@ -142,11 +163,21 @@ namespace Tango.Integration.Storage
             });
         }
 
+        /// <summary>
+        /// Gets the specified folder information.
+        /// </summary>
+        /// <param name="folder">The folder.</param>
+        /// <returns></returns>
         public Task<StorageFolder> GetFolder(StorageFolder folder)
         {
             return GetFolder(folder.Path);
         }
 
+        /// <summary>
+        /// Gets the specified path folder information.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns></returns>
         public async Task<StorageFolder> GetFolder(String path)
         {
             EnsureTransporter();
@@ -201,6 +232,13 @@ namespace Tango.Integration.Storage
             return sf;
         }
 
+        /// <summary>
+        /// Uploads the specified file stream to the specified destination path.
+        /// Returns a file handler for keeping track on the upload progress.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="stream">The stream.</param>
+        /// <returns></returns>
         public async Task<StorageFileHandler> UploadFile(String path, Stream stream)
         {
             FileUploadRequest request = new FileUploadRequest();
@@ -226,8 +264,15 @@ namespace Tango.Integration.Storage
 
             ThreadFactory.StartNew(() =>
             {
+                bool oldKeepAlive = _transporter.UseKeepAlive;
+
                 try
                 {
+                    if (SuppressKeepAliveWhileFileUploads)
+                    {
+                        _transporter.UseKeepAlive = false;
+                    }
+
                     while (stream.Position < stream.Length)
                     {
                         if (!canceled)
@@ -267,23 +312,36 @@ namespace Tango.Integration.Storage
                 {
                     handler.RaiseFailed(ex);
                 }
+                finally
+                {
+                    if (SuppressKeepAliveWhileFileUploads)
+                    {
+                        _transporter.UseKeepAlive = oldKeepAlive;
+                    }
+                }
             });
 
             return handler;
         }
 
+        /// <summary>
+        /// Uploads the specified file stream to the specified destination path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <param name="stream">The stream.</param>
+        /// <returns></returns>
         public async Task UploadFileSync(String path, Stream stream)
         {
             TaskCompletionSource<object> source = new TaskCompletionSource<object>();
 
             var handler = await UploadFile(path, stream);
 
-            handler.Completed += (_, __) => 
+            handler.Completed += (_, __) =>
             {
                 source.SetResult(true);
             };
 
-            handler.Failed += (_, ex) => 
+            handler.Failed += (_, ex) =>
             {
                 source.SetException(ex);
             };
@@ -291,6 +349,13 @@ namespace Tango.Integration.Storage
             await source.Task;
         }
 
+        /// <summary>
+        /// Downloads the specified storage file to the specified stream.
+        /// Returns a file handler for keeping track on the download progress.
+        /// </summary>
+        /// <param name="file">The file.</param>
+        /// <param name="stream">The stream.</param>
+        /// <returns></returns>
         public async Task<StorageFileHandler> DownloadFile(StorageFile file, Stream stream)
         {
             FileDownloadRequest request = new FileDownloadRequest();
@@ -359,6 +424,11 @@ namespace Tango.Integration.Storage
             return handler;
         }
 
+        /// <summary>
+        /// Deletes the specified storage item.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <returns></returns>
         public async Task DeleteItem(StorageItem item)
         {
             await _transporter.SendRequest<DeleteRequest, DeleteResponse>(new DeleteRequest()
@@ -368,6 +438,11 @@ namespace Tango.Integration.Storage
             });
         }
 
+        /// <summary>
+        /// Creates a new folder on the specified destination path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns></returns>
         public async Task CreateFolder(String path)
         {
             await _transporter.SendRequest<CreateRequest, CreateResponse>(new CreateRequest()
@@ -376,5 +451,7 @@ namespace Tango.Integration.Storage
                 Attribute = FileAttribute.Directory,
             });
         }
+
+        #endregion
     }
 }
diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs
index f00347c8d..1c21723c8 100644
--- a/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs
+++ b/Software/Visual_Studio/Tango.Transport/Adapters/UsbTransportAdapter.cs
@@ -153,7 +153,10 @@ namespace Tango.Transport.Adapters
                             State = TransportComponentState.Disconnected;
                             LogManager.Log("USB adapter disconnected.");
                         }
-                        catch { }
+                        catch (Exception ex)
+                        {
+                            LogManager.Log(ex, "Could not close serial port on " + Address + ".");
+                        }
 
                     }
                     catch (Exception ex)
@@ -167,7 +170,7 @@ namespace Tango.Transport.Adapters
                     }
                 });
 
-                TimeoutTask.StartNew(() => 
+                TimeoutTask.StartNew(() =>
                 {
 
                     if (!source.Task.IsCompleted)
@@ -202,7 +205,7 @@ namespace Tango.Transport.Adapters
             }
             catch (Exception ex)
             {
-                OnFailed(LogManager.Log(ex));
+                OnFailed(LogManager.Log(ex, "Error writing to the serial port."));
             }
         }
 
@@ -244,7 +247,24 @@ namespace Tango.Transport.Adapters
             }
             catch (Exception ex)
             {
-                LogManager.Log(ex, "Error occurred while trying to read from serial port.");
+                LogManager.Log(ex, "Error occurred while trying to read from the serial port.");
+            }
+        }
+
+        /// <summary>
+        /// Finalizes an instance of the <see cref="UsbTransportAdapter"/> class.
+        /// </summary>
+        ~UsbTransportAdapter()
+        {
+            if (_serialPort != null)
+            {
+                try
+                {
+                    LogManager.Log("Finalizing USB transport adapter.");
+                    _serialPort.Close();
+                    _serialPort.Dispose();
+                }
+                catch { }
             }
         }
     }
diff --git a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
index c1a13ce26..008c0759a 100644
--- a/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransporterBase.cs
@@ -1093,7 +1093,14 @@ namespace Tango.Transport
 
                         if (UseKeepAlive)
                         {
-                            var response = SendRequest<KeepAliveRequest, KeepAliveResponse>(new KeepAliveRequest(), TimeSpan.FromSeconds(2)).Result;
+                            if (_arrivedResponses.Count == 0)
+                            {
+                                var response = SendRequest<KeepAliveRequest, KeepAliveResponse>(new KeepAliveRequest(), TimeSpan.FromSeconds(2)).Result;
+                            }
+                            else
+                            {
+                                LogManager.Log("Keep alive request was skipped due to busy response queue.", LogCategory.Debug);
+                            }
                         }
                     }
                     catch (Exception ex) when (ex is TimeoutException || ex is AggregateException)
-- 
cgit v1.3.1


From b3251faca81119a951c176291cec428646500b17 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Tue, 30 Apr 2019 09:09:16 +0300
Subject: General bug fixes.

---
 Software/DB/PPC/Tango.mdf                          | Bin 75497472 -> 75497472 bytes
 Software/DB/PPC/Tango_log.ldf                      | Bin 53673984 -> 53673984 bytes
 Software/DB/TCC/TCC.mdf                            | Bin 8388608 -> 8388608 bytes
 Software/DB/TCC/TCC_log.ldf                        | Bin 8388608 -> 8388608 bytes
 .../Machine Studio Installer.aip                   |  18 +--
 .../Advanced Installer Projects/PPC Installer.aip  | 108 ++-------------
 .../ViewModels/MainViewVM.cs                       |  14 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 .../Tango.PPC.Events/ViewModels/MainViewVM.cs      |  13 +-
 .../Controls/DispenserController.xaml              |   2 +-
 .../Tango.PPC.Technician.csproj                    |  12 ++
 .../Tango.PPC.Technician/ViewModelLocator.cs       |  12 ++
 .../ViewModels/SystemViewVM.cs                     | 150 +++++++++++++++++++++
 .../Tango.PPC.Technician/Views/CatalogView.xaml    |   2 +-
 .../Tango.PPC.Technician/Views/DispensersView.xaml |   2 +-
 .../Tango.PPC.Technician/Views/MainView.xaml       |   1 +
 .../Tango.PPC.Technician/Views/SystemView.xaml     |  56 ++++++++
 .../Tango.PPC.Technician/Views/SystemView.xaml.cs  |  28 ++++
 .../Connection/DefaultMachineProvider.cs           |   7 +-
 .../MachineUpdate/MachineUpdateManager.cs          |   4 +-
 .../OS/DefaultOperationSystemManager.cs            |   8 ++
 .../Tango.PPC.Common/OS/IOperationSystemManager.cs |   6 +
 .../PPC/Tango.PPC.Common/PPCSettings.cs            |   6 +
 .../PPCApplication/DefaultPPCApplicationManager.cs |  11 +-
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../PPC/Tango.PPC.UI/Views/LayoutView.xaml         |   5 +-
 .../Tango.Integration/Operation/MachineOperator.cs |   2 +
 .../Discovery/UsbCommunicationScanner.cs           |  46 +++++--
 .../Tango.Transport/TransportMessage.cs            |  64 +++++----
 .../Tango.Transport/TransportMessageBase.cs        |   3 +-
 30 files changed, 417 insertions(+), 167 deletions(-)
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
 create mode 100644 Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels')

diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf
index 872d8ac1b..8848eced3 100644
Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ
diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf
index c0b0daa9f..2062993f9 100644
Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ
diff --git a/Software/DB/TCC/TCC.mdf b/Software/DB/TCC/TCC.mdf
index 032683b9d..a82e50d7e 100644
Binary files a/Software/DB/TCC/TCC.mdf and b/Software/DB/TCC/TCC.mdf differ
diff --git a/Software/DB/TCC/TCC_log.ldf b/Software/DB/TCC/TCC_log.ldf
index c016fe931..5b81a70e8 100644
Binary files a/Software/DB/TCC/TCC_log.ldf and b/Software/DB/TCC/TCC_log.ldf differ
diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index 4b88dab01..de4d79c45 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip	
@@ -15,10 +15,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{51771A9F-CEDC-4F70-878E-844671E5558B} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{D1B16C8D-42B2-4A1B-89AC-228AB51F3853} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.0.13.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.0.15.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -103,6 +103,7 @@
     <ROW Component="Microsoft.WindowsAzure.Storage.dll" ComponentId="{38DD34C7-3DE1-4F73-B1A0-433DA73627F0}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAzure.Storage.dll"/>
     <ROW Component="Newtonsoft.Json.dll" ComponentId="{4900AB50-083B-4DDE-9584-6AD9E63BEE98}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/>
     <ROW Component="ProductInformation" ComponentId="{0E2AEDFB-F480-4EFC-9E30-3BF55F4003A6}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="ProtoCompilers" ComponentId="{71B2AE10-C7DE-407E-BCED-880A2B571912}" Directory_="ProtoCompilers_Dir" Attributes="0"/>
     <ROW Component="RazorEngine.dll" ComponentId="{548FE444-B574-42E5-8E6D-74F0BD9ACCA3}" Directory_="APPDIR" Attributes="0" KeyPath="RazorEngine.dll"/>
     <ROW Component="RealTimeGraphX.WPF.dll" ComponentId="{9A629F42-5E01-48A8-A690-DB13143EC7D6}" Directory_="APPDIR" Attributes="0" KeyPath="RealTimeGraphX.WPF.dll"/>
     <ROW Component="RealTimeGraphX.dll" ComponentId="{ED4D6081-888A-44D8-8327-A74150928C55}" Directory_="APPDIR" Attributes="0" KeyPath="RealTimeGraphX.dll"/>
@@ -319,9 +320,6 @@
     <ROW Component="opencv_video330d.dll" ComponentId="{33A1A287-4354-49E8-A9FA-0AC40ECDAF8E}" Directory_="APPDIR" Attributes="0" KeyPath="opencv_video330d.dll"/>
     <ROW Component="opencv_videoio330d.dll" ComponentId="{2D1BA382-4181-46BB-AAFD-CEF4F0C478C0}" Directory_="APPDIR" Attributes="0" KeyPath="opencv_videoio330d.dll"/>
     <ROW Component="opencv_videostab330d.dll" ComponentId="{ECC20E86-E98A-4D9F-B7DA-67AF4528A9B1}" Directory_="APPDIR" Attributes="0" KeyPath="opencv_videostab330d.dll"/>
-    <ROW Component="protoc.exe" ComponentId="{98AAE135-84EC-42C8-A725-4347DF74DE49}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/>
-    <ROW Component="protoc1.0M4.jar" ComponentId="{073AA24A-50D2-4864-ADB0-4EAE6612A72C}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/>
-    <ROW Component="protocc.exe" ComponentId="{B3494D9B-FEC2-4E67-84EC-692CB834C3A1}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/>
     <ROW Component="roslyn" ComponentId="{0213EF2F-EA65-4862-BE1A-E69A06623386}" Directory_="roslyn_Dir" Attributes="0"/>
     <ROW Component="ucrtbased.dll" ComponentId="{DA7E4E6B-6A10-4C41-8B36-5BBAC6442CBF}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vcruntime140.dll" ComponentId="{96045530-543D-487A-875A-F9A7EBDCFED0}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
@@ -329,7 +327,7 @@
     <ROW Component="zlib1.dll" ComponentId="{AB6E3F34-F125-4364-A26B-F02193779155}" Directory_="APPDIR" Attributes="0" KeyPath="zlib1.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath ColorMine.dll CommandLine.dll DeepEqual.dll DocumentFormat.OpenXml.dll Dragablz.dll Dragablz.xml EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll ICSharpCode.AvalonEdit.dll Ionic.Zip.dll JWT.dll LiveCharts.Wpf.dll_1 LiveCharts.dll_1 MahApps.Metro.dll MaterialDesignColors.dll MaterialDesignThemes.Wpf.dll Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.Practices.ServiceLocation.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAPICodePack.Shell.dll Microsoft.WindowsAPICodePack.ShellExtensions.dll Microsoft.WindowsAPICodePack.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll ProductInformation RazorEngine.dll RealTimeGraphX.WPF.dll RealTimeGraphX.dll SHORTCUTDIR SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Concurrent.dll System.Collections.NonGeneric.dll System.Collections.Specialized.dll System.Collections.dll System.ComponentModel.EventBasedAsync.dll System.ComponentModel.Primitives.dll System.ComponentModel.TypeConverter.dll System.ComponentModel.dll System.Console.dll System.Data.Common.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.Contracts.dll System.Diagnostics.Debug.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.Diagnostics.TextWriterTraceListener.dll System.Diagnostics.Tools.dll System.Diagnostics.TraceSource.dll System.Diagnostics.Tracing.dll System.Drawing.Primitives.dll System.Dynamic.Runtime.dll System.Globalization.Calendars.dll System.Globalization.Extensions.dll System.Globalization.dll System.IO.Compression.ZipFile.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.Watcher.dll System.IO.FileSystem.dll System.IO.IsolatedStorage.dll System.IO.MemoryMappedFiles.dll System.IO.Pipes.dll System.IO.UnmanagedMemoryStream.dll System.IO.dll System.IdentityModel.Tokens.Jwt.dll System.Linq.Expressions.dll System.Linq.Parallel.dll System.Linq.Queryable.dll System.Linq.dll System.Net.Http.Formatting.dll System.Net.Http.dll System.Net.NameResolution.dll System.Net.NetworkInformation.dll System.Net.Ping.dll System.Net.Primitives.dll System.Net.Requests.dll System.Net.Security.dll System.Net.Sockets.dll System.Net.WebHeaderCollection.dll System.Net.WebSockets.Client.dll System.Net.WebSockets.dll System.ObjectModel.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Threading.dll System.Reflection.Extensions.dll System.Reflection.Primitives.dll System.Reflection.dll System.Resources.Reader.dll System.Resources.ResourceManager.dll System.Resources.Writer.dll System.Runtime.CompilerServices.VisualC.dll System.Runtime.Extensions.dll System.Runtime.Handles.dll System.Runtime.InteropServices.RuntimeInformation.dll System.Runtime.InteropServices.dll System.Runtime.Numerics.dll System.Runtime.Serialization.Formatters.dll System.Runtime.Serialization.Json.dll System.Runtime.Serialization.Primitives.dll System.Runtime.Serialization.Xml.dll System.Runtime.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Csp.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.dll System.Security.SecureString.dll System.Text.Encoding.Extensions.dll System.Text.Encoding.dll System.Text.RegularExpressions.dll System.Threading.Overlapped.dll System.Threading.Tasks.Parallel.dll System.Threading.Tasks.dll System.Threading.Thread.dll System.Threading.ThreadPool.dll System.Threading.Timer.dll System.Threading.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XDocument.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll System.Xml.XmlSerializer.dll Tango.AdvancedInstaller.dll Tango.AutoComplete.dll Tango.BL.dll Tango.BrushPicker.dll Tango.CSV.dll Tango.CircularGauge.dll Tango.CodeGeneration.dll Tango.ColorLib.dll Tango.ColorPicker.dll Tango.Core.dll Tango.DAL.Local.dll Tango.DAL.Remote.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Editors.dll Tango.Embroidery.dll Tango.EmbroideryUI.dll Tango.Emulations.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.MachineStudio.ColorCapture.dll Tango.MachineStudio.ColorLab.dll Tango.MachineStudio.Common.dll Tango.MachineStudio.DB.dll Tango.MachineStudio.DataCapture.dll Tango.MachineStudio.Developer.dll Tango.MachineStudio.Dispensers.dll Tango.MachineStudio.HardwareDesigner.dll Tango.MachineStudio.Logging.dll Tango.MachineStudio.MachineDesigner.dll Tango.MachineStudio.RML.dll Tango.MachineStudio.Statistics.dll_1 Tango.MachineStudio.Storage.dll Tango.MachineStudio.Stubs.dll Tango.MachineStudio.Technician.dll Tango.MachineStudio.UI.exe Tango.MachineStudio.Updater.exe Tango.MachineStudio.UsersAndRoles.dll Tango.PMR.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.Stubs.dll Tango.Synchronization.dll Tango.TCC.BL.dll Tango.TCC.CardDetector.dll Tango.TCC.ColorDetector.dll Tango.TCC.LoadTestLib.dll Tango.TCC.OpenCV.DLL.dll Tango.TFS.dll Tango.Transport.dll Tango.Video.dll Tango.Visuals.dll Tango.Web.dll WpfAnimatedGif.dll WriteableBitmapEx.Wpf.dll ZedGraph.dll ZedGraph.resources.dll benchmarks_rgb_lab.csv concrt140.dll cvextern.dll fpgen.exe libMagickCore2.dll libMagickWand2.dll libiconv2.dll libjpeg7.dll libpng120.dll libtiff3.dll libxml22.dll libzbar0.dll mscoree.dll msvcp140.dll msvcp140d.dll netstandard.dll opencv_aruco330d.dll opencv_calib3d330d.dll opencv_core330d.dll opencv_dnn330d.dll opencv_features2d330d.dll opencv_ffmpeg310.dll opencv_ffmpeg310_64.dll opencv_ffmpeg320.dll opencv_ffmpeg320_64.dll opencv_ffmpeg330.dll opencv_flann330d.dll opencv_highgui330d.dll opencv_imgcodecs330d.dll opencv_imgproc330d.dll opencv_ml330d.dll opencv_objdetect330d.dll opencv_photo330d.dll opencv_shape330d.dll opencv_stitching330d.dll opencv_superres330d.dll opencv_video330d.dll opencv_videoio330d.dll opencv_videostab330d.dll protoc.exe protoc1.0M4.jar protocc.exe roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll zlib1.dll"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_ExePath ColorMine.dll CommandLine.dll DeepEqual.dll DocumentFormat.OpenXml.dll Dragablz.dll Dragablz.xml EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll ICSharpCode.AvalonEdit.dll Ionic.Zip.dll JWT.dll LiveCharts.Wpf.dll_1 LiveCharts.dll_1 MahApps.Metro.dll MaterialDesignColors.dll MaterialDesignThemes.Wpf.dll Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.Practices.ServiceLocation.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAPICodePack.Shell.dll Microsoft.WindowsAPICodePack.ShellExtensions.dll Microsoft.WindowsAPICodePack.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll ProductInformation ProtoCompilers RazorEngine.dll RealTimeGraphX.WPF.dll RealTimeGraphX.dll SHORTCUTDIR SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Concurrent.dll System.Collections.NonGeneric.dll System.Collections.Specialized.dll System.Collections.dll System.ComponentModel.EventBasedAsync.dll System.ComponentModel.Primitives.dll System.ComponentModel.TypeConverter.dll System.ComponentModel.dll System.Console.dll System.Data.Common.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.Contracts.dll System.Diagnostics.Debug.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.Diagnostics.TextWriterTraceListener.dll System.Diagnostics.Tools.dll System.Diagnostics.TraceSource.dll System.Diagnostics.Tracing.dll System.Drawing.Primitives.dll System.Dynamic.Runtime.dll System.Globalization.Calendars.dll System.Globalization.Extensions.dll System.Globalization.dll System.IO.Compression.ZipFile.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.Watcher.dll System.IO.FileSystem.dll System.IO.IsolatedStorage.dll System.IO.MemoryMappedFiles.dll System.IO.Pipes.dll System.IO.UnmanagedMemoryStream.dll System.IO.dll System.IdentityModel.Tokens.Jwt.dll System.Linq.Expressions.dll System.Linq.Parallel.dll System.Linq.Queryable.dll System.Linq.dll System.Net.Http.Formatting.dll System.Net.Http.dll System.Net.NameResolution.dll System.Net.NetworkInformation.dll System.Net.Ping.dll System.Net.Primitives.dll System.Net.Requests.dll System.Net.Security.dll System.Net.Sockets.dll System.Net.WebHeaderCollection.dll System.Net.WebSockets.Client.dll System.Net.WebSockets.dll System.ObjectModel.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reactive.Windows.Threading.dll System.Reflection.Extensions.dll System.Reflection.Primitives.dll System.Reflection.dll System.Resources.Reader.dll System.Resources.ResourceManager.dll System.Resources.Writer.dll System.Runtime.CompilerServices.VisualC.dll System.Runtime.Extensions.dll System.Runtime.Handles.dll System.Runtime.InteropServices.RuntimeInformation.dll System.Runtime.InteropServices.dll System.Runtime.Numerics.dll System.Runtime.Serialization.Formatters.dll System.Runtime.Serialization.Json.dll System.Runtime.Serialization.Primitives.dll System.Runtime.Serialization.Xml.dll System.Runtime.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Csp.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.dll System.Security.SecureString.dll System.Text.Encoding.Extensions.dll System.Text.Encoding.dll System.Text.RegularExpressions.dll System.Threading.Overlapped.dll System.Threading.Tasks.Parallel.dll System.Threading.Tasks.dll System.Threading.Thread.dll System.Threading.ThreadPool.dll System.Threading.Timer.dll System.Threading.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XDocument.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll System.Xml.XmlSerializer.dll Tango.AdvancedInstaller.dll Tango.AutoComplete.dll Tango.BL.dll Tango.BrushPicker.dll Tango.CSV.dll Tango.CircularGauge.dll Tango.CodeGeneration.dll Tango.ColorLib.dll Tango.ColorPicker.dll Tango.Core.dll Tango.DAL.Local.dll Tango.DAL.Remote.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Editors.dll Tango.Embroidery.dll Tango.EmbroideryUI.dll Tango.Emulations.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.MachineStudio.ColorCapture.dll Tango.MachineStudio.ColorLab.dll Tango.MachineStudio.Common.dll Tango.MachineStudio.DB.dll Tango.MachineStudio.DataCapture.dll Tango.MachineStudio.Developer.dll Tango.MachineStudio.Dispensers.dll Tango.MachineStudio.HardwareDesigner.dll Tango.MachineStudio.Logging.dll Tango.MachineStudio.MachineDesigner.dll Tango.MachineStudio.RML.dll Tango.MachineStudio.Statistics.dll_1 Tango.MachineStudio.Storage.dll Tango.MachineStudio.Stubs.dll Tango.MachineStudio.Technician.dll Tango.MachineStudio.UI.exe Tango.MachineStudio.Updater.exe Tango.MachineStudio.UsersAndRoles.dll Tango.PMR.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.Stubs.dll Tango.Synchronization.dll Tango.TCC.BL.dll Tango.TCC.CardDetector.dll Tango.TCC.ColorDetector.dll Tango.TCC.LoadTestLib.dll Tango.TCC.OpenCV.DLL.dll Tango.TFS.dll Tango.Transport.dll Tango.Video.dll Tango.Visuals.dll Tango.Web.dll WpfAnimatedGif.dll WriteableBitmapEx.Wpf.dll ZedGraph.dll ZedGraph.resources.dll benchmarks_rgb_lab.csv concrt140.dll cvextern.dll fpgen.exe libMagickCore2.dll libMagickWand2.dll libiconv2.dll libjpeg7.dll libpng120.dll libtiff3.dll libxml22.dll libzbar0.dll mscoree.dll msvcp140.dll msvcp140d.dll netstandard.dll opencv_aruco330d.dll opencv_calib3d330d.dll opencv_core330d.dll opencv_dnn330d.dll opencv_features2d330d.dll opencv_ffmpeg310.dll opencv_ffmpeg310_64.dll opencv_ffmpeg320.dll opencv_ffmpeg320_64.dll opencv_ffmpeg330.dll opencv_flann330d.dll opencv_highgui330d.dll opencv_imgcodecs330d.dll opencv_imgproc330d.dll opencv_ml330d.dll opencv_objdetect330d.dll opencv_photo330d.dll opencv_shape330d.dll opencv_stitching330d.dll opencv_superres330d.dll opencv_video330d.dll opencv_videoio330d.dll opencv_videostab330d.dll roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll zlib1.dll"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -764,14 +762,11 @@
     <ROW File="opencv_video330d.dll" Component_="opencv_video330d.dll" FileName="OPENC~21.DLL|opencv_video330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_video330d.dll" SelfReg="false" NextFile="opencv_videoio330d.dll"/>
     <ROW File="opencv_videoio330d.dll" Component_="opencv_videoio330d.dll" FileName="OPENC~22.DLL|opencv_videoio330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_videoio330d.dll" SelfReg="false" NextFile="opencv_videostab330d.dll"/>
     <ROW File="opencv_videostab330d.dll" Component_="opencv_videostab330d.dll" FileName="OPENC~23.DLL|opencv_videostab330d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\opencv_videostab330d.dll" SelfReg="false" NextFile="Tango.MachineStudio.ColorCapture.dll"/>
-    <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc.exe" SelfReg="false" DigSign="true"/>
-    <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/>
-    <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/>
     <ROW File="template.bmp" Component_="benchmarks_rgb_lab.csv" FileName="template.bmp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\TCC\template.bmp" SelfReg="false" NextFile="ZedGraph.dll"/>
     <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/>
     <ROW File="vcruntime140.dll" Component_="vcruntime140.dll" FileName="VCRUNT~1.DLL|vcruntime140.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\vcruntime140.dll" SelfReg="false" NextFile="vcruntime140d.dll"/>
     <ROW File="vcruntime140d.dll" Component_="vcruntime140d.dll" FileName="VCRUNT~2.DLL|vcruntime140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\vcruntime140d.dll" SelfReg="false" NextFile="WpfAnimatedGif.dll"/>
-    <ROW File="zlib1.dll" Component_="zlib1.dll" FileName="zlib1.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\zlib1.dll" SelfReg="false" NextFile="protoc1.0M4.jar"/>
+    <ROW File="zlib1.dll" Component_="zlib1.dll" FileName="zlib1.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\Machine Studio\Release\zlib1.dll" SelfReg="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.custcomp.MsiShortcutPropertyComponent">
     <ROW MsiShortcutProperty="Tango.MachineStudio.UI.exe0" Shortcut_="Tango.MachineStudio.UI.exe" PropertyKey="System.AppUserModel.PreventPinning" PropVariantValue="1"/>
@@ -787,7 +782,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.0.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.0.13"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.0.9" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.0.15"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -864,6 +859,7 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
     <ROW Directory_="roslyn_Dir" Component_="roslyn" ManualDelete="false"/>
+    <ROW Directory_="ProtoCompilers_Dir" Component_="ProtoCompilers" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_AiRemoveFilesCommit" Type="11777" Source="ResourceCleaner.dll" Target="OnAiRemoveFilesCommit" WithoutSeq="true"/>
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 27458976f..074e21f8a 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{073C40F8-E2B8-4929-8119-ECD9E3981DA8} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{2ABD8786-722F-4DF7-851A-B1AC2D227A58} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.0.13.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.0.17.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -73,17 +73,9 @@
     <ROW Component="Microsoft.Azure.Common.NetFramework.dll" ComponentId="{894F089D-C807-489A-8523-388645F4D876}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.NetFramework.dll"/>
     <ROW Component="Microsoft.Azure.Common.dll" ComponentId="{4A8F7880-DE1E-4E8F-80E5-6DE1E14B4702}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.Common.dll"/>
     <ROW Component="Microsoft.Azure.ResourceManager.dll" ComponentId="{A00E27AE-9ED8-413F-9975-8C0B2D4C7BBE}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Azure.ResourceManager.dll"/>
-    <ROW Component="Microsoft.Build.Tasks.CodeAnalysis.dll" ComponentId="{75F31CDC-E831-431E-8CEE-E678261715EB}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.Build.Tasks.CodeAnalysis.dll"/>
-    <ROW Component="Microsoft.CodeAnalysis.CSharp.Scripting.dll" ComponentId="{2C3F019A-A6F0-4EAD-8BFE-160EF284F071}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.CodeAnalysis.CSharp.Scripting.dll"/>
-    <ROW Component="Microsoft.CodeAnalysis.CSharp.dll" ComponentId="{E3E1B080-2A9E-4F4B-88EF-68FE5CF0F0BC}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.CodeAnalysis.CSharp.dll"/>
-    <ROW Component="Microsoft.CodeAnalysis.Scripting.dll" ComponentId="{2402C20B-FA5E-4248-AD99-19FFA7F3C8B4}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.CodeAnalysis.Scripting.dll"/>
-    <ROW Component="Microsoft.CodeAnalysis.VisualBasic.dll" ComponentId="{F3622C63-5434-4BF2-9288-1B3291C287CB}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.CodeAnalysis.VisualBasic.dll"/>
-    <ROW Component="Microsoft.CodeAnalysis.dll" ComponentId="{4EB57476-AF8D-47C6-9ADC-D1942CE99D0B}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.CodeAnalysis.dll"/>
     <ROW Component="Microsoft.Data.Edm.dll" ComponentId="{06A0456E-381C-4EF8-B5E7-31D1B7E7CD85}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Edm.dll"/>
     <ROW Component="Microsoft.Data.OData.dll" ComponentId="{A06B5093-5096-4B70-8244-4563501A0529}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.OData.dll"/>
     <ROW Component="Microsoft.Data.Services.Client.dll" ComponentId="{CA6117B3-4B3F-4834-A9C1-C741BA6DA59F}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.Data.Services.Client.dll"/>
-    <ROW Component="Microsoft.DiaSymReader.Native.amd64.dll" ComponentId="{03C38AC8-2551-48D6-B58A-CF4E7074BF9F}" Directory_="roslyn_Dir" Attributes="256" KeyPath="Microsoft.DiaSymReader.Native.amd64.dll"/>
-    <ROW Component="Microsoft.DiaSymReader.Native.x86.dll" ComponentId="{A4D56ECD-C3B9-4AED-BFBF-C8C7D3C20696}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.DiaSymReader.Native.x86.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" ComponentId="{0D9D4D27-F558-4BA4-9C3A-BCF0201A8342}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
     <ROW Component="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" ComponentId="{4E807C1E-3E7D-4317-A035-1B27AD10B0B8}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
     <ROW Component="Microsoft.ServiceBus.dll" ComponentId="{E66AEAAE-74EA-4AAC-829A-61A0F319FC7C}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.ServiceBus.dll"/>
@@ -110,11 +102,11 @@
     <ROW Component="Microsoft.VisualStudio.Services.Client.Interactive.dll" ComponentId="{6C3540BE-3D48-41AB-90CD-161D2FC011B5}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.VisualStudio.Services.Client.Interactive.dll"/>
     <ROW Component="Microsoft.VisualStudio.Services.Common.dll" ComponentId="{B42A0E4C-1207-4D28-9814-B86D392D558B}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.VisualStudio.Services.Common.dll"/>
     <ROW Component="Microsoft.VisualStudio.Services.WebApi.dll" ComponentId="{50CBA0C0-C360-433D-B720-4BDF6BB89FAC}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.VisualStudio.Services.WebApi.dll"/>
-    <ROW Component="Microsoft.Win32.Primitives.dll" ComponentId="{D5AE46AA-612B-4DD5-94CB-28D9E7DEAFDC}" Directory_="roslyn_Dir" Attributes="0" KeyPath="Microsoft.Win32.Primitives.dll"/>
     <ROW Component="Microsoft.WindowsAzure.Storage.dll" ComponentId="{7D9DF36E-5D83-49A3-A08B-4FC2A0557E0B}" Directory_="APPDIR" Attributes="0" KeyPath="Microsoft.WindowsAzure.Storage.dll"/>
     <ROW Component="Newtonsoft.Json.dll" ComponentId="{E556628B-DB87-4249-AF5E-F5D0AC9E6C32}" Directory_="APPDIR" Attributes="0" KeyPath="Newtonsoft.Json.dll"/>
     <ROW Component="OverrideData.xml" ComponentId="{24820B41-EDB3-4974-B581-0C285A4AA675}" Directory_="Configurations_Dir" Attributes="0" KeyPath="OverrideData.xml" Type="0"/>
     <ROW Component="ProductInformation" ComponentId="{1D49743C-F4ED-4BE9-8ED0-3792287247F6}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
+    <ROW Component="ProtoCompilers" ComponentId="{E4650460-218E-407D-AA74-42D4B8FC7BBF}" Directory_="ProtoCompilers_Dir" Attributes="0"/>
     <ROW Component="SA.Binary.dll" ComponentId="{DBA04AD9-BFEB-41EB-9863-6AD1D6A14346}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.Binary.dll"/>
     <ROW Component="SA.CodeView.dll" ComponentId="{822D7035-5F5B-49B2-9039-5D005F39A111}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CodeView.dll"/>
     <ROW Component="SA.CommonTypes.dll" ComponentId="{F8BF4CDD-AE58-4033-99B8-6FD0466E9F85}" Directory_="SQLExaminer_Dir" Attributes="0" KeyPath="SA.CommonTypes.dll"/>
@@ -129,46 +121,20 @@
     <ROW Component="SQLite.Interop.dll" ComponentId="{564CD658-1365-436E-BF1F-8F616090B8FD}" Directory_="x64_Dir" Attributes="256" KeyPath="SQLite.Interop.dll"/>
     <ROW Component="SQLite.Interop.dll_1" ComponentId="{1FC59CC1-643E-46B6-9E5C-AE417128823A}" Directory_="x86_Dir" Attributes="0" KeyPath="SQLite.Interop.dll_1"/>
     <ROW Component="SimpleValidator.dll" ComponentId="{3B9AB784-0AFD-4667-A756-9B0A86ECCC2B}" Directory_="APPDIR" Attributes="0" KeyPath="SimpleValidator.dll"/>
-    <ROW Component="System.AppContext.dll" ComponentId="{32BA6C98-1BD2-4E50-B08F-5A5CC506CF2E}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.AppContext.dll"/>
-    <ROW Component="System.Collections.Immutable.dll" ComponentId="{336CC0F0-C346-401A-84DF-D5080652E2FE}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Collections.Immutable.dll"/>
-    <ROW Component="System.Console.dll" ComponentId="{0F0136F9-50AC-418C-8F92-6EB068D14792}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Console.dll"/>
     <ROW Component="System.Data.SQLite.EF6.dll" ComponentId="{77619618-AE0C-4A0A-A5E9-108FA3546A36}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.EF6.dll"/>
     <ROW Component="System.Data.SQLite.Linq.dll" ComponentId="{A614D2D8-C390-4DE9-AAF4-B4E3111FE389}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.Linq.dll"/>
     <ROW Component="System.Data.SQLite.dll" ComponentId="{B10ECB3B-FF56-4E95-9E10-A4D155ACCC10}" Directory_="APPDIR" Attributes="0" KeyPath="System.Data.SQLite.dll"/>
-    <ROW Component="System.Diagnostics.FileVersionInfo.dll" ComponentId="{18A14A05-3981-4E24-91A0-434B60D359DA}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Diagnostics.FileVersionInfo.dll"/>
-    <ROW Component="System.Diagnostics.Process.dll" ComponentId="{79D9695C-F441-4014-B65D-CBA6AC126C9C}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Diagnostics.Process.dll"/>
-    <ROW Component="System.Diagnostics.StackTrace.dll" ComponentId="{5C388B94-7DAD-4D8A-8147-92100BC49D87}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Diagnostics.StackTrace.dll"/>
     <ROW Component="System.IO.Compression.FileSystem.dll" ComponentId="{B9DD6F14-FAEA-4DB7-B535-6088091F3F04}" Directory_="APPDIR" Attributes="0" KeyPath="System.IO.Compression.FileSystem.dll"/>
-    <ROW Component="System.IO.Compression.dll" ComponentId="{5A25AF32-446A-4E4F-84C8-EC48C3F530C2}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.IO.Compression.dll"/>
-    <ROW Component="System.IO.FileSystem.DriveInfo.dll" ComponentId="{9DFA0844-AFD9-42B0-8CE3-5543F4D0DC37}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.IO.FileSystem.DriveInfo.dll"/>
-    <ROW Component="System.IO.FileSystem.Primitives.dll" ComponentId="{4B267242-ADD0-41FB-8411-C6E2101CA1C5}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.IO.FileSystem.Primitives.dll"/>
-    <ROW Component="System.IO.FileSystem.dll" ComponentId="{5C1FAA48-26C1-4243-83EF-AA03B70180DA}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.IO.FileSystem.dll"/>
-    <ROW Component="System.IO.Pipes.dll" ComponentId="{50F00146-6B99-401E-A7B6-11E2B1D3DF4D}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.IO.Pipes.dll"/>
     <ROW Component="System.IdentityModel.Tokens.Jwt.dll" ComponentId="{E51E96FF-9C01-41D1-9B2B-081CBA0679DC}" Directory_="APPDIR" Attributes="0" KeyPath="System.IdentityModel.Tokens.Jwt.dll"/>
     <ROW Component="System.Net.Http.Formatting.dll" ComponentId="{B9C00657-DA03-4398-9011-FDE98CE5123A}" Directory_="APPDIR" Attributes="0" KeyPath="System.Net.Http.Formatting.dll"/>
     <ROW Component="System.Reactive.Core.dll" ComponentId="{5B105ACC-CCA6-4CBC-963E-63253E27E7B5}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Core.dll"/>
     <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{C23DD172-ACE0-4811-90D6-0C2F38B2C27E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/>
     <ROW Component="System.Reactive.Linq.dll" ComponentId="{572F229C-22E6-4934-BDB9-68600F354F67}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/>
     <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{84B191EA-72B0-4FA8-B352-AEF6BBD48F31}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/>
-    <ROW Component="System.Reflection.Metadata.dll" ComponentId="{BA41616D-3E1F-4BEF-BFFB-32646D665B34}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Reflection.Metadata.dll"/>
-    <ROW Component="System.Security.AccessControl.dll" ComponentId="{5DCB7077-BAF9-42CE-852F-9A0ECD909214}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.AccessControl.dll"/>
-    <ROW Component="System.Security.Claims.dll" ComponentId="{1FAC77FC-8F46-43FD-A64A-ECA6406FB15B}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.Claims.dll"/>
-    <ROW Component="System.Security.Cryptography.Algorithms.dll" ComponentId="{A5D9C043-6FA4-4D65-B53B-36B877C79C53}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.Cryptography.Algorithms.dll"/>
-    <ROW Component="System.Security.Cryptography.Encoding.dll" ComponentId="{EE837AB8-394F-4FC0-A272-5E3AB7543208}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.Cryptography.Encoding.dll"/>
-    <ROW Component="System.Security.Cryptography.Primitives.dll" ComponentId="{D54C85D8-3C8F-4670-9F58-B0CCE7DB3491}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.Cryptography.Primitives.dll"/>
-    <ROW Component="System.Security.Cryptography.X509Certificates.dll" ComponentId="{42C859CB-130A-44E7-99CA-E77BDE9320C3}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.Cryptography.X509Certificates.dll"/>
-    <ROW Component="System.Security.Principal.Windows.dll" ComponentId="{4FBC0F85-483E-4371-B0B9-ADD0D7DF77F1}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Security.Principal.Windows.dll"/>
     <ROW Component="System.Spatial.dll" ComponentId="{5E31D7A5-2EC5-409E-B8F4-999D1349D46C}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
-    <ROW Component="System.Text.Encoding.CodePages.dll" ComponentId="{5A73D387-EED2-4A0C-BC1D-FB969CE833C3}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Text.Encoding.CodePages.dll"/>
-    <ROW Component="System.Threading.Thread.dll" ComponentId="{F3A5BA44-F581-44B9-B0E0-0D8DBDE79046}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Threading.Thread.dll"/>
-    <ROW Component="System.ValueTuple.dll" ComponentId="{47D0E22A-45F5-4483-A679-42EAB1F0ECEC}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.ValueTuple.dll"/>
     <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{9F1DD6B2-3514-4C62-AACA-EE7368ECB36B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/>
     <ROW Component="System.Web.Http.dll" ComponentId="{0ABCDC64-DE4A-4994-B4C8-3B0146F68F09}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/>
     <ROW Component="System.Windows.Interactivity.dll" ComponentId="{4ACC2B8A-2454-4DAC-9326-5F8426C068F0}" Directory_="APPDIR" Attributes="0" KeyPath="System.Windows.Interactivity.dll"/>
-    <ROW Component="System.Xml.ReaderWriter.dll" ComponentId="{1C0D8C4D-9673-4B6F-85F5-189551BF86B6}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Xml.ReaderWriter.dll"/>
-    <ROW Component="System.Xml.XPath.XDocument.dll" ComponentId="{6CB83D9C-33F5-41E0-9E42-AFD83708A7DC}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Xml.XPath.XDocument.dll"/>
-    <ROW Component="System.Xml.XPath.dll" ComponentId="{EB8E4216-9BEA-4A44-BF1E-CE2F5473230D}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Xml.XPath.dll"/>
-    <ROW Component="System.Xml.XmlDocument.dll" ComponentId="{CE254783-F14A-46C5-ADCC-C7F05DC74B24}" Directory_="roslyn_Dir" Attributes="0" KeyPath="System.Xml.XmlDocument.dll"/>
     <ROW Component="Tango.AdvancedInstaller.dll" ComponentId="{5C51256D-50D1-46F5-A44F-73AF2E63EAF5}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.AdvancedInstaller.dll"/>
     <ROW Component="Tango.AnimatedGif.dll" ComponentId="{2DCBEDC8-EDA7-4C90-8852-39E0B13DABF7}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.AnimatedGif.dll"/>
     <ROW Component="Tango.BL.dll" ComponentId="{56D29CF3-E600-48A5-BF55-045EEE7CFDC6}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.BL.dll"/>
@@ -204,22 +170,15 @@
     <ROW Component="Tango.Transport.dll" ComponentId="{757E4901-D269-42C1-A70E-7B8DABB66024}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Transport.dll"/>
     <ROW Component="Tango.Web.dll" ComponentId="{131328BC-D68F-4CB8-8D8C-F89CF6F8486C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Web.dll"/>
     <ROW Component="Tango.WiFi.dll" ComponentId="{8082C9BD-5BDB-4C52-BCA6-E8604D4D232B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WiFi.dll"/>
-    <ROW Component="VBCSCompiler.exe" ComponentId="{152BB058-C854-4CBF-AB0B-B7F07B1D479F}" Directory_="roslyn_Dir" Attributes="0" KeyPath="VBCSCompiler.exe"/>
-    <ROW Component="csc.exe" ComponentId="{241D7F10-ACB3-4548-93A3-5B26E9C23A89}" Directory_="roslyn_Dir" Attributes="0" KeyPath="csc.exe"/>
-    <ROW Component="csc.exe.config" ComponentId="{346A7E25-1B8D-4410-95E1-BF3AA3E854C2}" Directory_="roslyn_Dir" Attributes="0" KeyPath="csc.exe.config" Type="0"/>
-    <ROW Component="csi.exe" ComponentId="{598BD840-A5FA-45D8-ABF6-90E2EB44743D}" Directory_="roslyn_Dir" Attributes="0" KeyPath="csi.exe"/>
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
-    <ROW Component="protoc.exe" ComponentId="{C53FB330-0B4F-4A4C-95F2-66ED9B3688B2}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/>
-    <ROW Component="protoc1.0M4.jar" ComponentId="{7B7ADD61-0C2A-48ED-A8C1-70AC57AC09E0}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/>
-    <ROW Component="protocc.exe" ComponentId="{E9E722FD-32BE-4AF6-BCCB-FBAA1FBD783E}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/>
+    <ROW Component="roslyn" ComponentId="{A1030C14-FFD5-4404-A80D-62A51C5B17A9}" Directory_="roslyn_Dir" Attributes="0"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
-    <ROW Component="vbc.exe" ComponentId="{5C3D4747-957A-4364-909B-97CCCD6694E3}" Directory_="roslyn_Dir" Attributes="0" KeyPath="vbc.exe"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Build.Tasks.CodeAnalysis.dll Microsoft.CodeAnalysis.CSharp.Scripting.dll Microsoft.CodeAnalysis.CSharp.dll Microsoft.CodeAnalysis.Scripting.dll Microsoft.CodeAnalysis.VisualBasic.dll Microsoft.CodeAnalysis.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.DiaSymReader.Native.amd64.dll Microsoft.DiaSymReader.Native.x86.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.Win32.Primitives.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.AppContext.dll System.Collections.Immutable.dll System.Console.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.Diagnostics.FileVersionInfo.dll System.Diagnostics.Process.dll System.Diagnostics.StackTrace.dll System.IO.Compression.FileSystem.dll System.IO.Compression.dll System.IO.FileSystem.DriveInfo.dll System.IO.FileSystem.Primitives.dll System.IO.FileSystem.dll System.IO.Pipes.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Reflection.Metadata.dll System.Security.AccessControl.dll System.Security.Claims.dll System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.Encoding.dll System.Security.Cryptography.Primitives.dll System.Security.Cryptography.X509Certificates.dll System.Security.Principal.Windows.dll System.Spatial.dll System.Text.Encoding.CodePages.dll System.Threading.Thread.dll System.ValueTuple.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll System.Xml.ReaderWriter.dll System.Xml.XPath.XDocument.dll System.Xml.XPath.dll System.Xml.XmlDocument.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll VBCSCompiler.exe csc.exe csc.exe.config csi.exe mscoree.dll msvcp140d.dll protoc.exe protoc1.0M4.jar protocc.exe ucrtbased.dll vbc.exe vcruntime140.dll vcruntime140d.dll"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation ProtoCompilers SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SQLite.Interop.dll SQLite.Interop.dll_1 SimpleValidator.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.IO.Compression.FileSystem.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Spatial.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Windows.Interactivity.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.ColorLib.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BootScreen.exe Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll mscoree.dll msvcp140d.dll roslyn ucrtbased.dll vcruntime140.dll vcruntime140d.dll"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -254,21 +213,12 @@
     <ROW File="Microsoft.Azure.Common.NetFramework.dll" Component_="Microsoft.Azure.Common.NetFramework.dll" FileName="MICROS~3.DLL|Microsoft.Azure.Common.NetFramework.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Azure.Common.NetFramework.dll" SelfReg="false" NextFile="Microsoft.Azure.ResourceManager.dll"/>
     <ROW File="Microsoft.Azure.Common.dll" Component_="Microsoft.Azure.Common.dll" FileName="MICROS~2.DLL|Microsoft.Azure.Common.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Azure.Common.dll" SelfReg="false" NextFile="Microsoft.Azure.Common.NetFramework.dll"/>
     <ROW File="Microsoft.Azure.ResourceManager.dll" Component_="Microsoft.Azure.ResourceManager.dll" FileName="MICROS~4.DLL|Microsoft.Azure.ResourceManager.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Azure.ResourceManager.dll" SelfReg="false" NextFile="Microsoft.Data.Edm.dll"/>
-    <ROW File="Microsoft.Build.Tasks.CodeAnalysis.dll" Component_="Microsoft.Build.Tasks.CodeAnalysis.dll" FileName="MICROS~1.DLL|Microsoft.Build.Tasks.CodeAnalysis.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.Build.Tasks.CodeAnalysis.dll" SelfReg="false" NextFile="Microsoft.CodeAnalysis.CSharp.dll"/>
-    <ROW File="Microsoft.CSharp.Core.targets" Component_="csc.exe.config" FileName="MICROS~1.TAR|Microsoft.CSharp.Core.targets" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.CSharp.Core.targets" SelfReg="false" NextFile="Microsoft.DiaSymReader.Native.amd64.dll"/>
-    <ROW File="Microsoft.CodeAnalysis.CSharp.Scripting.dll" Component_="Microsoft.CodeAnalysis.CSharp.Scripting.dll" FileName="MICROS~3.DLL|Microsoft.CodeAnalysis.CSharp.Scripting.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.CodeAnalysis.CSharp.Scripting.dll" SelfReg="false" NextFile="Microsoft.CodeAnalysis.dll"/>
-    <ROW File="Microsoft.CodeAnalysis.CSharp.dll" Component_="Microsoft.CodeAnalysis.CSharp.dll" FileName="MICROS~2.DLL|Microsoft.CodeAnalysis.CSharp.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.CodeAnalysis.CSharp.dll" SelfReg="false" NextFile="Microsoft.CodeAnalysis.CSharp.Scripting.dll"/>
-    <ROW File="Microsoft.CodeAnalysis.Scripting.dll" Component_="Microsoft.CodeAnalysis.Scripting.dll" FileName="MICROS~5.DLL|Microsoft.CodeAnalysis.Scripting.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.CodeAnalysis.Scripting.dll" SelfReg="false" NextFile="Microsoft.CodeAnalysis.VisualBasic.dll"/>
-    <ROW File="Microsoft.CodeAnalysis.VisualBasic.dll" Component_="Microsoft.CodeAnalysis.VisualBasic.dll" FileName="MICROS~6.DLL|Microsoft.CodeAnalysis.VisualBasic.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.CodeAnalysis.VisualBasic.dll" SelfReg="false" NextFile="Microsoft.CSharp.Core.targets"/>
-    <ROW File="Microsoft.CodeAnalysis.dll" Component_="Microsoft.CodeAnalysis.dll" FileName="MICROS~4.DLL|Microsoft.CodeAnalysis.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.CodeAnalysis.dll" SelfReg="false" NextFile="Microsoft.CodeAnalysis.Scripting.dll"/>
     <ROW File="Microsoft.Data.Edm.dll" Component_="Microsoft.Data.Edm.dll" FileName="MICROS~5.DLL|Microsoft.Data.Edm.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Edm.dll" SelfReg="false" NextFile="Microsoft.Data.Edm.xml"/>
     <ROW File="Microsoft.Data.Edm.xml" Component_="CommandLine.xml" FileName="MICROS~1.XML|Microsoft.Data.Edm.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Edm.xml" SelfReg="false" NextFile="Microsoft.Data.OData.dll"/>
     <ROW File="Microsoft.Data.OData.dll" Component_="Microsoft.Data.OData.dll" FileName="MICROS~6.DLL|Microsoft.Data.OData.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.OData.dll" SelfReg="false" NextFile="Microsoft.Data.OData.xml"/>
     <ROW File="Microsoft.Data.OData.xml" Component_="CommandLine.xml" FileName="MICROS~2.XML|Microsoft.Data.OData.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.OData.xml" SelfReg="false" NextFile="Microsoft.Data.Services.Client.dll"/>
     <ROW File="Microsoft.Data.Services.Client.dll" Component_="Microsoft.Data.Services.Client.dll" FileName="MICROS~7.DLL|Microsoft.Data.Services.Client.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Services.Client.dll" SelfReg="false" NextFile="Microsoft.Data.Services.Client.xml"/>
     <ROW File="Microsoft.Data.Services.Client.xml" Component_="CommandLine.xml" FileName="MICROS~3.XML|Microsoft.Data.Services.Client.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.Data.Services.Client.xml" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"/>
-    <ROW File="Microsoft.DiaSymReader.Native.amd64.dll" Component_="Microsoft.DiaSymReader.Native.amd64.dll" FileName="MICROS~7.DLL|Microsoft.DiaSymReader.Native.amd64.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.DiaSymReader.Native.amd64.dll" SelfReg="false" NextFile="Microsoft.DiaSymReader.Native.x86.dll"/>
-    <ROW File="Microsoft.DiaSymReader.Native.x86.dll" Component_="Microsoft.DiaSymReader.Native.x86.dll" FileName="MICROS~8.DLL|Microsoft.DiaSymReader.Native.x86.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.DiaSymReader.Native.x86.dll" SelfReg="false" NextFile="Microsoft.VisualBasic.Core.targets"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" FileName="MICROS~9.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml" Component_="CommandLine.xml" FileName="MICROS~4.XML|Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.xml" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.xml"/>
     <ROW File="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Component_="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" FileName="MICROS~8.DLL|Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" SelfReg="false" NextFile="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"/>
@@ -312,14 +262,12 @@
     <ROW File="Microsoft.TeamFoundation.WorkItemTracking.Proxy.xml" Component_="CommandLine.xml" FileName="MICRO~22.XML|Microsoft.TeamFoundation.WorkItemTracking.Proxy.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.TeamFoundation.WorkItemTracking.Proxy.xml" SelfReg="false" NextFile="Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll"/>
     <ROW File="Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" Component_="Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" FileName="MICRO~30.DLL|Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll" SelfReg="false" NextFile="Microsoft.TeamFoundation.WorkItemTracking.WebApi.xml"/>
     <ROW File="Microsoft.TeamFoundation.WorkItemTracking.WebApi.xml" Component_="CommandLine.xml" FileName="MICRO~23.XML|Microsoft.TeamFoundation.WorkItemTracking.WebApi.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.TeamFoundation.WorkItemTracking.WebApi.xml" SelfReg="false" NextFile="Microsoft.VisualStudio.Services.Client.Interactive.dll"/>
-    <ROW File="Microsoft.VisualBasic.Core.targets" Component_="csc.exe.config" FileName="MICROS~2.TAR|Microsoft.VisualBasic.Core.targets" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.VisualBasic.Core.targets" SelfReg="false" NextFile="Microsoft.Win32.Primitives.dll"/>
     <ROW File="Microsoft.VisualStudio.Services.Client.Interactive.dll" Component_="Microsoft.VisualStudio.Services.Client.Interactive.dll" FileName="MICRO~31.DLL|Microsoft.VisualStudio.Services.Client.Interactive.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.VisualStudio.Services.Client.Interactive.dll" SelfReg="false" NextFile="Microsoft.VisualStudio.Services.Client.Interactive.xml"/>
     <ROW File="Microsoft.VisualStudio.Services.Client.Interactive.xml" Component_="CommandLine.xml" FileName="MICRO~24.XML|Microsoft.VisualStudio.Services.Client.Interactive.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.VisualStudio.Services.Client.Interactive.xml" SelfReg="false" NextFile="Microsoft.VisualStudio.Services.Common.dll"/>
     <ROW File="Microsoft.VisualStudio.Services.Common.dll" Component_="Microsoft.VisualStudio.Services.Common.dll" FileName="MICRO~32.DLL|Microsoft.VisualStudio.Services.Common.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.VisualStudio.Services.Common.dll" SelfReg="false" NextFile="Microsoft.VisualStudio.Services.Common.xml"/>
     <ROW File="Microsoft.VisualStudio.Services.Common.xml" Component_="CommandLine.xml" FileName="MICRO~25.XML|Microsoft.VisualStudio.Services.Common.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.VisualStudio.Services.Common.xml" SelfReg="false" NextFile="Microsoft.VisualStudio.Services.WebApi.dll"/>
     <ROW File="Microsoft.VisualStudio.Services.WebApi.dll" Component_="Microsoft.VisualStudio.Services.WebApi.dll" FileName="MICRO~33.DLL|Microsoft.VisualStudio.Services.WebApi.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.VisualStudio.Services.WebApi.dll" SelfReg="false" NextFile="Microsoft.VisualStudio.Services.WebApi.xml"/>
     <ROW File="Microsoft.VisualStudio.Services.WebApi.xml" Component_="CommandLine.xml" FileName="MICRO~26.XML|Microsoft.VisualStudio.Services.WebApi.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.VisualStudio.Services.WebApi.xml" SelfReg="false" NextFile="Microsoft.WindowsAzure.Storage.dll"/>
-    <ROW File="Microsoft.Win32.Primitives.dll" Component_="Microsoft.Win32.Primitives.dll" FileName="MICROS~9.DLL|Microsoft.Win32.Primitives.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\Microsoft.Win32.Primitives.dll" SelfReg="false" NextFile="System.AppContext.dll"/>
     <ROW File="Microsoft.WindowsAzure.Storage.dll" Component_="Microsoft.WindowsAzure.Storage.dll" FileName="MICRO~34.DLL|Microsoft.WindowsAzure.Storage.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Microsoft.WindowsAzure.Storage.dll" SelfReg="false" NextFile="mscoree.dll"/>
     <ROW File="Newtonsoft.Json.dll" Component_="Newtonsoft.Json.dll" FileName="NEWTON~1.DLL|Newtonsoft.Json.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Newtonsoft.Json.dll" SelfReg="false" NextFile="Newtonsoft.Json.xml"/>
     <ROW File="Newtonsoft.Json.xml" Component_="CommandLine.xml" FileName="NEWTON~1.XML|Newtonsoft.Json.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Newtonsoft.Json.xml" SelfReg="false" NextFile="SimpleValidator.dll"/>
@@ -339,23 +287,12 @@
     <ROW File="SQLite.Interop.dll_1" Component_="SQLite.Interop.dll_1" FileName="SQLITE~1.DLL|SQLite.Interop.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\x86\SQLite.Interop.dll" SelfReg="false" NextFile="JWT.dll"/>
     <ROW File="Schema.xml" Component_="OverrideData.xml" FileName="Schema.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\Schema.xml" SelfReg="false" NextFile="UpdateMachine.xml"/>
     <ROW File="SimpleValidator.dll" Component_="SimpleValidator.dll" FileName="SIMPLE~1.DLL|SimpleValidator.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SimpleValidator.dll" SelfReg="false" NextFile="OverrideData.xml"/>
-    <ROW File="System.AppContext.dll" Component_="System.AppContext.dll" FileName="SYSTEM~1.DLL|System.AppContext.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.AppContext.dll" SelfReg="false" NextFile="System.Collections.Immutable.dll"/>
-    <ROW File="System.Collections.Immutable.dll" Component_="System.Collections.Immutable.dll" FileName="SYSTEM~2.DLL|System.Collections.Immutable.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Collections.Immutable.dll" SelfReg="false" NextFile="System.Console.dll"/>
-    <ROW File="System.Console.dll" Component_="System.Console.dll" FileName="SYSTEM~3.DLL|System.Console.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Console.dll" SelfReg="false" NextFile="System.Diagnostics.FileVersionInfo.dll"/>
     <ROW File="System.Data.SQLite.EF6.dll" Component_="System.Data.SQLite.EF6.dll" FileName="SYSTEM~2.DLL|System.Data.SQLite.EF6.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Data.SQLite.EF6.dll" SelfReg="false" NextFile="System.Data.SQLite.Linq.dll"/>
     <ROW File="System.Data.SQLite.Linq.dll" Component_="System.Data.SQLite.Linq.dll" FileName="SYSTEM~3.DLL|System.Data.SQLite.Linq.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Data.SQLite.Linq.dll" SelfReg="false" NextFile="System.Data.SQLite.xml"/>
     <ROW File="System.Data.SQLite.dll" Component_="System.Data.SQLite.dll" FileName="SYSTEM~1.DLL|System.Data.SQLite.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Data.SQLite.dll" SelfReg="false" NextFile="System.Data.SQLite.dll.config"/>
     <ROW File="System.Data.SQLite.dll.config" Component_="CommandLine.xml" FileName="SYSTEM~1.CON|System.Data.SQLite.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Data.SQLite.dll.config" SelfReg="false" NextFile="System.Data.SQLite.EF6.dll"/>
     <ROW File="System.Data.SQLite.xml" Component_="CommandLine.xml" FileName="SYSTEM~1.XML|System.Data.SQLite.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Data.SQLite.xml" SelfReg="false" NextFile="System.IdentityModel.Tokens.Jwt.dll"/>
-    <ROW File="System.Diagnostics.FileVersionInfo.dll" Component_="System.Diagnostics.FileVersionInfo.dll" FileName="SYSTEM~4.DLL|System.Diagnostics.FileVersionInfo.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Diagnostics.FileVersionInfo.dll" SelfReg="false" NextFile="System.Diagnostics.Process.dll"/>
-    <ROW File="System.Diagnostics.Process.dll" Component_="System.Diagnostics.Process.dll" FileName="SYSTEM~5.DLL|System.Diagnostics.Process.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Diagnostics.Process.dll" SelfReg="false" NextFile="System.Diagnostics.StackTrace.dll"/>
-    <ROW File="System.Diagnostics.StackTrace.dll" Component_="System.Diagnostics.StackTrace.dll" FileName="SYSTEM~6.DLL|System.Diagnostics.StackTrace.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Diagnostics.StackTrace.dll" SelfReg="false" NextFile="System.IO.Compression.dll"/>
     <ROW File="System.IO.Compression.FileSystem.dll" Component_="System.IO.Compression.FileSystem.dll" FileName="SYSTEM~5.DLL|System.IO.Compression.FileSystem.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.IO.Compression.FileSystem.dll" SelfReg="false" NextFile="System.Net.Http.Formatting.dll"/>
-    <ROW File="System.IO.Compression.dll" Component_="System.IO.Compression.dll" FileName="SYSTEM~7.DLL|System.IO.Compression.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.IO.Compression.dll" SelfReg="false" NextFile="System.IO.FileSystem.dll"/>
-    <ROW File="System.IO.FileSystem.DriveInfo.dll" Component_="System.IO.FileSystem.DriveInfo.dll" FileName="SYSTEM~9.DLL|System.IO.FileSystem.DriveInfo.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.IO.FileSystem.DriveInfo.dll" SelfReg="false" NextFile="System.IO.FileSystem.Primitives.dll"/>
-    <ROW File="System.IO.FileSystem.Primitives.dll" Component_="System.IO.FileSystem.Primitives.dll" FileName="SYSTE~10.DLL|System.IO.FileSystem.Primitives.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.IO.FileSystem.Primitives.dll" SelfReg="false" NextFile="System.IO.Pipes.dll"/>
-    <ROW File="System.IO.FileSystem.dll" Component_="System.IO.FileSystem.dll" FileName="SYSTEM~8.DLL|System.IO.FileSystem.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.IO.FileSystem.dll" SelfReg="false" NextFile="System.IO.FileSystem.DriveInfo.dll"/>
-    <ROW File="System.IO.Pipes.dll" Component_="System.IO.Pipes.dll" FileName="SYSTE~11.DLL|System.IO.Pipes.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.IO.Pipes.dll" SelfReg="false" NextFile="System.Reflection.Metadata.dll"/>
     <ROW File="System.IdentityModel.Tokens.Jwt.dll" Component_="System.IdentityModel.Tokens.Jwt.dll" FileName="SYSTEM~4.DLL|System.IdentityModel.Tokens.Jwt.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.IdentityModel.Tokens.Jwt.dll" SelfReg="false" NextFile="System.IdentityModel.Tokens.Jwt.pdb"/>
     <ROW File="System.IdentityModel.Tokens.Jwt.pdb" Component_="System.IdentityModel.Tokens.Jwt.dll" FileName="SYSTEM~1.PDB|System.IdentityModel.Tokens.Jwt.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.IdentityModel.Tokens.Jwt.pdb" SelfReg="false" NextFile="System.IdentityModel.Tokens.Jwt.xml"/>
     <ROW File="System.IdentityModel.Tokens.Jwt.xml" Component_="CommandLine.xml" FileName="SYSTEM~2.XML|System.IdentityModel.Tokens.Jwt.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.IdentityModel.Tokens.Jwt.xml" SelfReg="false" NextFile="System.IO.Compression.FileSystem.dll"/>
@@ -369,28 +306,13 @@
     <ROW File="System.Reactive.Linq.xml" Component_="CommandLine.xml" FileName="SYSTEM~6.XML|System.Reactive.Linq.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Reactive.Linq.xml" SelfReg="false" NextFile="System.Reactive.PlatformServices.dll"/>
     <ROW File="System.Reactive.PlatformServices.dll" Component_="System.Reactive.PlatformServices.dll" FileName="SYSTE~10.DLL|System.Reactive.PlatformServices.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Reactive.PlatformServices.dll" SelfReg="false" NextFile="System.Reactive.PlatformServices.xml"/>
     <ROW File="System.Reactive.PlatformServices.xml" Component_="CommandLine.xml" FileName="SYSTEM~7.XML|System.Reactive.PlatformServices.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Reactive.PlatformServices.xml" SelfReg="false" NextFile="System.Spatial.dll"/>
-    <ROW File="System.Reflection.Metadata.dll" Component_="System.Reflection.Metadata.dll" FileName="SYSTE~12.DLL|System.Reflection.Metadata.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Reflection.Metadata.dll" SelfReg="false" NextFile="System.Security.AccessControl.dll"/>
-    <ROW File="System.Security.AccessControl.dll" Component_="System.Security.AccessControl.dll" FileName="SYSTE~13.DLL|System.Security.AccessControl.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.AccessControl.dll" SelfReg="false" NextFile="System.Security.Claims.dll"/>
-    <ROW File="System.Security.Claims.dll" Component_="System.Security.Claims.dll" FileName="SYSTE~14.DLL|System.Security.Claims.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.Claims.dll" SelfReg="false" NextFile="System.Security.Cryptography.Algorithms.dll"/>
-    <ROW File="System.Security.Cryptography.Algorithms.dll" Component_="System.Security.Cryptography.Algorithms.dll" FileName="SYSTE~15.DLL|System.Security.Cryptography.Algorithms.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.Cryptography.Algorithms.dll" SelfReg="false" NextFile="System.Security.Cryptography.Encoding.dll"/>
-    <ROW File="System.Security.Cryptography.Encoding.dll" Component_="System.Security.Cryptography.Encoding.dll" FileName="SYSTE~16.DLL|System.Security.Cryptography.Encoding.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.Cryptography.Encoding.dll" SelfReg="false" NextFile="System.Security.Cryptography.Primitives.dll"/>
-    <ROW File="System.Security.Cryptography.Primitives.dll" Component_="System.Security.Cryptography.Primitives.dll" FileName="SYSTE~17.DLL|System.Security.Cryptography.Primitives.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.Cryptography.Primitives.dll" SelfReg="false" NextFile="System.Security.Cryptography.X509Certificates.dll"/>
-    <ROW File="System.Security.Cryptography.X509Certificates.dll" Component_="System.Security.Cryptography.X509Certificates.dll" FileName="SYSTE~18.DLL|System.Security.Cryptography.X509Certificates.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.Cryptography.X509Certificates.dll" SelfReg="false" NextFile="System.Security.Principal.Windows.dll"/>
-    <ROW File="System.Security.Principal.Windows.dll" Component_="System.Security.Principal.Windows.dll" FileName="SYSTE~19.DLL|System.Security.Principal.Windows.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Security.Principal.Windows.dll" SelfReg="false" NextFile="System.Text.Encoding.CodePages.dll"/>
     <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~11.DLL|System.Spatial.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Spatial.dll" SelfReg="false" NextFile="System.Spatial.xml"/>
     <ROW File="System.Spatial.xml" Component_="CommandLine.xml" FileName="SYSTEM~8.XML|System.Spatial.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Spatial.xml" SelfReg="false" NextFile="System.Web.Http.dll"/>
-    <ROW File="System.Text.Encoding.CodePages.dll" Component_="System.Text.Encoding.CodePages.dll" FileName="SYSTE~20.DLL|System.Text.Encoding.CodePages.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Text.Encoding.CodePages.dll" SelfReg="false" NextFile="System.Threading.Thread.dll"/>
-    <ROW File="System.Threading.Thread.dll" Component_="System.Threading.Thread.dll" FileName="SYSTE~21.DLL|System.Threading.Thread.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Threading.Thread.dll" SelfReg="false" NextFile="System.ValueTuple.dll"/>
-    <ROW File="System.ValueTuple.dll" Component_="System.ValueTuple.dll" FileName="SYSTE~22.DLL|System.ValueTuple.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.ValueTuple.dll" SelfReg="false" NextFile="System.Xml.ReaderWriter.dll"/>
     <ROW File="System.Web.Http.WebHost.dll" Component_="System.Web.Http.WebHost.dll" FileName="SYSTE~13.DLL|System.Web.Http.WebHost.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Web.Http.WebHost.dll" SelfReg="false" NextFile="System.Web.Http.WebHost.xml"/>
     <ROW File="System.Web.Http.WebHost.xml" Component_="CommandLine.xml" FileName="SYSTEM~9.XML|System.Web.Http.WebHost.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Web.Http.WebHost.xml" SelfReg="false" NextFile="System.Web.Http.xml"/>
     <ROW File="System.Web.Http.dll" Component_="System.Web.Http.dll" FileName="SYSTE~12.DLL|System.Web.Http.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Web.Http.dll" SelfReg="false" NextFile="System.Web.Http.WebHost.dll"/>
     <ROW File="System.Web.Http.xml" Component_="CommandLine.xml" FileName="SYSTE~10.XML|System.Web.Http.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Web.Http.xml" SelfReg="false" NextFile="System.Windows.Interactivity.dll"/>
     <ROW File="System.Windows.Interactivity.dll" Component_="System.Windows.Interactivity.dll" FileName="SYSTE~14.DLL|System.Windows.Interactivity.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Windows.Interactivity.dll" SelfReg="false" NextFile="Tango.AnimatedGif.dll"/>
-    <ROW File="System.Xml.ReaderWriter.dll" Component_="System.Xml.ReaderWriter.dll" FileName="SYSTE~23.DLL|System.Xml.ReaderWriter.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Xml.ReaderWriter.dll" SelfReg="false" NextFile="System.Xml.XmlDocument.dll"/>
-    <ROW File="System.Xml.XPath.XDocument.dll" Component_="System.Xml.XPath.XDocument.dll" FileName="SYSTE~26.DLL|System.Xml.XPath.XDocument.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Xml.XPath.XDocument.dll" SelfReg="false" NextFile="vbc.exe"/>
-    <ROW File="System.Xml.XPath.dll" Component_="System.Xml.XPath.dll" FileName="SYSTE~25.DLL|System.Xml.XPath.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Xml.XPath.dll" SelfReg="false" NextFile="System.Xml.XPath.XDocument.dll"/>
-    <ROW File="System.Xml.XmlDocument.dll" Component_="System.Xml.XmlDocument.dll" FileName="SYSTE~24.DLL|System.Xml.XmlDocument.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\System.Xml.XmlDocument.dll" SelfReg="false" NextFile="System.Xml.XPath.dll"/>
     <ROW File="Tango.AdvancedInstaller.dll" Component_="Tango.AdvancedInstaller.dll" FileName="TANGOA~2.DLL|Tango.AdvancedInstaller.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.AdvancedInstaller.dll" SelfReg="false" NextFile="Tango.AdvancedInstaller.pdb"/>
     <ROW File="Tango.AdvancedInstaller.pdb" Component_="Tango.AdvancedInstaller.dll" FileName="TANGOA~2.PDB|Tango.AdvancedInstaller.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.AdvancedInstaller.pdb" SelfReg="false" NextFile="EFCache.dll"/>
     <ROW File="Tango.AnimatedGif.dll" Component_="Tango.AnimatedGif.dll" FileName="TANGOA~1.DLL|Tango.AnimatedGif.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.AnimatedGif.dll" SelfReg="false" NextFile="Tango.AnimatedGif.pdb"/>
@@ -446,7 +368,7 @@
     <ROW File="Tango.PPC.Storage.pdb" Component_="Tango.PPC.Storage.dll" FileName="TANGOP~9.PDB|Tango.PPC.Storage.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Storage.pdb" SelfReg="false" NextFile="Tango.PPC.UI.exe"/>
     <ROW File="Tango.PPC.Technician.dll" Component_="Tango.PPC.Technician.dll" FileName="TANGOP~7.DLL|Tango.PPC.Technician.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Technician.dll" SelfReg="false" NextFile="Tango.PPC.Technician.dll.config"/>
     <ROW File="Tango.PPC.Technician.dll.config" Component_="CommandLine.xml" FileName="TANGOP~7.CON|Tango.PPC.Technician.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Technician.dll.config" SelfReg="false" NextFile="Tango.PPC.Technician.pdb"/>
-    <ROW File="Tango.PPC.Technician.pdb" Component_="Tango.PPC.Technician.dll" FileName="TANGOP~8.PDB|Tango.PPC.Technician.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Technician.pdb" SelfReg="false" NextFile="protoc1.0M4.jar"/>
+    <ROW File="Tango.PPC.Technician.pdb" Component_="Tango.PPC.Technician.dll" FileName="TANGOP~8.PDB|Tango.PPC.Technician.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Technician.pdb" SelfReg="false"/>
     <ROW File="Tango.PPC.UI.exe" Component_="Tango.PPC.UI.exe" FileName="TANGOP~2.EXE|Tango.PPC.UI.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.UI.exe" SelfReg="false" NextFile="Tango.PPC.UI.exe.config" DigSign="true"/>
     <ROW File="Tango.PPC.UI.exe.config" Component_="CommandLine.xml" FileName="TANGOP~9.CON|Tango.PPC.UI.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.UI.exe.config" SelfReg="false" NextFile="Tango.PPC.UI.pdb"/>
     <ROW File="Tango.PPC.UI.pdb" Component_="Tango.PPC.UI.exe" FileName="TANGO~10.PDB|Tango.PPC.UI.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.UI.pdb" SelfReg="false" NextFile="Tango.PPC.Updater.exe"/>
@@ -484,23 +406,9 @@
     <ROW File="Tango.WiFi.pdb" Component_="Tango.WiFi.dll" FileName="TANGOW~2.PDB|Tango.WiFi.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.WiFi.pdb" SelfReg="false" NextFile="ucrtbased.dll"/>
     <ROW File="UpdateMachine.xml" Component_="OverrideData.xml" FileName="UPDATE~1.XML|UpdateMachine.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\UpdateMachine.xml" SelfReg="false" NextFile="UpdateTwineDB.xml"/>
     <ROW File="UpdateTwineDB.xml" Component_="OverrideData.xml" FileName="UPDATE~2.XML|UpdateTwineDB.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\UpdateTwineDB.xml" SelfReg="false" NextFile="Interop.MSDASC.dll"/>
-    <ROW File="VBCSCompiler.exe" Component_="VBCSCompiler.exe" FileName="VBCSCO~1.EXE|VBCSCompiler.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\VBCSCompiler.exe" SelfReg="false" NextFile="VBCSCompiler.exe.config" DigSign="true"/>
-    <ROW File="VBCSCompiler.exe.config" Component_="csc.exe.config" FileName="VBCSCO~1.CON|VBCSCompiler.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\VBCSCompiler.exe.config" SelfReg="false"/>
-    <ROW File="csc.exe" Component_="csc.exe" FileName="csc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csc.exe" SelfReg="false" NextFile="csc.exe.config" DigSign="true"/>
-    <ROW File="csc.exe.config" Component_="csc.exe.config" FileName="CSCEXE~1.CON|csc.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csc.exe.config" SelfReg="false" NextFile="csc.rsp"/>
-    <ROW File="csc.rsp" Component_="csc.exe.config" FileName="csc.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csc.rsp" SelfReg="false" NextFile="csi.exe"/>
-    <ROW File="csi.exe" Component_="csi.exe" FileName="csi.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csi.exe" SelfReg="false" NextFile="csi.exe.config" DigSign="true"/>
-    <ROW File="csi.exe.config" Component_="csc.exe.config" FileName="CSIEXE~1.CON|csi.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csi.exe.config" SelfReg="false" NextFile="csi.rsp"/>
-    <ROW File="csi.rsp" Component_="csc.exe.config" FileName="csi.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\csi.rsp" SelfReg="false" NextFile="Microsoft.Build.Tasks.CodeAnalysis.dll"/>
     <ROW File="mscoree.dll" Component_="mscoree.dll" FileName="mscoree.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\mscoree.dll" SelfReg="false" NextFile="msvcp140d.dll"/>
     <ROW File="msvcp140d.dll" Component_="msvcp140d.dll" FileName="MSVCP1~1.DLL|msvcp140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\msvcp140d.dll" SelfReg="false" NextFile="Newtonsoft.Json.dll"/>
-    <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc.exe" SelfReg="false" NextFile="csc.exe" DigSign="true"/>
-    <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/>
-    <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/>
     <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/>
-    <ROW File="vbc.exe" Component_="vbc.exe" FileName="vbc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe" SelfReg="false" NextFile="vbc.exe.config" DigSign="true"/>
-    <ROW File="vbc.exe.config" Component_="csc.exe.config" FileName="VBCEXE~1.CON|vbc.exe.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.exe.config" SelfReg="false" NextFile="vbc.rsp"/>
-    <ROW File="vbc.rsp" Component_="csc.exe.config" FileName="vbc.rsp" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\roslyn\vbc.rsp" SelfReg="false" NextFile="VBCSCompiler.exe"/>
     <ROW File="vcruntime140.dll" Component_="vcruntime140.dll" FileName="VCRUNT~1.DLL|vcruntime140.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\vcruntime140.dll" SelfReg="false" NextFile="vcruntime140d.dll"/>
     <ROW File="vcruntime140d.dll" Component_="vcruntime140d.dll" FileName="VCRUNT~2.DLL|vcruntime140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\vcruntime140d.dll" SelfReg="false" NextFile="SQLite.Interop.dll"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
@@ -512,7 +420,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.13"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.0.17"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -579,6 +487,8 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
+    <ROW Directory_="ProtoCompilers_Dir" Component_="ProtoCompilers" ManualDelete="false"/>
+    <ROW Directory_="roslyn_Dir" Component_="roslyn" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index e03c64a54..4ce8ab39d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -1081,13 +1081,13 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 _speech.SpeakError(events.Last().EventType.Name);
 
-                if (events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.StopJob)))
-                {
-                    if (JobHandler != null)
-                    {
-                        InvokeUI(StopJob);
-                    }
-                }
+                //if (events.ToList().Exists(x => x.Actions.Contains(BL.Enumerations.EventTypeActions.StopJob)))
+                //{
+                //    if (JobHandler != null)
+                //    {
+                //        InvokeUI(StopJob);
+                //    }
+                //}
             }
         }
 
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 a1601d9de..fb9d1472b 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("4.0.13.0")]
+[assembly: AssemblyVersion("4.0.15.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs
index 49e0763d9..dcf6afb97 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs
@@ -22,7 +22,7 @@ namespace Tango.PPC.Events.ViewModels
     /// <seealso cref="Tango.PPC.Common.PPCViewModel" />
     public class MainViewVM : PPCViewModel
     {
-        private Dictionary<EventTypes, NotificationItem> _notifications;
+        private List<KeyValuePair<EventTypes, NotificationItem>> _notifications;
 
         private EventsSource _selectedEventsSource;
         public EventsSource SelectedEventsSource
@@ -78,7 +78,7 @@ namespace Tango.PPC.Events.ViewModels
         public MainViewVM()
         {
             CurrentEvents = new ObservableCollection<MachinesEvent>();
-            _notifications = new Dictionary<EventTypes, NotificationItem>();
+            _notifications = new List<KeyValuePair<EventTypes, NotificationItem>>();
         }
 
         /// <summary>
@@ -157,7 +157,7 @@ namespace Tango.PPC.Events.ViewModels
                     }
 
                     NotificationProvider.PushNotification(notificationItem);
-                    _notifications.Add(ev.EventType.Type, notificationItem);
+                    _notifications.Add(new KeyValuePair<EventTypes, NotificationItem>(ev.EventType.Type, notificationItem));
 
                 }
             });
@@ -172,11 +172,10 @@ namespace Tango.PPC.Events.ViewModels
                     CurrentEvents.Remove(ev);
                     HistoryEvents.Insert(0, ev);
 
-                    if (_notifications.ContainsKey(ev.EventType.Type))
+                    foreach (var item in _notifications.ToList().Where(x => x.Key == ev.EventType.Type))
                     {
-                        var notification = _notifications[ev.EventType.Type];
-                        _notifications.Remove(ev.EventType.Type);
-                        NotificationProvider.PopNotification(notification);
+                        _notifications.Remove(item);
+                        NotificationProvider.PopNotification(item.Value);
                     }
                 }
             });
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Controls/DispenserController.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Controls/DispenserController.xaml
index 3fc7c607e..18636704a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Controls/DispenserController.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Controls/DispenserController.xaml
@@ -46,7 +46,7 @@
 
                             <TextBlock Margin="40 0 0 0">
                             <Run Text="Index:"></Run>
-                            <Run FontWeight="SemiBold" Text="{Binding ElementName=control,Path=IdsPack.PackIndex,FallbackValue='1'}"></Run>
+                            <Run FontWeight="SemiBold" Text="{Binding ElementName=control,Path=IdsPack.PackIndex,FallbackValue='1',Converter={StaticResource MathOperatorConverter},ConverterParameter='+1'}"></Run>
                             </TextBlock>
 
                             <TextBlock Margin="40 0 0 0" Foreground="{StaticResource TangoPrimaryAccentBrush}" FontStyle="Italic">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
index 212ab6f16..e524c44cb 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
@@ -86,6 +86,7 @@
     <Compile Include="ViewModels\DispensersViewVM.cs" />
     <Compile Include="ViewModels\LoggingViewVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\SystemViewVM.cs" />
     <Compile Include="Views\CatalogView.xaml.cs">
       <DependentUpon>CatalogView.xaml</DependentUpon>
     </Compile>
@@ -98,6 +99,9 @@
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\SystemView.xaml.cs">
+      <DependentUpon>SystemView.xaml</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -130,6 +134,10 @@
       <Project>{e4927038-348d-4295-aaf4-861c58cb3943}</Project>
       <Name>Tango.PMR</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{D8F1AD85-526A-4F50-B6DC-D437AF63D8D8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
       <Project>{8491D07B-C1F6-4B62-A412-41B9FD2D6538}</Project>
       <Name>Tango.SharedUI</Name>
@@ -172,6 +180,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SystemView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\technician_module.png" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModelLocator.cs
index 9460578c8..ae4678e60 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModelLocator.cs
@@ -19,6 +19,7 @@ namespace Tango.PPC.Technician
             TangoIOC.Default.Register<LoggingViewVM>();
             TangoIOC.Default.Register<CatalogViewVM>();
             TangoIOC.Default.Register<DispensersViewVM>();
+            TangoIOC.Default.Register<SystemViewVM>();
         }
 
         /// <summary>
@@ -64,5 +65,16 @@ namespace Tango.PPC.Technician
                 return TangoIOC.Default.GetInstance<DispensersViewVM>();
             }
         }
+
+        /// <summary>
+        /// Gets the system view VM.
+        /// </summary>
+        public static SystemViewVM SystemViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<SystemViewVM>();
+            }
+        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
new file mode 100644
index 000000000..5f7002e78
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/SystemViewVM.cs
@@ -0,0 +1,150 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+using Tango.Core.Commands;
+using Tango.PPC.Common;
+using Tango.PPC.Common.OS;
+using Tango.Settings;
+
+namespace Tango.PPC.Technician.ViewModels
+{
+    public class SystemViewVM : PPCViewModel
+    {
+        private IOperationSystemManager _os;
+        private Timer _statsTimer;
+
+        private float _cpu;
+        public float CPU
+        {
+            get { return _cpu; }
+            set { _cpu = value; RaisePropertyChangedAuto(); }
+        }
+
+        private long _ram;
+        public long RAM
+        {
+            get { return _ram; }
+            set { _ram = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand RestartCommand { get; set; }
+
+        public RelayCommand ShutdownCommand { get; set; }
+
+        public RelayCommand FactoryResetCommand { get; set; }
+
+        public RelayCommand ExitToExplorerCommand { get; set; }
+
+        public SystemViewVM(IOperationSystemManager os)
+        {
+            _os = os;
+
+            CPU = 0;
+            RAM = 0;
+
+            RestartCommand = new RelayCommand(RestartSystem);
+            ShutdownCommand = new RelayCommand(ShutdownSystem);
+            FactoryResetCommand = new RelayCommand(FactoryReset);
+            ExitToExplorerCommand = new RelayCommand(ExitToExplorer);
+        }
+
+        private async void FactoryReset()
+        {
+            if (await NotificationProvider.ShowQuestion("Are you sure you want to reset this device and back to factory settings?"))
+            {
+                Settings.ApplicationState = ApplicationStates.PreSetup;
+                Settings.Save();
+                ApplicationManager.Restart();
+            }
+        }
+
+        private async void ShutdownSystem()
+        {
+            if (await NotificationProvider.ShowQuestion("Are you sure you want to shutdown the device?"))
+            {
+                _os.Shutdown();
+            }
+        }
+
+        private async void RestartSystem()
+        {
+            if (await NotificationProvider.ShowQuestion("Are you sure you want to restart the device?"))
+            {
+                _os.Restart();
+            }
+        }
+
+        private async void ExitToExplorer()
+        {
+            if (await NotificationProvider.ShowQuestion("Close the application and start OS shell?"))
+            {
+                Process.Start(new ProcessStartInfo()
+                {
+                    UseShellExecute = true,
+                    FileName = "explorer.exe",
+                });
+
+                ApplicationManager.ShutDown();
+            }
+        }
+
+        public override void OnApplicationStarted()
+        {
+            _statsTimer = new Timer();
+            _statsTimer.Interval = 2000;
+            _statsTimer.Elapsed += _statsTimer_Elapsed;
+            _statsTimer.Start();
+        }
+
+        private void _statsTimer_Elapsed(object sender, ElapsedEventArgs e)
+        {
+            if (IsVisible)
+            {
+                CPU = GetAppCPU();
+                RAM = GetAppRam();
+            }
+        }
+
+        public float GetTotalCPU()
+        {
+            PerformanceCounter cpuCounter = new PerformanceCounter();
+            cpuCounter.CategoryName = "Processor";
+            cpuCounter.CounterName = "% Processor Time";
+            cpuCounter.InstanceName = "_Total";
+
+            // will always start at 0
+            float firstValue = cpuCounter.NextValue();
+            System.Threading.Thread.Sleep(1000);
+            // now matches task manager reading
+            float secondValue = cpuCounter.NextValue();
+
+            return secondValue;
+        }
+
+        public float GetAppCPU()
+        {
+            PerformanceCounter cpuCounter = new PerformanceCounter();
+            cpuCounter.CategoryName = "Process";
+            cpuCounter.CounterName = "% Processor Time";
+            cpuCounter.InstanceName = Process.GetCurrentProcess().ProcessName;
+
+            // will always start at 0
+            float firstValue = cpuCounter.NextValue();
+            System.Threading.Thread.Sleep(1000);
+            // now matches task manager reading
+            float secondValue = cpuCounter.NextValue();
+
+            return secondValue / Environment.ProcessorCount;
+        }
+
+        public long GetAppRam()
+        {
+            Process proc = Process.GetCurrentProcess();
+            return proc.PrivateMemorySize64;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml
index 4571f99de..58c88324f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/CatalogView.xaml
@@ -32,7 +32,7 @@
                     </DockPanel>
                 </touch:TouchButton>
 
-                <touch:TouchButton Width="250" Height="250" Style="{StaticResource TangoHollowButton}" Padding="20">
+                <touch:TouchButton Command="{Binding NavigationCommand}" CommandParameter="SystemView" Width="250" Height="250" Style="{StaticResource TangoHollowButton}" Padding="20">
                     <DockPanel>
                         <TextBlock Margin="0 10 0 0" DockPanel.Dock="Bottom" HorizontalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">System</TextBlock>
                         <Image Width="128" Source="../Images/system.png" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/DispensersView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/DispensersView.xaml
index c8fc038f1..58600df3c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/DispensersView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/DispensersView.xaml
@@ -27,7 +27,7 @@
         <Grid Grid.Row="1">
             <Grid x:Name="container" Margin="0 20 0 0">
                 <touch:LightTouchScrollViewer>
-                    <ItemsControl ItemsSource="{Binding MachineProvider.Machine.Configuration.IdsPacks}">
+                    <ItemsControl ItemsSource="{Binding MachineProvider.Machine.Configuration.NoneEmptyIdsPacks}">
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <controls:DispenserController Margin="20 10" Height="150" IdsPack="{Binding}" MachineOperator="{Binding ElementName=view,Path=DataContext.MachineProvider.MachineOperator}" />
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml
index e697696c2..08f9a335a 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml
@@ -16,6 +16,7 @@
             <local:CatalogView/>
             <local:LoggingView/>
             <local:DispensersView/>
+            <local:SystemView/>
         </controls:NavigationControl>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
new file mode 100644
index 000000000..dc13b2918
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml
@@ -0,0 +1,56 @@
+<UserControl x:Class="Tango.PPC.Technician.Views.SystemView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.PPC.Technician.Views"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             xmlns:vm="clr-namespace:Tango.PPC.Technician.ViewModels"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:global="clr-namespace:Tango.PPC.Technician"
+             mc:Ignorable="d" 
+             d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:SystemViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.SystemViewVM}" x:Name="view">
+
+    <UserControl.Resources>
+        <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter" />
+    </UserControl.Resources>
+
+    <Grid Background="{StaticResource TangoMidBackgroundBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="1*"/>
+        </Grid.RowDefinitions>
+
+        <Border Padding="20" Background="{StaticResource TangoPrimaryBackgroundBrush}" BorderThickness="0 0 0 1" BorderBrush="{StaticResource TangoDividerBrush}">
+            <Border.Effect>
+                <DropShadowEffect Color="Silver" ShadowDepth="0" BlurRadius="20" Opacity="1" />
+            </Border.Effect>
+            <TextBlock VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}" FontWeight="SemiBold">System</TextBlock>
+        </Border>
+
+        <Grid Grid.Row="1" Margin="20">
+
+            <DockPanel>
+                <UniformGrid DockPanel.Dock="Top" Columns="2" Margin="50" TextElement.FontSize="{StaticResource TangoHeaderFontSize}">
+                    <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold">
+                        <Run>CPU Usage:</Run>
+                        <Run Text="{Binding CPU,Mode=OneWay,StringFormat='0.0'}"></Run><Run>%</Run>
+                    </TextBlock>
+
+                    <TextBlock HorizontalAlignment="Center" FontWeight="SemiBold">
+                        <Run>RAM Usage:</Run>
+                        <Run Text="{Binding RAM,Mode=OneWay,Converter={StaticResource ByteArrayToFileSizeConverter}}"></Run>
+                    </TextBlock>
+                </UniformGrid>
+
+                <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Width="300" TextElement.FontSize="{StaticResource TangoTitleFontSize}">
+                    <touch:TouchButton Command="{Binding RestartCommand}" Height="60" Background="{StaticResource TangoErrorBrush}">Restart Device</touch:TouchButton>
+                    <touch:TouchButton Command="{Binding ShutdownCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Shutdown Device</touch:TouchButton>
+                    <touch:TouchButton Command="{Binding FactoryResetCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Factory Reset</touch:TouchButton>
+                    <touch:TouchButton Command="{Binding ExitToExplorerCommand}" Height="60" Background="{StaticResource TangoErrorBrush}" Margin="0 20 0 0">Exit To Shell</touch:TouchButton>
+                </StackPanel>
+            </DockPanel>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml.cs
new file mode 100644
index 000000000..f4a672407
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.PPC.Technician.Views
+{
+    /// <summary>
+    /// Interaction logic for SystemView.xaml
+    /// </summary>
+    public partial class SystemView : UserControl
+    {
+        public SystemView()
+        {
+            InitializeComponent();
+        }
+    }
+}
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 61ddfdb2b..ab42de712 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs
@@ -79,6 +79,7 @@ namespace Tango.PPC.Common.Connection
             MachineOperator.UseKeepAlive = true;
             MachineOperator.EnableDiagnostics = false;
             MachineOperator.EnableEmbeddedDebugging = false;
+            MachineOperator.FirmwareUpgradeMode = Integration.Upgrade.FirmwareUpgradeModes.DFU | Integration.Upgrade.FirmwareUpgradeModes.TFP_PACKAGE;
 
             var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
 
@@ -96,6 +97,8 @@ namespace Tango.PPC.Common.Connection
                 {
                     try
                     {
+                        Thread.Sleep(2000);
+
                         LogManager.Log("Starting machine connection procedure...", LogCategory.Debug);
 
                         var settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
@@ -108,7 +111,7 @@ namespace Tango.PPC.Common.Connection
 
                                 LogManager.Log("Scanning for machine on available serial ports...", LogCategory.Debug);
                                 Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_115200);
-                                var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, timeout);
+                                var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, settings.EmbeddedDeviceHint, timeout);
 
                                 LogManager.Log("Machine discovered on port: " + response.Adapter.Address, LogCategory.Debug);
                                 LogManager.Log("Device Information:", LogCategory.Debug);
@@ -132,6 +135,7 @@ namespace Tango.PPC.Common.Connection
 
                                 await Task.Delay(1000);
                                 await MachineOperator.UploadHardwareConfiguration(Machine.Configuration.HardwareVersion, Machine.Configuration);
+                                MachineOperator.UseKeepAlive = true;
                             }
                             else
                             {
@@ -152,6 +156,7 @@ namespace Tango.PPC.Common.Connection
 
                                 await Task.Delay(1000);
                                 await MachineOperator.UploadHardwareConfiguration(Machine.Configuration.HardwareVersion, Machine.Configuration);
+                                MachineOperator.UseKeepAlive = true;
                             }
                         }
                         else
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index b64b624fe..3061b9506 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -119,9 +119,9 @@ namespace Tango.PPC.Common.MachineUpdate
                     {
                         throw LogManager.Log(new InvalidOperationException("Could not perform an update while the machine is not connected."));
                     }
-                    if (op.Status != MachineStatuses.ReadyToDye)
+                    if (op.IsPrinting)
                     {
-                        throw LogManager.Log(new InvalidOperationException($"Could not perform an update while the machine is in a {op.Status} status."));
+                        throw LogManager.Log(new InvalidOperationException($"Could not perform an update while the machine is in {op.Status} status."));
                     }
                 }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/DefaultOperationSystemManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/DefaultOperationSystemManager.cs
index cfbc6d752..d0c8567a1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/DefaultOperationSystemManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/DefaultOperationSystemManager.cs
@@ -160,5 +160,13 @@ namespace Tango.PPC.Common.OS
         {
             Process.Start("shutdown.exe", "-r -t 0");
         }
+
+        /// <summary>
+        /// Shutdown the system.
+        /// </summary>
+        public void Shutdown()
+        {
+            Process.Start("shutdown.exe", "-s -t 0");
+        }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/IOperationSystemManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/IOperationSystemManager.cs
index 0cdf85927..f3ec398fc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/IOperationSystemManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/OS/IOperationSystemManager.cs
@@ -49,5 +49,11 @@ namespace Tango.PPC.Common.OS
         /// </summary>
         /// <returns></returns>
         void Restart();
+
+        /// <summary>
+        /// Shutdown the system.
+        /// </summary>
+        /// <returns></returns>
+        void Shutdown();
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 050f1615c..a14d5ede7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -42,6 +42,11 @@ namespace Tango.PPC.Common
         /// </summary>
         public String EmbeddedComPort { get; set; }
 
+        /// <summary>
+        /// Gets or sets the embedded device scanning hint.
+        /// </summary>
+        public String EmbeddedDeviceHint { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [enable external bridge].
         /// </summary>
@@ -132,6 +137,7 @@ namespace Tango.PPC.Common
             MachineScanningTimeoutSeconds = 20;
             LoggingCategories = new List<LogCategory>();
             EmbeddedComPort = null;
+            EmbeddedDeviceHint = "Tango USB Serial Port";
             ExternalBridgePassword = "Aa123456";
             HotSpotPassword = "Aa123456";
             LockScreenTimeout = TimeSpan.FromMinutes(10);
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index ef2b8aeee..7aeb6760e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -182,7 +182,7 @@ namespace Tango.PPC.UI.PPCApplication
                     //Start watchdog
                     _watchdogServer = new WatchDogServer(Application.Current.Dispatcher);
 #if !DEBUG
-                   
+
                     if (settings.EnableWatchDog)
                     {
                         _watchdogServer.Start();
@@ -425,6 +425,15 @@ namespace Tango.PPC.UI.PPCApplication
             }
             catch { }
 
+            try
+            {
+                if (_machineProvider.MachineOperator.State == Transport.TransportComponentState.Connected)
+                {
+                    _machineProvider.MachineOperator.Adapter.Disconnect().Wait();
+                }
+            }
+            catch { }
+
             Process.Start(Application.ResourceAssembly.Location);
             Environment.Exit(0);
         }
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 8a23fd4f2..62916369e 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 PPC Application")]
-[assembly: AssemblyVersion("1.0.13.0")]
+[assembly: AssemblyVersion("1.0.17.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
index 56b4c2283..18c8cc7ae 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -38,7 +38,10 @@
 
                                     <TextBlock Foreground="{StaticResource TangoGrayTextBrush}" FontSize="{StaticResource TangoSmallFontSize}" Margin="40 20 20 50" VerticalAlignment="Bottom" HorizontalAlignment="Left">
                                         <Run>Machine S/N:</Run>
-                                        <Run FontStyle="Italic" Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True}"></Run>
+                                        <Run FontStyle="Italic" Text="{Binding MachineProvider.Machine.SerialNumber,Mode=OneWay,IsAsync=True,FallbackValue='0000'}"></Run>
+                                        <Run>|</Run>
+                                        <Run>Version:</Run>
+                                        <Run FontStyle="Italic" Text="{Binding ApplicationManager.Version,FallbackValue='1.0.0.0',Mode=OneWay,IsAsync=True}"></Run>
                                     </TextBlock>
                                 </Grid>
                             </Border>
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 4e42f2b7f..e8e76839a 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -857,6 +857,8 @@ namespace Tango.Integration.Operation
 
                         bool responseLogged = false;
 
+                        Thread.Sleep(500); //Just wait maybe Shlomo is getting this message to fast after restart ?
+
                         SendContinuousRequest<ResumeCurrentJobRequest, ResumeCurrentJobResponse>(request, null, TimeSpan.FromSeconds(2)).Subscribe((response) =>
                         {
                             if (!responseLogged)
diff --git a/Software/Visual_Studio/Tango.Transport/Discovery/UsbCommunicationScanner.cs b/Software/Visual_Studio/Tango.Transport/Discovery/UsbCommunicationScanner.cs
index 32876e44e..10628da27 100644
--- a/Software/Visual_Studio/Tango.Transport/Discovery/UsbCommunicationScanner.cs
+++ b/Software/Visual_Studio/Tango.Transport/Discovery/UsbCommunicationScanner.cs
@@ -54,6 +54,18 @@ namespace Tango.Transport.Discovery
         /// <param name="timeout">The timeout.</param>
         /// <returns></returns>
         public Task<CommunicationScannerResult<UsbTransportAdapter, TResponse>> Scan(TRequest request, TimeSpan timeout)
+        {
+            return Scan(request, null, timeout);
+        }
+
+        /// <summary>
+        /// Scans the environment with the specified request while expecting the type of response.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <param name="hint">The expected device name.</param>
+        /// <param name="timeout">The timeout.</param>
+        /// <returns></returns>
+        public Task<CommunicationScannerResult<UsbTransportAdapter, TResponse>> Scan(TRequest request, String hint, TimeSpan timeout)
         {
             var logManager = LogManager.Default;
 
@@ -71,6 +83,24 @@ namespace Tango.Transport.Discovery
                 logManager.Log("Enumerating com ports...");
                 var comPorts = ComPortEnumerator.EnumerateComPorts();
 
+                if (!String.IsNullOrWhiteSpace(hint))
+                {
+                    logManager.Log($"Device hint is '{hint}'.");
+
+                    var expected_port = comPorts.FirstOrDefault(x => x.Description.Contains(hint));
+
+                    if (expected_port != null)
+                    {
+                        logManager.Log($"Device found by hint on port {expected_port.Port}. Sorting ports...");
+                        comPorts.Remove(expected_port);
+                        comPorts.Insert(0, expected_port);
+                    }
+                    else
+                    {
+                        logManager.Log("Device could not be found by hint.");
+                    }
+                }
+
                 while (!found && DateTime.Now < startTime.Add(timeout))
                 {
                     foreach (var port in comPorts)
@@ -84,15 +114,15 @@ namespace Tango.Transport.Discovery
 
                         ScanningPort?.Invoke(port.Port);
 
-                        SafeFileHandle hFile = UsbComPortWin32.CreateFile(@"\\.\" + port.Port, -1073741824, 0, IntPtr.Zero, 3, UsbComPortWin32.dwFlagsAndAttributes, IntPtr.Zero);
-                        if (hFile.IsInvalid)
-                        {
-                            logManager.Log(String.Format("Port {0} is already open or invalid.", port.Port));
-                            hFile.Close();
-                            continue;
-                        }
+                        //SafeFileHandle hFile = UsbComPortWin32.CreateFile(@"\\.\" + port.Port, -1073741824, 0, IntPtr.Zero, 3, UsbComPortWin32.dwFlagsAndAttributes, IntPtr.Zero);
+                        //if (hFile.IsInvalid)
+                        //{
+                        //    logManager.Log(String.Format("Port {0} is already open or invalid.", port.Port));
+                        //    hFile.Close();
+                        //    continue;
+                        //}
 
-                        hFile.Close();
+                        //hFile.Close();
 
                         SerialPort serialPort = new SerialPort(port.Port);
 
diff --git a/Software/Visual_Studio/Tango.Transport/TransportMessage.cs b/Software/Visual_Studio/Tango.Transport/TransportMessage.cs
index 18f130d7b..73bf3b1e0 100644
--- a/Software/Visual_Studio/Tango.Transport/TransportMessage.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransportMessage.cs
@@ -5,6 +5,7 @@ using System.Linq;
 using System.Reactive.Subjects;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Logging;
 using Tango.PMR;
 using Tango.PMR.Common;
 
@@ -50,45 +51,60 @@ namespace Tango.Transport
 
             Task.Factory.StartNew(() =>
             {
-                if (!IsContinuous)
+                try
                 {
-                    if (!_completionSource.Task.IsCompleted)
+                    if (!IsContinuous)
+                    {
+                        if (!_completionSource.Task.IsCompleted)
+                        {
+                            if (_completionSource.GetType() == typeof(TaskCompletionSource<IMessage>))
+                            {
+                                _completionSource.SetResult((T)result.GetType().GetProperty("Message").GetValue(result));
+                            }
+                            else if (_completionSource.GetType() == typeof(TaskCompletionSource<MessageContainer>))
+                            {
+                                _completionSource.SetResult((T)result.GetType().GetProperty("Container").GetValue(result));
+                            }
+                            else
+                            {
+                                _completionSource.SetResult((T)result);
+                            }
+                        }
+                    }
+                    else
                     {
-                        if (_completionSource.GetType() == typeof(TaskCompletionSource<IMessage>))
+                        LastResponseTime = DateTime.Now;
+                        AtLeastOneResponseReceived = true;
+
+                        if (ContinuesResponseSubject.GetType() == typeof(Subject<IMessage>))
                         {
-                            _completionSource.SetResult((T)result.GetType().GetProperty("Message").GetValue(result));
+                            ContinuesResponseSubject.OnNext((T)result.GetType().GetProperty("Message").GetValue(result));
                         }
-                        else if (_completionSource.GetType() == typeof(TaskCompletionSource<MessageContainer>))
+                        else if (ContinuesResponseSubject.GetType() == typeof(Subject<MessageContainer>))
                         {
-                            _completionSource.SetResult((T)result.GetType().GetProperty("Container").GetValue(result));
+                            ContinuesResponseSubject.OnNext((T)result.GetType().GetProperty("Container").GetValue(result));
                         }
                         else
                         {
-                            _completionSource.SetResult((T)result);
+                            ContinuesResponseSubject.OnNext((T)result);
+                        }
+
+                        if (completed)
+                        {
+                            ContinuesResponseSubject.OnCompleted();
                         }
                     }
                 }
-                else
+                catch (Exception ex)
                 {
-                    LastResponseTime = DateTime.Now;
-                    AtLeastOneResponseReceived = true;
-
-                    if (ContinuesResponseSubject.GetType() == typeof(Subject<IMessage>))
-                    {
-                        ContinuesResponseSubject.OnNext((T)result.GetType().GetProperty("Message").GetValue(result));
-                    }
-                    else if (ContinuesResponseSubject.GetType() == typeof(Subject<MessageContainer>))
+                    LogManager.Log(ex, $"Error while settings result for message.");
+                    try
                     {
-                        ContinuesResponseSubject.OnNext((T)result.GetType().GetProperty("Container").GetValue(result));
+                        SetException(ex);
                     }
-                    else
-                    {
-                        ContinuesResponseSubject.OnNext((T)result);
-                    }
-
-                    if (completed)
+                    catch (Exception e)
                     {
-                        ContinuesResponseSubject.OnCompleted();
+                        LogManager.Log(e, $"Error while settings exception for message.");
                     }
                 }
             });
diff --git a/Software/Visual_Studio/Tango.Transport/TransportMessageBase.cs b/Software/Visual_Studio/Tango.Transport/TransportMessageBase.cs
index 4e80dc2e6..7736a2752 100644
--- a/Software/Visual_Studio/Tango.Transport/TransportMessageBase.cs
+++ b/Software/Visual_Studio/Tango.Transport/TransportMessageBase.cs
@@ -4,13 +4,14 @@ using System.Linq;
 using System.Reactive.Subjects;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.Core;
 
 namespace Tango.Transport
 {
     /// <summary>
     /// Represents a base transport message.
     /// </summary>
-    internal abstract class TransportMessageBase
+    internal abstract class TransportMessageBase : ExtendedObject
     {
         /// <summary>
         /// Gets or sets a value indicating whether this instance is multi response.
-- 
cgit v1.3.1