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

31 files changed, 279 insertions, 106 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
index e59141e7f..5939bfd53 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Converters/LiquidVolumesToLubricantLiquidVolume.cs
@@ -14,8 +14,15 @@ namespace Tango.MachineStudio.Developer.Converters
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            IEnumerable<LiquidVolume> liquid_volumes = value as IEnumerable<LiquidVolume>;
-            return liquid_volumes.SingleOrDefault(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.Lubricant.ToInt32());
+            if (value != null)
+            {
+                IEnumerable<LiquidVolume> liquid_volumes = value as IEnumerable<LiquidVolume>;
+                return liquid_volumes.SingleOrDefault(x => x.IdsPack.IdsPackFormula.Code == IdsPackFormulas.Lubricant.ToInt32());
+            }
+            else
+            {
+                return null;
+            }
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
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 41f57794a..02431fd98 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
@@ -2179,6 +2179,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
             {
                 var cloned = stop.Clone();
                 cloned.StopIndex = SelectedSegment.BrushStops.Max(x => x.StopIndex) + 1;
+                cloned.SetLiquidVolumes(ActiveJob.Machine.Configuration, SelectedRML, SelectedProcessParametersTable);
                 SelectedSegment.BrushStops.Add(cloned);
             }
 
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 9504d5769..c4c831011 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
@@ -962,11 +962,11 @@
                                                                                                                 <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run>
                                                                                                                 <Run FontSize="12" Foreground="Gray" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
                                                                                                 </TextBlock>
-                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}">
+                                                                                                <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}" Minimum="0" Maximum="100">
                                                                                                     <Slider.Foreground>
                                                                                                         <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
                                                                                                     </Slider.Foreground>
-                                                                                                    <Slider.Minimum>
+                                                                                                    <!--<Slider.Minimum>
                                                                                                         <MultiBinding Converter="{StaticResource BrushStopToOffsetLimitConverter}" ConverterParameter="min">
                                                                                                             <Binding Path="."></Binding>
                                                                                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
@@ -979,7 +979,7 @@
                                                                                                             <Binding RelativeSource="{RelativeSource AncestorType=UserControl,Mode=FindAncestor}" Path="DataContext.SelectedSegment"></Binding>
                                                                                                             <Binding Path="StopIndex"></Binding>
                                                                                                         </MultiBinding>
-                                                                                                    </Slider.Maximum>
+                                                                                                    </Slider.Maximum>-->
                                                                                                 </Slider>
                                                                                             </StackPanel>
                                                                                         </Grid>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Images/logging_module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Images/logging_module.png
