From 569ba975d7679638b7967f7168b3d12644fd29ed Mon Sep 17 00:00:00 2001
From: StephenCWills <swills@gridprotectionalliance.org>
Date: Wed, 20 Jun 2018 12:26:00 -0400
Subject: [PATCH] Migrated template projects to .NET 4.6.1.

---
 .../AlgorithmTemplateLibrary.csproj           |  3 +-
 .../AlgorithmTemplateService.csproj           |  2 +-
 .../AlgorithmTemplateService/App.config       |  2 +-
 .../Properties/Resources.Designer.cs          |  2 +-
 .../Properties/Settings.Designer.cs           |  2 +-
 .../AlgorithmTemplateServiceConsole.csproj    |  2 +-
 .../App.config                                | 32 ++++----
 .../AlgorithmTemplateTestHarness.csproj       |  4 +-
 .../AlgorithmTemplateTestHarness/App.config   |  6 +-
 .../Properties/Resources.Designer.cs          | 44 +++++------
 .../Properties/Settings.Designer.cs           | 22 +++---
 .../AlgorithmTemplateLibrary.fsproj           |  2 +-
 .../AlgorithmTemplateLibrary/App.config       |  2 +-
 .../AlgorithmTemplateService.csproj           |  2 +-
 .../AlgorithmTemplateService/App.config       |  2 +-
 .../Properties/Resources.Designer.cs          |  2 +-
 .../Properties/Settings.Designer.cs           |  2 +-
 .../AlgorithmTemplateServiceConsole.csproj    |  2 +-
 .../App.config                                | 32 ++++----
 .../AlgorithmTemplateTestHarness.csproj       |  4 +-
 .../AlgorithmTemplateTestHarness/App.config   |  6 +-
 .../Properties/Resources.Designer.cs          | 44 +++++------
 .../Properties/Settings.Designer.cs           | 22 +++---
 .../AlgorithmTemplate.pyproj                  | 11 +--
 .../AlgorithmTemplateService.csproj           |  2 +-
 .../AlgorithmTemplateService/App.config       |  2 +-
 .../Properties/Resources.Designer.cs          |  2 +-
 .../Properties/Settings.Designer.cs           |  2 +-
 .../AlgorithmTemplateServiceConsole.csproj    |  2 +-
 .../App.config                                | 32 ++++----
 .../AlgorithmTemplateTestHarness.csproj       |  4 +-
 .../AlgorithmTemplateTestHarness/App.config   |  6 +-
 .../Properties/Resources.Designer.cs          | 44 +++++------
 .../Properties/Settings.Designer.cs           | 22 +++---
 .../AlgorithmTemplateLibrary.vbproj           |  9 ++-
 .../My Project/Settings.Designer.cs           | 26 +++++++
 .../My Project/Settings.Designer.vb           | 73 -------------------
 .../AlgorithmTemplateService.csproj           |  2 +-
 .../AlgorithmTemplateService/App.config       |  2 +-
 .../Properties/Resources.Designer.cs          |  2 +-
 .../Properties/Settings.Designer.cs           |  2 +-
 .../AlgorithmTemplateServiceConsole.csproj    |  2 +-
 .../App.config                                | 32 ++++----
 .../AlgorithmTemplateTestHarness.csproj       |  4 +-
 .../AlgorithmTemplateTestHarness/App.config   |  6 +-
 .../Properties/Resources.Designer.cs          | 44 +++++------
 .../Properties/Settings.Designer.cs           | 22 +++---
 47 files changed, 255 insertions(+), 343 deletions(-)
 create mode 100644 Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.cs
 delete mode 100644 Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.vb

diff --git a/Source/Templates/CSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.csproj b/Source/Templates/CSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.csproj
index cd4488bbce..36d73b9c74 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.csproj
+++ b/Source/Templates/CSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
     <AssemblyName>AlgorithmTemplateLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj b/Source/Templates/CSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj
index 9caf616ec4..146272c51a 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj
+++ b/Source/Templates/CSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateService</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateService/App.config b/Source/Templates/CSharp/AlgorithmTemplateService/App.config
index 2d2a12d81b..bae5d6d814 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateService/App.config
+++ b/Source/Templates/CSharp/AlgorithmTemplateService/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
 </configuration>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs b/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs
index d73da070b0..40430fb3da 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs
+++ b/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace AlgorithmTemplateService.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 {
diff --git a/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs b/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs
index 037a71499c..e4a95e750d 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs
+++ b/Source/Templates/CSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AlgorithmTemplateService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj b/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
index f1cf2a3973..30c70a3cc3 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
+++ b/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateServiceConsole</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/App.config b/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/App.config
index a77d61a5ca..a9a7c713cb 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/App.config
+++ b/Source/Templates/CSharp/AlgorithmTemplateServiceConsole/App.config
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core" />
+    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core"/>
   </configSections>
   <categorizedSettings>
     <systemSettings>
-      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false" />
+      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false"/>
     </systemSettings>
     <clientHelper>
-      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User" />
-      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User" />
-      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false" />
-      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false" />
+      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User"/>
+      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User"/>
+      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false"/>
+      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false"/>
     </clientHelper>
     <remotingClient>
-      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false" />
-      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false" />
-      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false" />
-      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false" />
-      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false" />
-      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false" />
-      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false" />
-      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false" />
+      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false"/>
+      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false"/>
+      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false"/>
+      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false"/>
+      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false"/>
+      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false"/>
+      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false"/>
+      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false"/>
     </remotingClient>
   </categorizedSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
   </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
index 41a610eaec..59f74fe045 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
+++ b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
     <AssemblyName>AlgorithmTemplateTestHarness</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,6 +64,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/App.config b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/App.config
index 8324aa6ff1..bae5d6d814 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/App.config
+++ b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
index c1f9e585ed..2a551e19f9 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
+++ b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace AlgorithmTemplate.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
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AlgorithmTemplate.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
index babae0131b..3e2076634d 100644
--- a/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
+++ b/Source/Templates/CSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.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.7.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/Source/Templates/FSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.fsproj b/Source/Templates/FSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.fsproj
index 813fc8a928..6cf7d499d2 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.fsproj
+++ b/Source/Templates/FSharp/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.fsproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
     <AssemblyName>AlgorithmTemplateLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
     <Name>AlgorithmTemplateLibrary</Name>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateLibrary/App.config b/Source/Templates/FSharp/AlgorithmTemplateLibrary/App.config
index cd505a46bd..9868bb45f3 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateLibrary/App.config
+++ b/Source/Templates/FSharp/AlgorithmTemplateLibrary/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
   </startup>
 </configuration>
\ No newline at end of file
diff --git a/Source/Templates/FSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj b/Source/Templates/FSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj
index 8749f7d25a..d397d4d193 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj
+++ b/Source/Templates/FSharp/AlgorithmTemplateService/AlgorithmTemplateService.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateService</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateService/App.config b/Source/Templates/FSharp/AlgorithmTemplateService/App.config
index 2d2a12d81b..bae5d6d814 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateService/App.config
+++ b/Source/Templates/FSharp/AlgorithmTemplateService/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
 </configuration>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs b/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs
index d73da070b0..40430fb3da 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs
+++ b/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace AlgorithmTemplateService.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 {
diff --git a/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs b/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs
index 037a71499c..e4a95e750d 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs
+++ b/Source/Templates/FSharp/AlgorithmTemplateService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AlgorithmTemplateService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj b/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
index f1cf2a3973..30c70a3cc3 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
+++ b/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateServiceConsole</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/App.config b/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/App.config
index a77d61a5ca..a9a7c713cb 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/App.config
+++ b/Source/Templates/FSharp/AlgorithmTemplateServiceConsole/App.config
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core" />
+    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core"/>
   </configSections>
   <categorizedSettings>
     <systemSettings>
-      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false" />
+      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false"/>
     </systemSettings>
     <clientHelper>
-      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User" />
-      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User" />
-      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false" />
-      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false" />
+      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User"/>
+      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User"/>
+      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false"/>
+      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false"/>
     </clientHelper>
     <remotingClient>
-      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false" />
-      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false" />
-      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false" />
-      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false" />
-      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false" />
-      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false" />
-      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false" />
-      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false" />
+      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false"/>
+      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false"/>
+      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false"/>
+      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false"/>
+      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false"/>
+      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false"/>
+      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false"/>
+      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false"/>
     </remotingClient>
   </categorizedSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
   </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
index bfc03eeb5d..9c9a408d8e 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
+++ b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
     <AssemblyName>AlgorithmTemplateTestHarness</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,6 +64,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/App.config b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/App.config
index 8324aa6ff1..bae5d6d814 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/App.config
+++ b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
index c1f9e585ed..2a551e19f9 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
+++ b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace AlgorithmTemplate.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
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AlgorithmTemplate.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
index babae0131b..3e2076634d 100644
--- a/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
+++ b/Source/Templates/FSharp/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.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.7.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/Source/Templates/IronPython/AlgorithmTemplate/AlgorithmTemplate.pyproj b/Source/Templates/IronPython/AlgorithmTemplate/AlgorithmTemplate.pyproj
index 8f58846120..ee03b7f676 100644
--- a/Source/Templates/IronPython/AlgorithmTemplate/AlgorithmTemplate.pyproj
+++ b/Source/Templates/IronPython/AlgorithmTemplate/AlgorithmTemplate.pyproj
@@ -8,9 +8,8 @@
     <StartupFile>Program.py</StartupFile>
     <SearchPath>..\Dependencies\GSF\;..\Dependencies\openECA\</SearchPath>
     <WorkingDirectory>.</WorkingDirectory>
-    <InterpreterId>{fcc291aa-427c-498c-a4d7-4502d6449b8c}</InterpreterId>
+    <InterpreterId>IronPython|2.7-64</InterpreterId>
     <LaunchProvider>IronPython (.NET) launcher</LaunchProvider>
-    <InterpreterVersion>2.7</InterpreterVersion>
     <OutputPath>.</OutputPath>
     <Name>AlgorithmTemplate</Name>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
@@ -25,20 +24,17 @@
     <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Program.py" />
+    <Compile Include="Program.py" />
   </ItemGroup>
   <ItemGroup>
-    <InterpreterReference Include="{fcc291aa-427c-498c-a4d7-4502d6449b8c}\2.7" />
+    <InterpreterReference Include="IronPython|2.7-64" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Model\" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <PtvsTargetsFile>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets</PtvsTargetsFile>
   </PropertyGroup>
-  <Import Condition="Exists($(PtvsTargetsFile))" Project="$(PtvsTargetsFile)" />
-  <Import Condition="!Exists($(PtvsTargetsFile))" Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
        Visual Studio and specify your pre- and post-build commands in
        the BeforeBuild and AfterBuild targets below. -->
@@ -47,4 +43,5 @@
   </Target>
   <Target Name="AfterBuild">
   </Target>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Templates/Matlab/AlgorithmTemplateService/AlgorithmTemplateService.csproj b/Source/Templates/Matlab/AlgorithmTemplateService/AlgorithmTemplateService.csproj
index 580a7ed438..96d688ba1b 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateService/AlgorithmTemplateService.csproj
+++ b/Source/Templates/Matlab/AlgorithmTemplateService/AlgorithmTemplateService.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateService</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/Matlab/AlgorithmTemplateService/App.config b/Source/Templates/Matlab/AlgorithmTemplateService/App.config
index 2d2a12d81b..bae5d6d814 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateService/App.config
+++ b/Source/Templates/Matlab/AlgorithmTemplateService/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
 </configuration>
diff --git a/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Resources.Designer.cs b/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Resources.Designer.cs
index d73da070b0..40430fb3da 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Resources.Designer.cs
+++ b/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace AlgorithmTemplateService.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 {
diff --git a/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Settings.Designer.cs b/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Settings.Designer.cs
index 037a71499c..e4a95e750d 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Settings.Designer.cs
+++ b/Source/Templates/Matlab/AlgorithmTemplateService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AlgorithmTemplateService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj b/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
index f1cf2a3973..30c70a3cc3 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
+++ b/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateServiceConsole</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/App.config b/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/App.config
index a77d61a5ca..a9a7c713cb 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/App.config
+++ b/Source/Templates/Matlab/AlgorithmTemplateServiceConsole/App.config
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core" />
+    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core"/>
   </configSections>
   <categorizedSettings>
     <systemSettings>
-      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false" />
+      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false"/>
     </systemSettings>
     <clientHelper>
-      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User" />
-      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User" />
-      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false" />
-      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false" />
+      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User"/>
+      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User"/>
+      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false"/>
+      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false"/>
     </clientHelper>
     <remotingClient>
-      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false" />
-      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false" />
-      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false" />
-      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false" />
-      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false" />
-      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false" />
-      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false" />
-      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false" />
+      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false"/>
+      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false"/>
+      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false"/>
+      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false"/>
+      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false"/>
+      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false"/>
+      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false"/>
+      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false"/>
     </remotingClient>
   </categorizedSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
   </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
index c94389af9a..3c47ec5516 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
+++ b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
     <AssemblyName>AlgorithmTemplateTestHarness</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,6 +64,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/App.config b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/App.config
index 8324aa6ff1..bae5d6d814 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/App.config
+++ b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
index c1f9e585ed..2a551e19f9 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
+++ b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace AlgorithmTemplate.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
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AlgorithmTemplate.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
index babae0131b..3e2076634d 100644
--- a/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
+++ b/Source/Templates/Matlab/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.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.7.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/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.vbproj b/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.vbproj
index d23624b991..f00c3e0f56 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.vbproj
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/AlgorithmTemplateLibrary.vbproj
@@ -12,8 +12,9 @@
     <AssemblyName>AlgorithmTemplateLibrary</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -85,10 +86,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
+    <Compile Include="My Project\Settings.Designer.cs">
       <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -107,7 +108,7 @@
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.cs b/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.cs
new file mode 100644
index 0000000000..0db4e79a35
--- /dev/null
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.cs	
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace My {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.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 {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.vb b/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.vb
deleted file mode 100644
index 71a0969cba..0000000000
--- a/Source/Templates/VisualBasic/AlgorithmTemplateLibrary/My Project/Settings.Designer.vb	
+++ /dev/null
@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
-#Region "My.Settings Auto-Save Functionality"
-#If _MyType = "WindowsForms" Then
-    Private Shared addedHandler As Boolean
-
-    Private Shared addedHandlerLockObject As New Object
-
-    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
-        If My.Application.SaveMySettingsOnExit Then
-            My.Settings.Save()
-        End If
-    End Sub
-#End If
-#End Region
-        
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-                
-#If _MyType = "WindowsForms" Then
-               If Not addedHandler Then
-                    SyncLock addedHandlerLockObject
-                        If Not addedHandler Then
-                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                            addedHandler = True
-                        End If
-                    End SyncLock
-                End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
-    Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
-        Friend ReadOnly Property Settings() As Global.AlgorithmTemplate.My.MySettings
-            Get
-                Return Global.AlgorithmTemplate.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateService/AlgorithmTemplateService.csproj b/Source/Templates/VisualBasic/AlgorithmTemplateService/AlgorithmTemplateService.csproj
index 311174af8c..38d4f0b3b7 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateService/AlgorithmTemplateService.csproj
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateService/AlgorithmTemplateService.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateService</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateService/App.config b/Source/Templates/VisualBasic/AlgorithmTemplateService/App.config
index 2d2a12d81b..bae5d6d814 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateService/App.config
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateService/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
 </configuration>
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Resources.Designer.cs b/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Resources.Designer.cs
index d73da070b0..40430fb3da 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Resources.Designer.cs
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace AlgorithmTemplateService.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 {
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Settings.Designer.cs b/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Settings.Designer.cs
index 037a71499c..e4a95e750d 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Settings.Designer.cs
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateService/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace AlgorithmTemplateService.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj b/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
index f1cf2a3973..30c70a3cc3 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/AlgorithmTemplateServiceConsole.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplateService</RootNamespace>
     <AssemblyName>AlgorithmTemplateServiceConsole</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/App.config b/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/App.config
index a77d61a5ca..a9a7c713cb 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/App.config
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateServiceConsole/App.config
@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core" />
+    <section name="categorizedSettings" type="GSF.Configuration.CategorizedSettingsSection, GSF.Core"/>
   </configSections>
   <categorizedSettings>
     <systemSettings>
-      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false" />
+      <add name="OptimizationsConnectionString" value="" description="Specifies which optimizations to enable for the system." encrypted="false"/>
     </systemSettings>
     <clientHelper>
-      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User" />
-      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User" />
-      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false" />
-      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false" />
+      <add name="Username" value="" description="Username to be used for authentication with the service." encrypted="false" scope="User"/>
+      <add name="Password" value="" description="Password to be used for authentication with the service." encrypted="true" scope="User"/>
+      <add name="SerializationFormat" value="Binary" description="Message serialization format for interactions with service, one of: Xml, Json or Binary. Default is Binary." encrypted="false"/>
+      <add name="StatusMessageFilter" value="Filter -Remove 0" description="Command used to negotiate status message filter when client connects to the ServiceHelper." encrypted="false"/>
     </clientHelper>
     <remotingClient>
-      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false" />
-      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false" />
-      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false" />
-      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false" />
-      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false" />
-      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false" />
-      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false" />
-      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false" />
+      <add name="ConnectionString" value="server=localhost:[REMOTE_CONSOLE_PORT]; interface=0.0.0.0" description="Data required by the client to connect to the server." encrypted="false"/>
+      <add name="MaxConnectionAttempts" value="-1" description="Maximum number of times the client will attempt to connect to the server." encrypted="false"/>
+      <add name="SendBufferSize" value="32768" description="Size of the buffer used by the client for sending data from the server." encrypted="false"/>
+      <add name="ReceiveBufferSize" value="32768" description="Size of the buffer used by the client for receiving data from the server." encrypted="false"/>
+      <add name="PayloadAware" value="True" description="True if payload boundaries are to be preserved during transmission, otherwise False." encrypted="false"/>
+      <add name="IntegratedSecurity" value="True" description="True if the current Windows account credentials are used for authentication, otherwise False." encrypted="false"/>
+      <add name="AllowDualStackSocket" value="True" description="True if dual-mode socket is allowed when IP address is IPv6, otherwise False." encrypted="false"/>
+      <add name="MaxSendQueueSize" value="500000" description="The maximum size of the send queue before payloads are dumped from the queue." encrypted="false"/>
     </remotingClient>
   </categorizedSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
   </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
index 9569be2c96..56b431bb82 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/AlgorithmTemplateTestHarness.csproj
@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmTemplate</RootNamespace>
     <AssemblyName>AlgorithmTemplateTestHarness</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -63,6 +64,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/App.config b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/App.config
index 8324aa6ff1..bae5d6d814 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/App.config
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
index c1f9e585ed..2a551e19f9 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,51 +19,43 @@ namespace AlgorithmTemplate.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
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AlgorithmTemplate.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
index babae0131b..3e2076634d 100644
--- a/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
+++ b/Source/Templates/VisualBasic/AlgorithmTemplateTestHarness/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AlgorithmTemplate.Properties
-{
-
-
+namespace AlgorithmTemplate.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.7.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;
             }
         }