deleted file mode 100644
index 3f8318f70..000000000
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Images/logging_module.png
+++ /dev/null
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/App.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/App.xaml
index 66ea48976..a696ceef9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/App.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="Tango.PPC.Logging.App"
+<Application x:Class="Tango.PPC.Technician.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Application.Resources>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Images/technician_module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Images/technician_module.png
new file mode 100644
index 000000000..2c5cc1fbc
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Images/technician_module.png
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/AssemblyInfo.cs
index a834fd095..97a615572 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@ using System.Windows;
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Tango PPC Logging Module")]
+[assembly: AssemblyTitle("Tango PPC Technician Module")]
 [assembly: AssemblyVersion("1.0.0.0")]
 
 [assembly: ThemeInfo(
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Resources.Designer.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Resources.Designer.cs
index 6cbf8164a..26e366738 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Resources.Designer.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Resources.Designer.cs
@@ -8,7 +8,8 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.PPC.Logging.Properties {
+namespace Tango.PPC.Technician.Properties {
+    using System;
     
     
     /// <summary>
@@ -18,7 +19,7 @@ namespace Tango.PPC.Logging.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -37,8 +38,8 @@ namespace Tango.PPC.Logging.Properties {
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
-                if ((resourceMan == null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.PPC.Logging.Properties.Resources", typeof(Resources).Assembly);
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.PPC.Technician.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Resources.resx b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Resources.resx
index af7dbebba..af7dbebba 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Resources.resx
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Resources.resx
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Settings.Designer.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Settings.Designer.cs
index ab102e0eb..dfc1a086b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Settings.Designer.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tango.PPC.Logging.Properties
-{
+namespace Tango.PPC.Technician.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.8.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
-        public static Settings Default
-        {
-            get
-            {
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Settings.settings b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Settings.settings
index 033d7a5e9..033d7a5e9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Properties/Settings.settings
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Properties/Settings.settings
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Tango.PPC.Logging.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
index 51e41dba8..2a4c1d39c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Tango.PPC.Logging.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Tango.PPC.Technician.csproj
@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{D2EE865B-B006-487A-9487-60A663636AC3}</ProjectGuid>
     <OutputType>library</OutputType>
-    <RootNamespace>Tango.PPC.Logging</RootNamespace>
-    <AssemblyName>Tango.PPC.Logging</AssemblyName>
+    <RootNamespace>Tango.PPC.Technician</RootNamespace>
+    <AssemblyName>Tango.PPC.Technician</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -57,7 +57,7 @@
     <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="LoggingModule.cs" />
+    <Compile Include="TechnicianModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -110,9 +110,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Images\logging_module.png" />
-  </ItemGroup>
-  <ItemGroup>
     <Page Include="App.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -122,5 +119,8 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\technician_module.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/LoggingModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/TechnicianModule.cs
index 78c597e81..07ef8cabf 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/LoggingModule.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/TechnicianModule.cs
@@ -6,21 +6,21 @@ using System.Threading.Tasks;
 using System.Windows.Media.Imaging;
 using Tango.BL.Enumerations;
 using Tango.PPC.Common;
-using Tango.PPC.Logging.Views;
+using Tango.PPC.Technician.Views;
 using Tango.SharedUI.Helpers;
 
-namespace Tango.PPC.Logging
+namespace Tango.PPC.Technician
 {
     [PPCModule(5)]
-    public class LoggingModule : PPCModuleBase
+    public class TechnicianModule : PPCModuleBase
     {
-        public override string Name => "Logging";
-        public override string Description => "PPC logging module.";
-        public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/logging_module.png");
+        public override string Name => "Technician";
+        public override string Description => "PPC technician module.";
+        public override BitmapSource Image => ResourceHelper.GetImageFromResources("Images/technician_module.png");
         public override Type MainViewType => typeof(MainView);
         public override Permissions Permission => Permissions.RunPPC;
 
-        public LoggingModule()
+        public TechnicianModule()
         {
             IsVisibleInMenu = false;
         }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/ViewModelLocator.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModelLocator.cs
index d86a0d2ab..3a4c8d829 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/ViewModelLocator.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModelLocator.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.DI;
-using Tango.PPC.Logging.ViewModels;
+using Tango.PPC.Technician.ViewModels;
 
-namespace Tango.PPC.Logging
+namespace Tango.PPC.Technician
 {
     public static class ViewModelLocator
     {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/MainViewVM.cs
index 736bff5a2..893d495fc 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/ViewModels/MainViewVM.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Tango.PPC.Common;
 
-namespace Tango.PPC.Logging.ViewModels
+namespace Tango.PPC.Technician.ViewModels
 {
     public class MainViewVM : PPCViewModel
     {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml
index fb4dd5d04..5e9401742 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml
@@ -1,13 +1,13 @@
-<UserControl x:Class="Tango.PPC.Logging.Views.MainView"
+<UserControl x:Class="Tango.PPC.Technician.Views.MainView"
              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:sys="clr-namespace:System;assembly=mscorlib"
-             xmlns:vm="clr-namespace:Tango.PPC.Logging.ViewModels"
+             xmlns:vm="clr-namespace:Tango.PPC.Technician.ViewModels"
              xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
-             xmlns:global="clr-namespace:Tango.PPC.Logging"
-             xmlns:local="clr-namespace:Tango.PPC.Logging.Views"
+             xmlns:global="clr-namespace:Tango.PPC.Technician"
+             xmlns:local="clr-namespace:Tango.PPC.Technician.Views"
              mc:Ignorable="d" 
              d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
     <Grid Background="{StaticResource TangoMidBackgroundBrush}">
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Views/MainView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml.cs
index eb448c67c..41eb08c0f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/MainView.xaml.cs
@@ -13,7 +13,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Tango.PPC.Logging.Views
+namespace Tango.PPC.Technician.Views
 {
     /// <summary>
     /// Interaction logic for MainView.xaml
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/app.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/app.config
index f47375ba5..f47375ba5 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/app.config
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/app.config
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/packages.config b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/packages.config
index b3daf0d6c..b3daf0d6c 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Logging/packages.config
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/packages.config
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
index 7769c74f6..ff3f65221 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Application/IPPCApplicationManager.cs
@@ -56,6 +56,11 @@ namespace Tango.PPC.Common.Application
         bool IsShuttingDown { get; }
 
         /// <summary>
+        /// Gets a value indicating whether the application is in technician mode.
+        /// </summary>
+        bool IsInTechnicianMode { get; }
+
+        /// <summary>
         /// Shutdown the application.
         /// </summary>
         void ShutDown();
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginView.xaml
new file mode 100644
index 000000000..ca53d6027
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginView.xaml
@@ -0,0 +1,26 @@
+<UserControl x:Class="Tango.PPC.UI.Dialogs.TechnicianModeLoginView"
+             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:local="clr-namespace:Tango.PPC.UI.Dialogs"
+             xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             Background="{StaticResource TangoPrimaryBackgroundBrush}"  d:DesignHeight="555" d:DesignWidth="560" Width="600" Height="250" d:DataContext="{d:DesignInstance Type=local:TechnicianModeLoginViewVM, IsDesignTimeCreatable=False}">
+    <Grid Margin="10">
+        <DockPanel>
+            <StackPanel DockPanel.Dock="Bottom" HorizontalAlignment="Right" Orientation="Horizontal">
+                <touch:TouchButton Command="{Binding CloseCommand}" Style="{StaticResource TangoMessageBoxButton}" DockPanel.Dock="Right" Width="120" Height="50" VerticalAlignment="Bottom">CANCEL</touch:TouchButton>
+                <touch:TouchButton Command="{Binding OKCommand}" Style="{StaticResource TangoMessageBoxButton}" DockPanel.Dock="Right" Width="120" Height="50" VerticalAlignment="Bottom">OK</touch:TouchButton>
+            </StackPanel>
+            <DockPanel>
+                <Image Source="/Images/technician-mode.png" Stretch="Uniform" VerticalAlignment="Top" Height="70"></Image>
+                <StackPanel Margin="10 0 0 0">
+                    <TextBlock FontSize="{StaticResource TangoHeaderFontSize}">Technician Mode</TextBlock>
+                    <TextBlock Margin="0 10 0 0" TextWrapping="Wrap">Please enter the technician mode password.</TextBlock>
+                    <touch:TouchTextBox Margin="0 30 40 0" IsPassword="True" Text="{Binding Password,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
+                </StackPanel>
+            </DockPanel>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginView.xaml.cs
new file mode 100644
index 000000000..02dfed896
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginView.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.UI.Dialogs
+{
+    /// <summary>
+    /// Interaction logic for TechnicianModeLoginView.xaml
+    /// </summary>
+    public partial class TechnicianModeLoginView : UserControl
+    {
+        public TechnicianModeLoginView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginViewVM.cs
new file mode 100644
index 000000000..2a46bcd96
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/TechnicianModeLoginViewVM.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.SharedUI;
+
+namespace Tango.PPC.UI.Dialogs
+{
+    public class TechnicianModeLoginViewVM : DialogViewVM
+    {
+        private String _password;
+        public String Password
+        {
+            get { return _password; }
+            set { _password = value; RaisePropertyChangedAuto(); }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/technician-mode.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/technician-mode.png
new file mode 100644
index 000000000..7d98c6734
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/technician-mode.png
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 788d2b178..261dbe6d4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -28,6 +28,7 @@ using Tango.PPC.Common.EventLogging;
 using Tango.BL.Enumerations;
 using Tango.PPC.Common.Notifications;
 using Tango.PPC.Common.WatchDog;
+using Tango.PPC.UI.Dialogs;
 
 namespace Tango.PPC.UI.PPCApplication
 {
@@ -89,6 +90,11 @@ namespace Tango.PPC.UI.PPCApplication
         public bool IsShuttingDown { get; private set; }
 
         /// <summary>
+        /// Gets a value indicating whether the application is in technician mode.
+        /// </summary>
+        public bool IsInTechnicianMode { get; private set; }
+
+        /// <summary>
         /// Gets the application version.
         /// </summary>
         public Version Version
@@ -412,10 +418,24 @@ namespace Tango.PPC.UI.PPCApplication
         /// <summary>
         /// Enteres the application technician mode.
         /// </summary>
-        public void EnterTechnicianMode()
+        public async void EnterTechnicianMode()
         {
-            _moduleLoader.AllModules.ToList().ForEach(x => x.OnTechnicianEntered());
-            _notificationProvider.ShowInfo("Technician mode is now enabled.");
+            var vm = await _notificationProvider.ShowDialog<TechnicianModeLoginViewVM>();
+
+            if (vm.DialogResult)
+            {
+                if (vm.Password == "Aa123456")
+                {
+                    IsInTechnicianMode = true;
+                    _moduleLoader.AllModules.ToList().ForEach(x => x.OnTechnicianEntered());
+                    await _notificationProvider.ShowInfo("Technician mode is now enabled.");
+                }
+                else
+                {
+                    await _notificationProvider.ShowError("Invalid technician mode password.");
+                    EnterTechnicianMode();
+                }
+            }
         }
 
         /// <summary>
@@ -423,6 +443,7 @@ namespace Tango.PPC.UI.PPCApplication
         /// </summary>
         public void ExitTechnicianMode()
         {
+            IsInTechnicianMode = false;
             _moduleLoader.AllModules.ToList().ForEach(x => x.OnTechnicianExited());
             _notificationProvider.ShowInfo("Technician mode is now disabled.");
         }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index 1201c4ab0..8c4cc4992 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -122,6 +122,10 @@
     <Compile Include="Connectivity\WiFiAuthenticationViewVM.cs" />
     <Compile Include="Converters\AppBarItemConverter.cs" />
     <Compile Include="Converters\ItemBaseConverter.cs" />
+    <Compile Include="Dialogs\TechnicianModeLoginView.xaml.cs">
+      <DependentUpon>TechnicianModeLoginView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Dialogs\TechnicianModeLoginViewVM.cs" />
     <Compile Include="Dialogs\UpdateFromFileView.xaml.cs">
       <DependentUpon>UpdateFromFileView.xaml</DependentUpon>
     </Compile>
@@ -182,6 +186,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Dialogs\TechnicianModeLoginView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Dialogs\UpdateFromFileView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -278,6 +286,7 @@
     <Resource Include="Images\power-tablet.png" />
     <Resource Include="Images\Menu\power.png" />
     <Resource Include="Images\Menu\update.png" />
+    <Resource Include="Images\technician-mode.png" />
     <Content Include="Manifests\release.xml" />
     <Content Include="Manifests\debug.xml" />
     <None Include="packages.config" />
@@ -366,10 +375,6 @@
       <Project>{096f16c8-6d06-4b5f-9496-b9d2df2d94a3}</Project>
       <Name>Tango.PPC.Jobs</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Modules\Tango.PPC.Logging\Tango.PPC.Logging.csproj">
-      <Project>{d2ee865b-b006-487a-9487-60a663636ac3}</Project>
-      <Name>Tango.PPC.Logging</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.PPC.MachineSettings\Tango.PPC.MachineSettings.csproj">
       <Project>{91b70e9b-66a7-4873-ae10-400e71cf404f}</Project>
       <Name>Tango.PPC.MachineSettings</Name>
@@ -378,6 +383,10 @@
       <Project>{04febb02-f782-4b96-b47d-f6902afa43be}</Project>
       <Name>Tango.PPC.Storage</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.PPC.Technician\Tango.PPC.Technician.csproj">
+      <Project>{d2ee865b-b006-487a-9487-60a663636ac3}</Project>
+      <Name>Tango.PPC.Technician</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Tango.PPC.Common\Tango.PPC.Common.csproj">
       <Project>{0be74eee-22cb-4dba-b896-793b9e1a3ac0}</Project>
       <Name>Tango.PPC.Common</Name>
@@ -509,7 +518,7 @@ del "$(TargetDir)firmware_package.tfp"</PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
index 1c1eeca5e..3cb790e65 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/LayoutViewVM.cs
@@ -244,6 +244,25 @@ namespace Tango.PPC.UI.ViewModels
 
         #endregion
 
+        #region Public Methods
+
+        /// <summary>
+        /// Toggles the application technician mode.
+        /// </summary>
+        public void ToggleTechnicianMode()
+        {
+            if (!ApplicationManager.IsInTechnicianMode)
+            {
+                ApplicationManager.EnterTechnicianMode();
+            }
+            else
+            {
+                ApplicationManager.ExitTechnicianMode();
+            }
+        }
+
+        #endregion
+
         #region Event Handlers
 
         /// <summary>
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 5d4428989..2a2f3e8b5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml
@@ -213,7 +213,7 @@
                         </Border>
                         <Grid DockPanel.Dock="Right" Margin="0 0 20 0">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel VerticalAlignment="Center">
+                                <StackPanel x:Name="techPressElement" VerticalAlignment="Center" Background="Transparent">
                                     <Image Width="33" HorizontalAlignment="Center">
                                         <Image.Style>
                                             <Style TargetType="Image">
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs
index 50b9df550..2156e45ca 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml.cs
@@ -14,9 +14,11 @@ using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using System.Windows.Threading;
 using Tango.Core.EventArguments;
 using Tango.Logging;
 using Tango.PPC.Common;
+using Tango.PPC.UI.ViewModels;
 using Tango.PPC.UI.ViewsContracts;
 
 namespace Tango.PPC.UI.Views
@@ -27,11 +29,49 @@ namespace Tango.PPC.UI.Views
     public partial class LayoutView : UserControl, ILayoutView
     {
         public static LayoutView Instance { get; private set; }
+        private LayoutViewVM _vm;
+        private DispatcherTimer _timer;
 
         public LayoutView()
         {
             InitializeComponent();
             Instance = this;
+            Loaded += (_, __) => _vm = DataContext as LayoutViewVM;
+            techPressElement.RegisterForPreviewMouseOrTouchDown(OnMouseOrTouchDown);
+            techPressElement.RegisterForPreviewMouseOrTouchUp(OnMouseOrTouchUp);
+            _timer = new DispatcherTimer();
+            _timer.Interval = TimeSpan.FromSeconds(10);
+            _timer.Tick += _timer_Tick;
+        }
+
+        private void _timer_Tick(object sender, EventArgs e)
+        {
+            _timer.Stop();
+            _vm.ToggleTechnicianMode();
+        }
+
+        private void OnMouseOrTouchDown(object sender, MouseOrTouchEventArgs e)
+        {
+            techPressElement.CaptureMouse();
+
+            if (e.TouchDevice != null)
+            {
+                techPressElement.CaptureTouch(e.TouchDevice);
+            }
+
+            _timer.Start();
+        }
+
+        private void OnMouseOrTouchUp(object sender, MouseOrTouchEventArgs e)
+        {
+            this.ReleaseMouseCapture();
+
+            if (e.TouchDevice != null)
+            {
+                techPressElement.ReleaseTouchCapture(e.TouchDevice);
+            }
+
+            _timer.Stop();
         }
     }
 }
diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
index 43b27e174..a36dc5069 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanel.xaml
@@ -116,15 +116,16 @@
 
                                                 <DockPanel>
                                                     <StackPanel Margin="0 40 0 10" DockPanel.Dock="Bottom" HorizontalAlignment="Right" Orientation="Horizontal">
-                                                        <local:TouchButton Command="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CancelDateCommand}" Width="80" Margin="2 0" FontSize="{StaticResource TangoDefaultFontSize}" Style="{StaticResource TangoMessageBoxButton}">CANCEL</local:TouchButton>
-                                                        <local:TouchButton Command="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DateSelectedCommand}" Width="100" Margin="2 0" FontSize="{StaticResource TangoDefaultFontSize}" Style="{StaticResource TangoMessageBoxButton}">OK</local:TouchButton>
+                                                        <local:TouchButton Command="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CancelDateCommand}" Width="120" Margin="2 0" Style="{StaticResource TangoMessageBoxButton}">CANCEL</local:TouchButton>
+                                                        <local:TouchButton Command="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DateSelectedCommand}" Width="120" Margin="2 0" Style="{StaticResource TangoMessageBoxButton}">OK</local:TouchButton>
                                                     </StackPanel>
 
-                                                    <local:TouchCalendar Width="370" x:Name="PART_calendar" Focusable="False"
-                                                    SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDatePicker.SelectedDate,Mode=OneWay}" 
-                                                    DisplayDateStart="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDatePicker.DisplayDateStart,Mode=OneWay}"
-                                                    DisplayDateEnd="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDatePicker.DisplayDateEnd,Mode=OneWay}"
-                                                    />
+                                                    <Viewbox Width="470" Stretch="Uniform">
+                                                        <local:TouchCalendar Width="370" x:Name="PART_calendar" Focusable="False"
+                                                         SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDatePicker.SelectedDate,Mode=OneWay}" 
+                                                         DisplayDateStart="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDatePicker.DisplayDateStart,Mode=OneWay}"
+                                                         DisplayDateEnd="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentDatePicker.DisplayDateEnd,Mode=OneWay}"/>
+                                                    </Viewbox>
                                                 </DockPanel>
                                             </Border>
                                         </Grid>
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index f630c9813..ee29e7bcb 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -238,8 +238,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.FirmwarePackageGenera
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.BootScreen", "PPC\Tango.PPC.BootScreen\Tango.PPC.BootScreen.csproj", "{7E5E4BED-538C-4566-A005-DCC070AF8715}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Logging", "PPC\Modules\Tango.PPC.Logging\Tango.PPC.Logging.csproj", "{D2EE865B-B006-487A-9487-60A663636AC3}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Web", "Tango.Web\Tango.Web.csproj", "{5001990F-977B-48FF-B217-0236A5022AD8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.Dispensers", "MachineStudio\Modules\MachineStudio.Dispensers\Tango.MachineStudio.Dispensers.csproj", "{F69DA3A8-F823-461E-87CF-A9275ABC0B15}"
@@ -266,6 +264,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.AdvancedInstaller", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.Pulse", "Tango.Pulse\Tango.Pulse.csproj", "{8435223D-DB6B-45E3-A08B-45B7416F8481}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Technician", "PPC\Modules\Tango.PPC.Technician\Tango.PPC.Technician.csproj", "{D2EE865B-B006-487A-9487-60A663636AC3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AppVeyor|Any CPU = AppVeyor|Any CPU
@@ -4258,46 +4258,6 @@ Global
 		{7E5E4BED-538C-4566-A005-DCC070AF8715}.Release|x64.Build.0 = Release|Any CPU
 		{7E5E4BED-538C-4566-A005-DCC070AF8715}.Release|x86.ActiveCfg = Release|Any CPU
 		{7E5E4BED-538C-4566-A005-DCC070AF8715}.Release|x86.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM64.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x64.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x64.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x86.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x86.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x64.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x86.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x64.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x86.Build.0 = Debug|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM64.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x64.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x64.Build.0 = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x86.ActiveCfg = Release|Any CPU
-		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x86.Build.0 = Release|Any CPU
 		{5001990F-977B-48FF-B217-0236A5022AD8}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
 		{5001990F-977B-48FF-B217-0236A5022AD8}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
 		{5001990F-977B-48FF-B217-0236A5022AD8}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
@@ -4773,6 +4733,46 @@ Global
 		{8435223D-DB6B-45E3-A08B-45B7416F8481}.Release|x64.Build.0 = Release|Any CPU
 		{8435223D-DB6B-45E3-A08B-45B7416F8481}.Release|x86.ActiveCfg = Release|Any CPU
 		{8435223D-DB6B-45E3-A08B-45B7416F8481}.Release|x86.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|ARM64.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x64.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x64.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x86.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.AppVeyor|x86.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x64.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Debug|x86.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x64.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.DefaultBuild|x86.Build.0 = Debug|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|ARM64.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x64.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x64.Build.0 = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x86.ActiveCfg = Release|Any CPU
+		{D2EE865B-B006-487A-9487-60A663636AC3}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4846,7 +4846,6 @@ Global
 		{5991F6B5-EA4E-41E9-A4F6-7D3A50010FD6} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8}
 		{43135FB9-41DB-4F87-9771-CF2C762027C0} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 		{7E5E4BED-538C-4566-A005-DCC070AF8715} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60}
-		{D2EE865B-B006-487A-9487-60A663636AC3} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
 		{F69DA3A8-F823-461E-87CF-A9275ABC0B15} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8}
 		{DB79FB33-CE7A-49CF-AA89-F697E5CDB0F6} = {AD8721D6-D728-4D58-A0D8-BE2E3FF7A9BC}
 		{1D0F15B7-C1F3-4B9E-B0BC-A5B9E50C91D0} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
@@ -4856,14 +4855,15 @@ Global
 		{E711CD86-89C1-432C-9C60-BFF30BBBFB3A} = {57DF2A95-5DDD-4830-A4AF-B484B59C7C2B}
 		{FABA6A2B-C7EA-4C58-A125-150FA5B4C72F} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60}
 		{E470673E-AEC8-4555-9136-D2F66B02DBFB} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
+		{D2EE865B-B006-487A-9487-60A663636AC3} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_UseGlobalSettings = False
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_UseGlobalSettings = False
 	EndGlobalSection
 EndGlobal