diff --git a/framework/wcf/Basic/Ajax/ComplexTypeAjaxService/CS/service/service.csproj b/framework/wcf/Basic/Ajax/ComplexTypeAjaxService/CS/service/service.csproj
index a1ffa7411ac..1d3c132fe34 100644
--- a/framework/wcf/Basic/Ajax/ComplexTypeAjaxService/CS/service/service.csproj
+++ b/framework/wcf/Basic/Ajax/ComplexTypeAjaxService/CS/service/service.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -25,7 +17,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,18 +66,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <PropertyGroup>
     <PostBuildEvent>
             mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
             mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
             copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+            copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+            copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
             del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
-            copy "$(ProjectDir)ComplexTypeClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
+            copy "$(MSBuildProjectDirectory)\ComplexTypeClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
     </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
@@ -100,11 +88,13 @@
           <IISUrl>http://localhost:65189/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+</Project>
diff --git a/framework/wcf/Basic/Ajax/ConfigFreeAjaxService/CS/service/service.csproj b/framework/wcf/Basic/Ajax/ConfigFreeAjaxService/CS/service/service.csproj
index e210f65bc4a..22b61f3bf44 100644
--- a/framework/wcf/Basic/Ajax/ConfigFreeAjaxService/CS/service/service.csproj
+++ b/framework/wcf/Basic/Ajax/ConfigFreeAjaxService/CS/service/service.csproj
@@ -1,22 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -24,7 +16,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,18 +64,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
-            copy "$(ProjectDir)ConfigFreeClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
+      copy "$(MSBuildProjectDirectory)\ConfigFreeClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
     </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
@@ -98,11 +86,13 @@
           <IISUrl>http://localhost:65254/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+</Project>
diff --git a/framework/wcf/Basic/Ajax/JSONP/CS/service/Service.csproj b/framework/wcf/Basic/Ajax/JSONP/CS/service/Service.csproj
index 8f0198c0ccc..0eb6696a38a 100644
--- a/framework/wcf/Basic/Ajax/JSONP/CS/service/Service.csproj
+++ b/framework/wcf/Basic/Ajax/JSONP/CS/service/Service.csproj
@@ -10,12 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Jsonp</RootNamespace>
     <AssemblyName>JsonpServiceSample</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -23,7 +18,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,7 +77,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <ProjectExtensions>
@@ -94,12 +88,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>33695</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
@@ -112,4 +104,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Ajax/JSONP/CS/website/Website.csproj b/framework/wcf/Basic/Ajax/JSONP/CS/website/Website.csproj
index 1a0ee440f8a..e7ef24defa9 100644
--- a/framework/wcf/Basic/Ajax/JSONP/CS/website/Website.csproj
+++ b/framework/wcf/Basic/Ajax/JSONP/CS/website/Website.csproj
@@ -4,21 +4,14 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{850BE9C8-B7C5-4A04-8E0B-3E43407F9E18}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>website</RootNamespace>
     <AssemblyName>website</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -26,7 +19,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,7 +76,7 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <ProjectExtensions>
@@ -95,12 +87,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>26648</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
@@ -113,4 +103,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/app.config b/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/app.config
index 3e0e37cfc8c..7bf4723c41e 100644
--- a/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/app.config
+++ b/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/client.csproj b/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/client.csproj
index b78530df390..f20cc2c18c9 100644
--- a/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/client.csproj
+++ b/framework/wcf/Basic/Ajax/JsonSerialization/CS/client/client.csproj
@@ -1,18 +1,13 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,5 +40,5 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Ajax/JsonSerialization/VB/client/app.config b/framework/wcf/Basic/Ajax/JsonSerialization/VB/client/app.config
index b5cb6d50fc4..50c61ffed97 100644
--- a/framework/wcf/Basic/Ajax/JsonSerialization/VB/client/app.config
+++ b/framework/wcf/Basic/Ajax/JsonSerialization/VB/client/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <system.diagnostics>
-        <sources>
-            <!-- This section defines the logging configuration for My.Application.Log -->
-            <source name="DefaultSource" switchName="DefaultSwitch">
-                <listeners>
-                    <add name="FileLog"/>
-                    <!-- Uncomment the below section to write to the Application Event Log -->
-                    <!--<add name="EventLog"/>-->
-                </listeners>
-            </source>
-        </sources>
-        <switches>
-            <add name="DefaultSwitch" value="Information"/>
-        </switches>
-        <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
-            <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
-            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
-        </sharedListeners>
-    </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+  <system.diagnostics>
+    <sources>
+      <!-- This section defines the logging configuration for My.Application.Log -->
+      <source name="DefaultSource" switchName="DefaultSwitch">
+        <listeners>
+          <add name="FileLog" />
+          <!-- Uncomment the below section to write to the Application Event Log -->
+          <!--<add name="EventLog"/>-->
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="DefaultSwitch" value="Information" />
+    </switches>
+    <sharedListeners>
+      <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
+      <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
+      <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
+    </sharedListeners>
+  </system.diagnostics>
+</configuration>
diff --git a/framework/wcf/Basic/Ajax/PostAjaxService/CS/service/service.csproj b/framework/wcf/Basic/Ajax/PostAjaxService/CS/service/service.csproj
index d58488fcde7..d2d4869a03f 100644
--- a/framework/wcf/Basic/Ajax/PostAjaxService/CS/service/service.csproj
+++ b/framework/wcf/Basic/Ajax/PostAjaxService/CS/service/service.csproj
@@ -1,22 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -24,7 +16,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,8 +53,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="PostAjaxClientPage.aspx">
-    </Content>
+    <Content Include="PostAjaxClientPage.aspx"></Content>
     <Content Include="service.svc" />
   </ItemGroup>
   <ItemGroup>
@@ -73,18 +63,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
-            copy "$(ProjectDir)PostAjaxClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
+      copy "$(MSBuildProjectDirectory)\PostAjaxClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
     </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
@@ -98,11 +85,13 @@
           <IISUrl>http://localhost:65279/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+</Project>
diff --git a/framework/wcf/Basic/Ajax/SimpleAjaxService/CS/service/service.csproj b/framework/wcf/Basic/Ajax/SimpleAjaxService/CS/service/service.csproj
index ac718168ed1..c869161c01d 100644
--- a/framework/wcf/Basic/Ajax/SimpleAjaxService/CS/service/service.csproj
+++ b/framework/wcf/Basic/Ajax/SimpleAjaxService/CS/service/service.csproj
@@ -1,22 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -24,7 +16,6 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,8 +53,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="SimpleAjaxClientPage.aspx">
-    </Content>
+    <Content Include="SimpleAjaxClientPage.aspx"></Content>
     <Content Include="service.svc" />
   </ItemGroup>
   <ItemGroup>
@@ -73,18 +63,15 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
-            copy "$(ProjectDir)SimpleAjaxClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
+      copy "$(MSBuildProjectDirectory)\SimpleAjaxClientPage.aspx" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
     </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
@@ -98,11 +85,13 @@
           <IISUrl>http://localhost:65289/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+</Project>
diff --git a/framework/wcf/Basic/Ajax/XmlAjaxService/CS/service/service.csproj b/framework/wcf/Basic/Ajax/XmlAjaxService/CS/service/service.csproj
index f2f7088baa3..acb9bfb609d 100644
--- a/framework/wcf/Basic/Ajax/XmlAjaxService/CS/service/service.csproj
+++ b/framework/wcf/Basic/Ajax/XmlAjaxService/CS/service/service.csproj
@@ -1,18 +1,13 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,16 +48,16 @@
   <ItemGroup>
     <None Include="web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
-            copy "$(ProjectDir)XmlAjaxClientPage.htm" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      del %SystemDrive%\inetpub\wwwroot\ServiceModelSamples\*ClientPage*
+      copy "$(MSBuildProjectDirectory)\XmlAjaxClientPage.htm" %SystemDrive%\inetpub\wwwroot\ServiceModelSamples
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Basic/Http/CS/client/App.config b/framework/wcf/Basic/Binding/Basic/Http/CS/client/App.config
index ed668c06ed6..b9c4d603443 100644
--- a/framework/wcf/Basic/Binding/Basic/Http/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Basic/Http/CS/client/App.config
@@ -1,20 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Http.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Http.ICalculator" />
     </client>
-
     <bindings>
       <basicHttpBinding>
         <!-- See this sample's service configuration for the expanded 
              configuration section for a basicHttpBinding.  The client binding
              configuration also has an allowCookies setting which is false by default
             -->
-        <binding name="Binding1" allowCookies="false"/>
+        <binding name="Binding1" allowCookies="false" />
       </basicHttpBinding>
     </bindings>
-
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Binding/Basic/Http/CS/client/client.csproj b/framework/wcf/Basic/Binding/Basic/Http/CS/client/client.csproj
index 561f7a03988..0b2770324c3 100644
--- a/framework/wcf/Basic/Binding/Basic/Http/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Basic/Http/CS/client/client.csproj
@@ -8,26 +8,21 @@
     <Product>Windows Communication Foundation and Windows Workflow Foundation SDK</Product>
     <Copyright>Copyright (c) Microsoft Corporation</Copyright>
   </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <None Remove="Connected Services\Microsoft.Samples.Http\ConnectedService.json" />
     <Compile Remove="Connected Services\Microsoft.Samples.Http\Reference.cs" />
     <None Include="Connected Services\Microsoft.Samples.Http\Reference.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <None Remove="App.config" />
     <Compile Remove="generatedClient.cs" />
     <None Include="generatedClient.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.ServiceModel.Primitives" Version="6.*" />
     <PackageReference Include="System.ServiceModel.Http" Version="6.*" />
   </ItemGroup>
-
 </Project>
diff --git a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/App.config b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/App.config
index eda7e180afc..b9dd473f751 100644
--- a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/App.config
@@ -1,11 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
       <!-- Use a behavior to configure the client certificate to present to the service. -->
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.MessageSecurity.ICalculator"/>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.MessageSecurity.ICalculator" />
     </client>
-
     <bindings>
       <basicHttpBinding>
         <!-- 
@@ -14,12 +13,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </basicHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -29,7 +27,7 @@
         This configuration references the "client.com" certificate installed during the setup instructions.
         -->
           <clientCredentials>
-            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName"/>
+            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName" />
             <serviceCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -39,12 +37,12 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
-              <defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
+              <defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/client.csproj b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/client.csproj
index 40bedc3253f..c0cf90fa443 100644
--- a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,27 +50,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/App.config b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/App.config
index a1dd3f3b4b3..7e7d9c42cb0 100644
--- a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/App.config
@@ -1,21 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-  
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MessageSecurity.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/ServiceModelSamples/service  -->
-        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MessageSecurity.ICalculator"/>
+        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MessageSecurity.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <basicHttpBinding>
         <!-- 
@@ -24,25 +22,24 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </basicHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <!--
         The serviceCredentials behavior allows one to define a service certificate.
         A service certificate is used by a client to authenticate the service and provide message protection.
         This configuration references the "localhost" certificate installed during the setup instructions.
         -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
             <clientCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -52,11 +49,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </clientCertificate>
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/service.csproj b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/service.csproj
index 6947a35f085..21145cc5e22 100644
--- a/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Basic/MessageSecurity/CS/service/service.csproj
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,31 +50,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/client/App.config b/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/client/App.config
index eda7e180afc..b9dd473f751 100644
--- a/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/client/App.config
@@ -1,11 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
       <!-- Use a behavior to configure the client certificate to present to the service. -->
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.MessageSecurity.ICalculator"/>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.MessageSecurity.ICalculator" />
     </client>
-
     <bindings>
       <basicHttpBinding>
         <!-- 
@@ -14,12 +13,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </basicHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -29,7 +27,7 @@
         This configuration references the "client.com" certificate installed during the setup instructions.
         -->
           <clientCredentials>
-            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName"/>
+            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName" />
             <serviceCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -39,12 +37,12 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
-              <defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
+              <defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/service/App.config b/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/service/App.config
index 8e31b7cffbe..0db0d80647c 100644
--- a/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/service/App.config
+++ b/framework/wcf/Basic/Binding/Basic/MessageSecurity/VB/service/App.config
@@ -1,19 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MessageSecurity.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-             <add baseAddress="http://localhost:8000/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host -->
-        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MessageSecurity.ICalculator"/>
+        <endpoint address="" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MessageSecurity.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <basicHttpBinding>
         <!-- 
@@ -22,24 +20,23 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </basicHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <!--
         The serviceCredentials behavior allows one to define a service certificate.
         A service certificate is used by a client to authenticate the service and provide message protection.
         This configuration references the "localhost" certificate installed during the setup instructions.
         -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
             <clientCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -49,11 +46,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </clientCertificate>
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/App.config b/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/App.config
index b183bdf3249..d959339c42a 100644
--- a/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/App.config
@@ -1,23 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- this endpoint has an https: address -->
-      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportSecurity.ICalculator"/>
+      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportSecurity.ICalculator" />
     </client>
-
     <bindings>
       <basicHttpBinding>
         <!-- configure BasicHttp binding with Transport security mode and
 			       clientCredentialType as None-->
         <binding name="Binding1">
           <security mode="Transport">
-            <transport clientCredentialType="None"/>
+            <transport clientCredentialType="None" />
           </security>
         </binding>
       </basicHttpBinding>
     </bindings>
-
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/client.csproj b/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/client.csproj
index 37c20b32c17..d266345d7f7 100644
--- a/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/client/client.csproj
@@ -8,27 +8,22 @@
     <Product>Windows Communication Foundation and Windows Workflow Foundation SDK</Product>
     <Copyright>Copyright (c) Microsoft Corporation</Copyright>
   </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <None Remove="Connected Services\Microsoft.Samples.TransportSecurity\ConnectedService.json" />
     <Compile Remove="Connected Services\Microsoft.Samples.TransportSecurity\Reference.cs" />
     <None Include="Connected Services\Microsoft.Samples.TransportSecurity\Reference.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <None Remove="App.config" />
     <Compile Remove="generatedClient.cs" />
     <None Include="generatedClient.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.ServiceModel.Primitives" Version="6.*" />
     <PackageReference Include="System.ServiceModel.Http" Version="6.*" />
   </ItemGroup>
-
 </Project>
diff --git a/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/service/service.csproj b/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/service/service.csproj
index 94b0854c98c..b8ff00347d9 100644
--- a/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Basic/TransportSecurity/CS/service/service.csproj
@@ -58,5 +58,5 @@
       copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/app.config b/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/app.config
+++ b/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/client.csproj b/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/client.csproj
index a725368cd97..3ad81b18c9d 100644
--- a/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Custom/Imperative/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,5 +55,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/app.config b/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/app.config
+++ b/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/service.csproj b/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/service.csproj
index c268c11bdce..80f6dc4e9df 100644
--- a/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Custom/Imperative/CS/service/service.csproj
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,5 +42,5 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Imperative/VB/client/app.config b/framework/wcf/Basic/Binding/Custom/Imperative/VB/client/app.config
index 6b91abde932..5aa9ed6d0f8 100644
--- a/framework/wcf/Basic/Binding/Custom/Imperative/VB/client/app.config
+++ b/framework/wcf/Basic/Binding/Custom/Imperative/VB/client/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.diagnostics>
-        <sources>
-            <!-- This section defines the logging configuration for My.Application.Log -->
-            <source name="DefaultSource" switchName="DefaultSwitch">
-                <listeners>
-                    <add name="FileLog"/>
-                    <!-- Uncomment the below section to write to the Application Event Log -->
-                    <!--<add name="EventLog"/>-->
-                </listeners>
-            </source>
-        </sources>
-        <switches>
-            <add name="DefaultSwitch" value="Information"/>
-        </switches>
-        <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
-            <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
-            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
-        </sharedListeners>
-    </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.diagnostics>
+    <sources>
+      <!-- This section defines the logging configuration for My.Application.Log -->
+      <source name="DefaultSource" switchName="DefaultSwitch">
+        <listeners>
+          <add name="FileLog" />
+          <!-- Uncomment the below section to write to the Application Event Log -->
+          <!--<add name="EventLog"/>-->
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="DefaultSwitch" value="Information" />
+    </switches>
+    <sharedListeners>
+      <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
+      <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
+      <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
+    </sharedListeners>
+  </system.diagnostics>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Imperative/VB/service/app.config b/framework/wcf/Basic/Binding/Custom/Imperative/VB/service/app.config
index 6b91abde932..5aa9ed6d0f8 100644
--- a/framework/wcf/Basic/Binding/Custom/Imperative/VB/service/app.config
+++ b/framework/wcf/Basic/Binding/Custom/Imperative/VB/service/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.diagnostics>
-        <sources>
-            <!-- This section defines the logging configuration for My.Application.Log -->
-            <source name="DefaultSource" switchName="DefaultSwitch">
-                <listeners>
-                    <add name="FileLog"/>
-                    <!-- Uncomment the below section to write to the Application Event Log -->
-                    <!--<add name="EventLog"/>-->
-                </listeners>
-            </source>
-        </sources>
-        <switches>
-            <add name="DefaultSwitch" value="Information"/>
-        </switches>
-        <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
-            <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
-            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
-        </sharedListeners>
-    </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.diagnostics>
+    <sources>
+      <!-- This section defines the logging configuration for My.Application.Log -->
+      <source name="DefaultSource" switchName="DefaultSwitch">
+        <listeners>
+          <add name="FileLog" />
+          <!-- Uncomment the below section to write to the Application Event Log -->
+          <!--<add name="EventLog"/>-->
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="DefaultSwitch" value="Information" />
+    </switches>
+    <sharedListeners>
+      <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
+      <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
+      <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
+    </sharedListeners>
+  </system.diagnostics>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/App.config b/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/App.config
index 1b74412bfe0..b99709d2b86 100644
--- a/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/App.config
@@ -1,26 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.ReliableSession.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.ReliableSession.ICalculator" />
     </client>
-
     <!-- custom binding configuration - configures Http transport, reliable sessions -->
     <bindings>
       <customBinding>
         <binding name="Binding1">
-          <reliableSession/>
-          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true">
-          </security>
-          <compositeDuplex clientBaseAddress="http://localhost:8000/myClient"/>
-          <oneWay/>
-          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8"/>
-          <httpTransport authenticationScheme="Anonymous" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" proxyAuthenticationScheme="Anonymous" realm="" useDefaultWebProxy="true"/>
+          <reliableSession />
+          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true"></security>
+          <compositeDuplex clientBaseAddress="http://localhost:8000/myClient" />
+          <oneWay />
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8" />
+          <httpTransport authenticationScheme="Anonymous" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" proxyAuthenticationScheme="Anonymous" realm="" useDefaultWebProxy="true" />
         </binding>
       </customBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/client.csproj b/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/client.csproj
index b7003b5ffcc..3e4bfe1d345 100644
--- a/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ReliableSession</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/service/service.csproj b/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/service/service.csproj
index 80012bcc6df..f192dfcf7c0 100644
--- a/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Custom/ReliableSession/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ReliableSession</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,35 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/App.config b/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/App.config
index eb49302ec09..3e11265ce19 100644
--- a/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/App.config
@@ -1,21 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- this endpoint has an https: address -->
-      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="reliableSessionOverHttps" contract="Microsoft.Samples.ReliableSessionOverHttps.ICalculator"/>
+      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="reliableSessionOverHttps" contract="Microsoft.Samples.ReliableSessionOverHttps.ICalculator" />
     </client>
-
-      <bindings>
-        <customBinding>
-          <binding name="reliableSessionOverHttps">
-            <reliableSession/>
-            <httpsTransport/>
-          </binding>
-        </customBinding>      
+    <bindings>
+      <customBinding>
+        <binding name="reliableSessionOverHttps">
+          <reliableSession />
+          <httpsTransport />
+        </binding>
+      </customBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/client.csproj b/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/client.csproj
index 547e7ba2a14..507a55951f2 100644
--- a/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,27 +43,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/service/service.csproj b/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/service/service.csproj
index d8a0c43bcf7..c5ebc58cce3 100644
--- a/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Custom/ReliableSessionOverHttps/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,35 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Security/CS/client/App.config b/framework/wcf/Basic/Binding/Custom/Security/CS/client/App.config
index f89abaaac95..4632d058fce 100644
--- a/framework/wcf/Basic/Binding/Custom/Security/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Security/CS/client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
@@ -14,30 +14,27 @@
         -->
       </endpoint>
     </client>
-
     <bindings>
       <!-- configure a custom binding -->
       <customBinding>
         <binding name="Binding1">
-          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true">
-          </security>
-          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8"/>
-          <sslStreamSecurity requireClientCertificate="false"/>
-          <tcpTransport/>
+          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true"></security>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8" />
+          <sslStreamSecurity requireClientCertificate="false" />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="CalculatorClientBehavior">
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Security/CS/client/client.csproj b/framework/wcf/Basic/Binding/Custom/Security/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/Custom/Security/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Custom/Security/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Security/CS/service/App.config b/framework/wcf/Basic/Binding/Custom/Security/CS/service/App.config
index c613a43320b..c415f8346aa 100644
--- a/framework/wcf/Basic/Binding/Custom/Security/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Security/CS/service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
@@ -6,39 +6,36 @@
         <host>
           <baseAddresses>
             <!-- use following base address -->
-            <add baseAddress="net.tcp://localhost:8000/ServiceModelSamples/Service"/>
+            <add baseAddress="net.tcp://localhost:8000/ServiceModelSamples/Service" />
           </baseAddresses>
         </host>
-        <endpoint address="" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Security.ICalculatorDuplex"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Security.ICalculatorDuplex" />
         <!-- the mex endpoint is exposed at net.tcp://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <!-- configure a custom binding -->
       <customBinding>
         <binding name="Binding1">
-          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true">
-          </security>
-          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8"/>
-          <sslStreamSecurity requireClientCertificate="false"/>
-          <tcpTransport/>
+          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true"></security>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8" />
+          <sslStreamSecurity requireClientCertificate="false" />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata />
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Security/CS/service/service.csproj b/framework/wcf/Basic/Binding/Custom/Security/CS/service/service.csproj
index d326a8d499d..60b7a4ca15c 100644
--- a/framework/wcf/Basic/Binding/Custom/Security/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Custom/Security/CS/service/service.csproj
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,31 +46,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Security/VB/client/App.config b/framework/wcf/Basic/Binding/Custom/Security/VB/client/App.config
index f89abaaac95..4632d058fce 100644
--- a/framework/wcf/Basic/Binding/Custom/Security/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Security/VB/client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
@@ -14,30 +14,27 @@
         -->
       </endpoint>
     </client>
-
     <bindings>
       <!-- configure a custom binding -->
       <customBinding>
         <binding name="Binding1">
-          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true">
-          </security>
-          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8"/>
-          <sslStreamSecurity requireClientCertificate="false"/>
-          <tcpTransport/>
+          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true"></security>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8" />
+          <sslStreamSecurity requireClientCertificate="false" />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="CalculatorClientBehavior">
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Security/VB/service/App.config b/framework/wcf/Basic/Binding/Custom/Security/VB/service/App.config
index c613a43320b..c415f8346aa 100644
--- a/framework/wcf/Basic/Binding/Custom/Security/VB/service/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Security/VB/service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
@@ -6,39 +6,36 @@
         <host>
           <baseAddresses>
             <!-- use following base address -->
-            <add baseAddress="net.tcp://localhost:8000/ServiceModelSamples/Service"/>
+            <add baseAddress="net.tcp://localhost:8000/ServiceModelSamples/Service" />
           </baseAddresses>
         </host>
-        <endpoint address="" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Security.ICalculatorDuplex"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Security.ICalculatorDuplex" />
         <!-- the mex endpoint is exposed at net.tcp://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <!-- configure a custom binding -->
       <customBinding>
         <binding name="Binding1">
-          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true">
-          </security>
-          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8"/>
-          <sslStreamSecurity requireClientCertificate="false"/>
-          <tcpTransport/>
+          <security authenticationMode="SecureConversation" requireSecurityContextCancellation="true"></security>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" writeEncoding="utf-8" />
+          <sslStreamSecurity requireClientCertificate="false" />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata />
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Transport/CS/client/App.config b/framework/wcf/Basic/Binding/Custom/Transport/CS/client/App.config
index 31af7dc0e87..237ddd87057 100644
--- a/framework/wcf/Basic/Binding/Custom/Transport/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Transport/CS/client/App.config
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="default" address="http://localhost:8000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
-      <endpoint name="tcp" address="net.tcp://localhost:9000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
-      <endpoint name="namedpipe" address="net.pipe://localhost/servicemodelsamples/service" binding="customBinding" bindingConfiguration="NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="default" address="http://localhost:8000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
+      <endpoint name="tcp" address="net.tcp://localhost:9000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
+      <endpoint name="namedpipe" address="net.pipe://localhost/servicemodelsamples/service" binding="customBinding" bindingConfiguration="NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
     <bindings>
       <!-- 
                 Following are three CustomBinding configurations.
@@ -27,14 +25,14 @@
       <customBinding>
         <!-- Configure a CustomBinding that supports http transport and text encoding -->
         <binding name="HttpBinding">
-          <textMessageEncoding messageVersion="Soap12WSAddressing10"/>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <httpTransport/>
+          <httpTransport />
           <!-- Attributes of httpTransport with default values.
                         allowCookies="False"
                         authenticationScheme="Anonymous"
@@ -56,14 +54,14 @@
         </binding>
         <!-- Configure a CustomBinding that supports tcp transport and text encoding -->
         <binding name="TcpBinding">
-          <textMessageEncoding/>
+          <textMessageEncoding />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <tcpTransport/>
+          <tcpTransport />
           <!-- Attributes of tcpTransport with default values.
                         listenBacklog="10"
                         portSharingEnabled="False"
@@ -84,13 +82,13 @@
         </binding>
         <!-- Configure a CustomBinding that supports namedpipe transport and binary encoding -->
         <binding name="NamedPipeBinding">
-          <binaryMessageEncoding/>
+          <binaryMessageEncoding />
           <!-- Attributes for binaryMessageEncoder with default values.
                         maxSessionSize="2048" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <namedPipeTransport/>
+          <namedPipeTransport />
           <!-- Attributes of namedPipeTransport with default values.
                         scheme="net.pipe"
                         connectionBufferSize="8192"
@@ -109,5 +107,4 @@
       </customBinding>
     </bindings>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Transport/CS/client/client.csproj b/framework/wcf/Basic/Binding/Custom/Transport/CS/client/client.csproj
index e373f0349d5..43e34525cbd 100644
--- a/framework/wcf/Basic/Binding/Custom/Transport/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Custom/Transport/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,5 +42,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Transport/CS/service/App.config b/framework/wcf/Basic/Binding/Custom/Transport/CS/service/App.config
index 8bc08b5a031..90413a46da8 100644
--- a/framework/wcf/Basic/Binding/Custom/Transport/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Transport/CS/service/App.config
@@ -1,27 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-  
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/servicemodelsamples/service"/>
-            <add baseAddress="net.tcp://localhost:9000/servicemodelsamples/service"/>
-            <add baseAddress="net.pipe://localhost/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
+            <add baseAddress="net.tcp://localhost:9000/servicemodelsamples/service" />
+            <add baseAddress="net.pipe://localhost/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- configure http endpoint, use base address provided by host -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- configure tcp endpoint, use base address provided by host -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="TcpBinding" bindingName="ICalculator_TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="TcpBinding" bindingName="ICalculator_TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- configure namedpipe endpoint, use base address provided by host -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="NamedPipeBinding" bindingName="ICalculator_NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="NamedPipeBinding" bindingName="ICalculator_NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <!-- 
                 Following are three CustomBinding configurations.
@@ -41,14 +39,14 @@
       <customBinding>
         <!-- Configure a CustomBinding that supports http transport and text encoding -->
         <binding name="HttpBinding">
-          <textMessageEncoding messageVersion="Soap12WSAddressing10"/>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <httpTransport/>
+          <httpTransport />
           <!-- Attributes of httpTransport with default values.
                         authenticationScheme="Anonymous"
                         bypassProxyOnLocal="False"
@@ -69,14 +67,14 @@
         </binding>
         <!-- Configure a CustomBinding that supports tcp transport and text encoding -->
         <binding name="TcpBinding">
-          <textMessageEncoding/>
+          <textMessageEncoding />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <tcpTransport/>
+          <tcpTransport />
           <!-- Attributes of tcpTransport with default values.
                         listenBacklog="10"
                         portSharingEnabled="False"
@@ -97,13 +95,13 @@
         </binding>
         <!-- Configure a CustomBinding that supports namedpipe transport and binary encoding -->
         <binding name="NamedPipeBinding">
-          <binaryMessageEncoding/>
+          <binaryMessageEncoding />
           <!-- Attributes for binaryMessageEncoder with default values.
                         maxSessionSize="2048" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <namedPipeTransport/>
+          <namedPipeTransport />
           <!-- Attributes of namedPipeTransport with default values.
                         scheme="net.pipe"
                         connectionBufferSize="8192"
@@ -121,17 +119,14 @@
         </binding>
       </customBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Transport/CS/service/service.csproj b/framework/wcf/Basic/Binding/Custom/Transport/CS/service/service.csproj
index 4b991e4e065..52ed6dffd2b 100644
--- a/framework/wcf/Basic/Binding/Custom/Transport/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Custom/Transport/CS/service/service.csproj
@@ -1,25 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,9 +43,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Custom/Transport/VB/client/app.config b/framework/wcf/Basic/Binding/Custom/Transport/VB/client/app.config
index 31af7dc0e87..237ddd87057 100644
--- a/framework/wcf/Basic/Binding/Custom/Transport/VB/client/app.config
+++ b/framework/wcf/Basic/Binding/Custom/Transport/VB/client/app.config
@@ -1,13 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="default" address="http://localhost:8000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
-      <endpoint name="tcp" address="net.tcp://localhost:9000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
-      <endpoint name="namedpipe" address="net.pipe://localhost/servicemodelsamples/service" binding="customBinding" bindingConfiguration="NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="default" address="http://localhost:8000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
+      <endpoint name="tcp" address="net.tcp://localhost:9000/servicemodelsamples/service" binding="customBinding" bindingConfiguration="TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
+      <endpoint name="namedpipe" address="net.pipe://localhost/servicemodelsamples/service" binding="customBinding" bindingConfiguration="NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
     <bindings>
       <!-- 
                 Following are three CustomBinding configurations.
@@ -27,14 +25,14 @@
       <customBinding>
         <!-- Configure a CustomBinding that supports http transport and text encoding -->
         <binding name="HttpBinding">
-          <textMessageEncoding messageVersion="Soap12WSAddressing10"/>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <httpTransport/>
+          <httpTransport />
           <!-- Attributes of httpTransport with default values.
                         allowCookies="False"
                         authenticationScheme="Anonymous"
@@ -56,14 +54,14 @@
         </binding>
         <!-- Configure a CustomBinding that supports tcp transport and text encoding -->
         <binding name="TcpBinding">
-          <textMessageEncoding/>
+          <textMessageEncoding />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <tcpTransport/>
+          <tcpTransport />
           <!-- Attributes of tcpTransport with default values.
                         listenBacklog="10"
                         portSharingEnabled="False"
@@ -84,13 +82,13 @@
         </binding>
         <!-- Configure a CustomBinding that supports namedpipe transport and binary encoding -->
         <binding name="NamedPipeBinding">
-          <binaryMessageEncoding/>
+          <binaryMessageEncoding />
           <!-- Attributes for binaryMessageEncoder with default values.
                         maxSessionSize="2048" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <namedPipeTransport/>
+          <namedPipeTransport />
           <!-- Attributes of namedPipeTransport with default values.
                         scheme="net.pipe"
                         connectionBufferSize="8192"
@@ -109,5 +107,4 @@
       </customBinding>
     </bindings>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Custom/Transport/VB/service/App.config b/framework/wcf/Basic/Binding/Custom/Transport/VB/service/App.config
index 5cdbc5edde6..90413a46da8 100644
--- a/framework/wcf/Basic/Binding/Custom/Transport/VB/service/App.config
+++ b/framework/wcf/Basic/Binding/Custom/Transport/VB/service/App.config
@@ -1,27 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/servicemodelsamples/service"/>
-            <add baseAddress="net.tcp://localhost:9000/servicemodelsamples/service"/>
-            <add baseAddress="net.pipe://localhost/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
+            <add baseAddress="net.tcp://localhost:9000/servicemodelsamples/service" />
+            <add baseAddress="net.pipe://localhost/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- configure http endpoint, use base address provided by host -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="HttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- configure tcp endpoint, use base address provided by host -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="TcpBinding" bindingName="ICalculator_TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="TcpBinding" bindingName="ICalculator_TcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- configure namedpipe endpoint, use base address provided by host -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="NamedPipeBinding" bindingName="ICalculator_NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="NamedPipeBinding" bindingName="ICalculator_NamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <!-- 
                 Following are three CustomBinding configurations.
@@ -41,14 +39,14 @@
       <customBinding>
         <!-- Configure a CustomBinding that supports http transport and text encoding -->
         <binding name="HttpBinding">
-          <textMessageEncoding messageVersion="Soap12WSAddressing10"/>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <httpTransport/>
+          <httpTransport />
           <!-- Attributes of httpTransport with default values.
                         authenticationScheme="Anonymous"
                         bypassProxyOnLocal="False"
@@ -69,14 +67,14 @@
         </binding>
         <!-- Configure a CustomBinding that supports tcp transport and text encoding -->
         <binding name="TcpBinding">
-          <textMessageEncoding/>
+          <textMessageEncoding />
           <!-- Attributes of textMessageEncoder with default values.
                         messageVersion="Soap12WSAddressing10" 
                         writeEncoding="utf-8" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <tcpTransport/>
+          <tcpTransport />
           <!-- Attributes of tcpTransport with default values.
                         listenBacklog="10"
                         portSharingEnabled="False"
@@ -97,13 +95,13 @@
         </binding>
         <!-- Configure a CustomBinding that supports namedpipe transport and binary encoding -->
         <binding name="NamedPipeBinding">
-          <binaryMessageEncoding/>
+          <binaryMessageEncoding />
           <!-- Attributes for binaryMessageEncoder with default values.
                         maxSessionSize="2048" 
                         maxReadPoolSize="64"
                         maxWritePoolSize="16"
                     -->
-          <namedPipeTransport/>
+          <namedPipeTransport />
           <!-- Attributes of namedPipeTransport with default values.
                         scheme="net.pipe"
                         connectionBufferSize="8192"
@@ -121,17 +119,14 @@
         </binding>
       </customBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/App.config
index 7e8bea016e9..bca336309eb 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/App.config
@@ -1,24 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ Dead Letter queue name -->
-    <add key="deadLetterQueueName" value=".\private$\ServiceModelSamplesOrdersAppDLQ"/>
+    <add key="deadLetterQueueName" value=".\private$\ServiceModelSamplesOrdersAppDLQ" />
   </appSettings>
-
   <system.serviceModel>
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
+      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
     </client>
-
     <bindings>
       <netMsmqBinding>
         <binding name="PerAppDLQBinding" deadLetterQueue="Custom" customDeadLetterQueue="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ" timeToLive="00:00:02">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/Client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/Client.csproj
index db8f0cf88d1..86cb152a092 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5C7DFB5F-0CA6-41CC-ABD3-670459BDD569}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,27 +50,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/App.config
index dd818b3e6e4..0cf58ff8a38 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/App.config
@@ -1,27 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQDeadLetter.PurchaseOrderDLQService">
         <!-- Define NetMsmqEndpoint in this case, DLQ end point to read messages-->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ" binding="netMsmqBinding" bindingConfiguration="DefaultBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ" binding="netMsmqBinding" bindingConfiguration="DefaultBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
       </service>
     </services>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="SystemDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
+      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="SystemDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
     </client>
-
     <bindings>
       <netMsmqBinding>
         <binding name="DefaultBinding">
-          <security mode="None"/>
-        </binding>
-        <binding name="SystemDLQBinding" deadLetterQueue="System">
+          <security mode="None" />
         </binding>
+        <binding name="SystemDLQBinding" deadLetterQueue="System"></binding>
       </netMsmqBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/DeadLetterService.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/DeadLetterService.csproj
index cc41f97f6a7..c62330a5f5b 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/DeadLetterService.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/DeadLetterService/DeadLetterService.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{530DCEDD-FBF5-43A7-80AC-BF0A78FFFB94}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeadLetterService</RootNamespace>
     <AssemblyName>DeadLetterService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,27 +50,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/App.config
index 07a72da3c93..3648a809339 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/App.config
@@ -1,28 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ dead letter queue -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesDeadLetter"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesDeadLetter" />
   </appSettings>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQDeadLetter.OrderProcessorService">
         <host>
           <baseAddresses>
-             <add baseAddress="http://localhost:8000/orderProcessor/deadLetterSample"/>
+            <add baseAddress="http://localhost:8000/orderProcessor/deadLetterSample" />
           </baseAddresses>
         </host>
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesDeadLetter" binding="netMsmqBinding" bindingConfiguration="PerAppDLQBinding" contract="Microsoft.Samples.MSMQDeadLetter.IOrderProcessor" />
       </service>
     </services>
     <bindings>
       <netMsmqBinding>
         <binding name="PerAppDLQBinding" deadLetterQueue="Custom" customDeadLetterQueue="net.msmq://localhost/private/ServiceModelSamplesOrdersAppDLQ">
-          <security mode ="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/Service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/Service.csproj
index 3ec4d96bdb2..ddd8310d86e 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/DeadLetter/CS/Service/Service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{60FECAE3-DA07-43E1-B64B-630C1CD87FC5}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +49,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/App.config
index 7fede2f0b5b..1eb5bacbce4 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/App.config
@@ -1,24 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All rights reserved.-->
 <configuration>
-
   <system.serviceModel>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint address="net.msmq://localhost/private/ServiceModelSamplesMessageSecurity" binding="netMsmqBinding" bindingConfiguration="messageSecurityBinding" contract="Microsoft.Samples.MSMQMessageSecurity.IOrderProcessor" behaviorConfiguration="ClientCertificateBehavior"/>
+      <endpoint address="net.msmq://localhost/private/ServiceModelSamplesMessageSecurity" binding="netMsmqBinding" bindingConfiguration="messageSecurityBinding" contract="Microsoft.Samples.MSMQMessageSecurity.IOrderProcessor" behaviorConfiguration="ClientCertificateBehavior" />
     </client>
-
     <bindings>
-        <netMsmqBinding>
-            <binding name="messageSecurityBinding">
-                <security mode="Message">
-                    <message clientCredentialType="Certificate"/>
-                </security>
-            </binding>
-        </netMsmqBinding>
+      <netMsmqBinding>
+        <binding name="messageSecurityBinding">
+          <security mode="Message">
+            <message clientCredentialType="Certificate" />
+          </security>
+        </binding>
+      </netMsmqBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -28,9 +24,9 @@
         This configuration references the "client.com" certificate installed during the setup instructions.
         -->
           <clientCredentials>
-            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName"/>
+            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName" />
             <serviceCertificate>
-                <defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName"/>
+              <defaultCertificate findValue="localhost" storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" />
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
             is in the user's Trusted People store, then it will be trusted without performing a
@@ -39,12 +35,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/client.csproj
index 2597935ab0a..d8f4d080ae7 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,27 +63,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/App.config
index 81e30fd401e..dff5149952a 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/App.config
@@ -1,49 +1,45 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesMessageSecurity"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesMessageSecurity" />
   </appSettings>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQMessageSecurity.OrderProcessorService" behaviorConfiguration="PurchaseOrderServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesMessageSecurity" binding="netMsmqBinding" bindingConfiguration="messageSecurityBinding" contract="Microsoft.Samples.MSMQMessageSecurity.IOrderProcessor"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesMessageSecurity" binding="netMsmqBinding" bindingConfiguration="messageSecurityBinding" contract="Microsoft.Samples.MSMQMessageSecurity.IOrderProcessor" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
-        <netMsmqBinding>
-            <binding name="messageSecurityBinding">
-                <security mode="Message">
-                    <message clientCredentialType="Certificate"/>
-                </security>
-            </binding>
-        </netMsmqBinding>
+      <netMsmqBinding>
+        <binding name="messageSecurityBinding">
+          <security mode="Message">
+            <message clientCredentialType="Certificate" />
+          </security>
+        </binding>
+      </netMsmqBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="PurchaseOrderServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
           <!-- 
                The serviceCredentials behavior allows one to define a service certificate.
                A service certificate is used by the service to authenticate itself to its clients and to provide message protection.
                This configuration references the "localhost" certificate installed during the setup instructions.
           -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
             <clientCertificate>
-                <certificate findValue="client.com" storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectName"/>
+              <certificate findValue="client.com" storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectName" />
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
             is in the user's Trusted People store, then it will be trusted without performing a
@@ -52,13 +48,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </clientCertificate>
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/service.csproj
index e3c054c1acf..1d3917d7e57 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/MessageSecurity/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50105</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,27 +51,5 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/App.config
index c910b6988bb..5b2904f7628 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/App.config
@@ -1,21 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <system.serviceModel>
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesPoison" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQPoison.IOrderProcessor"/>
+      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesPoison" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQPoison.IOrderProcessor" />
     </client>
-    
     <bindings>
       <netMsmqBinding>
         <binding name="netMsmqBindingConfig">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
- 
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/Client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/Client.csproj
index e31327671f5..961390496d9 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F85369F2-BD64-4953-A924-90A838D8A29A}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,27 +50,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/App.config
index 8dfd5222df6..2274d86ae84 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/App.config
@@ -1,22 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQPoison.OrderProcessorService">
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesPoison;poison" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQPoison.IOrderProcessor">
-        </endpoint>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesPoison;poison" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQPoison.IOrderProcessor"></endpoint>
       </service>
     </services>
-    
     <bindings>
       <netMsmqBinding>
         <binding name="netMsmqBindingConfig">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-    
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/PoisonMessageService.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/PoisonMessageService.csproj
index 619ff39f790..cac6e0ec876 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/PoisonMessageService.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/PoisonMessageService/PoisonMessageService.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E66F395-1641-4F2D-AD94-DFB97A805338}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PoisonMessageService</RootNamespace>
     <AssemblyName>PoisonMessageService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +49,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/App.config
index 692ffedd31d..2e08f260a6a 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/App.config
@@ -1,42 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesPoison"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesPoison" />
   </appSettings>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQPoison.OrderProcessorService" behaviorConfiguration="OrderProcessorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
-
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesPoison" binding="netMsmqBinding" bindingConfiguration="PoisonBinding" contract="Microsoft.Samples.MSMQPoison.IOrderProcessor"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesPoison" binding="netMsmqBinding" bindingConfiguration="PoisonBinding" contract="Microsoft.Samples.MSMQPoison.IOrderProcessor" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
-
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <netMsmqBinding>
         <binding name="PoisonBinding" receiveRetryCount="0" maxRetryCycles="1" retryCycleDelay="00:00:05" receiveErrorHandling="Move">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="OrderProcessorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/Service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/Service.csproj
index 24f49308884..c1a003c1d05 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/Service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Poison/Msmq4/CS/service/Service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5FA90AD0-1DDA-424A-8D6D-569E0C9D8CD9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +49,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/App.config
index 2f2728ad7a7..0b61d8d8b1e 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/App.config
@@ -1,22 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <system.serviceModel>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint name="OrderTakerEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesSession" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQSessionSample.IOrderTaker"/>
+      <endpoint name="OrderTakerEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesSession" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQSessionSample.IOrderTaker" />
     </client>
-
     <bindings>
       <netMsmqBinding>
         <binding name="netMsmqBindingConfig">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/client.csproj
index 26208fd141f..006bf6881dd 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{82CEFC8D-91DF-4DCE-9EE0-9F1A6812F514}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>client</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +49,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/App.config
index 3d86b094c5d..bbc7f14ed17 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/App.config
@@ -1,43 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesSession"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesSession" />
   </appSettings>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQSessionSample.OrderTakerService" behaviorConfiguration="OrderTakerServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
-        </host>               
+        </host>
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesSession" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQSessionSample.IOrderTaker"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesSession" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQSessionSample.IOrderTaker" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="OrderTakerServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
     <bindings>
       <netMsmqBinding>
         <binding name="netMsmqBindingConfig">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/service.csproj
index adaa0ce4ed8..b47f7af2bda 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Session/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{87AD269C-696F-40E3-AD68-07F1808F1317}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +48,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/App.config
index b8379f0f583..2dac6323902 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/App.config
@@ -1,20 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <system.serviceModel>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesSrmp" bindingConfiguration="srmpBinding" binding="netMsmqBinding" contract="Microsoft.Samples.MSMQSrmpSample.IOrderProcessor"/>
+      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesSrmp" bindingConfiguration="srmpBinding" binding="netMsmqBinding" contract="Microsoft.Samples.MSMQSrmpSample.IOrderProcessor" />
     </client>
     <bindings>
       <netMsmqBinding>
         <binding name="srmpBinding" queueTransferProtocol="Srmp">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/client.csproj
index 9a9e870cc8f..d8f4d080ae7 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,14 +32,8 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Messaging" />
-    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\binaries.AMD64chk\System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\binaries.AMD64chk\System.ServiceModel.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -90,27 +63,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/App.config
index 7b926426cc6..158c1eb8b7d 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/App.config
@@ -1,40 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesSrmp"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesSrmp" />
   </appSettings>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQSrmpSample.OrderProcessorService" behaviorConfiguration="OrderProcessorBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesSrmp" bindingConfiguration="srmpBinding" binding="netMsmqBinding" contract="Microsoft.Samples.MSMQSrmpSample.IOrderProcessor"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesSrmp" bindingConfiguration="srmpBinding" binding="netMsmqBinding" contract="Microsoft.Samples.MSMQSrmpSample.IOrderProcessor" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
     <bindings>
       <netMsmqBinding>
         <binding name="srmpBinding" queueTransferProtocol="Srmp">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
     <behaviors>
       <serviceBehaviors>
         <behavior name="OrderProcessorBehavior">
-          <serviceDebug includeExceptionDetailInFaults="false"/>
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="false" />
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/service.csproj
index 4178cb5150b..12eeef7d96b 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Srmp/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,14 +37,8 @@
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Messaging" />
-    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\binaries.AMD64chk\System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\binaries.AMD64chk\System.ServiceModel.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -74,27 +49,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/App.config
index dc8c229f163..70f767fff6f 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/App.config
@@ -1,21 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTransacted" binding="netMsmqBinding" bindingConfiguration="TransactedBinding" contract="Microsoft.Samples.MSMQTransactedSample.IOrderProcessor"/>
+      <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTransacted" binding="netMsmqBinding" bindingConfiguration="TransactedBinding" contract="Microsoft.Samples.MSMQTransactedSample.IOrderProcessor" />
     </client>
-
     <bindings>
       <netMsmqBinding>
         <binding name="TransactedBinding">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/client.csproj
index 2597935ab0a..d8f4d080ae7 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,27 +63,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/App.config
index 5fc377e6808..90246b0899c 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/App.config
@@ -1,43 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesTransacted"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesTransacted" />
   </appSettings>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQTransactedSample.OrderProcessorService" behaviorConfiguration="OrderProcessorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTransacted" binding="netMsmqBinding" bindingConfiguration="TransactedBinding" contract="Microsoft.Samples.MSMQTransactedSample.IOrderProcessor"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTransacted" binding="netMsmqBinding" bindingConfiguration="TransactedBinding" contract="Microsoft.Samples.MSMQTransactedSample.IOrderProcessor" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="OrderProcessorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
     <bindings>
       <netMsmqBinding>
         <binding name="TransactedBinding">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/service.csproj
index eccd2bd50dc..a2e98e17341 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Transacted/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50105</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,30 +49,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/App.config
index a5e01d6f506..4e19aab566c 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/App.config
@@ -1,33 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesTwo-way/OrderStatus"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesTwo-way/OrderStatus" />
   </appSettings>
-
   <system.serviceModel>
-
     <services>
       <service name="Microsoft.Samples.MSMQTwoWay.OrderStatusService">
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTwo-way/OrderStatus" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQTwoWay.IOrderStatus"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTwo-way/OrderStatus" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQTwoWay.IOrderStatus" />
       </service>
     </services>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesTwo-way/OrderProcessor" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQTwoWay.IOrderProcessor"/>
+      <endpoint name="OrderProcessorEndpoint" address="net.msmq://localhost/private/ServiceModelSamplesTwo-way/OrderProcessor" binding="netMsmqBinding" bindingConfiguration="netMsmqBindingConfig" contract="Microsoft.Samples.MSMQTwoWay.IOrderProcessor" />
     </client>
-
     <bindings>
       <netMsmqBinding>
         <binding name="netMsmqBindingConfig">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/client.csproj
index 2597935ab0a..d8f4d080ae7 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,27 +63,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/App.config
index 92f8d7045c3..19df73ea81b 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/App.config
@@ -1,28 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesTwo-way/OrderProcessor"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesTwo-way/OrderProcessor" />
   </appSettings>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQTwoWay.OrderProcessorService">
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTwo-way/OrderProcessor" binding="netMsmqBinding" bindingConfiguration="TransactedBinding" contract="Microsoft.Samples.MSMQTwoWay.IOrderProcessor"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesTwo-way/OrderProcessor" binding="netMsmqBinding" bindingConfiguration="TransactedBinding" contract="Microsoft.Samples.MSMQTwoWay.IOrderProcessor" />
       </service>
     </services>
-
     <bindings>
       <netMsmqBinding>
         <binding name="TransactedBinding">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/service.csproj
index 68962a6e018..7f5d9b1c0d0 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Two-way/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,30 +50,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/App.config
index 0cf232e3960..32d8cc64e00 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/App.config
@@ -1,22 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <system.serviceModel>
-
     <client>
       <!-- Define NetMsmqEndpoint -->
-      <endpoint address="net.msmq://localhost/private/ServiceModelSamplesVolatile" binding="netMsmqBinding" bindingConfiguration="volatileBinding" contract="Microsoft.Samples.MSMQVolatileSample.IStockTicker"/>
+      <endpoint address="net.msmq://localhost/private/ServiceModelSamplesVolatile" binding="netMsmqBinding" bindingConfiguration="volatileBinding" contract="Microsoft.Samples.MSMQVolatileSample.IStockTicker" />
     </client>
-
     <bindings>
       <netMsmqBinding>
         <binding name="volatileBinding" durable="false" exactlyOnce="false">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/client.csproj
index 1f8b7aca08d..b93e6ebe55b 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D41C2F2B-6E2E-4E04-8125-AC49640F6FFE}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>client</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +49,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/App.config b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/App.config
index 8592a8e17d1..ec4966dd4e4 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/App.config
@@ -1,45 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\ServiceModelSamplesVolatile"/>
+    <add key="queueName" value=".\private$\ServiceModelSamplesVolatile" />
   </appSettings>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQVolatileSample.StockTickerService" behaviorConfiguration="StockTickerServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
-
         <!-- Define NetMsmqEndpoint -->
-        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesVolatile" binding="netMsmqBinding" bindingConfiguration="volatileBinding" contract="Microsoft.Samples.MSMQVolatileSample.IStockTicker"/>
+        <endpoint address="net.msmq://localhost/private/ServiceModelSamplesVolatile" binding="netMsmqBinding" bindingConfiguration="volatileBinding" contract="Microsoft.Samples.MSMQVolatileSample.IStockTicker" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
-
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <netMsmqBinding>
         <binding name="volatileBinding" durable="false" exactlyOnce="false">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </netMsmqBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="StockTickerServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/service.csproj
index 4b870351c86..06918281d28 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQ/Volatile/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{30DA088C-55E5-40E2-AFB1-5B26E0AA4C70}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +48,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/App.config b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/App.config
index 8c681ad1446..f23c98faf94 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="orderQueueName" value=".\private$\Orders"/>
-    <add key="orderResponseQueueName" value=".\private$\OrderResponse"/>
+    <add key="orderQueueName" value=".\private$\Orders" />
+    <add key="orderResponseQueueName" value=".\private$\OrderResponse" />
   </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/client.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/client.csproj
index 376c9758002..bbba1a8951d 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CCB30805-1E5E-426D-BB25-3AB6D4ACE70F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,27 +51,5 @@
       <Name>Order</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Order/order.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Order/order.csproj
index 7466586d293..57eaefbec79 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Order/order.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Order/order.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15776E64-5E84-4B87-B079-9164587B5570}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Order</RootNamespace>
     <AssemblyName>Order</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,29 +39,7 @@
     <Compile Include="Order.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -88,4 +47,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/App.config b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/App.config
index 037ac13b49d..490b8149265 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/App.config
@@ -1,31 +1,24 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <appSettings>
-    <add key="orderQueueName" value=".\private$\Orders"/>
+    <add key="orderQueueName" value=".\private$\Orders" />
   </appSettings>
   <system.serviceModel>
     <client>
-      <endpoint name="OrderResponseEndpoint" address="msmq.formatname:DIRECT=OS:.\private$\OrderResponse" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.MSMQMessageCorrelation.IOrderResponse">
-      </endpoint>
+      <endpoint name="OrderResponseEndpoint" address="msmq.formatname:DIRECT=OS:.\private$\OrderResponse" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.MSMQMessageCorrelation.IOrderResponse"></endpoint>
     </client>
-
     <services>
       <service name="Microsoft.Samples.MSMQMessageCorrelation.OrderProcessorService">
-        <endpoint address="msmq.formatname:DIRECT=OS:.\private$\Orders" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.MSMQMessageCorrelation.IOrderProcessor">
-        </endpoint>
+        <endpoint address="msmq.formatname:DIRECT=OS:.\private$\Orders" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.MSMQMessageCorrelation.IOrderProcessor"></endpoint>
       </service>
     </services>
-
     <bindings>
       <msmqIntegrationBinding>
         <binding name="OrderProcessorBinding">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </msmqIntegrationBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/Service.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/Service.csproj
index 5b751d23143..0bee90f3074 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MessageCorrelation/CS/Service/Service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{58A81298-3B51-493E-B7FB-FF48C7BE30DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,27 +56,5 @@
       <Name>Order</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/App.config b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/App.config
index 05768fa4fac..77b5a6178a5 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/App.config
@@ -1,8 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-	<appSettings>
-		<!-- use appSetting to configure MSMQ queue name -->
-		<add key="orderQueueName" value=".\private$\Orders"/>
-	</appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <appSettings>
+    <!-- use appSetting to configure MSMQ queue name -->
+    <add key="orderQueueName" value=".\private$\Orders" />
+  </appSettings>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/Client.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/Client.csproj
index 376c9758002..bbba1a8951d 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CCB30805-1E5E-426D-BB25-3AB6D4ACE70F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,27 +51,5 @@
       <Name>Order</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Order/Order.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Order/Order.csproj
index 7466586d293..57eaefbec79 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Order/Order.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Order/Order.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15776E64-5E84-4B87-B079-9164587B5570}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Order</RootNamespace>
     <AssemblyName>Order</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,29 +39,7 @@
     <Compile Include="Order.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -88,4 +47,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/App.config b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/App.config
index 1ce3e31382a..e8d64d31c76 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/App.config
@@ -1,26 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="orderQueueName" value=".\private$\Orders"/>
+    <add key="orderQueueName" value=".\private$\Orders" />
   </appSettings>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.MSMQToWCF.OrderProcessorService">
-        <endpoint address="msmq.formatname:DIRECT=OS:.\private$\Orders" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.MSMQToWCF.IOrderProcessor">
-        </endpoint>
+        <endpoint address="msmq.formatname:DIRECT=OS:.\private$\Orders" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.MSMQToWCF.IOrderProcessor"></endpoint>
       </service>
     </services>
-
     <bindings>
       <msmqIntegrationBinding>
         <binding name="OrderProcessorBinding">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </msmqIntegrationBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/Service.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/Service.csproj
index 0679c9ba75f..aaa5b216ce9 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/MsmqToWcf/CS/Service/Service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{58A81298-3B51-493E-B7FB-FF48C7BE30DB}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,27 +52,5 @@
       <Name>Order</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/App.config b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/App.config
index 0cac6797418..d04a41eb263 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/App.config
@@ -1,22 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <system.serviceModel>
-
     <client>
-      <endpoint name="OrderResponseEndpoint" address="msmq.formatname:DIRECT=OS:.\private$\Orders" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.WCFToMSMQ.IOrderProcessor">
-      </endpoint>
+      <endpoint name="OrderResponseEndpoint" address="msmq.formatname:DIRECT=OS:.\private$\Orders" binding="msmqIntegrationBinding" bindingConfiguration="OrderProcessorBinding" contract="Microsoft.Samples.WCFToMSMQ.IOrderProcessor"></endpoint>
     </client>
-
     <bindings>
       <msmqIntegrationBinding>
         <binding name="OrderProcessorBinding">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
       </msmqIntegrationBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/Client.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/Client.csproj
index d9d65856c39..0ce11ed4961 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{93198C3C-0859-472E-A1DE-9207B0B23757}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,27 +53,5 @@
       <Name>Order</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Order/Order.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Order/Order.csproj
index 5e16bed9c31..f5f7ea4eab0 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Order/Order.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Order/Order.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15776E64-5E84-4B87-B079-9164587B5570}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Order</RootNamespace>
     <AssemblyName>Order</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,33 +37,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <Reference Include="System" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <HintPath>..\..\..\..\..\..\..\..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -90,4 +47,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/App.config b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/App.config
index e67cdcf9133..39af4c65cd0 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/App.config
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/App.config
@@ -1,9 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
-    <add key="queueName" value=".\private$\Orders"/>
+    <add key="queueName" value=".\private$\Orders" />
   </appSettings>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/Service.csproj b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/Service.csproj
index abbd7871458..8ab20607f78 100644
--- a/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Binding/Net/MSMQIntegration/WcfToMsmq/CS/Service/Service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E8C53AC7-CF3C-4128-B2C8-4153E13555B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,27 +50,5 @@
       <Name>Order</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/App.config b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/App.config
index f1c40eecc14..3ad37bbed39 100644
--- a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="net.pipe://localhost/servicemodelsamples/service" binding="netNamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint address="net.pipe://localhost/servicemodelsamples/service" binding="netNamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/App.config b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/App.config
index c16503e17af..bc7610387fe 100644
--- a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/App.config
@@ -1,21 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-  
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: net.pipe://localhost/ServiceModelSamples/service  -->
-        <endpoint address="net.pipe://localhost/ServiceModelSamples/service" binding="netNamedPipeBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="net.pipe://localhost/ServiceModelSamples/service" binding="netNamedPipeBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <!-- 
             Following is the expanded configuration section for a NetNamedPipeBinding.
@@ -24,22 +22,19 @@
       <netNamedPipeBinding>
         <binding name="Binding1" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="65536">
           <security mode="Transport">
-            <transport protectionLevel="EncryptAndSign"/>
+            <transport protectionLevel="EncryptAndSign" />
           </security>
         </binding>
       </netNamedPipeBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/service.csproj b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/service.csproj
index 0a6732c70c3..3907177041e 100644
--- a/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/Net/NamedPipe/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/Net/NamedPipe/VB/client/App.config b/framework/wcf/Basic/Binding/Net/NamedPipe/VB/client/App.config
index f1c40eecc14..3ad37bbed39 100644
--- a/framework/wcf/Basic/Binding/Net/NamedPipe/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/NamedPipe/VB/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="net.pipe://localhost/servicemodelsamples/service" binding="netNamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint address="net.pipe://localhost/servicemodelsamples/service" binding="netNamedPipeBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/NamedPipe/VB/service/App.config b/framework/wcf/Basic/Binding/Net/NamedPipe/VB/service/App.config
index 499b5441668..bc7610387fe 100644
--- a/framework/wcf/Basic/Binding/Net/NamedPipe/VB/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/NamedPipe/VB/service/App.config
@@ -1,21 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: net.pipe://localhost/ServiceModelSamples/service  -->
-        <endpoint address="net.pipe://localhost/ServiceModelSamples/service" binding="netNamedPipeBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="net.pipe://localhost/ServiceModelSamples/service" binding="netNamedPipeBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <!-- 
             Following is the expanded configuration section for a NetNamedPipeBinding.
@@ -24,22 +22,19 @@
       <netNamedPipeBinding>
         <binding name="Binding1" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" transactionFlow="false" transferMode="Buffered" transactionProtocol="OleTransactions" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxBufferSize="65536" maxConnections="10" maxReceivedMessageSize="65536">
           <security mode="Transport">
-            <transport protectionLevel="EncryptAndSign"/>
+            <transport protectionLevel="EncryptAndSign" />
           </security>
         </binding>
       </netNamedPipeBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/App.config b/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/App.config
index 9174a43d29f..2d9b48f2a8f 100644
--- a/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
diff --git a/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/client.csproj
index 4d8e291c24a..a5b372a848c 100644
--- a/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/client/client.csproj
@@ -8,27 +8,22 @@
     <Product>Windows Communication Foundation and Windows Workflow Foundation SDK</Product>
     <Copyright>Copyright (c) Microsoft Corporation</Copyright>
   </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <None Remove="Connected Services\Microsoft.Samples.NetTcp\ConnectedService.json" />
     <Compile Remove="Connected Services\Microsoft.Samples.NetTcp\Reference.cs" />
     <None Include="Connected Services\Microsoft.Samples.NetTcp\Reference.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <None Remove="App.config" />
     <Compile Remove="generatedClient.cs" />
     <None Include="generatedClient.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.ServiceModel.Primitives" Version="6.*" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="6.*" />
   </ItemGroup>
-
 </Project>
diff --git a/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/service/App.config b/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/service/App.config
index 475300727b7..c7deea814bd 100644
--- a/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/Net/Tcp/Default/CS/service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
@@ -11,7 +11,7 @@
       <serviceBehaviors>
         <behavior>
           <serviceMetadata httpGetEnabled="true" httpGetUrl="http://localhost:8000/servicemodelsamples/service" />
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
diff --git a/framework/wcf/Basic/Binding/Net/Tcp/PortSharing/CS/client/client.csproj b/framework/wcf/Basic/Binding/Net/Tcp/PortSharing/CS/client/client.csproj
index b52a17aaa67..8b5cef50a27 100644
--- a/framework/wcf/Basic/Binding/Net/Tcp/PortSharing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/Net/Tcp/PortSharing/CS/client/client.csproj
@@ -8,14 +8,11 @@
     <Product>Windows Communication Foundation and Windows Workflow Foundation SDK</Product>
     <Copyright>Copyright (c) Microsoft Corporation</Copyright>
   </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.ServiceModel.Primitives" Version="6.*" />
     <PackageReference Include="System.ServiceModel.NetTcp" Version="6.*" />
   </ItemGroup>
-
 </Project>
diff --git a/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/App.config b/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/App.config
index 6d5819a8ee6..caddda543ff 100644
--- a/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/App.config
@@ -1,19 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.DualHttp.ICalculatorDuplex"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.DualHttp.ICalculatorDuplex" />
     </client>
-
     <bindings>
       <!-- configure a WSDualHttpBinding that supports duplex communication -->
       <wsDualHttpBinding>
-        <binding name="Binding1" clientBaseAddress="http://localhost:8000/myClient/" useDefaultWebProxy="true" bypassProxyOnLocal="false">
-        </binding>
+        <binding name="Binding1" clientBaseAddress="http://localhost:8000/myClient/" useDefaultWebProxy="true" bypassProxyOnLocal="false"></binding>
       </wsDualHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/client.csproj
index be1b0fb27a5..2cdd00ea842 100644
--- a/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/DualHttp/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.DualHttp</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/DualHttp/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/DualHttp/CS/service/service.csproj
index ab476ae5f2a..1ad576da02b 100644
--- a/framework/wcf/Basic/Binding/WS/DualHttp/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/DualHttp/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.DualHttp</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,35 +48,13 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)Service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
+    <PostBuildEvent>if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+    copy "$(TargetDir)Service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
 </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MTOM/CS/client/App.config b/framework/wcf/Basic/Binding/WS/MTOM/CS/client/App.config
index 15f17f2ed95..d9ce702cd9c 100644
--- a/framework/wcf/Basic/Binding/WS/MTOM/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MTOM/CS/client/App.config
@@ -1,14 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
-        <binding name="WSHttpBinding_IUpload" messageEncoding="Mtom"/>
+        <binding name="WSHttpBinding_IUpload" messageEncoding="Mtom" />
       </wsHttpBinding>
     </bindings>
     <client>
-      <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpload" contract="IUpload">
-      </endpoint>
+      <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IUpload" contract="IUpload"></endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MTOM/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/MTOM/CS/client/client.csproj
index 67a57c7c504..a910a6b6801 100644
--- a/framework/wcf/Basic/Binding/WS/MTOM/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/MTOM/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,10 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\..\..\..\..\..\..\binaries.x86chk\System.Runtime.Serialization.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.XML" />
   </ItemGroup>
@@ -71,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MTOM/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/MTOM/CS/service/service.csproj
index 1478a365537..e9d12b700de 100644
--- a/framework/wcf/Basic/Binding/WS/MTOM/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/MTOM/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,35 +45,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/App.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/App.config
index 710263cf4af..63573e9e8a2 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" behaviorConfiguration="ClientCredentialsBehavior" bindingConfiguration="Binding1" contract="Microsoft.Samples.Anonymous.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" behaviorConfiguration="ClientCredentialsBehavior" bindingConfiguration="Binding1" contract="Microsoft.Samples.Anonymous.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -13,12 +12,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="None"/>
+            <message clientCredentialType="None" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCredentialsBehavior">
@@ -32,11 +30,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/service/service.csproj
index bb88c6d8cf7..f6944405683 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/VB/client/App.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/VB/client/App.config
index 710263cf4af..63573e9e8a2 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Anonymous/VB/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" behaviorConfiguration="ClientCredentialsBehavior" bindingConfiguration="Binding1" contract="Microsoft.Samples.Anonymous.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" behaviorConfiguration="ClientCredentialsBehavior" bindingConfiguration="Binding1" contract="Microsoft.Samples.Anonymous.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -13,12 +12,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="None"/>
+            <message clientCredentialType="None" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCredentialsBehavior">
@@ -32,11 +30,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/App.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/App.config
index f261cd61d26..65933fed916 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/App.config
@@ -1,11 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
       <!-- Use a behavior to configure the client certificate to present to the service. -->
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.Certificate.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.Certificate.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -14,12 +13,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -29,7 +27,7 @@
         This configuration references the "client.com" certificate installed during the setup instructions.
         -->
           <clientCredentials>
-            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName"/>
+            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName" />
             <serviceCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -39,11 +37,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/client.csproj
index b9f6e064655..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/service/service.csproj
index 61a59d70ac5..217e50e7bc3 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,34 +48,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/VB/client/App.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/VB/client/App.config
index f261cd61d26..65933fed916 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Certificate/VB/client/App.config
@@ -1,11 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
       <!-- Use a behavior to configure the client certificate to present to the service. -->
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.Certificate.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.Certificate.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -14,12 +13,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -29,7 +27,7 @@
         This configuration references the "client.com" certificate installed during the setup instructions.
         -->
           <clientCredentials>
-            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName"/>
+            <clientCertificate findValue="client.com" storeLocation="CurrentUser" storeName="My" x509FindType="FindBySubjectName" />
             <serviceCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -39,11 +37,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/App.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/App.config
index 8a0dc3cd92e..71cbade8348 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCredentialsBehavior" contract="Microsoft.Samples.UserName.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCredentialsBehavior" contract="Microsoft.Samples.UserName.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -13,12 +12,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <endpointBehaviors>
@@ -33,11 +31,11 @@
         -->
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/client.csproj
index b9f6e064655..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/service/service.csproj
index 7f9dff1c1f5..f6944405683 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/VB/client/app.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/VB/client/app.config
index 8a0dc3cd92e..71cbade8348 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/VB/client/app.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Username/VB/client/app.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCredentialsBehavior" contract="Microsoft.Samples.UserName.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCredentialsBehavior" contract="Microsoft.Samples.UserName.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -13,12 +12,11 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <endpointBehaviors>
@@ -33,11 +31,11 @@
         -->
           <clientCredentials>
             <serviceCertificate>
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/App.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/App.config
index f92de295db7..f8b66eadab5 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Windows.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Windows.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -14,10 +13,10 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/client.csproj
index b9f6e064655..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/service/service.csproj
index 7f9dff1c1f5..f6944405683 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/VB/client/app.config b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/VB/client/app.config
index f92de295db7..f8b66eadab5 100644
--- a/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/VB/client/app.config
+++ b/framework/wcf/Basic/Binding/WS/MessageSecurity/Windows/VB/client/app.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Windows.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Windows.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -14,10 +13,10 @@
         -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/App.config b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/App.config
index b68fa2fe290..4402ecf9a2c 100644
--- a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/App.config
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <netTcpBinding>
-        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions"/>
+        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions" />
       </netTcpBinding>
       <wsHttpBinding>
-        <binding name="transactionalWsatHttpBinding" transactionFlow="true"/>
+        <binding name="transactionalWsatHttpBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
     <client>
       <endpoint address="http://localhost:8000/ServiceModelSamples/service" binding="wsHttpBinding" bindingConfiguration="transactionalWsatHttpBinding" contract="ICalculator" name="WSAtomicTransaction_endpoint">
         <!--The username and the domain over here will have to be replaced 
         by the identity under which the service will be running-->
-         <!--identity>
+        <!--identity>
               <userPrincipalName value="username@domain" />
          </identity-->
       </endpoint>
       <endpoint address="net.tcp://localhost:8008/ServiceModelSamples/service" binding="netTcpBinding" bindingConfiguration="transactionalOleTransactionsTcpBinding" contract="ICalculator" name="OleTransactions_endpoint">
         <!--The username and the domain over here will have to be replaced 
         by the identity under which the service will be running-->
-         <!--identity>
+        <!--identity>
               <userPrincipalName value="username@domain" />
          </identity-->
       </endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/client.csproj
index 155dd115bb5..8e3d2d95195 100644
--- a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/App.config b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/App.config
index 6e2976f83e1..92fb439bb61 100644
--- a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/App.config
+++ b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/App.config
@@ -1,48 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
     <!-- Sets whether the server will connect to a database -->
-    <add key="usingSql" value="true"/>
+    <add key="usingSql" value="true" />
     <!-- Sets the database connection string -->
-    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True"/>
+    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True" />
   </appSettings>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
-            <add baseAddress="net.tcp://localhost:8008/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
+            <add baseAddress="net.tcp://localhost:8008/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- specify wsHttpBinding with the WSAtomicTransactionOctober2004 transactional binding configuration -->
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalWsatHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="WSAtomicTransaction_endpoint"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalWsatHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="WSAtomicTransaction_endpoint" />
         <!-- specify netTcpBinding and an OleTransactions transactional binding configuration -->
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="transactionalOleTransactionsTcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="OleTransactions_endpoint"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" name="mex_endpoint"/>
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="transactionalOleTransactionsTcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="OleTransactions_endpoint" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" name="mex_endpoint" />
       </service>
     </services>
-
     <!-- binding configuration - configures a WSHttpBinding to require transaction flow -->
     <bindings>
       <netTcpBinding>
-        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions"/>
+        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions" />
       </netTcpBinding>
       <wsHttpBinding>
-        <binding name="transactionalWsatHttpBinding" transactionFlow="true"/>
+        <binding name="transactionalWsatHttpBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <serviceMetadata httpGetEnabled="true" />
+          <serviceDebug includeExceptionDetailInFaults="false" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/service.csproj
index d9b9f0a7b03..48ce477582e 100644
--- a/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/TransactionFlow/CS/service/service.csproj
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,31 +57,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/client/App.config b/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/client/App.config
index b68fa2fe290..4402ecf9a2c 100644
--- a/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/client/App.config
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <netTcpBinding>
-        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions"/>
+        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions" />
       </netTcpBinding>
       <wsHttpBinding>
-        <binding name="transactionalWsatHttpBinding" transactionFlow="true"/>
+        <binding name="transactionalWsatHttpBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
     <client>
       <endpoint address="http://localhost:8000/ServiceModelSamples/service" binding="wsHttpBinding" bindingConfiguration="transactionalWsatHttpBinding" contract="ICalculator" name="WSAtomicTransaction_endpoint">
         <!--The username and the domain over here will have to be replaced 
         by the identity under which the service will be running-->
-         <!--identity>
+        <!--identity>
               <userPrincipalName value="username@domain" />
          </identity-->
       </endpoint>
       <endpoint address="net.tcp://localhost:8008/ServiceModelSamples/service" binding="netTcpBinding" bindingConfiguration="transactionalOleTransactionsTcpBinding" contract="ICalculator" name="OleTransactions_endpoint">
         <!--The username and the domain over here will have to be replaced 
         by the identity under which the service will be running-->
-         <!--identity>
+        <!--identity>
               <userPrincipalName value="username@domain" />
          </identity-->
       </endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/service/App.config b/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/service/App.config
index 52424da0399..879b33bba32 100644
--- a/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/service/App.config
+++ b/framework/wcf/Basic/Binding/WS/TransactionFlow/VB/service/App.config
@@ -1,48 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
     <!-- Sets whether the server will connect to a database -->
-    <add key="usingSql" value="false"/>
+    <add key="usingSql" value="false" />
     <!-- Sets the database connection string -->
-    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True"/>
+    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True" />
   </appSettings>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
-            <add baseAddress="net.tcp://localhost:8008/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
+            <add baseAddress="net.tcp://localhost:8008/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- specify wsHttpBinding with the WSAtomicTransactionOctober2004 transactional binding configuration -->
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalWsatHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="WSAtomicTransaction_endpoint"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalWsatHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="WSAtomicTransaction_endpoint" />
         <!-- specify netTcpBinding and an OleTransactions transactional binding configuration -->
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="transactionalOleTransactionsTcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="OleTransactions_endpoint"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" name="mex_endpoint"/>
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="transactionalOleTransactionsTcpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" name="OleTransactions_endpoint" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" name="mex_endpoint" />
       </service>
     </services>
-
     <!-- binding configuration - configures a WSHttpBinding to require transaction flow -->
     <bindings>
       <netTcpBinding>
-        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions"/>
+        <binding name="transactionalOleTransactionsTcpBinding" transactionFlow="true" transactionProtocol="OleTransactions" />
       </netTcpBinding>
       <wsHttpBinding>
-        <binding name="transactionalWsatHttpBinding" transactionFlow="true"/>
+        <binding name="transactionalWsatHttpBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <serviceMetadata httpGetEnabled="true" />
+          <serviceDebug includeExceptionDetailInFaults="false" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/App.config b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/App.config
index 87e1e3da53c..c53a22de170 100644
--- a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportWithMessageCredentialSecurity.ICalculator"/>
+      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportWithMessageCredentialSecurity.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -13,10 +12,10 @@
         -->
         <binding name="Binding1">
           <security mode="TransportWithMessageCredential">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/client.csproj
index 412f9463b72..1726ff549ed 100644
--- a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50301</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/service/service.csproj
index 61a59d70ac5..217e50e7bc3 100644
--- a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,34 +48,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/VB/client/App.config b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/VB/client/App.config
index 87e1e3da53c..c53a22de170 100644
--- a/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/VB/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/TransportWithMessageCredentialSecurity/VB/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportWithMessageCredentialSecurity.ICalculator"/>
+      <endpoint name="" address="https://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportWithMessageCredentialSecurity.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -13,10 +12,10 @@
         -->
         <binding name="Binding1">
           <security mode="TransportWithMessageCredential">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/App.config b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/App.config
index 411004b9d8f..9915e46e322 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/App.config
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -12,18 +12,16 @@
           <security mode="Message">
             <message issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1">
               <!-- Endpoint address and binding for Security Token Service -->
-              <issuer address="http://localhost:8000/sts/windows" binding="ws2007HttpBinding"/>              
+              <issuer address="http://localhost:8000/sts/windows" binding="ws2007HttpBinding" />
             </message>
           </security>
         </binding>
       </ws2007FederationHttpBinding>
     </bindings>
-
     <client>
       <!-- Service endpoint -->
-      <endpoint name="ServiceFed" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" behaviorConfiguration="Client" address="http://localhost:8010/fedservice/calc" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator"/>
+      <endpoint name="ServiceFed" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" behaviorConfiguration="Client" address="http://localhost:8010/fedservice/calc" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator" />
     </client>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="Client">
@@ -40,14 +38,12 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
-              <defaultCertificate storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
+              <defaultCertificate storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/Client.csproj b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/Client.csproj
index 41ae33ae037..d5484774d20 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{31740DB0-199C-4084-85AB-5916DD165312}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Demos.Security.Federation</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,8 +34,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.Core" />
+    <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Client.cs" />
@@ -70,27 +50,5 @@
       <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/RSTRSTR/RSTRSTR.csproj b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/RSTRSTR/RSTRSTR.csproj
index b2a2568c27c..6d49b09bccc 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/RSTRSTR/RSTRSTR.csproj
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/RSTRSTR/RSTRSTR.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EDAD158A-C895-48FB-A39C-282FE1C2E7CB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Samples.Security.RSTRSTR</RootNamespace>
     <AssemblyName>RSTRSTR</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -58,9 +38,9 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.Runtime.Serialization"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -70,29 +50,7 @@
     <Compile Include="RequestSecurityTokenBase.cs" />
     <Compile Include="RequestSecurityTokenResponseWSTrust13.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -100,4 +58,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/App.config b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/App.config
index 256eedf1de8..1f6a7bc387a 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/App.config
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -9,28 +9,26 @@
         <!-- Set up base addresses -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/sts/"/>
+            <add baseAddress="http://localhost:8000/sts/" />
           </baseAddresses>
-        </host>        
+        </host>
         <!-- MEX endpoint(s) -->
-        <endpoint contract="IMetadataExchange" binding="mexHttpBinding" address="mex"/>
+        <endpoint contract="IMetadataExchange" binding="mexHttpBinding" address="mex" />
         <!-- Endpoint for clients who authenticate using Windows -->
-        <endpoint address="windows" binding="ws2007HttpBinding" contract="Microsoft.Samples.WS2007FederationHttpBinding.IWSTrust13"/>
+        <endpoint address="windows" binding="ws2007HttpBinding" contract="Microsoft.Samples.WS2007FederationHttpBinding.IWSTrust13" />
       </service>
     </services>
-    
     <behaviors>
       <serviceBehaviors>
         <behavior name="STSBehaviour">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <!-- 
           The serviceMetadata behavior allows one to enable metadata (e.g. WSDL, Policy) publishing.
           This configuration enables publishing of such data over HTTP GET.
           -->
-          <serviceMetadata httpGetEnabled="true"/>          
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/SecurityTokenService.csproj b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/SecurityTokenService.csproj
index ec4428a6fca..b02a3c4dfe7 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/SecurityTokenService.csproj
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/SecurityTokenService/SecurityTokenService.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C0D12177-0B43-40EA-9D9A-1F08A902475F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Samples.Security.SecurityTokenService</RootNamespace>
     <AssemblyName>SecurityTokenService</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,9 +37,9 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.Runtime.Serialization"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -77,29 +57,7 @@
       <Name>RSTRSTR</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -107,4 +65,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/App.config b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/App.config
index 0c090dcb2b8..65a5c74885c 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/App.config
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
-	<system.serviceModel>
+  <system.serviceModel>
     <bindings>
       <!-- Service binding using federation -->
       <ws2007FederationHttpBinding>
@@ -14,7 +14,7 @@
               <!-- Metadata address for Security Token Service -->
               <issuerMetadata address="http://localhost:8000/sts/mex">
                 <identity>
-                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS"/>
+                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS" />
                 </identity>
               </issuerMetadata>
             </message>
@@ -22,29 +22,27 @@
         </binding>
       </ws2007FederationHttpBinding>
     </bindings>
-        
     <services>
       <service name="Microsoft.Samples.WS2007FederationHttpBinding.CalculatorService" behaviorConfiguration="ServiceBehaviour">
         <host>
           <!-- configure base address provided by host -->
           <baseAddresses>
-            <add baseAddress="http://localhost:8010/fedservice/"/>
+            <add baseAddress="http://localhost:8010/fedservice/" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host, provide one endpoint -->
-        <endpoint address="calc" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator"/>
+        <endpoint address="calc" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator" />
       </service>
     </services>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="ServiceBehaviour">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <!-- 
           The serviceMetadata behavior allows one to enable metadata (e.g. WSDL, Policy) publishing.
           This configuration enables publishing of such data over HTTP GET.
           -->
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceMetadata httpGetEnabled="true" />
           <serviceCredentials>
             <!-- 
             The serviceCredentials behavior allows one to define validation parameters for issued tokens.
@@ -53,7 +51,7 @@
             -->
             <issuedTokenAuthentication audienceUriMode="Never">
               <knownCertificates>
-                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS"/>
+                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS" />
               </knownCertificates>
             </issuedTokenAuthentication>
             <!-- 
@@ -61,12 +59,10 @@
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during setup of the sample.
             -->
-            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost"/>
+            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
-	</system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/Service.csproj b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/Service.csproj
index 1fbfc5105ea..1c8990adba5 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3613196C-2906-4679-96CA-E8B432DCA77C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Demos.Security.Federation</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,7 +34,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core"/>
+    <Reference Include="System.Core" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
@@ -70,27 +51,5 @@
       <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Shared/Shared.csproj b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Shared/Shared.csproj
index 814291cb6bb..b77f32a0551 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Shared/Shared.csproj
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/CS/Shared/Shared.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FC4B8FA4-5BC0-43DE-9EF8-40E2DA1EB56F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Demos.Security.Shared</RootNamespace>
     <AssemblyName>Shared</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,36 +33,14 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System.Core"/>
+    <Reference Include="System.Core" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ICalculator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -90,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Client/App.config b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Client/App.config
index 411004b9d8f..9915e46e322 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Client/App.config
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -12,18 +12,16 @@
           <security mode="Message">
             <message issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1">
               <!-- Endpoint address and binding for Security Token Service -->
-              <issuer address="http://localhost:8000/sts/windows" binding="ws2007HttpBinding"/>              
+              <issuer address="http://localhost:8000/sts/windows" binding="ws2007HttpBinding" />
             </message>
           </security>
         </binding>
       </ws2007FederationHttpBinding>
     </bindings>
-
     <client>
       <!-- Service endpoint -->
-      <endpoint name="ServiceFed" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" behaviorConfiguration="Client" address="http://localhost:8010/fedservice/calc" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator"/>
+      <endpoint name="ServiceFed" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" behaviorConfiguration="Client" address="http://localhost:8010/fedservice/calc" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator" />
     </client>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="Client">
@@ -40,14 +38,12 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
-              <defaultCertificate storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
+              <defaultCertificate storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/SecurityTokenService/App.config b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/SecurityTokenService/App.config
index 256eedf1de8..1f6a7bc387a 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/SecurityTokenService/App.config
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/SecurityTokenService/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -9,28 +9,26 @@
         <!-- Set up base addresses -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/sts/"/>
+            <add baseAddress="http://localhost:8000/sts/" />
           </baseAddresses>
-        </host>        
+        </host>
         <!-- MEX endpoint(s) -->
-        <endpoint contract="IMetadataExchange" binding="mexHttpBinding" address="mex"/>
+        <endpoint contract="IMetadataExchange" binding="mexHttpBinding" address="mex" />
         <!-- Endpoint for clients who authenticate using Windows -->
-        <endpoint address="windows" binding="ws2007HttpBinding" contract="Microsoft.Samples.WS2007FederationHttpBinding.IWSTrust13"/>
+        <endpoint address="windows" binding="ws2007HttpBinding" contract="Microsoft.Samples.WS2007FederationHttpBinding.IWSTrust13" />
       </service>
     </services>
-    
     <behaviors>
       <serviceBehaviors>
         <behavior name="STSBehaviour">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <!-- 
           The serviceMetadata behavior allows one to enable metadata (e.g. WSDL, Policy) publishing.
           This configuration enables publishing of such data over HTTP GET.
           -->
-          <serviceMetadata httpGetEnabled="true"/>          
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Service/App.config b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Service/App.config
index 0c090dcb2b8..65a5c74885c 100644
--- a/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Service/App.config
+++ b/framework/wcf/Basic/Binding/WS/WS2007FederationHttp/VB/Service/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
-	<system.serviceModel>
+  <system.serviceModel>
     <bindings>
       <!-- Service binding using federation -->
       <ws2007FederationHttpBinding>
@@ -14,7 +14,7 @@
               <!-- Metadata address for Security Token Service -->
               <issuerMetadata address="http://localhost:8000/sts/mex">
                 <identity>
-                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS"/>
+                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS" />
                 </identity>
               </issuerMetadata>
             </message>
@@ -22,29 +22,27 @@
         </binding>
       </ws2007FederationHttpBinding>
     </bindings>
-        
     <services>
       <service name="Microsoft.Samples.WS2007FederationHttpBinding.CalculatorService" behaviorConfiguration="ServiceBehaviour">
         <host>
           <!-- configure base address provided by host -->
           <baseAddresses>
-            <add baseAddress="http://localhost:8010/fedservice/"/>
+            <add baseAddress="http://localhost:8010/fedservice/" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host, provide one endpoint -->
-        <endpoint address="calc" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator"/>
+        <endpoint address="calc" binding="ws2007FederationHttpBinding" bindingConfiguration="ServiceFed" contract="Microsoft.Samples.WS2007FederationHttpBinding.ICalculator" />
       </service>
     </services>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="ServiceBehaviour">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <!-- 
           The serviceMetadata behavior allows one to enable metadata (e.g. WSDL, Policy) publishing.
           This configuration enables publishing of such data over HTTP GET.
           -->
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceMetadata httpGetEnabled="true" />
           <serviceCredentials>
             <!-- 
             The serviceCredentials behavior allows one to define validation parameters for issued tokens.
@@ -53,7 +51,7 @@
             -->
             <issuedTokenAuthentication audienceUriMode="Never">
               <knownCertificates>
-                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS"/>
+                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS" />
               </knownCertificates>
             </issuedTokenAuthentication>
             <!-- 
@@ -61,12 +59,10 @@
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during setup of the sample.
             -->
-            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost"/>
+            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
-	</system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/App.config b/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/App.config
index 4d5e5c31fd3..5c487c32900 100644
--- a/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/App.config
@@ -1,21 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Http.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Http.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- See this sample's service configuration for the expanded 
              configuration section for a WSHttpBinding.  The client binding
              configuration also has an allowCookies setting which is false by default
             -->
-        <binding name="Binding1" allowCookies="false"/>
+        <binding name="Binding1" allowCookies="false" />
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/wsHttp/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/wsHttp/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/wsHttp/CS/service/service.csproj
index c9e12f4e345..c5ebc58cce3 100644
--- a/framework/wcf/Basic/Binding/WS/wsHttp/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/wsHttp/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/App.config b/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/App.config
index 53ce5221c75..70c7e3f4fdf 100644
--- a/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/App.config
@@ -1,20 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.ReliableSession.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.ReliableSession.ICalculator" />
     </client>
-
     <!-- binding configuration  - configures WSHttp binding for reliable sessions -->
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
-          <reliableSession enabled="true"/>
+          <reliableSession enabled="true" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/client.csproj
index 38bfa9a656b..c590275d295 100644
--- a/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,27 +49,5 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/service/service.csproj
index 0e1628e5bd7..a78ac9a1452 100644
--- a/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/wsReliableSession/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,34 +49,14 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/App.config b/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/App.config
index 53e48524fb4..8c41b3080bb 100644
--- a/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/App.config
+++ b/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/App.config
@@ -1,24 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- this endpoint has an https: address -->
-      <endpoint address="https://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportSecurity.ICalculator"/>
+      <endpoint address="https://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TransportSecurity.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- configure wsHttpbinding with Transport security mode
                    and clientCredentialType as None -->
         <binding name="Binding1">
           <security mode="Transport">
-            <transport clientCredentialType="None"/>
+            <transport clientCredentialType="None" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/client.csproj b/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/client.csproj
index daf37b67b64..d284189721e 100644
--- a/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/client.csproj
+++ b/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50301</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,27 +44,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/service/service.csproj b/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/service/service.csproj
index e6d699bb9f0..a78ac9a1452 100644
--- a/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/service/service.csproj
+++ b/framework/wcf/Basic/Binding/WS/wsTransportSecurity/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,35 +49,14 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/AddressHeaders/CS/client/App.config b/framework/wcf/Basic/Client/AddressHeaders/CS/client/App.config
index f872c5fcdc7..7df594cb0e2 100644
--- a/framework/wcf/Basic/Client/AddressHeaders/CS/client/App.config
+++ b/framework/wcf/Basic/Client/AddressHeaders/CS/client/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <client>
-            <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="basicHttpBinding" contract="IHello" name="WSHttpBinding_IHello">
-                <identity>
-                    <servicePrincipalName value="host/localhost"/>
-                </identity>
-            </endpoint>
-        </client>
-    </system.serviceModel>
+  <system.serviceModel>
+    <client>
+      <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="basicHttpBinding" contract="IHello" name="WSHttpBinding_IHello">
+        <identity>
+          <servicePrincipalName value="host/localhost" />
+        </identity>
+      </endpoint>
+    </client>
+  </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Client/AddressHeaders/CS/client/client.csproj b/framework/wcf/Basic/Client/AddressHeaders/CS/client/client.csproj
index af4ccb9b9e3..8a555831c1c 100644
--- a/framework/wcf/Basic/Client/AddressHeaders/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/AddressHeaders/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/AddressHeaders/CS/service/service.csproj b/framework/wcf/Basic/Client/AddressHeaders/CS/service/service.csproj
index c48bab7e939..be8dd7955a0 100644
--- a/framework/wcf/Basic/Client/AddressHeaders/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/AddressHeaders/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/ChannelFactory/CS/client/app.config b/framework/wcf/Basic/Client/ChannelFactory/CS/client/app.config
index eb6101ea228..29fd3c32c32 100644
--- a/framework/wcf/Basic/Client/ChannelFactory/CS/client/app.config
+++ b/framework/wcf/Basic/Client/ChannelFactory/CS/client/app.config
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
-<configuration>
-</configuration>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Client/ChannelFactory/CS/client/client.csproj b/framework/wcf/Basic/Client/ChannelFactory/CS/client/client.csproj
index 6e3fdc452c8..5884b447ba1 100644
--- a/framework/wcf/Basic/Client/ChannelFactory/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/ChannelFactory/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,30 +41,8 @@
     <Compile Include="client.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/ChannelFactory/CS/service/service.csproj b/framework/wcf/Basic/Client/ChannelFactory/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Client/ChannelFactory/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/ChannelFactory/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/App.config b/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/App.config
index a763c07daed..64a296cabd7 100644
--- a/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/App.config
+++ b/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.ExpectedExceptions.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.ExpectedExceptions.ICalculator" />
     </client>
-   
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/client.csproj b/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/client.csproj
index af4ccb9b9e3..8a555831c1c 100644
--- a/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/ExpectedExceptions/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/ExpectedExceptions/CS/service/service.csproj b/framework/wcf/Basic/Client/ExpectedExceptions/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Client/ExpectedExceptions/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/ExpectedExceptions/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/Interop/ASMX/CS/client/App.config b/framework/wcf/Basic/Client/Interop/ASMX/CS/client/App.config
index 346d12a1d93..07255866284 100644
--- a/framework/wcf/Basic/Client/Interop/ASMX/CS/client/App.config
+++ b/framework/wcf/Basic/Client/Interop/ASMX/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--  Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/ServiceModelSamples/service.asmx" binding="basicHttpBinding" contract="Microsoft.Samples.WCFClientInteropASMX.CalculatorServiceSoap"/>
+      <endpoint address="http://localhost/ServiceModelSamples/service.asmx" binding="basicHttpBinding" contract="Microsoft.Samples.WCFClientInteropASMX.CalculatorServiceSoap" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Client/Interop/ASMX/CS/client/client.csproj b/framework/wcf/Basic/Client/Interop/ASMX/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Client/Interop/ASMX/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/Interop/ASMX/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/Interop/ASMX/CS/service/service.csproj b/framework/wcf/Basic/Client/Interop/ASMX/CS/service/service.csproj
index e4a7ae40ac8..c79036b6bb5 100644
--- a/framework/wcf/Basic/Client/Interop/ASMX/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/Interop/ASMX/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50301</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,34 +49,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.asmx" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.asmx" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/App.config b/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/App.config
index 1ba043e8c9c..7b47a116799 100644
--- a/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/App.config
+++ b/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.XmlSerializer.IXmlSerializerCalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.XmlSerializer.IXmlSerializerCalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/client.csproj b/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/service/service.csproj b/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/service/service.csproj
index c48bab7e939..be8dd7955a0 100644
--- a/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/Interop/XmlSerializer/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/App.config b/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/App.config
index e103c43582c..1b1bc625d88 100644
--- a/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/App.config
+++ b/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/App.config
@@ -1,10 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-
   <appSettings>
     <!-- use appSetting to configure service mex address to retrieve metadata from -->
-    <add key="mexAddress" value="http://localhost/servicemodelsamples/service.svc/mex"/>
+    <add key="mexAddress" value="http://localhost/servicemodelsamples/service.svc/mex" />
   </appSettings>
-
 </configuration>
diff --git a/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/client.csproj b/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/client.csproj
index 2ab160d93f1..f7f4a34131b 100644
--- a/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/RetrieveMetadata/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/RetrieveMetadata/CS/service/service.csproj b/framework/wcf/Basic/Client/RetrieveMetadata/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Client/RetrieveMetadata/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/RetrieveMetadata/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/TypedClient/CS/client/App.config b/framework/wcf/Basic/Client/TypedClient/CS/client/App.config
index 6e8bc823f3d..79fdef7bc0c 100644
--- a/framework/wcf/Basic/Client/TypedClient/CS/client/App.config
+++ b/framework/wcf/Basic/Client/TypedClient/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.TypedClient.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.TypedClient.ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Client/TypedClient/CS/client/client.csproj b/framework/wcf/Basic/Client/TypedClient/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Client/TypedClient/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/TypedClient/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/TypedClient/CS/service/service.csproj b/framework/wcf/Basic/Client/TypedClient/CS/service/service.csproj
index c48bab7e939..be8dd7955a0 100644
--- a/framework/wcf/Basic/Client/TypedClient/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/TypedClient/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/UsingUsing/CS/client/App.config b/framework/wcf/Basic/Client/UsingUsing/CS/client/App.config
index 41c8abe66d0..113fd4c5034 100644
--- a/framework/wcf/Basic/Client/UsingUsing/CS/client/App.config
+++ b/framework/wcf/Basic/Client/UsingUsing/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.UsingUsing.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.UsingUsing.ICalculator" />
     </client>
-   
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Client/UsingUsing/CS/client/client.csproj b/framework/wcf/Basic/Client/UsingUsing/CS/client/client.csproj
index af4ccb9b9e3..8a555831c1c 100644
--- a/framework/wcf/Basic/Client/UsingUsing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Client/UsingUsing/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Client/UsingUsing/CS/service/service.csproj b/framework/wcf/Basic/Client/UsingUsing/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Client/UsingUsing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Client/UsingUsing/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/Basic/CS/client/App.config b/framework/wcf/Basic/Contract/Data/Basic/CS/client/App.config
index b1ffe336d1f..04bebdf2f5e 100644
--- a/framework/wcf/Basic/Contract/Data/Basic/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Data/Basic/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--  Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Data.IDataContractCalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Data.IDataContractCalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Data/Basic/CS/client/client.csproj b/framework/wcf/Basic/Contract/Data/Basic/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Data/Basic/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Data/Basic/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/Basic/CS/service/service.csproj b/framework/wcf/Basic/Contract/Data/Basic/CS/service/service.csproj
index 959481bc223..f9669411488 100644
--- a/framework/wcf/Basic/Contract/Data/Basic/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Data/Basic/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,34 +48,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/DCRSample/DCRSample.csproj b/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/DCRSample/DCRSample.csproj
index 35b4a6295fb..5312f7bf010 100644
--- a/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/DCRSample/DCRSample.csproj
+++ b/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/DCRSample/DCRSample.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.DCR</RootNamespace>
     <AssemblyName>DCRSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -53,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/Types/Types.csproj b/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/Types/Types.csproj
index fae5a25a6c7..cd91a8ab666 100644
--- a/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/Types/Types.csproj
+++ b/framework/wcf/Basic/Contract/Data/DataContractResolver/CS/Types/Types.csproj
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68594EFE-EFF3-4671-A93B-E7D22C6F9A7D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <OutputPath>bin\Debug\</OutputPath>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.DCR.Types</RootNamespace>
     <AssemblyName>Types</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -40,5 +40,5 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Types.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/app.config b/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/app.config
index a4ae2ed235d..15ae7946751 100644
--- a/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/app.config
+++ b/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-</configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/client.csproj b/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/client.csproj
index 5dae6998295..cacba1ad040 100644
--- a/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Data/DataContractSerializer/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,27 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Client/client.csproj b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Client/client.csproj
index 9af2aa0673e..981b98271f1 100644
--- a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Client/client.csproj
+++ b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Client/client.csproj
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,5 +48,5 @@
       <Name>Types</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Common/Common.csproj b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Common/Common.csproj
index b905a1753ff..71d4e56ae76 100644
--- a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Common/Common.csproj
+++ b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Common/Common.csproj
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F8AA8D53-14BD-4DA8-8FEE-0A70E785E704}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.KAA.Common</RootNamespace>
     <AssemblyName>Common</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,11 +43,11 @@
     <Compile Include="MyDataContractResolver.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(TargetDir)Common.dll" "$(TargetDir)..\..\..\Service\Common.dll"
+    <PostBuildEvent>
+      copy "$(TargetDir)Common.dll" "$(TargetDir)..\..\..\Service\Common.dll"
       copy "$(TargetDir)Common.dll" "$(TargetDir)..\..\..\Client\Common.dll"
-</PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -57,4 +56,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Service/service.csproj b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Service/service.csproj
index 739c58bcfc8..18920b15b69 100644
--- a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Service/service.csproj
+++ b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Service/service.csproj
@@ -1,22 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,16 +54,16 @@
       <Name>Types</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-      mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-      mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-      copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-      copy "$(TargetDir)Types.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-      copy "$(TargetDir)Common.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-      copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-      copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)Types.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)Common.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Types/Types.csproj b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Types/Types.csproj
index de680bf036c..85ff1d1d691 100644
--- a/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Types/Types.csproj
+++ b/framework/wcf/Basic/Contract/Data/KnownAssemblyAttribute/CS/Types/Types.csproj
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.KAA.Types</RootNamespace>
     <AssemblyName>Types</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,10 +41,11 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Types.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy "$(TargetDir)Types.dll" "$(TargetDir)..\..\..\Service\Types.dll"
+    <PostBuildEvent>
+      copy "$(TargetDir)Types.dll" "$(TargetDir)..\..\..\Service\Types.dll"
       copy "$(TargetDir)Types.dll" "$(TargetDir)..\..\..\Client\Types.dll"
-</PostBuildEvent>
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/App.config b/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/App.config
index 496c67f9ac0..6019f86d245 100644
--- a/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.KnownTypes.IDataContractCalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.KnownTypes.IDataContractCalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/client.csproj b/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Data/KnownTypes/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/KnownTypes/CS/service/service.csproj b/framework/wcf/Basic/Contract/Data/KnownTypes/CS/service/service.csproj
index ebd189ea229..98ac233d301 100644
--- a/framework/wcf/Basic/Contract/Data/KnownTypes/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Data/KnownTypes/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,34 +48,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/DCSwithDCR/DCSwithDCR.csproj b/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/DCSwithDCR/DCSwithDCR.csproj
index 4327ce8264f..be42a154814 100644
--- a/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/DCSwithDCR/DCSwithDCR.csproj
+++ b/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/DCSwithDCR/DCSwithDCR.csproj
@@ -1,21 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>DCSwithDCR</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,5 +36,5 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/NetDCS/NetDCS.csproj b/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/NetDCS/NetDCS.csproj
index 3c85be8a4b8..4a66a0a145f 100644
--- a/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/NetDCS/NetDCS.csproj
+++ b/framework/wcf/Basic/Contract/Data/NetDCSasDCSwithDCR/CS/NetDCS/NetDCS.csproj
@@ -1,21 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>NetDCS</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,5 +36,5 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.XML" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/app.config b/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/app.config
index ea9113f992e..aef7a4262de 100644
--- a/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/app.config
+++ b/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/app.config
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_ISocialNetwork" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
-                    </security>
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc"
-                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ISocialNetwork"
-                contract="ServiceReference.ISocialNetwork" name="BasicHttpBinding_ISocialNetwork" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_ISocialNetwork">
+          <readerQuotas />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ISocialNetwork" contract="ServiceReference.ISocialNetwork" name="BasicHttpBinding_ISocialNetwork" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/client.csproj b/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/client.csproj
index 6f298a46139..a4e03a7f05a 100644
--- a/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{168D4931-F200-4703-8EF9-D2D71BA0EF26}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,28 +48,6 @@
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Service References\ServiceReference\Client.ServiceReference.Person.datasource">
@@ -127,7 +86,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -135,4 +94,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/service/service.csproj b/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/service/service.csproj
index 639fd0d9427..46a87080583 100644
--- a/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Data/ObjectReferences/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C915C9DD-F25C-4465-B1EC-7E5EFD4D59D4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,29 +47,6 @@
     <None Include="service.svc" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -98,11 +56,12 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/POCO/CS/client/app.config b/framework/wcf/Basic/Contract/Data/POCO/CS/client/app.config
index 0c23aff406d..384393924d4 100644
--- a/framework/wcf/Basic/Contract/Data/POCO/CS/client/app.config
+++ b/framework/wcf/Basic/Contract/Data/POCO/CS/client/app.config
@@ -1,28 +1,19 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_IDataContractCalculator" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
-                    </security>
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc"
-                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IDataContractCalculator"
-                contract="ServiceReference.IDataContractCalculator" name="BasicHttpBinding_IDataContractCalculator" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_IDataContractCalculator">
+          <readerQuotas />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IDataContractCalculator" contract="ServiceReference.IDataContractCalculator" name="BasicHttpBinding_IDataContractCalculator" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Contract/Data/POCO/CS/client/client.csproj b/framework/wcf/Basic/Contract/Data/POCO/CS/client/client.csproj
index 78365d646ea..da35ced48fb 100644
--- a/framework/wcf/Basic/Contract/Data/POCO/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Data/POCO/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{168D4931-F200-4703-8EF9-D2D71BA0EF26}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,28 +48,6 @@
       <DependentUpon>Reference.svcmap</DependentUpon>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
@@ -127,7 +86,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -135,4 +94,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Contract/Data/POCO/CS/service/service.csproj b/framework/wcf/Basic/Contract/Data/POCO/CS/service/service.csproj
index 639fd0d9427..46a87080583 100644
--- a/framework/wcf/Basic/Contract/Data/POCO/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Data/POCO/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C915C9DD-F25C-4465-B1EC-7E5EFD4D59D4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,29 +47,6 @@
     <None Include="service.svc" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -98,11 +56,12 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/Default/CS/client/App.config b/framework/wcf/Basic/Contract/Message/Default/CS/client/App.config
index a9e14e06ac0..68cfa932e43 100644
--- a/framework/wcf/Basic/Contract/Message/Default/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Message/Default/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Message.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Message.ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Message/Default/CS/client/client.csproj b/framework/wcf/Basic/Contract/Message/Default/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Message/Default/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Message/Default/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/Default/CS/service/service.csproj b/framework/wcf/Basic/Contract/Message/Default/CS/service/service.csproj
index c48bab7e939..be8dd7955a0 100644
--- a/framework/wcf/Basic/Contract/Message/Default/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Message/Default/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/Untyped/CS/client/App.config b/framework/wcf/Basic/Contract/Message/Untyped/CS/client/App.config
index cb903402f67..dda7247aca6 100644
--- a/framework/wcf/Basic/Contract/Message/Untyped/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Message/Untyped/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Message/Untyped/CS/client/client.csproj b/framework/wcf/Basic/Contract/Message/Untyped/CS/client/client.csproj
index a0b530b172a..10b2e77103f 100644
--- a/framework/wcf/Basic/Contract/Message/Untyped/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Message/Untyped/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/Untyped/CS/service/service.csproj b/framework/wcf/Basic/Contract/Message/Untyped/CS/service/service.csproj
index c370a5a7ae5..7e3fd7ac4cb 100644
--- a/framework/wcf/Basic/Contract/Message/Untyped/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Message/Untyped/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,34 +49,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/App.config b/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/App.config
index f7f02410a02..3d1ec491777 100644
--- a/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-   <system.serviceModel>
-
-      <client>
-         <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Unwrapped.ICalculator"/>
-      </client>
-
-   </system.serviceModel>
-
+  <system.serviceModel>
+    <client>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Unwrapped.ICalculator" />
+    </client>
+  </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/client.csproj b/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Message/Unwrapped/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/Unwrapped/CS/service/service.csproj b/framework/wcf/Basic/Contract/Message/Unwrapped/CS/service/service.csproj
index 173e2d07ff9..209e6647267 100644
--- a/framework/wcf/Basic/Contract/Message/Unwrapped/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Message/Unwrapped/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50301</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/App.config b/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/App.config
index 0d7560fe128..7fb73b8d9de 100644
--- a/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.UseAndStyle.IUseAndStyleCalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.UseAndStyle.IUseAndStyleCalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/client.csproj b/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/service/service.csproj b/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/service/service.csproj
index 7f6aed4ef61..2c68cfa9afe 100644
--- a/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Message/UseAndStyle/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50301</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/App.config b/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/App.config
index 19894c20670..b17d2e78486 100644
--- a/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.XmlReader.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.XmlReader.ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/client.csproj b/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Message/XmlReader/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Message/XmlReader/CS/service/service.csproj b/framework/wcf/Basic/Contract/Message/XmlReader/CS/service/service.csproj
index c48bab7e939..be8dd7955a0 100644
--- a/framework/wcf/Basic/Contract/Message/XmlReader/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Message/XmlReader/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Duplex/CS/client/App.config b/framework/wcf/Basic/Contract/Service/Duplex/CS/client/App.config
index 549afda835c..95c98d190d0 100644
--- a/framework/wcf/Basic/Contract/Service/Duplex/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Service/Duplex/CS/client/App.config
@@ -1,20 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="DuplexBinding" contract="Microsoft.Samples.Duplex.ICalculatorDuplex"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="DuplexBinding" contract="Microsoft.Samples.Duplex.ICalculatorDuplex" />
     </client>
-
     <bindings>
       <!-- configure a binding that support duplex communication -->
       <wsDualHttpBinding>
-        <binding name="DuplexBinding" clientBaseAddress="http://localhost:8000/myClient/">
-        </binding>
+        <binding name="DuplexBinding" clientBaseAddress="http://localhost:8000/myClient/"></binding>
       </wsDualHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Duplex/CS/client/client.csproj b/framework/wcf/Basic/Contract/Service/Duplex/CS/client/client.csproj
index 7dd1171b88d..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Contract/Service/Duplex/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Service/Duplex/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Duplex/CS/service/service.csproj b/framework/wcf/Basic/Contract/Service/Duplex/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Contract/Service/Duplex/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Service/Duplex/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Faults/CS/client/App.config b/framework/wcf/Basic/Contract/Service/Faults/CS/client/App.config
index f224eff181f..6d195adb093 100644
--- a/framework/wcf/Basic/Contract/Service/Faults/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Service/Faults/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Faults.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Faults.ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Faults/CS/client/client.csproj b/framework/wcf/Basic/Contract/Service/Faults/CS/client/client.csproj
index a0b530b172a..10b2e77103f 100644
--- a/framework/wcf/Basic/Contract/Service/Faults/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Service/Faults/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Faults/CS/service/service.csproj b/framework/wcf/Basic/Contract/Service/Faults/CS/service/service.csproj
index 334e16ecce6..6b1703e713a 100644
--- a/framework/wcf/Basic/Contract/Service/Faults/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Service/Faults/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Oneway/CS/client/App.config b/framework/wcf/Basic/Contract/Service/Oneway/CS/client/App.config
index 984d63ba8eb..4b9d34c24b7 100644
--- a/framework/wcf/Basic/Contract/Service/Oneway/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Service/Oneway/CS/client/App.config
@@ -1,13 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" contract="Microsoft.Samples.OneWay.IOneWayCalculator"/>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" contract="Microsoft.Samples.OneWay.IOneWayCalculator" />
     </client>
-  
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Oneway/CS/client/client.csproj b/framework/wcf/Basic/Contract/Service/Oneway/CS/client/client.csproj
index 0042cde1cbd..12e98ec46ca 100644
--- a/framework/wcf/Basic/Contract/Service/Oneway/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Service/Oneway/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50301</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,27 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Oneway/CS/service/App.config b/framework/wcf/Basic/Contract/Service/Oneway/CS/service/App.config
index 8c2609cc4b9..8ae2c44c083 100644
--- a/framework/wcf/Basic/Contract/Service/Oneway/CS/service/App.config
+++ b/framework/wcf/Basic/Contract/Service/Oneway/CS/service/App.config
@@ -1,17 +1,15 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-  
   <system.serviceModel>
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Oneway/CS/service/service.csproj b/framework/wcf/Basic/Contract/Service/Oneway/CS/service/service.csproj
index 656546c409e..8154c7ac1bc 100644
--- a/framework/wcf/Basic/Contract/Service/Oneway/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Service/Oneway/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50105</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Session/CS/client/App.config b/framework/wcf/Basic/Contract/Service/Session/CS/client/App.config
index 8ccdb883f50..5fc5a6042a3 100644
--- a/framework/wcf/Basic/Contract/Service/Session/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Service/Session/CS/client/App.config
@@ -1,21 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.Session.ICalculatorSession"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.Session.ICalculatorSession" />
     </client>
-
     <bindings>
       <!-- configure a binding that support a session -->
       <wsHttpBinding>
         <binding>
-          <reliableSession enabled="true"/>
+          <reliableSession enabled="true" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Session/CS/client/client.csproj b/framework/wcf/Basic/Contract/Service/Session/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Contract/Service/Session/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Service/Session/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Session/CS/service/service.csproj b/framework/wcf/Basic/Contract/Service/Session/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Contract/Service/Session/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Service/Session/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Stream/CS/client/App.config b/framework/wcf/Basic/Contract/Service/Stream/CS/client/App.config
index a62879b9bfe..1675bf64ad7 100644
--- a/framework/wcf/Basic/Contract/Service/Stream/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Service/Stream/CS/client/App.config
@@ -1,4 +1,4 @@
-<configuration>
+<configuration>
   <system.serviceModel>
     <bindings>
       <basicHttpBinding>
@@ -11,8 +11,7 @@
         transferMode was manually changed to Streamed in this sample to 
         allow transport streaming on the client side
         -->
-        <binding maxReceivedMessageSize="67108864" transferMode="Streamed">
-        </binding>
+        <binding maxReceivedMessageSize="67108864" transferMode="Streamed"></binding>
       </basicHttpBinding>
       <customBinding>
         <!-- 
@@ -22,15 +21,14 @@
             Streamed or Buffered based on the service's metadata
           -->
         <binding>
-          <textMessageEncoding messageVersion="Soap12WSAddressing10"/>
-          <httpTransport transferMode="Streamed" maxReceivedMessageSize="67108864"/>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" />
+          <httpTransport transferMode="Streamed" maxReceivedMessageSize="67108864" />
         </binding>
       </customBinding>
-
     </bindings>
     <client>
-      <endpoint address="http://localhost:8000/servicemodelsamples/service/ep1" binding="basicHttpBinding" contract="Microsoft.Samples.Stream.IStreamingSample" name="BasicHttpBinding_IStreamingSample"/>
-      <endpoint address="http://localhost:9000/servicemodelsamples/service/ep2" binding="customBinding" contract="Microsoft.Samples.Stream.IStreamingSample" name="CustomBinding_IStreamingSample"/>
+      <endpoint address="http://localhost:8000/servicemodelsamples/service/ep1" binding="basicHttpBinding" contract="Microsoft.Samples.Stream.IStreamingSample" name="BasicHttpBinding_IStreamingSample" />
+      <endpoint address="http://localhost:9000/servicemodelsamples/service/ep2" binding="customBinding" contract="Microsoft.Samples.Stream.IStreamingSample" name="CustomBinding_IStreamingSample" />
     </client>
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Stream/CS/client/client.csproj b/framework/wcf/Basic/Contract/Service/Stream/CS/client/client.csproj
index 0733371d80b..8bec5090d7a 100644
--- a/framework/wcf/Basic/Contract/Service/Stream/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Service/Stream/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,27 +60,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/Stream/CS/service/App.config b/framework/wcf/Basic/Contract/Service/Stream/CS/service/App.config
index b67c9af3907..902e60f9f51 100644
--- a/framework/wcf/Basic/Contract/Service/Stream/CS/service/App.config
+++ b/framework/wcf/Basic/Contract/Service/Stream/CS/service/App.config
@@ -1,46 +1,42 @@
-<configuration>
+<configuration>
   <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.Stream.StreamingService">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/ServiceModelSamples/service  -->
-        <endpoint address="ep1" binding="basicHttpBinding" contract="Microsoft.Samples.Stream.IStreamingSample"/>
+        <endpoint address="ep1" binding="basicHttpBinding" contract="Microsoft.Samples.Stream.IStreamingSample" />
         <!-- this endpoint is exposed at http://localhost:9000/ServiceModelSamples/service/ep2  -->
-        <endpoint address="http://localhost:9000/ServiceModelSamples/service/ep2" binding="customBinding" contract="Microsoft.Samples.Stream.IStreamingSample"/>
+        <endpoint address="http://localhost:9000/ServiceModelSamples/service/ep2" binding="customBinding" contract="Microsoft.Samples.Stream.IStreamingSample" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
-<!-- an example basicHttpBinding using streaming -->
-<basicHttpBinding>
-  <binding maxReceivedMessageSize="67108864" transferMode="Streamed"/>
-</basicHttpBinding>
-<!-- an example customBinding using Http and streaming-->
-<customBinding>
-  <binding>
-    <textMessageEncoding messageVersion="Soap12WSAddressing10"/>
-    <httpTransport transferMode="Streamed" maxReceivedMessageSize="67108864"/>
-  </binding>
-</customBinding>
+      <!-- an example basicHttpBinding using streaming -->
+      <basicHttpBinding>
+        <binding maxReceivedMessageSize="67108864" transferMode="Streamed" />
+      </basicHttpBinding>
+      <!-- an example customBinding using Http and streaming-->
+      <customBinding>
+        <binding>
+          <textMessageEncoding messageVersion="Soap12WSAddressing10" />
+          <httpTransport transferMode="Streamed" maxReceivedMessageSize="67108864" />
+        </binding>
+      </customBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Contract/Service/Stream/CS/service/service.csproj b/framework/wcf/Basic/Contract/Service/Stream/CS/service/service.csproj
index 60cc949d5cd..90448da586d 100644
--- a/framework/wcf/Basic/Contract/Service/Stream/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Service/Stream/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,27 +53,5 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/App.config b/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/App.config
index 35af82a01c2..9680d8ea383 100644
--- a/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/App.config
+++ b/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/ServiceModelSamples/service.svc" binding="basicHttpBinding" contract="ICalculator"/>
+      <endpoint name="" address="http://localhost/ServiceModelSamples/service.svc" binding="basicHttpBinding" contract="ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/client.csproj b/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/client.csproj
index 70573d674ff..ab46882af98 100644
--- a/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/client.csproj
+++ b/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,37 +51,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/service/service.csproj b/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/service/service.csproj
index 0a114fbf2ac..a3af803d573 100644
--- a/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/service/service.csproj
+++ b/framework/wcf/Basic/Contract/Service/XmlSerializerFaults/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,46 +51,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Announcements/CS/client/client.csproj b/framework/wcf/Basic/Discovery/Announcements/CS/client/client.csproj
index 76aa757ed4f..5b4fb8d27fe 100644
--- a/framework/wcf/Basic/Discovery/Announcements/CS/client/client.csproj
+++ b/framework/wcf/Basic/Discovery/Announcements/CS/client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68A87B1B-36AC-44E1-8D35-977816811572}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,8 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Discovery" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -49,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Announcements/CS/service/service.csproj b/framework/wcf/Basic/Discovery/Announcements/CS/service/service.csproj
index d7365fc6249..fda621d05c8 100644
--- a/framework/wcf/Basic/Discovery/Announcements/CS/service/service.csproj
+++ b/framework/wcf/Basic/Discovery/Announcements/CS/service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3857098-A417-426E-8EC1-3445F0A99DFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Basic/CS/client/client.csproj b/framework/wcf/Basic/Discovery/Basic/CS/client/client.csproj
index 7949c6719c4..84889a8c84d 100644
--- a/framework/wcf/Basic/Discovery/Basic/CS/client/client.csproj
+++ b/framework/wcf/Basic/Discovery/Basic/CS/client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68A87B1B-36AC-44E1-8D35-977816811572}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,8 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Discovery" />
   </ItemGroup>
   <ItemGroup>
@@ -49,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Basic/CS/service/service.csproj b/framework/wcf/Basic/Discovery/Basic/CS/service/service.csproj
index d7365fc6249..fda621d05c8 100644
--- a/framework/wcf/Basic/Discovery/Basic/CS/service/service.csproj
+++ b/framework/wcf/Basic/Discovery/Basic/CS/service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3857098-A417-426E-8EC1-3445F0A99DFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Configuration/CS/client/App.config b/framework/wcf/Basic/Discovery/Configuration/CS/client/App.config
index f1af2e780a4..d066327e698 100644
--- a/framework/wcf/Basic/Discovery/Configuration/CS/client/App.config
+++ b/framework/wcf/Basic/Discovery/Configuration/CS/client/App.config
@@ -2,29 +2,20 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
   <system.serviceModel>
-    
     <client>
       <!--  Create an endpoint, make kind="dynamicEndpoint" and use the endpointConfiguration to change settings of DynamicEndpoint -->
-      <endpoint name="calculatorEndpoint"
-                binding="wsHttpBinding"
-                contract="ICalculatorService"
-                kind ="dynamicEndpoint"
-                endpointConfiguration="dynamicEndpointConfiguration">
-      </endpoint>
+      <endpoint name="calculatorEndpoint" binding="wsHttpBinding" contract="ICalculatorService" kind="dynamicEndpoint" endpointConfiguration="dynamicEndpointConfiguration"></endpoint>
     </client>
-    
     <standardEndpoints>
-      
-      <dynamicEndpoint>      
+      <dynamicEndpoint>
         <standardEndpoint name="dynamicEndpointConfiguration">
           <discoveryClientSettings>
             <!-- Controls where the discovery will happen. In this case, Probe message is sent over UdpDiscoveryEndpoint. -->
             <endpoint kind="udpDiscoveryEndpoint" endpointConfiguration="adhocDiscoveryEndpointConfiguration" />
-            
             <!-- Add Scopes, ScopeMatchBy, Extensions and termination criteria in FindCriteria -->
             <findCriteria scopeMatchBy="http://schemas.microsoft.com/ws/2008/06/discovery/rfc" duration="00:00:10" maxResults="1">
               <scopes>
-                <add scope="http://www.microsoft.com/building42/floor1"/>
+                <add scope="http://www.microsoft.com/building42/floor1" />
               </scopes>
               <!-- These extensions are sent from the client to the service as part of the probe message -->
               <extensions>
@@ -32,20 +23,14 @@
               </extensions>
             </findCriteria>
           </discoveryClientSettings>
-        </standardEndpoint>   
+        </standardEndpoint>
       </dynamicEndpoint>
-      
-      <udpDiscoveryEndpoint>  
-        <!-- Specify the discovery protocol version and  UDP transport settings. --> 
+      <udpDiscoveryEndpoint>
+        <!-- Specify the discovery protocol version and  UDP transport settings. -->
         <standardEndpoint name="adhocDiscoveryEndpointConfiguration" discoveryVersion="WSDiscovery11">
-          <transportSettings duplicateMessageHistoryLength="2048"
-                             maxPendingMessageCount="5"
-                             maxReceivedMessageSize="8192"
-                             maxBufferPoolSize="262144"/>
-        </standardEndpoint>      
+          <transportSettings duplicateMessageHistoryLength="2048" maxPendingMessageCount="5" maxReceivedMessageSize="8192" maxBufferPoolSize="262144" />
+        </standardEndpoint>
       </udpDiscoveryEndpoint>
-    
     </standardEndpoints>
-    
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Discovery/Configuration/CS/client/client.csproj b/framework/wcf/Basic/Discovery/Configuration/CS/client/client.csproj
index 2bdc15773e1..d9ba7397b9f 100644
--- a/framework/wcf/Basic/Discovery/Configuration/CS/client/client.csproj
+++ b/framework/wcf/Basic/Discovery/Configuration/CS/client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68A87B1B-36AC-44E1-8D35-977816811572}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,8 +32,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Discovery" />
   </ItemGroup>
   <ItemGroup>
@@ -52,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Configuration/CS/service/App.config b/framework/wcf/Basic/Discovery/Configuration/CS/service/App.config
index f04713d8979..f7fb3e6bac8 100644
--- a/framework/wcf/Basic/Discovery/Configuration/CS/service/App.config
+++ b/framework/wcf/Basic/Discovery/Configuration/CS/service/App.config
@@ -1,58 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
-    <system.serviceModel>
-      
-      <services>
-        <service name="Microsoft.Samples.Discovery.CalculatorService"
-                 behaviorConfiguration="calculatorServiceBehavior">
-          <endpoint address=""
-                    binding="wsHttpBinding"
-                    contract="Microsoft.Samples.Discovery.ICalculatorService"
-                    behaviorConfiguration="endpointBehaviorConfiguration" />
-          <!-- Add an UdpDiscoveryEndpoint over which the discovery service will listen for discovery request messages. -->
-          <endpoint name="udpDiscovery" kind="udpDiscoveryEndpoint" endpointConfiguration="adhocDiscoveryEndpointConfiguration"/>
-        </service>
-      </services>
-      
-      <behaviors>
-      
-        <serviceBehaviors>
-          <behavior name="calculatorServiceBehavior">
-        
-            <!-- Add ServiceDiscoveryBehavior which enables discovery -->
-            <serviceDiscovery>
-              <!-- This section is used to specify where the announcement messages will be sent. If this section is not added, then announcements will not be sent. -->
-              <announcementEndpoints>
-                <endpoint kind="udpAnnouncementEndpoint"/>
-              </announcementEndpoints>
-            </serviceDiscovery>
-          
-          </behavior>
-        </serviceBehaviors>
-        
-        <endpointBehaviors>
-          <behavior name="endpointBehaviorConfiguration">
-            
-            <endpointDiscovery>
-              <!-- The endpoint discovery behavior can be used to enable or disable discovery for a particular endpoint as well as adding scopes. -->
-              <scopes>
-                <add scope="http://www.microsoft.com/building42/floor1"/>
-                <add scope="ldap:///ou=engineering,o=exampleorg,c=us"/>
-              </scopes>
-            </endpointDiscovery>
-            
-          </behavior>          
-        </endpointBehaviors>
-        
-      </behaviors>
-      
-      <standardEndpoints>
-        <udpDiscoveryEndpoint>
-          <!-- Specify the discovery protocol version and maxResponseDelay -->
-          <standardEndpoint name="adhocDiscoveryEndpointConfiguration" discoveryVersion="WSDiscovery11" maxResponseDelay="00:00:00.600" />  
-        </udpDiscoveryEndpoint>
-      </standardEndpoints>
-    
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <services>
+      <service name="Microsoft.Samples.Discovery.CalculatorService" behaviorConfiguration="calculatorServiceBehavior">
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Discovery.ICalculatorService" behaviorConfiguration="endpointBehaviorConfiguration" />
+        <!-- Add an UdpDiscoveryEndpoint over which the discovery service will listen for discovery request messages. -->
+        <endpoint name="udpDiscovery" kind="udpDiscoveryEndpoint" endpointConfiguration="adhocDiscoveryEndpointConfiguration" />
+      </service>
+    </services>
+    <behaviors>
+      <serviceBehaviors>
+        <behavior name="calculatorServiceBehavior">
+          <!-- Add ServiceDiscoveryBehavior which enables discovery -->
+          <serviceDiscovery>
+            <!-- This section is used to specify where the announcement messages will be sent. If this section is not added, then announcements will not be sent. -->
+            <announcementEndpoints>
+              <endpoint kind="udpAnnouncementEndpoint" />
+            </announcementEndpoints>
+          </serviceDiscovery>
+        </behavior>
+      </serviceBehaviors>
+      <endpointBehaviors>
+        <behavior name="endpointBehaviorConfiguration">
+          <endpointDiscovery>
+            <!-- The endpoint discovery behavior can be used to enable or disable discovery for a particular endpoint as well as adding scopes. -->
+            <scopes>
+              <add scope="http://www.microsoft.com/building42/floor1" />
+              <add scope="ldap:///ou=engineering,o=exampleorg,c=us" />
+            </scopes>
+          </endpointDiscovery>
+        </behavior>
+      </endpointBehaviors>
+    </behaviors>
+    <standardEndpoints>
+      <udpDiscoveryEndpoint>
+        <!-- Specify the discovery protocol version and maxResponseDelay -->
+        <standardEndpoint name="adhocDiscoveryEndpointConfiguration" discoveryVersion="WSDiscovery11" maxResponseDelay="00:00:00.600" />
+      </udpDiscoveryEndpoint>
+    </standardEndpoints>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Discovery/Configuration/CS/service/service.csproj b/framework/wcf/Basic/Discovery/Configuration/CS/service/service.csproj
index f42c965f800..83157ca0371 100644
--- a/framework/wcf/Basic/Discovery/Configuration/CS/service/service.csproj
+++ b/framework/wcf/Basic/Discovery/Configuration/CS/service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3857098-A417-426E-8EC1-3445F0A99DFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/Configuration/VB/client/app.config b/framework/wcf/Basic/Discovery/Configuration/VB/client/app.config
index 296d8a22b90..f0ea6c56f39 100644
--- a/framework/wcf/Basic/Discovery/Configuration/VB/client/app.config
+++ b/framework/wcf/Basic/Discovery/Configuration/VB/client/app.config
@@ -1,30 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
   <system.serviceModel>
-    
     <client>
       <!--  Create an endpoint, make kind="dynamicEndpoint" and use the endpointConfiguration to change settings of DynamicEndpoint -->
-      <endpoint name="calculatorEndpoint"
-                binding="wsHttpBinding"
-                contract="ICalculatorService"
-                kind ="dynamicEndpoint"
-                endpointConfiguration="dynamicEndpointConfiguration">
-      </endpoint>
+      <endpoint name="calculatorEndpoint" binding="wsHttpBinding" contract="ICalculatorService" kind="dynamicEndpoint" endpointConfiguration="dynamicEndpointConfiguration"></endpoint>
     </client>
-    
     <standardEndpoints>
-      
-      <dynamicEndpoint>      
+      <dynamicEndpoint>
         <standardEndpoint name="dynamicEndpointConfiguration">
           <discoveryClientSettings>
             <!-- Controls where the discovery will happen. In this case, Probe message is sent over UdpDiscoveryEndpoint. -->
             <endpoint kind="udpDiscoveryEndpoint" endpointConfiguration="adhocDiscoveryEndpointConfiguration" />
-            
             <!-- Add scopes, ScopeMatchBy, extensions and termination criteria in FindCriteria -->
             <findCriteria scopeMatchBy="http://schemas.microsoft.com/ws/2008/06/discovery/rfc" duration="00:00:10" maxResults="1">
               <scopes>
-                <add scope="http://www.microsoft.com/building42/floor1"/>
+                <add scope="http://www.microsoft.com/building42/floor1" />
               </scopes>
               <!-- These extensions are sent from the client to the service as part of the probe message -->
               <extensions>
@@ -32,20 +23,14 @@
               </extensions>
             </findCriteria>
           </discoveryClientSettings>
-        </standardEndpoint>   
+        </standardEndpoint>
       </dynamicEndpoint>
-      
-      <udpDiscoveryEndpoint>  
-        <!-- Specify the discovery protocol version and  UDP transport settings. --> 
+      <udpDiscoveryEndpoint>
+        <!-- Specify the discovery protocol version and  UDP transport settings. -->
         <standardEndpoint name="adhocDiscoveryEndpointConfiguration" discoveryVersion="WSDiscovery11">
-          <transportSettings duplicateMessageHistoryLength="2048"
-                             maxPendingMessageCount="5"
-                             maxReceivedMessageSize="8192"
-                             maxBufferPoolSize="262144"/>
-        </standardEndpoint>      
+          <transportSettings duplicateMessageHistoryLength="2048" maxPendingMessageCount="5" maxReceivedMessageSize="8192" maxBufferPoolSize="262144" />
+        </standardEndpoint>
       </udpDiscoveryEndpoint>
-    
     </standardEndpoints>
-    
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Discovery/Configuration/VB/service/app.config b/framework/wcf/Basic/Discovery/Configuration/VB/service/app.config
index 0d2b96f066f..f7fb3e6bac8 100644
--- a/framework/wcf/Basic/Discovery/Configuration/VB/service/app.config
+++ b/framework/wcf/Basic/Discovery/Configuration/VB/service/app.config
@@ -1,58 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
   <system.serviceModel>
-
     <services>
-      <service name="Microsoft.Samples.Discovery.CalculatorService"
-               behaviorConfiguration="calculatorServiceBehavior">
-        <endpoint address=""
-                  binding="wsHttpBinding"
-                  contract="Microsoft.Samples.Discovery.ICalculatorService"
-                  behaviorConfiguration="endpointBehaviorConfiguration" />
+      <service name="Microsoft.Samples.Discovery.CalculatorService" behaviorConfiguration="calculatorServiceBehavior">
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Discovery.ICalculatorService" behaviorConfiguration="endpointBehaviorConfiguration" />
         <!-- Add an UdpDiscoveryEndpoint over which the discovery service will listen for discovery request messages. -->
-        <endpoint name="udpDiscovery" kind="udpDiscoveryEndpoint" endpointConfiguration="adhocDiscoveryEndpointConfiguration"/>
+        <endpoint name="udpDiscovery" kind="udpDiscoveryEndpoint" endpointConfiguration="adhocDiscoveryEndpointConfiguration" />
       </service>
     </services>
-
     <behaviors>
-
       <serviceBehaviors>
         <behavior name="calculatorServiceBehavior">
-
           <!-- Add ServiceDiscoveryBehavior which enables discovery -->
           <serviceDiscovery>
             <!-- This section is used to specify where the announcement messages will be sent. If this section is not added, then announcements will not be sent. -->
             <announcementEndpoints>
-              <endpoint kind="udpAnnouncementEndpoint"/>
+              <endpoint kind="udpAnnouncementEndpoint" />
             </announcementEndpoints>
           </serviceDiscovery>
-
         </behavior>
       </serviceBehaviors>
-
       <endpointBehaviors>
         <behavior name="endpointBehaviorConfiguration">
-
           <endpointDiscovery>
             <!-- The endpoint discovery behavior can be used to enable or disable discovery for a particular endpoint as well as adding scopes. -->
             <scopes>
-              <add scope="http://www.microsoft.com/building42/floor1"/>
-              <add scope="ldap:///ou=engineering,o=exampleorg,c=us"/>
+              <add scope="http://www.microsoft.com/building42/floor1" />
+              <add scope="ldap:///ou=engineering,o=exampleorg,c=us" />
             </scopes>
           </endpointDiscovery>
-
         </behavior>
       </endpointBehaviors>
-
     </behaviors>
-
     <standardEndpoints>
       <udpDiscoveryEndpoint>
         <!-- Specify the discovery protocol version and maxResponseDelay -->
         <standardEndpoint name="adhocDiscoveryEndpointConfiguration" discoveryVersion="WSDiscovery11" maxResponseDelay="00:00:00.600" />
       </udpDiscoveryEndpoint>
     </standardEndpoints>
-
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Client/CalculatorClient.csproj b/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Client/CalculatorClient.csproj
index 28df228bd62..e9a64006a85 100644
--- a/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Client/CalculatorClient.csproj
+++ b/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Client/CalculatorClient.csproj
@@ -1,15 +1,15 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CCF6FB93-36BE-4126-8964-504FC6D61867}</ProjectGuid>
     <OutputType>Exe</OutputType>
-	<AppDesignerFolder>Properties</AppDesignerFolder>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>CalculatorClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,8 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Discovery" />
   </ItemGroup>
   <ItemGroup>
diff --git a/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Service/CalculatorService.csproj b/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Service/CalculatorService.csproj
index 58b19d7d797..559494952dc 100644
--- a/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Service/CalculatorService.csproj
+++ b/framework/wcf/Basic/Discovery/CustomFindCriteria/CS/Service/CalculatorService.csproj
@@ -1,15 +1,15 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{32650726-4A12-41BE-A558-74844841E962}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>CalculatorService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,8 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Discovery" />
   </ItemGroup>
   <ItemGroup>
@@ -51,4 +50,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Client/Client.csproj b/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Client/Client.csproj
index 77c306dab6c..e879eb06726 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Client/Client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{18BF4809-CCA1-4ABA-9F44-2CD885A3E8F8}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/DiscoveryRouter/DiscoveryRouter.csproj b/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/DiscoveryRouter/DiscoveryRouter.csproj
index c9734b3d472..6260537dee3 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/DiscoveryRouter/DiscoveryRouter.csproj
+++ b/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/DiscoveryRouter/DiscoveryRouter.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6911C427-1359-42B5-9BDE-5C75343DA6E8}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>DiscoveryRouter</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Service/Service.csproj b/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Service/Service.csproj
index fcf1154a225..7c2ab04575f 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Discovery/DiscoveryRouter/CS/Service/Service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8C817E2C-871A-4043-BC56-493B5ACCB518}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/App.config b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/App.config
index 787c3c04a47..ca8e84e09e9 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/App.config
+++ b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/App.config
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
-    <system.serviceModel>
-        <client>
-          <endpoint address=""
-              binding="wsHttpBinding"
-              contract="ICalculatorService">
-          </endpoint>
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <client>
+      <endpoint address="" binding="wsHttpBinding" contract="ICalculatorService"></endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/client.csproj b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/client.csproj
index 7475beca2fe..0ca2b0c3fa7 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/client.csproj
+++ b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68A87B1B-36AC-44E1-8D35-977816811572}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/service/service.csproj b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/service/service.csproj
index d7365fc6249..fda621d05c8 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/service/service.csproj
+++ b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/CS/service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3857098-A417-426E-8EC1-3445F0A99DFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/VB/client/app.config b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/VB/client/app.config
index 787c3c04a47..ca8e84e09e9 100644
--- a/framework/wcf/Basic/Discovery/DiscoveryWithScopes/VB/client/app.config
+++ b/framework/wcf/Basic/Discovery/DiscoveryWithScopes/VB/client/app.config
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
-    <system.serviceModel>
-        <client>
-          <endpoint address=""
-              binding="wsHttpBinding"
-              contract="ICalculatorService">
-          </endpoint>
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <client>
+      <endpoint address="" binding="wsHttpBinding" contract="ICalculatorService"></endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowClient/WorkflowClient.csproj b/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowClient/WorkflowClient.csproj
index 7ec7c0a42b5..4e66e2d1251 100644
--- a/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowClient/WorkflowClient.csproj
+++ b/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowClient/WorkflowClient.csproj
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2B85A5E1-113F-4A7E-ADE8-578CED21602A}</ProjectGuid>
     <ProjectTypeGuids>{32f31d43-81cc-4c15-9de6-3fc5453562b6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>WorkflowClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/App.config b/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/App.config
index 7b4b5fda51c..79c40e4e1ae 100644
--- a/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/App.config
+++ b/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/App.config
@@ -1,30 +1,21 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.serviceModel>
-    
     <services>
-      <service name="PrintService" 
-               behaviorConfiguration="printServiceBehavior">
-        <endpoint address=""
-                  binding="basicHttpBinding"
-                  contract="IPrintService"/>
-                  
+      <service name="PrintService" behaviorConfiguration="printServiceBehavior">
+        <endpoint address="" binding="basicHttpBinding" contract="IPrintService" />
         <!--Adding the udp endpoint over which discovery service will listen for discovery messages.-->
-        <endpoint kind="udpDiscoveryEndpoint"/>
+        <endpoint kind="udpDiscoveryEndpoint" />
       </service>
     </services>
-    
     <behaviors>
-      
       <serviceBehaviors>
         <behavior name="printServiceBehavior">
           <!--Adding the discovery service behavior to make the WF service discoverable-->
-          <serviceDiscovery/>
+          <serviceDiscovery />
         </behavior>
       </serviceBehaviors>
-      
     </behaviors>
-    
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/WorkflowService.csproj b/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/WorkflowService.csproj
index d9ac3417d95..3c255d988ec 100644
--- a/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/WorkflowService.csproj
+++ b/framework/wcf/Basic/Discovery/WorkflowDiscovery/CS/WorkflowService/WorkflowService.csproj
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{829015B6-C687-4056-B2CA-DEBC64B70240}</ProjectGuid>
     <ProjectTypeGuids>{32f31d43-81cc-4c15-9de6-3fc5453562b6};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>WorkflowService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -53,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/App.config b/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/App.config
index 4ed6710c118..6d6fa7c0f55 100644
--- a/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/App.config
+++ b/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.GettingStarted.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.GettingStarted.ICalculator" />
     </client>
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/client.csproj b/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/client.csproj
index 0a598e48e45..d39fc39a75b 100644
--- a/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/client.csproj
+++ b/framework/wcf/Basic/GettingStarted/GettingStarted/CS/client/client.csproj
@@ -8,26 +8,21 @@
     <Product>Windows Communication Foundation and Windows Workflow Foundation SDK</Product>
     <Copyright>Copyright (c) Microsoft Corporation</Copyright>
   </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <None Remove="Connected Services\Microsoft.Samples.GettingStarted\ConnectedService.json" />
     <Compile Remove="Connected Services\Microsoft.Samples.GettingStarted\Reference.cs" />
     <None Include="Connected Services\Microsoft.Samples.GettingStarted\Reference.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <None Remove="App.config" />
     <Compile Remove="generatedClient.cs" />
     <None Include="generatedClient.cs" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.ServiceModel.Primitives" Version="6.*" />
     <PackageReference Include="System.ServiceModel.Http" Version="6.*" />
   </ItemGroup>
-
 </Project>
diff --git a/framework/wcf/Basic/Management/AnalyticTrace/CS/EtwAnalyticTraceSample/EtwAnalyticTraceSample.csproj b/framework/wcf/Basic/Management/AnalyticTrace/CS/EtwAnalyticTraceSample/EtwAnalyticTraceSample.csproj
index 00849cc79f2..ef8c78e1791 100644
--- a/framework/wcf/Basic/Management/AnalyticTrace/CS/EtwAnalyticTraceSample/EtwAnalyticTraceSample.csproj
+++ b/framework/wcf/Basic/Management/AnalyticTrace/CS/EtwAnalyticTraceSample/EtwAnalyticTraceSample.csproj
@@ -1,16 +1,16 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20107</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4C0F94B5-0FAB-4943-AE1C-D85DA1055EDD}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>EtwAnalyticTraceSample</RootNamespace>
     <AssemblyName>EtwAnalyticTraceSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,8 +72,8 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -82,12 +82,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>1378</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/framework/wcf/Basic/Management/AnalyticTraceExtensibility/CS/WCFAnalyticTracingExtensibility/WCFAnalyticTracingExtensibility.csproj b/framework/wcf/Basic/Management/AnalyticTraceExtensibility/CS/WCFAnalyticTracingExtensibility/WCFAnalyticTracingExtensibility.csproj
index b71d039f3ff..7aad7ca19ea 100644
--- a/framework/wcf/Basic/Management/AnalyticTraceExtensibility/CS/WCFAnalyticTracingExtensibility/WCFAnalyticTracingExtensibility.csproj
+++ b/framework/wcf/Basic/Management/AnalyticTraceExtensibility/CS/WCFAnalyticTracingExtensibility/WCFAnalyticTracingExtensibility.csproj
@@ -1,16 +1,16 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C429909E-8210-4B6F-8113-79579B050903}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WCFAnalyticTracingExtensibility</RootNamespace>
     <AssemblyName>WCFAnalyticTracingExtensibility</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,8 +76,8 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -86,12 +86,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4079</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/framework/wcf/Basic/Management/CircularTracing/CS/CircularTraceListener/TraceListener.csproj b/framework/wcf/Basic/Management/CircularTracing/CS/CircularTraceListener/TraceListener.csproj
index 8dce89f1bf1..4ee8c02569f 100644
--- a/framework/wcf/Basic/Management/CircularTracing/CS/CircularTraceListener/TraceListener.csproj
+++ b/framework/wcf/Basic/Management/CircularTracing/CS/CircularTraceListener/TraceListener.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6CD4E59E-C294-4A04-AA33-DA7AEBB65373}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ServiceModel</RootNamespace>
     <AssemblyName>CircularTraceListener</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,33 +36,11 @@
     <Compile Include="CircularTraceListener.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -89,4 +48,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Management/CircularTracing/CS/client/App.config b/framework/wcf/Basic/Management/CircularTracing/CS/client/App.config
index 8403bd2b677..e7557a295a5 100644
--- a/framework/wcf/Basic/Management/CircularTracing/CS/client/App.config
+++ b/framework/wcf/Basic/Management/CircularTracing/CS/client/App.config
@@ -1,25 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel" switchValue="Information, ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="CircularTraceListener"/>
+          <add name="CircularTraceListener" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add name="CircularTraceListener" type="Microsoft.Samples.ServiceModel.CircularTraceListener,CircularTraceListener" initializeData="c:\logs\CircularTracing-client.svclog" maxFileSizeKB="100"/>
+      <add name="CircularTraceListener" type="Microsoft.Samples.ServiceModel.CircularTraceListener,CircularTraceListener" initializeData="c:\logs\CircularTracing-client.svclog" maxFileSizeKB="100" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
   </system.serviceModel>
-<startup>
-  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-</startup>
 </configuration>
diff --git a/framework/wcf/Basic/Management/CircularTracing/CS/client/client.csproj b/framework/wcf/Basic/Management/CircularTracing/CS/client/client.csproj
index 2b93504e52c..45354e2c9c7 100644
--- a/framework/wcf/Basic/Management/CircularTracing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/CircularTracing/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ServiceModel</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,32 +46,10 @@
       <Name>TraceListener</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/CircularTracing/CS/service/service.csproj b/framework/wcf/Basic/Management/CircularTracing/CS/service/service.csproj
index 79fa254a554..b5a78734596 100644
--- a/framework/wcf/Basic/Management/CircularTracing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/CircularTracing/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,8 +72,8 @@
       <Name>TraceListener</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -86,8 +85,7 @@
           <IISUrl>http://localhost/myservice</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -95,12 +93,14 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(TargetDir)CircularTraceListener.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)CircularTraceListener.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/CircularTracing/VB/client/App.config b/framework/wcf/Basic/Management/CircularTracing/VB/client/App.config
index 8403bd2b677..e7557a295a5 100644
--- a/framework/wcf/Basic/Management/CircularTracing/VB/client/App.config
+++ b/framework/wcf/Basic/Management/CircularTracing/VB/client/App.config
@@ -1,25 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel" switchValue="Information, ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="CircularTraceListener"/>
+          <add name="CircularTraceListener" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add name="CircularTraceListener" type="Microsoft.Samples.ServiceModel.CircularTraceListener,CircularTraceListener" initializeData="c:\logs\CircularTracing-client.svclog" maxFileSizeKB="100"/>
+      <add name="CircularTraceListener" type="Microsoft.Samples.ServiceModel.CircularTraceListener,CircularTraceListener" initializeData="c:\logs\CircularTracing-client.svclog" maxFileSizeKB="100" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
   </system.serviceModel>
-<startup>
-  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-</startup>
 </configuration>
diff --git a/framework/wcf/Basic/Management/ETWTracing/CS/EtwTraceListener/EtwTraceListener.csproj b/framework/wcf/Basic/Management/ETWTracing/CS/EtwTraceListener/EtwTraceListener.csproj
index 38ac751c8aa..e2139887c2b 100644
--- a/framework/wcf/Basic/Management/ETWTracing/CS/EtwTraceListener/EtwTraceListener.csproj
+++ b/framework/wcf/Basic/Management/ETWTracing/CS/EtwTraceListener/EtwTraceListener.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2455E327-7741-4330-9444-D5A8C2A32B31}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>EtwTraceListener</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,33 +38,11 @@
     <Compile Include="EtwTraceListener.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -91,4 +50,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Management/ETWTracing/CS/client/App.config b/framework/wcf/Basic/Management/ETWTracing/CS/client/App.config
index eb5eae86599..3917cb58481 100644
--- a/framework/wcf/Basic/Management/ETWTracing/CS/client/App.config
+++ b/framework/wcf/Basic/Management/ETWTracing/CS/client/App.config
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.diagnostics>
-        <sources>
-            <source name="System.ServiceModel" switchValue="Information, ActivityTracing" propagateActivity="true">
-                <listeners>
-                    <add name="ETW"/>
-                </listeners>
-            </source>
-        </sources>
-        <sharedListeners>
-            <add type="Microsoft.Samples.ServiceModel.EtwTraceListener, EtwTraceListener, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="ETW" traceOutputOptions="Timestamp"/>
-        </sharedListeners>
-        <trace autoflush="true"/>
-    </system.diagnostics>
-    <system.serviceModel>
-        <client>
-          <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
-        </client>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.diagnostics>
+    <sources>
+      <source name="System.ServiceModel" switchValue="Information, ActivityTracing" propagateActivity="true">
+        <listeners>
+          <add name="ETW" />
+        </listeners>
+      </source>
+    </sources>
+    <sharedListeners>
+      <add type="Microsoft.Samples.ServiceModel.EtwTraceListener, EtwTraceListener, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" name="ETW" traceOutputOptions="Timestamp" />
+    </sharedListeners>
+    <trace autoflush="true" />
+  </system.diagnostics>
+  <system.serviceModel>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Management/ETWTracing/CS/client/client.csproj b/framework/wcf/Basic/Management/ETWTracing/CS/client/client.csproj
index 8719e8949bf..243b5c36011 100644
--- a/framework/wcf/Basic/Management/ETWTracing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/ETWTracing/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8F278A71-0840-44D5-8354-558B943934A9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,33 +48,11 @@
       <Name>EtwTraceListener</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Management/ETWTracing/CS/service/service.csproj b/framework/wcf/Basic/Management/ETWTracing/CS/service/service.csproj
index 4b77cb10b13..1cde4bf91cc 100644
--- a/framework/wcf/Basic/Management/ETWTracing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/ETWTracing/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,8 +71,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -82,12 +81,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -95,12 +92,14 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(TargetDir)EtwTraceListener.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)EtwTraceListener.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/ExtendingTracing/CS/client/App.config b/framework/wcf/Basic/Management/ExtendingTracing/CS/client/App.config
index fbb3d7b2deb..692be7db141 100644
--- a/framework/wcf/Basic/Management/ExtendingTracing/CS/client/App.config
+++ b/framework/wcf/Basic/Management/ExtendingTracing/CS/client/App.config
@@ -1,30 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
   </system.serviceModel>
-  
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel" switchValue="Warning" propagateActivity="true">
         <listeners>
-          <add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-          <add name="xml"/>
+          <add type="System.Diagnostics.DefaultTraceListener" name="Default" />
+          <add name="xml" />
         </listeners>
       </source>
       <source name="ClientCalculatorTraceSource" switchValue="Information,ActivityTracing">
         <listeners>
-          <add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-          <add name="xml"/>
+          <add type="System.Diagnostics.DefaultTraceListener" name="Default" />
+          <add name="xml" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add initializeData="C:\logs\ExtendingTracing-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" traceOutputOptions="Callstack"/>
+      <add initializeData="C:\logs\ExtendingTracing-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" traceOutputOptions="Callstack" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/ExtendingTracing/CS/client/client.csproj b/framework/wcf/Basic/Management/ExtendingTracing/CS/client/client.csproj
index 1148c27d0a9..902508c86d8 100644
--- a/framework/wcf/Basic/Management/ExtendingTracing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/ExtendingTracing/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/ExtendingTracing/CS/service/service.csproj b/framework/wcf/Basic/Management/ExtendingTracing/CS/service/service.csproj
index f573904a578..cc6260fbfe2 100644
--- a/framework/wcf/Basic/Management/ExtendingTracing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/ExtendingTracing/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,8 +67,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -78,12 +77,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -91,11 +88,13 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/ExtendingTracing/VB/client/App.config b/framework/wcf/Basic/Management/ExtendingTracing/VB/client/App.config
index fbb3d7b2deb..692be7db141 100644
--- a/framework/wcf/Basic/Management/ExtendingTracing/VB/client/App.config
+++ b/framework/wcf/Basic/Management/ExtendingTracing/VB/client/App.config
@@ -1,30 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
   </system.serviceModel>
-  
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel" switchValue="Warning" propagateActivity="true">
         <listeners>
-          <add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-          <add name="xml"/>
+          <add type="System.Diagnostics.DefaultTraceListener" name="Default" />
+          <add name="xml" />
         </listeners>
       </source>
       <source name="ClientCalculatorTraceSource" switchValue="Information,ActivityTracing">
         <listeners>
-          <add type="System.Diagnostics.DefaultTraceListener" name="Default"/>
-          <add name="xml"/>
+          <add type="System.Diagnostics.DefaultTraceListener" name="Default" />
+          <add name="xml" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add initializeData="C:\logs\ExtendingTracing-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" traceOutputOptions="Callstack"/>
+      <add initializeData="C:\logs\ExtendingTracing-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" traceOutputOptions="Callstack" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/PerfCounters/CS/client/App.config b/framework/wcf/Basic/Management/PerfCounters/CS/client/App.config
index da89a00e07b..2037618f0b7 100644
--- a/framework/wcf/Basic/Management/PerfCounters/CS/client/App.config
+++ b/framework/wcf/Basic/Management/PerfCounters/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/PerfCounters/CS/client/client.csproj b/framework/wcf/Basic/Management/PerfCounters/CS/client/client.csproj
index 44f86aedfe3..dd36fca96dc 100644
--- a/framework/wcf/Basic/Management/PerfCounters/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/PerfCounters/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/PerfCounters/CS/service/service.csproj b/framework/wcf/Basic/Management/PerfCounters/CS/service/service.csproj
index 0e3bf66eacb..7c819f9a959 100644
--- a/framework/wcf/Basic/Management/PerfCounters/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/PerfCounters/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,8 +65,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -76,12 +75,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -89,11 +86,12 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
     </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/framework/wcf/Basic/Management/PerfCounters/VB/client/App.config b/framework/wcf/Basic/Management/PerfCounters/VB/client/App.config
index da89a00e07b..2037618f0b7 100644
--- a/framework/wcf/Basic/Management/PerfCounters/VB/client/App.config
+++ b/framework/wcf/Basic/Management/PerfCounters/VB/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/SecurityLockdown/CS/client/App.config b/framework/wcf/Basic/Management/SecurityLockdown/CS/client/App.config
index e2eb06fa13b..53f8057f174 100644
--- a/framework/wcf/Basic/Management/SecurityLockdown/CS/client/App.config
+++ b/framework/wcf/Basic/Management/SecurityLockdown/CS/client/App.config
@@ -1,36 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel.MessageLogging" logKnownPii="true">
         <listeners>
-          <add name="ServiceModelMessageLoggingListener"/>
+          <add name="ServiceModelMessageLoggingListener" />
         </listeners>
       </source>
       <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="ServiceModelTraceListener"/>
+          <add name="ServiceModelTraceListener" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add name="ServiceModelMessageLoggingListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientMessages.svclog"/>
-      <add name="ServiceModelTraceListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientTraces.svclog"/>
+      <add name="ServiceModelMessageLoggingListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientMessages.svclog" />
+      <add name="ServiceModelTraceListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientTraces.svclog" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
   <system.serviceModel>
-
     <diagnostics>
-      <messageLogging logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true"/>
+      <messageLogging logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" />
     </diagnostics>
-
-    
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-   
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/SecurityLockdown/CS/client/client.csproj b/framework/wcf/Basic/Management/SecurityLockdown/CS/client/client.csproj
index 3f99ddd25fc..e0ab0be33d9 100644
--- a/framework/wcf/Basic/Management/SecurityLockdown/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/SecurityLockdown/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -60,31 +39,9 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/SecurityLockdown/CS/service/service.csproj b/framework/wcf/Basic/Management/SecurityLockdown/CS/service/service.csproj
index f573904a578..cc6260fbfe2 100644
--- a/framework/wcf/Basic/Management/SecurityLockdown/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/SecurityLockdown/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,8 +67,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -78,12 +77,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -91,11 +88,13 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/SecurityLockdown/VB/client/App.config b/framework/wcf/Basic/Management/SecurityLockdown/VB/client/App.config
index 4802cce6963..53f8057f174 100644
--- a/framework/wcf/Basic/Management/SecurityLockdown/VB/client/App.config
+++ b/framework/wcf/Basic/Management/SecurityLockdown/VB/client/App.config
@@ -1,36 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel.MessageLogging" logKnownPii="true">
         <listeners>
-          <add name="ServiceModelMessageLoggingListener"/>
+          <add name="ServiceModelMessageLoggingListener" />
         </listeners>
       </source>
       <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="ServiceModelTraceListener"/>
+          <add name="ServiceModelTraceListener" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add name="ServiceModelMessageLoggingListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientMessages.svclog"/>
-      <add name="ServiceModelTraceListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientTraces.svclog"/>
+      <add name="ServiceModelMessageLoggingListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientMessages.svclog" />
+      <add name="ServiceModelTraceListener" type="System.Diagnostics.XmlWriterTraceListener, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" initializeData="c:\logs\SecurityLockdown-clientTraces.svclog" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
   <system.serviceModel>
-
     <diagnostics>
-      <messageLogging logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true"/>
+      <messageLogging logMalformedMessages="true" logMessagesAtServiceLevel="true" logMessagesAtTransportLevel="true" />
     </diagnostics>
-
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/ServiceValidation/CS/client/App.config b/framework/wcf/Basic/Management/ServiceValidation/CS/client/App.config
index 0754a6d52dd..b4143037879 100644
--- a/framework/wcf/Basic/Management/ServiceValidation/CS/client/App.config
+++ b/framework/wcf/Basic/Management/ServiceValidation/CS/client/App.config
@@ -1,39 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="CalcServiceSEP1">
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
-                        <message clientCredentialType="UserName" algorithmSuite="Default"/>
-                    </security>
-                </binding>
-            </basicHttpBinding>
-          
-            <wsHttpBinding>
-                <binding name="CalcServiceSEP2">
-                    <security mode="Message">
-                        <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
-                        <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true"/>
-                    </security>
-                </binding>
-              
-                <binding name="CalcServiceSEP3">
-                    <security mode="None">
-                        <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
-                        <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="true"/>
-                    </security>
-                </binding>   
-            </wsHttpBinding> 
-        </bindings>
-      
-        <client>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="CalcServiceSEP1" contract="ICalculator" name="CalcServiceSEP1"/>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp2" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP2" contract="ICalculator" name="CalcServiceSEP2">
-            </endpoint>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp3" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP3" contract="ICalculator" name="CalcServiceSEP3"/>
-        </client>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="CalcServiceSEP1">
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+      <wsHttpBinding>
+        <binding name="CalcServiceSEP2">
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true" />
+          </security>
+        </binding>
+        <binding name="CalcServiceSEP3">
+          <security mode="None">
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="true" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="CalcServiceSEP1" contract="ICalculator" name="CalcServiceSEP1" />
+      <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp2" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP2" contract="ICalculator" name="CalcServiceSEP2"></endpoint>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp3" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP3" contract="ICalculator" name="CalcServiceSEP3" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Management/ServiceValidation/CS/client/client.csproj b/framework/wcf/Basic/Management/ServiceValidation/CS/client/client.csproj
index 770f85f592d..d777c951f0f 100644
--- a/framework/wcf/Basic/Management/ServiceValidation/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/ServiceValidation/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4E6E0B5C-761F-4A84-9C96-7B5189DB21D0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,7 +32,7 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -73,30 +54,8 @@
       <Name>endpointValidate</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Management/ServiceValidation/CS/endpointValidate/endpointValidate.csproj b/framework/wcf/Basic/Management/ServiceValidation/CS/endpointValidate/endpointValidate.csproj
index a1559ca156e..07cf802b81c 100644
--- a/framework/wcf/Basic/Management/ServiceValidation/CS/endpointValidate/endpointValidate.csproj
+++ b/framework/wcf/Basic/Management/ServiceValidation/CS/endpointValidate/endpointValidate.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9C49E806-5227-431D-A149-078FC7B09B29}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ServiceModel</RootNamespace>
     <AssemblyName>endpointValidate</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,7 +33,6 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -68,35 +47,15 @@
   </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent>
-           mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-           mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-           copy "$(TargetDir)endpointValidate.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)endpointValidate.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/ServiceValidation/CS/service/service.csproj b/framework/wcf/Basic/Management/ServiceValidation/CS/service/service.csproj
index f573904a578..cc6260fbfe2 100644
--- a/framework/wcf/Basic/Management/ServiceValidation/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/ServiceValidation/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,8 +67,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -78,12 +77,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -91,11 +88,13 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/ServiceValidation/VB/client/app.config b/framework/wcf/Basic/Management/ServiceValidation/VB/client/app.config
index ee2a721b8f7..c830e89c7db 100644
--- a/framework/wcf/Basic/Management/ServiceValidation/VB/client/app.config
+++ b/framework/wcf/Basic/Management/ServiceValidation/VB/client/app.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.serviceModel>
@@ -6,34 +6,30 @@
       <basicHttpBinding>
         <binding name="CalcServiceSEP1">
           <security mode="None">
-            <transport clientCredentialType="None" proxyCredentialType="None" realm=""/>
-            <message clientCredentialType="UserName" algorithmSuite="Default"/>
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
           </security>
         </binding>
       </basicHttpBinding>
-
       <wsHttpBinding>
         <binding name="CalcServiceSEP2">
           <security mode="Message">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true"/>
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true" />
           </security>
         </binding>
-
         <binding name="CalcServiceSEP3">
           <security mode="None">
-            <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="true"/>
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="true" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="CalcServiceSEP1" contract="Microsoft.Samples.ServiceModel.ICalculator" name="CalcServiceSEP1"/>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp2" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP2" contract="Microsoft.Samples.ServiceModel.ICalculator" name="CalcServiceSEP2">
-      </endpoint>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp3" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP3" contract="Microsoft.Samples.ServiceModel.ICalculator" name="CalcServiceSEP3"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="CalcServiceSEP1" contract="Microsoft.Samples.ServiceModel.ICalculator" name="CalcServiceSEP1" />
+      <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp2" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP2" contract="Microsoft.Samples.ServiceModel.ICalculator" name="CalcServiceSEP2"></endpoint>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc/wshttp3" binding="wsHttpBinding" bindingConfiguration="CalcServiceSEP3" contract="Microsoft.Samples.ServiceModel.ICalculator" name="CalcServiceSEP3" />
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/TracingAndLogging/CS/client/App.config b/framework/wcf/Basic/Management/TracingAndLogging/CS/client/App.config
index f5f891746ed..652a4ecd633 100644
--- a/framework/wcf/Basic/Management/TracingAndLogging/CS/client/App.config
+++ b/framework/wcf/Basic/Management/TracingAndLogging/CS/client/App.config
@@ -1,37 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
     <diagnostics>
       <!-- Enable Message Logging here -->
       <!-- log all messages received or sent at the transport or service model levels -->
-      <messageLogging logEntireMessage="true" maxMessagesToLog="300" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
+      <messageLogging logEntireMessage="true" maxMessagesToLog="300" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true" />
     </diagnostics>
-
   </system.serviceModel>
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="xml"/>
+          <add name="xml" />
         </listeners>
       </source>
       <source name="System.ServiceModel.MessageLogging">
         <listeners>
-          <add name="xml"/>
+          <add name="xml" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add initializeData="C:\logs\TracingAndLogging-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml"/>
+      <add initializeData="C:\logs\TracingAndLogging-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
-  </startup>
 </configuration>
diff --git a/framework/wcf/Basic/Management/TracingAndLogging/CS/client/client.csproj b/framework/wcf/Basic/Management/TracingAndLogging/CS/client/client.csproj
index 672af0e1bc2..dd36fca96dc 100644
--- a/framework/wcf/Basic/Management/TracingAndLogging/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/TracingAndLogging/CS/client/client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/TracingAndLogging/CS/service/service.csproj b/framework/wcf/Basic/Management/TracingAndLogging/CS/service/service.csproj
index f573904a578..cc6260fbfe2 100644
--- a/framework/wcf/Basic/Management/TracingAndLogging/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/TracingAndLogging/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,8 +67,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -78,12 +77,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -91,11 +88,13 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/TracingAndLogging/VB/client/app.config b/framework/wcf/Basic/Management/TracingAndLogging/VB/client/app.config
index 335e40a23eb..652a4ecd633 100644
--- a/framework/wcf/Basic/Management/TracingAndLogging/VB/client/app.config
+++ b/framework/wcf/Basic/Management/TracingAndLogging/VB/client/app.config
@@ -1,34 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
     <diagnostics>
       <!-- Enable Message Logging here -->
       <!-- log all messages received or sent at the transport or service model levels -->
-      <messageLogging logEntireMessage="true" maxMessagesToLog="300" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true"/>
+      <messageLogging logEntireMessage="true" maxMessagesToLog="300" logMessagesAtServiceLevel="true" logMalformedMessages="true" logMessagesAtTransportLevel="true" />
     </diagnostics>
-
   </system.serviceModel>
   <system.diagnostics>
     <sources>
       <source name="System.ServiceModel" switchValue="Information,ActivityTracing" propagateActivity="true">
         <listeners>
-          <add name="xml"/>
+          <add name="xml" />
         </listeners>
       </source>
       <source name="System.ServiceModel.MessageLogging">
         <listeners>
-          <add name="xml"/>
+          <add name="xml" />
         </listeners>
       </source>
     </sources>
     <sharedListeners>
-      <add initializeData="C:\logs\TracingAndLogging-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml"/>
+      <add initializeData="C:\logs\TracingAndLogging-client.svclog" type="System.Diagnostics.XmlWriterTraceListener" name="xml" />
     </sharedListeners>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/WMIProvider/CS/client/App.config b/framework/wcf/Basic/Management/WMIProvider/CS/client/App.config
index da89a00e07b..2037618f0b7 100644
--- a/framework/wcf/Basic/Management/WMIProvider/CS/client/App.config
+++ b/framework/wcf/Basic/Management/WMIProvider/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Management/WMIProvider/CS/client/client.csproj b/framework/wcf/Basic/Management/WMIProvider/CS/client/client.csproj
index c49b397ea67..8a555831c1c 100644
--- a/framework/wcf/Basic/Management/WMIProvider/CS/client/client.csproj
+++ b/framework/wcf/Basic/Management/WMIProvider/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Management/WMIProvider/CS/service/service.csproj b/framework/wcf/Basic/Management/WMIProvider/CS/service/service.csproj
index 13637de6e9c..883e285ebc1 100644
--- a/framework/wcf/Basic/Management/WMIProvider/CS/service/service.csproj
+++ b/framework/wcf/Basic/Management/WMIProvider/CS/service/service.csproj
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>
-    </ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
+    <ProductVersion></ProductVersion>
     <ProjectGuid>{1520661F-1D47-4846-86DD-98D340BB2A87}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,8 +70,8 @@
       <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -81,12 +80,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>4406</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
           <EnableWcfTestClientForSVCDefaultValue>True</EnableWcfTestClientForSVCDefaultValue>
         </WebProjectProperties>
@@ -94,12 +91,13 @@
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            </PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/framework/wcf/Basic/Management/WMIProvider/VB/client/app.config b/framework/wcf/Basic/Management/WMIProvider/VB/client/app.config
index 40a4aeecb56..394eeaf4a89 100644
--- a/framework/wcf/Basic/Management/WMIProvider/VB/client/app.config
+++ b/framework/wcf/Basic/Management/WMIProvider/VB/client/app.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.ServiceModel.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/App.config b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/App.config
index d256be2f952..cc4dd7dba98 100644
--- a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/App.config
+++ b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/App.config
@@ -1,19 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved -->
 <configuration>
   <system.serviceModel>
-
     <client>
       <!--	<endpoint address="http://localhost:8000/servicemodelsamples/service" 
 								binding="wsHttpBinding" 
 								contract="Microsoft.Samples.HelloRoutingService.ICalculator" />-->
-
-      <endpoint address="http://localhost:8000/routingservice/router"
-                binding="wsHttpBinding"
-                contract="Microsoft.Samples.HelloRoutingService.ICalculator" />
+      <endpoint address="http://localhost:8000/routingservice/router" binding="wsHttpBinding" contract="Microsoft.Samples.HelloRoutingService.ICalculator" />
     </client>
-   
   </system.serviceModel>
-
 </configuration>
-
diff --git a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/CalculatorClient.csproj b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/CalculatorClient.csproj
index a739c43565c..3ffcf5888c2 100644
--- a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/CalculatorClient.csproj
+++ b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorClient/CalculatorClient.csproj
@@ -1,38 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -52,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -65,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/App.config b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/App.config
index 5af8509001a..a68ad931e83 100644
--- a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/App.config
+++ b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/App.config
@@ -1,39 +1,28 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved -->
 <configuration>
   <system.serviceModel>
-
     <services>
-
-      <service
-          name="Microsoft.Samples.HelloRoutingService.CalculatorService"
-          behaviorConfiguration="CalculatorServiceBehavior">
+      <service name="Microsoft.Samples.HelloRoutingService.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- ICalculator is exposed at the base address provided by host: http://localhost/servicemodelsamples/service.svc  -->
-        <endpoint address=""
-                  binding="wsHttpBinding"
-                  contract="Microsoft.Samples.HelloRoutingService.ICalculator" />
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.HelloRoutingService.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost/servicemodelsamples/service.svc/mex -->
-        <endpoint address="mex"
-                  binding="mexHttpBinding"
-                  contract="IMetadataExchange" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
           <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/CalculatorService.csproj b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/CalculatorService.csproj
index a9134b17315..ddd8c12d7d0 100644
--- a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/CalculatorService.csproj
+++ b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/CalculatorService/CalculatorService.csproj
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
     <StartupObject />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -27,6 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -35,6 +30,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -47,9 +43,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/App.config b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/App.config
index a00d8949d4b..2848be279cf 100644
--- a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/App.config
+++ b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved -->
 <configuration>
   <system.web>
@@ -9,26 +9,20 @@
   <system.serviceModel>
     <services>
       <!--ROUTING SERVICE -->
-      <service behaviorConfiguration="routingData"
-          name="System.ServiceModel.Routing.RoutingService">
+      <service behaviorConfiguration="routingData" name="System.ServiceModel.Routing.RoutingService">
         <host>
           <baseAddresses>
-            <add  baseAddress="http://localhost:8000/routingservice/router"/>
+            <add baseAddress="http://localhost:8000/routingservice/router" />
           </baseAddresses>
         </host>
-        <endpoint address="" 
-                  binding="wsHttpBinding" 
-                  name="reqReplyEndpoint" 
-                  contract="System.ServiceModel.Routing.IRequestReplyRouter" />
-        <endpoint address="mex" 
-                  binding="mexHttpBinding" 
-                  contract="IMetadataExchange"  />
+        <endpoint address="" binding="wsHttpBinding" name="reqReplyEndpoint" contract="System.ServiceModel.Routing.IRequestReplyRouter" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
     <behaviors>
       <serviceBehaviors>
         <behavior name="routingData">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
           <routing filterTableName="routingTable1" />
         </behavior>
       </serviceBehaviors>
@@ -43,9 +37,9 @@
       </filters>
       <filterTables>
         <filterTable name="routingTable1">
-            <add filterName="MatchAllFilter1" endpointName="CalculatorService" />
+          <add filterName="MatchAllFilter1" endpointName="CalculatorService" />
         </filterTable>
-      </filterTables>    
-  </routing>
+      </filterTables>
+    </routing>
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/RoutingService.csproj b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/RoutingService.csproj
index 7a8f132e2f8..392b47723a9 100644
--- a/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/RoutingService.csproj
+++ b/framework/wcf/Basic/RoutingServices/HelloRoutingService/CS/RoutingService/RoutingService.csproj
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15B3E0D2-6217-493A-A690-158C497F5318}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RoutingService</RootNamespace>
     <AssemblyName>RoutingService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <StartupObject>Microsoft.Samples.HelloRoutingService.Router</StartupObject>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,7 +48,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -58,4 +57,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Security/CryptoAgility/CS/Client/App.config b/framework/wcf/Basic/Security/CryptoAgility/CS/Client/App.config
index 89e015a0aea..87aa0bcb754 100644
--- a/framework/wcf/Basic/Security/CryptoAgility/CS/Client/App.config
+++ b/framework/wcf/Basic/Security/CryptoAgility/CS/Client/App.config
@@ -1,32 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <wsHttpBinding>
-                <binding name="WSHttpBinding_ICalculator_Windows" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-                    allowCookies="false">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
-                        enabled="false" />
-                    <security mode="Message">
-                        <transport clientCredentialType="Windows" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="Windows" negotiateServiceCredential="true"
-                            algorithmSuite="Basic128" establishSecurityContext="false" />
-                    </security>
-                </binding>
-            </wsHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost:8003/servicemodelsamples/service/Calculator"
-                binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Windows"
-                contract="ICalculator" name="WSHttpBinding_ICalculator_Windows">
-            </endpoint>
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <wsHttpBinding>
+        <binding name="WSHttpBinding_ICalculator_Windows">
+          <readerQuotas />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" algorithmSuite="Basic128" establishSecurityContext="false" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:8003/servicemodelsamples/service/Calculator" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Windows" contract="ICalculator" name="WSHttpBinding_ICalculator_Windows"></endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Security/CryptoAgility/CS/Client/Client.csproj b/framework/wcf/Basic/Security/CryptoAgility/CS/Client/Client.csproj
index 6c1b32abc63..f7bae69e7cc 100644
--- a/framework/wcf/Basic/Security/CryptoAgility/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Security/CryptoAgility/CS/Client/Client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C7570A1B-4D8E-4629-A780-53920F7EA957}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,4 +46,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Security/CryptoAgility/CS/Service/App.config b/framework/wcf/Basic/Security/CryptoAgility/CS/Service/App.config
index 29bc739dc1f..2a2848ef7dd 100644
--- a/framework/wcf/Basic/Security/CryptoAgility/CS/Service/App.config
+++ b/framework/wcf/Basic/Security/CryptoAgility/CS/Service/App.config
@@ -1,40 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
   <system.serviceModel>
-
     <bindings>
       <wsHttpBinding>
-        <binding name="mexHttpBinding">
-        </binding>
+        <binding name="mexHttpBinding"></binding>
         <binding name="WSHttpBinding_Windows">
           <security mode="Message">
-            <message algorithmSuite="Basic128"
-                     clientCredentialType="Windows"
-                     establishSecurityContext="false"  />
+            <message algorithmSuite="Basic128" clientCredentialType="Windows" establishSecurityContext="false" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <services>
-      <service name="Microsoft.ServiceModel.Samples.CalculatorService"
-               behaviorConfiguration="CalculatorServiceBehavior">
+      <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <add baseAddress="http://localhost:8003/servicemodelsamples" />
           </baseAddresses>
         </host>
-        <endpoint address="mex"
-                  behaviorConfiguration=""
-                  binding="wsHttpBinding"
-                  bindingConfiguration="mexHttpBinding"
-                  name="MexEndpoint"
-                  contract="IMetadataExchange">
-        </endpoint>
+        <endpoint address="mex" behaviorConfiguration="" binding="wsHttpBinding" bindingConfiguration="mexHttpBinding" name="MexEndpoint" contract="IMetadataExchange"></endpoint>
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
@@ -45,5 +31,4 @@
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Security/CryptoAgility/CS/Service/Service.csproj b/framework/wcf/Basic/Security/CryptoAgility/CS/Service/Service.csproj
index e7904f4ecaa..b529c22a00c 100644
--- a/framework/wcf/Basic/Security/CryptoAgility/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Security/CryptoAgility/CS/Service/Service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{187191B1-28F3-4BF4-84D4-338FFCB14198}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,4 +49,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/Addressing/CS/client/App.config b/framework/wcf/Basic/Services/Addressing/CS/client/App.config
index b70f3274f52..b2f9f66a5e8 100644
--- a/framework/wcf/Basic/Services/Addressing/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Addressing/CS/client/App.config
@@ -1,12 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--  Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="CalculatorEndpoint1" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" contract="Microsoft.Samples.Addressing.ICalculator">
-      </endpoint>
-      <endpoint name="CalculatorEndpoint4" address="net.tcp://localhost:9000/servicemodelsamples/service" binding="netTcpBinding" contract="Microsoft.Samples.Addressing.ICalculator">
-      </endpoint>
+      <endpoint name="CalculatorEndpoint1" address="http://localhost:8000/servicemodelsamples/service" binding="basicHttpBinding" contract="Microsoft.Samples.Addressing.ICalculator"></endpoint>
+      <endpoint name="CalculatorEndpoint4" address="net.tcp://localhost:9000/servicemodelsamples/service" binding="netTcpBinding" contract="Microsoft.Samples.Addressing.ICalculator"></endpoint>
     </client>
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Basic/Services/Addressing/CS/client/client.csproj b/framework/wcf/Basic/Services/Addressing/CS/client/client.csproj
index cc848c4ea8c..d1098170012 100644
--- a/framework/wcf/Basic/Services/Addressing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Addressing/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,27 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Addressing/CS/service/App.config b/framework/wcf/Basic/Services/Addressing/CS/service/App.config
index 050ad6eece1..642c6f3a735 100644
--- a/framework/wcf/Basic/Services/Addressing/CS/service/App.config
+++ b/framework/wcf/Basic/Services/Addressing/CS/service/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--  Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
diff --git a/framework/wcf/Basic/Services/Addressing/CS/service/service.csproj b/framework/wcf/Basic/Services/Addressing/CS/service/service.csproj
index 0a6732c70c3..3907177041e 100644
--- a/framework/wcf/Basic/Services/Addressing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Addressing/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/App.config
index cd869ad496d..1269c476220 100644
--- a/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/App.config
@@ -1,13 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- default client endpoint for ICalculatorConcurrency -->
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Concurrency.ICalculatorConcurrency"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Concurrency.ICalculatorConcurrency" />
     </client>
-  
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/client.csproj
index 742cdb25a34..e172630b040 100644
--- a/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F86BF909-06ED-4B1F-8B2A-4C5EA9C8462D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,27 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/service/service.csproj
index 57380707f56..78d1f98ee4b 100644
--- a/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Concurrency/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Default/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Default/CS/client/App.config
index 719f347af6c..aedc9c5411f 100644
--- a/framework/wcf/Basic/Services/Behaviors/Default/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Default/CS/client/App.config
@@ -1,13 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- default client endpoint for ICalculator -->
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.Behaviors.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.Behaviors.ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Default/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Default/CS/client/client.csproj
index 5019b6ef84b..3b1324046f6 100644
--- a/framework/wcf/Basic/Services/Behaviors/Default/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Default/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F86BF909-06ED-4B1F-8B2A-4C5EA9C8462D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,27 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Default/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Default/CS/service/service.csproj
index d72f87d72fc..24fd649d2c3 100644
--- a/framework/wcf/Basic/Services/Behaviors/Default/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Default/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,34 +49,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/App.config
index 36cbc05731b..e2a60de3c17 100644
--- a/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/App.config
@@ -1,20 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.Instancing.ICalculatorInstance"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.Instancing.ICalculatorInstance" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding>
-          <reliableSession enabled="true"/>
+          <reliableSession enabled="true" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/client.csproj
index af4ccb9b9e3..8a555831c1c 100644
--- a/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Instancing/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Instancing/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Instancing/CS/service/service.csproj
index e4e27d423b8..e77462fd63f 100644
--- a/framework/wcf/Basic/Services/Behaviors/Instancing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Instancing/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/App.config
index 8c5a988bd54..26f3e5ef3f7 100644
--- a/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Metadata.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.Metadata.ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Metadata/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Metadata/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Metadata/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Services/Behaviors/Metadata/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Metadata/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/App.config
index f3bc3f529be..33a87c86ca0 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/App.config
@@ -1,11 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Auditing.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Auditing.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -15,11 +13,10 @@
 				-->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/client.csproj
index b9f6e064655..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/service/service.csproj
index 34068673059..ab4848f1af6 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/VB/client/app.config b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/VB/client/app.config
index f3bc3f529be..33a87c86ca0 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Auditing/VB/client/app.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Auditing/VB/client/app.config
@@ -1,11 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Auditing.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.Auditing.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -15,11 +13,10 @@
 				-->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/App.config
index 654caf08284..cafdb0c1781 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/App.config
@@ -1,12 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator">
-      </endpoint>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator"></endpoint>
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/client.csproj
index 6c7591b2704..09c614a6744 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -82,27 +60,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/App.config b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/App.config
index 144146ea8ef..609bf9b2ceb 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/App.config
@@ -1,31 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.Impersonation.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- This endpoint is exposed at the base address provided by host: http://localhost:8000/servicemodelsamples/service  -->
-        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/servicemodelsamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/service.csproj
index 47fbb434e4f..e524494002b 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/client/App.config b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/client/App.config
index 654caf08284..cafdb0c1781 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/client/App.config
@@ -1,12 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator">
-      </endpoint>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator"></endpoint>
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/service/App.config b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/service/App.config
index 144146ea8ef..609bf9b2ceb 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/service/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/Impersonation/VB/service/App.config
@@ -1,31 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.Impersonation.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- This endpoint is exposed at the base address provided by host: http://localhost:8000/servicemodelsamples/service  -->
-        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Impersonation.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/servicemodelsamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/App.config
index 55d95490271..4593f0273e8 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/App.config
@@ -1,14 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" behaviorConfiguration="ClientBehavior" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MembershipAndRoleProvider.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" behaviorConfiguration="ClientBehavior" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MembershipAndRoleProvider.ICalculator" />
     </client>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientBehavior">
@@ -22,23 +20,21 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-    
     <bindings>
       <wsHttpBinding>
         <!-- Set up a binding that uses Username as the client credential type -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/client.csproj
index b9f6e064655..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/service/service.csproj
index 31789e0fd7d..23b6f1e0f8e 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,36 +49,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/VB/client/App.config b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/VB/client/App.config
index a2155c4de40..4593f0273e8 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/VB/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/MembershipAndRoleProvider/VB/client/App.config
@@ -1,14 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" behaviorConfiguration="ClientBehavior" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MembershipAndRoleProvider.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" behaviorConfiguration="ClientBehavior" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.MembershipAndRoleProvider.ICalculator" />
     </client>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientBehavior">
@@ -22,23 +20,21 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
     <bindings>
       <wsHttpBinding>
         <!-- Set up a binding that uses Username as the client credential type -->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/App.config
index b2ddd91a25e..57f1133ca68 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/App.config
@@ -1,11 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.PrincipalPermissionAuthorization.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.PrincipalPermissionAuthorization.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -15,11 +13,10 @@
 				-->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/client.csproj
index b9f6e064655..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/service/service.csproj
index 34068673059..ab4848f1af6 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/VB/client/app.config b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/VB/client/app.config
index b2ddd91a25e..57f1133ca68 100644
--- a/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/VB/client/app.config
+++ b/framework/wcf/Basic/Services/Behaviors/Security/PrincipalPermissionAuthorization/VB/client/app.config
@@ -1,11 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.PrincipalPermissionAuthorization.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.PrincipalPermissionAuthorization.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <!-- 
@@ -15,11 +13,10 @@
 				-->
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/App.config
index 40ffa8d3933..c35af82d582 100644
--- a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-   
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/client.csproj
index af4ccb9b9e3..8a555831c1c 100644
--- a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/service/service.csproj
index 5bd0753aff1..ab4848f1af6 100644
--- a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,36 +47,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/VB/client/App.config b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/VB/client/App.config
index 9ab62f8bef9..c35af82d582 100644
--- a/framework/wcf/Basic/Services/Behaviors/ServiceDebug/VB/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/ServiceDebug/VB/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/App.config
index 96c80298d28..3e6b17e55ac 100644
--- a/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Throttling/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Throttling/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Throttling/CS/service/service.csproj
index e4e27d423b8..e77462fd63f 100644
--- a/framework/wcf/Basic/Services/Behaviors/Throttling/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Throttling/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Throttling/VB/client/app.config b/framework/wcf/Basic/Services/Behaviors/Throttling/VB/client/app.config
index 96c80298d28..3e6b17e55ac 100644
--- a/framework/wcf/Basic/Services/Behaviors/Throttling/VB/client/app.config
+++ b/framework/wcf/Basic/Services/Behaviors/Throttling/VB/client/app.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/App.config b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/App.config
index ff0f0b1c856..d707437fd46 100644
--- a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/App.config
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
-        <binding name="transactionalBinding" transactionFlow="true"/>
+        <binding name="transactionalBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
     <client>
       <endpoint address="http://localhost:8000/ServiceModelSamples/service" binding="wsHttpBinding" bindingConfiguration="transactionalBinding" contract="ICalculator">
         <!--The username and the domain over here will have to be replaced 
         by the identity under which the service will be running-->
-         <!--identity>
+        <!--identity>
               <userPrincipalName value="username@domain" />
          </identity-->
       </endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/client.csproj b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/client.csproj
index 155dd115bb5..8e3d2d95195 100644
--- a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/App.config b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/App.config
index 94be4ea8257..45a0ab11d8b 100644
--- a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/App.config
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
     <!-- Sets whether the server will connect to a database -->
-    <add key="usingSql" value="true"/>
+    <add key="usingSql" value="true" />
     <!-- Sets the database connection string -->
-    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True;User Instance=True"/>
+    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True;User Instance=True" />
   </appSettings>
   <system.serviceModel>
     <services>
@@ -13,31 +13,27 @@
         <!-- specify wsHttpBinding and a transactional binding configuration -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!-- binding configuration - configures a WSHttpBinding to require transaction flow -->
     <bindings>
       <wsHttpBinding>
-        <binding name="transactionalBinding" transactionFlow="true"/>
+        <binding name="transactionalBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <serviceMetadata httpGetEnabled="true" />
+          <serviceDebug includeExceptionDetailInFaults="false" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/service.csproj b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/service.csproj
index 715072dced8..999f0da791d 100644
--- a/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Behaviors/Transactions/CS/service/service.csproj
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,31 +59,8 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Behaviors/Transactions/VB/client/App.config b/framework/wcf/Basic/Services/Behaviors/Transactions/VB/client/App.config
index ff0f0b1c856..d707437fd46 100644
--- a/framework/wcf/Basic/Services/Behaviors/Transactions/VB/client/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Transactions/VB/client/App.config
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
-        <binding name="transactionalBinding" transactionFlow="true"/>
+        <binding name="transactionalBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
     <client>
       <endpoint address="http://localhost:8000/ServiceModelSamples/service" binding="wsHttpBinding" bindingConfiguration="transactionalBinding" contract="ICalculator">
         <!--The username and the domain over here will have to be replaced 
         by the identity under which the service will be running-->
-         <!--identity>
+        <!--identity>
               <userPrincipalName value="username@domain" />
          </identity-->
       </endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Behaviors/Transactions/VB/service/App.config b/framework/wcf/Basic/Services/Behaviors/Transactions/VB/service/App.config
index 94be4ea8257..45a0ab11d8b 100644
--- a/framework/wcf/Basic/Services/Behaviors/Transactions/VB/service/App.config
+++ b/framework/wcf/Basic/Services/Behaviors/Transactions/VB/service/App.config
@@ -1,10 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
     <!-- Sets whether the server will connect to a database -->
-    <add key="usingSql" value="true"/>
+    <add key="usingSql" value="true" />
     <!-- Sets the database connection string -->
-    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True;User Instance=True"/>
+    <add key="connectionString" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SampleDb.mdf;Integrated Security=True;User Instance=True" />
   </appSettings>
   <system.serviceModel>
     <services>
@@ -13,31 +13,27 @@
         <!-- specify wsHttpBinding and a transactional binding configuration -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="transactionalBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!-- binding configuration - configures a WSHttpBinding to require transaction flow -->
     <bindings>
       <wsHttpBinding>
-        <binding name="transactionalBinding" transactionFlow="true"/>
+        <binding name="transactionalBinding" transactionFlow="true" />
       </wsHttpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="true"/>
-          <serviceDebug includeExceptionDetailInFaults="false"/>
+          <serviceMetadata httpGetEnabled="true" />
+          <serviceDebug includeExceptionDetailInFaults="false" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/App.config b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/App.config
index f6e08159818..9222b9c9ec7 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/App.config
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/App.config
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_ICalculator" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
-                    </security>
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost:8000/ServiceModelSamples/Service.svc"
-                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ICalculator"
-                contract="ICalculator" name="BasicHttpBinding_ICalculator" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_ICalculator">
+          <readerQuotas />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:8000/ServiceModelSamples/Service.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ICalculator" contract="ICalculator" name="BasicHttpBinding_ICalculator" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/client.csproj b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/client.csproj
index 5721998a51a..5dfb8a27bd2 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/client.csproj
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20107</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65BE53C1-CE01-40DC-A0C3-D049F14827B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ConfigSimplification</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -55,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/App.config b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/App.config
index b86395d8072..b608fbc3cd0 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/App.config
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/App.config
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
     <!-- No <service> tag is necessary. Default endpoints will be added to the service -->
     <!-- The service behavior with name="" will be picked up by the service -->
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/service.csproj b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/service.csproj
index 94b74ec6769..b1b4de5e666 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/service.csproj
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Self-Hosted/CS/Service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20107</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ConfigSimplification</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/App.config b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/App.config
index 5c6ae4971ed..3e7b6e0ae4f 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/App.config
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/App.config
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_ICalculator" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
-                    </security>
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc"
-                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ICalculator"
-                contract="ICalculator" name="BasicHttpBinding_ICalculator" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_ICalculator">
+          <readerQuotas />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ICalculator" contract="ICalculator" name="BasicHttpBinding_ICalculator" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/client.csproj b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/client.csproj
index 1a3fe718ace..65e6eca0180 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/client.csproj
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20107</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65BE53C1-CE01-40DC-A0C3-D049F14827B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Service/service.csproj b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Service/service.csproj
index 2e41935c94f..84f8b5ad957 100644
--- a/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Service/service.csproj
+++ b/framework/wcf/Basic/Services/ConfigSimplificationIn40/Web-Hosted/CS/Service/service.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20207</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{15B3E0D2-6217-493A-A690-158C497F5318}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -12,16 +12,12 @@
     <AssemblyName>service</AssemblyName>
     <ProjectTypeGuids>{3D9AD99F-2412-4246-B90B-4EAA41C64699};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <StartArguments>/client:"client.exe"</StartArguments>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <StartupObject />
-    <SccProjectName>
-    </SccProjectName>
-    <SccLocalPath>
-    </SccLocalPath>
-    <SccAuxPath>
-    </SccAuxPath>
-    <SccProvider>
-    </SccProvider>
+    <SccProjectName></SccProjectName>
+    <SccLocalPath></SccLocalPath>
+    <SccAuxPath></SccAuxPath>
+    <SccProvider></SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -57,14 +53,13 @@
   <ItemGroup>
     <Content Include="service.svc" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
       mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
       mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
       copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-      copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-      copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
     </PostBuildEvent>
   </PropertyGroup>
   <ProjectExtensions>
@@ -76,4 +71,5 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Client/Client.csproj b/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Client/Client.csproj
index 89bf811d126..093dd376c58 100644
--- a/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Client/Client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>Client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -78,37 +56,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.0 %28x86%29</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/App.config b/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/App.config
index 20d51fce0dc..e0bb06a8782 100644
--- a/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/App.config
+++ b/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
@@ -14,8 +14,8 @@
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
diff --git a/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/Service.csproj b/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/Service.csproj
index 9a5c0b6a61a..88346605587 100644
--- a/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Services/ConfigurationChannelFactory/CS/Service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -74,27 +54,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/App.config
index 39f5550fdfd..91f4e2b4eb7 100644
--- a/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/App.config
@@ -1,15 +1,13 @@
-<?xml version="1.0"?>
- <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
+<?xml version="1.0"?>
+<!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-    <system.serviceModel>
-
-        <client>
-            <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="AllowCookieBinding" contract="Microsoft.Samples.AspNetCompatibility.ICalculatorSession"/>
-        </client>
-
-        <bindings>
-            <!-- configure a binding that allows Http cookies -->
-          <!--<customBinding>
+  <system.serviceModel>
+    <client>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="AllowCookieBinding" contract="Microsoft.Samples.AspNetCompatibility.ICalculatorSession" />
+    </client>
+    <bindings>
+      <!-- configure a binding that allows Http cookies -->
+      <!--<customBinding>
             <binding name="AllowCookieBinding">
               <textMessageEncoding maxReadPoolSize="64" maxWritePoolSize="16"
                   messageVersion="Soap11WSAddressing10" writeEncoding="utf-8" />
@@ -21,11 +19,9 @@
                   useDefaultWebProxy="true" />
             </binding>
           </customBinding>-->
-          <basicHttpBinding>
-            <binding name="AllowCookieBinding" allowCookies="true"/>
-          </basicHttpBinding>
-        </bindings>
-
-    </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+      <basicHttpBinding>
+        <binding name="AllowCookieBinding" allowCookies="true" />
+      </basicHttpBinding>
+    </bindings>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/client.csproj
index d05b0d0b904..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,22 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/service/service.csproj
index f32c44d1ffa..16dc814ef2a 100644
--- a/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/ASPNetCompatibility/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,30 +50,15 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>rmdir /S /Q %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)bin\service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+    <PostBuildEvent>
+      rmdir /S /Q %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\bin\service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/App.config
index efa3ef78cc8..558052d6200 100644
--- a/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
- <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
+<?xml version="1.0"?>
+<!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.InLineCode.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.InLineCode.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/client.csproj
index d05b0d0b904..a4f8592d2fc 100644
--- a/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/InlineCode/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,22 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/InlineCode/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/InlineCode/CS/service/service.csproj
index 82b9fb3dd83..53d436497c5 100644
--- a/framework/wcf/Basic/Services/Hosting/InlineCode/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/InlineCode/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,28 +46,13 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>rmdir /S /Q %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+    <PostBuildEvent>
+      rmdir /S /Q %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/App.config
index 738e558a661..c4acdf8dac3 100644
--- a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/App.config
@@ -1,12 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator">
-      </endpoint>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"></endpoint>
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/client.csproj
index 81fd5a8377a..d1098170012 100644
--- a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,9 +28,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <HintPath>C:\Windows\Microsoft.Net\assembly\GAC_MSIL\System\v4.0_4.0.0.0__b77a5c561934e089\System.dll</HintPath>
-    </Reference>
+    <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
@@ -83,27 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/App.config b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/App.config
index 3928e495f2c..b9815b30bd2 100644
--- a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/App.config
+++ b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/App.config
@@ -1,31 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-  
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/ServiceModelSamples/service  -->
-        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/service.csproj
index 31e2da8f1e2..3907177041e 100644
--- a/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/SelfHost/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/SelfHost/VB/client/App.config b/framework/wcf/Basic/Services/Hosting/SelfHost/VB/client/App.config
index 738e558a661..c4acdf8dac3 100644
--- a/framework/wcf/Basic/Services/Hosting/SelfHost/VB/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/SelfHost/VB/client/App.config
@@ -1,12 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator">
-      </endpoint>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"></endpoint>
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/SelfHost/VB/service/App.config b/framework/wcf/Basic/Services/Hosting/SelfHost/VB/service/App.config
index e6e8918b30f..b9815b30bd2 100644
--- a/framework/wcf/Basic/Services/Hosting/SelfHost/VB/service/App.config
+++ b/framework/wcf/Basic/Services/Hosting/SelfHost/VB/service/App.config
@@ -1,31 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/ServiceModelSamples/service  -->
-        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/App.config
index d813f5fa254..f981a521a79 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
     <!-- use appSetting to configure MSMQ queue name -->
@@ -37,4 +37,4 @@
       </providers>
     </roleManager>
   </system.web>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/client.csproj
index fcaf40d2415..2053f54afec 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,9 +28,7 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System">
-      <HintPath>..\..\..\..\..\..\Windows\Microsoft.Net\assembly\GAC_MSIL\System\v4.0_4.0.0.0__b77a5c561934e089\System.dll</HintPath>
-    </Reference>
+    <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Messaging" />
@@ -87,22 +64,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/service/service.csproj
index 472ef61cd80..c1895a980ad 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/MsmqActivation/CS/service/service.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,30 +52,14 @@
     <None Include="service.svc" />
     <None Include="web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/App.config
index c4f140eadd3..3e54464278e 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/App.config
@@ -1,26 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="net.pipe://localhost/servicemodelsamples/service.svc" binding="netNamedPipeBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.NamedPipeActivation.ICalculator"/>
+      <endpoint name="" address="net.pipe://localhost/servicemodelsamples/service.svc" binding="netNamedPipeBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.NamedPipeActivation.ICalculator" />
     </client>
-
     <bindings>
-
       <!--  Following is the expanded configuration section for a NetNamedPipeBinding.
             Each property is configured with the default value.   -->
-
       <netNamedPipeBinding>
         <binding name="Binding1" maxBufferSize="65536" maxConnections="10">
-          <security mode="None">
-          </security>
+          <security mode="None"></security>
         </binding>
-
       </netNamedPipeBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/client.csproj
index 8e0821cc601..e0d706ff163 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,22 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/service/service.csproj
index b51581b8006..42ccd76bf3f 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/NamedPipeActivation/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,31 +48,15 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>rmdir /S /Q %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+    <PostBuildEvent>
+      rmdir /S /Q %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/App.config
index 408528f8eca..ff05ee635f2 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/App.config
@@ -1,16 +1,16 @@
-<?xml version="1.0"?>
- <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
+<?xml version="1.0"?>
+<!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <netTcpBinding>
-              <binding name="NetTcpBinding_ICalculator">
-                <security mode="None"/>
-              </binding>
-            </netTcpBinding>
-        </bindings>
-        <client>
-            <endpoint address="net.tcp://localhost/servicemodelsamples/service.svc" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_ICalculator" contract="Microsoft.Samples.TcpActivation.ICalculator" name="NetTcpBinding_ICalculator"/>
-        </client>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <bindings>
+      <netTcpBinding>
+        <binding name="NetTcpBinding_ICalculator">
+          <security mode="None" />
+        </binding>
+      </netTcpBinding>
+    </bindings>
+    <client>
+      <endpoint address="net.tcp://localhost/servicemodelsamples/service.svc" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_ICalculator" contract="Microsoft.Samples.TcpActivation.ICalculator" name="NetTcpBinding_ICalculator" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/client.csproj
index ea96d0278ce..5f9f6fb479f 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,22 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/service/service.csproj
index f477267c7fa..3597c5a975a 100644
--- a/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WASHost/TCPActivation/CS/service/service.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,31 +49,15 @@
     <None Include="service.svc" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>rmdir /S /Q %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+    <PostBuildEvent>
+      rmdir /S /Q %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WebRoutingIntegration/CS/Service/Service.csproj b/framework/wcf/Basic/Services/Hosting/WebRoutingIntegration/CS/Service/Service.csproj
index 3f87334ec04..13d4ac5eefd 100644
--- a/framework/wcf/Basic/Services/Hosting/WebRoutingIntegration/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WebRoutingIntegration/CS/Service/Service.csproj
@@ -1,16 +1,16 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0851EDD9-5666-4258-B4B7-0A34B0AFFB49}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.WebRoutingIntegration</RootNamespace>
     <AssemblyName>WebRoutingIntegration</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -91,8 +91,8 @@
       <DependentUpon>Web.config</DependentUpon>
     </Content>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -101,12 +101,10 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>28477</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/App.config b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/App.config
index 91faf8929c4..7755e3fc818 100644
--- a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
- <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
+<?xml version="1.0"?>
+<!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.Samples.WindowsService.ICalculator"/>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" contract="Microsoft.Samples.WindowsService.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/client.csproj b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/client.csproj
index 9fe8e72530d..d1098170012 100644
--- a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,22 +59,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/App.config b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/App.config
index 91722eb393c..3c5a050865f 100644
--- a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/App.config
+++ b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/App.config
@@ -1,31 +1,28 @@
-<?xml version="1.0"?>
- <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
+<?xml version="1.0"?>
+<!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.WindowsService.WcfCalculatorService">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!-- this endpoint is exposed at the base address provided by host: http://localhost:8000/ServiceModelSamples/service  -->
-        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.WindowsService.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.WindowsService.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/ServiceModelSamples/service/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-    
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-  </configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/service.csproj b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/service.csproj
index 07721eb342d..37211dfcb43 100644
--- a/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Hosting/WindowsService/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,22 +51,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Imperative/CS/client/app.config b/framework/wcf/Basic/Services/Imperative/CS/client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Basic/Services/Imperative/CS/client/app.config
+++ b/framework/wcf/Basic/Services/Imperative/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Services/Imperative/CS/client/client.csproj b/framework/wcf/Basic/Services/Imperative/CS/client/client.csproj
index 58a37d43fec..157514b975d 100644
--- a/framework/wcf/Basic/Services/Imperative/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Imperative/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,5 +41,5 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Imperative/CS/service/app.config b/framework/wcf/Basic/Services/Imperative/CS/service/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Basic/Services/Imperative/CS/service/app.config
+++ b/framework/wcf/Basic/Services/Imperative/CS/service/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Basic/Services/Imperative/CS/service/service.csproj b/framework/wcf/Basic/Services/Imperative/CS/service/service.csproj
index bc6bbe6e11f..65c64363a19 100644
--- a/framework/wcf/Basic/Services/Imperative/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Imperative/CS/service/service.csproj
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,5 +42,5 @@
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Imperative/VB/client/app.config b/framework/wcf/Basic/Services/Imperative/VB/client/app.config
index 6b91abde932..5aa9ed6d0f8 100644
--- a/framework/wcf/Basic/Services/Imperative/VB/client/app.config
+++ b/framework/wcf/Basic/Services/Imperative/VB/client/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.diagnostics>
-        <sources>
-            <!-- This section defines the logging configuration for My.Application.Log -->
-            <source name="DefaultSource" switchName="DefaultSwitch">
-                <listeners>
-                    <add name="FileLog"/>
-                    <!-- Uncomment the below section to write to the Application Event Log -->
-                    <!--<add name="EventLog"/>-->
-                </listeners>
-            </source>
-        </sources>
-        <switches>
-            <add name="DefaultSwitch" value="Information"/>
-        </switches>
-        <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
-            <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
-            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
-        </sharedListeners>
-    </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.diagnostics>
+    <sources>
+      <!-- This section defines the logging configuration for My.Application.Log -->
+      <source name="DefaultSource" switchName="DefaultSwitch">
+        <listeners>
+          <add name="FileLog" />
+          <!-- Uncomment the below section to write to the Application Event Log -->
+          <!--<add name="EventLog"/>-->
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="DefaultSwitch" value="Information" />
+    </switches>
+    <sharedListeners>
+      <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
+      <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
+      <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
+    </sharedListeners>
+  </system.diagnostics>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Imperative/VB/service/app.config b/framework/wcf/Basic/Services/Imperative/VB/service/app.config
index 6b91abde932..5aa9ed6d0f8 100644
--- a/framework/wcf/Basic/Services/Imperative/VB/service/app.config
+++ b/framework/wcf/Basic/Services/Imperative/VB/service/app.config
@@ -1,23 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.diagnostics>
-        <sources>
-            <!-- This section defines the logging configuration for My.Application.Log -->
-            <source name="DefaultSource" switchName="DefaultSwitch">
-                <listeners>
-                    <add name="FileLog"/>
-                    <!-- Uncomment the below section to write to the Application Event Log -->
-                    <!--<add name="EventLog"/>-->
-                </listeners>
-            </source>
-        </sources>
-        <switches>
-            <add name="DefaultSwitch" value="Information"/>
-        </switches>
-        <sharedListeners>
-            <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter"/>
-            <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
-            <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
-        </sharedListeners>
-    </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.diagnostics>
+    <sources>
+      <!-- This section defines the logging configuration for My.Application.Log -->
+      <source name="DefaultSource" switchName="DefaultSwitch">
+        <listeners>
+          <add name="FileLog" />
+          <!-- Uncomment the below section to write to the Application Event Log -->
+          <!--<add name="EventLog"/>-->
+        </listeners>
+      </source>
+    </sources>
+    <switches>
+      <add name="DefaultSwitch" value="Information" />
+    </switches>
+    <sharedListeners>
+      <add name="FileLog" type="Microsoft.VisualBasic.Logging.FileLogTraceListener, Microsoft.VisualBasic, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" initializeData="FileLogWriter" />
+      <!-- Uncomment the below section and replace APPLICATION_NAME with the name of your application to write to the Application Event Log -->
+      <!--<add name="EventLog" type="System.Diagnostics.EventLogTraceListener" initializeData="APPLICATION_NAME"/> -->
+    </sharedListeners>
+  </system.diagnostics>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Interop/ASMX/CS/client/App.config b/framework/wcf/Basic/Services/Interop/ASMX/CS/client/App.config
index 71a17f7825f..3d47393b9a1 100644
--- a/framework/wcf/Basic/Services/Interop/ASMX/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Interop/ASMX/CS/client/App.config
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="CalculatorServiceAddress" value="http://localhost/ServiceModelSamples/service.svc"/>
+    <add key="CalculatorServiceAddress" value="http://localhost/ServiceModelSamples/service.svc" />
   </appSettings>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Interop/ASMX/CS/client/client.csproj b/framework/wcf/Basic/Services/Interop/ASMX/CS/client/client.csproj
index a14e7844c5c..b3e3868f47f 100644
--- a/framework/wcf/Basic/Services/Interop/ASMX/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Interop/ASMX/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,5 +43,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Interop/ASMX/CS/service/service.csproj b/framework/wcf/Basic/Services/Interop/ASMX/CS/service/service.csproj
index e53831768b3..c0472e70e5e 100644
--- a/framework/wcf/Basic/Services/Interop/ASMX/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Interop/ASMX/CS/service/service.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,12 +44,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Interop/ASMX/VB/client/app.config b/framework/wcf/Basic/Services/Interop/ASMX/VB/client/app.config
index 71a17f7825f..3d47393b9a1 100644
--- a/framework/wcf/Basic/Services/Interop/ASMX/VB/client/app.config
+++ b/framework/wcf/Basic/Services/Interop/ASMX/VB/client/app.config
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="CalculatorServiceAddress" value="http://localhost/ServiceModelSamples/service.svc"/>
+    <add key="CalculatorServiceAddress" value="http://localhost/ServiceModelSamples/service.svc" />
   </appSettings>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Interop/COM/CS/client/client.csproj b/framework/wcf/Basic/Services/Interop/COM/CS/client/client.csproj
index e08ae6af873..c670f7c3d2e 100644
--- a/framework/wcf/Basic/Services/Interop/COM/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Interop/COM/CS/client/client.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6841ED96-7CD8-45E6-A922-873C839A65ED}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -12,27 +12,8 @@
     <AssemblyName>client</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>calcClientKey.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,27 +51,5 @@
     <Content Include="ComCalcClient.vbs" />
     <Content Include="serviceWsdl.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Interop/COM/CS/service/service.csproj b/framework/wcf/Basic/Services/Interop/COM/CS/service/service.csproj
index 89e6de239f1..bfe292fdce7 100644
--- a/framework/wcf/Basic/Services/Interop/COM/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Interop/COM/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F4C8493A-8DB6-4F8E-ACE2-C578D941D76B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,34 +48,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleContracts/CS/client/App.config b/framework/wcf/Basic/Services/MultipleContracts/CS/client/App.config
index 19c07866f5f..86af90b31e1 100644
--- a/framework/wcf/Basic/Services/MultipleContracts/CS/client/App.config
+++ b/framework/wcf/Basic/Services/MultipleContracts/CS/client/App.config
@@ -1,22 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- ICalculator endpoint using BasicBinding -->
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
       <!-- ICalculatorSession endpoint using BindingWithSession -->
-      <endpoint address="http://localhost/servicemodelsamples/service.svc/session" binding="wsHttpBinding" bindingConfiguration="BindingWithSession" contract="Microsoft.ServiceModel.Samples.ICalculatorSession"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc/session" binding="wsHttpBinding" bindingConfiguration="BindingWithSession" contract="Microsoft.ServiceModel.Samples.ICalculatorSession" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="BindingWithSession">
-          <reliableSession enabled="true"/>
+          <reliableSession enabled="true" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/MultipleContracts/CS/client/client.csproj b/framework/wcf/Basic/Services/MultipleContracts/CS/client/client.csproj
index e373f0349d5..43e34525cbd 100644
--- a/framework/wcf/Basic/Services/MultipleContracts/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/MultipleContracts/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,5 +42,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleContracts/CS/service/service.csproj b/framework/wcf/Basic/Services/MultipleContracts/CS/service/service.csproj
index d237f6a01b8..2385f581fb7 100644
--- a/framework/wcf/Basic/Services/MultipleContracts/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/MultipleContracts/CS/service/service.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,14 +44,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleContracts/VB/client/app.config b/framework/wcf/Basic/Services/MultipleContracts/VB/client/app.config
index 19c07866f5f..86af90b31e1 100644
--- a/framework/wcf/Basic/Services/MultipleContracts/VB/client/app.config
+++ b/framework/wcf/Basic/Services/MultipleContracts/VB/client/app.config
@@ -1,22 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- ICalculator endpoint using BasicBinding -->
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
       <!-- ICalculatorSession endpoint using BindingWithSession -->
-      <endpoint address="http://localhost/servicemodelsamples/service.svc/session" binding="wsHttpBinding" bindingConfiguration="BindingWithSession" contract="Microsoft.ServiceModel.Samples.ICalculatorSession"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc/session" binding="wsHttpBinding" bindingConfiguration="BindingWithSession" contract="Microsoft.ServiceModel.Samples.ICalculatorSession" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="BindingWithSession">
-          <reliableSession enabled="true"/>
+          <reliableSession enabled="true" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/App.config b/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/App.config
index 7597bbd83f7..7e774c80087 100644
--- a/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/App.config
+++ b/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/App.config
@@ -1,14 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- passing "basic" into the constructor of the CalculatorClient class selects this endpoint-->
-      <endpoint name="basic" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="basic" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
       <!-- passing "secure" into the constructor of the CalculatorClient class selects this endpoint-->
-      <endpoint name="secure" address="http://localhost/servicemodelsamples/service.svc/secure" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="secure" address="http://localhost/servicemodelsamples/service.svc/secure" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/client.csproj b/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/client.csproj
index e373f0349d5..43e34525cbd 100644
--- a/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/MultipleEndpoints/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,5 +42,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleEndpoints/CS/service/service.csproj b/framework/wcf/Basic/Services/MultipleEndpoints/CS/service/service.csproj
index d237f6a01b8..2385f581fb7 100644
--- a/framework/wcf/Basic/Services/MultipleEndpoints/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/MultipleEndpoints/CS/service/service.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,14 +44,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleEndpoints/VB/client/app.config b/framework/wcf/Basic/Services/MultipleEndpoints/VB/client/app.config
index 7597bbd83f7..7e774c80087 100644
--- a/framework/wcf/Basic/Services/MultipleEndpoints/VB/client/app.config
+++ b/framework/wcf/Basic/Services/MultipleEndpoints/VB/client/app.config
@@ -1,14 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- passing "basic" into the constructor of the CalculatorClient class selects this endpoint-->
-      <endpoint name="basic" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="basic" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
       <!-- passing "secure" into the constructor of the CalculatorClient class selects this endpoint-->
-      <endpoint name="secure" address="http://localhost/servicemodelsamples/service.svc/secure" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator"/>
+      <endpoint name="secure" address="http://localhost/servicemodelsamples/service.svc/secure" binding="wsHttpBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/App.config b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/App.config
index d5a312c5521..22b27da8afd 100644
--- a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/App.config
+++ b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/App.config
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.serviceModel>
-        <client>
-            <endpoint address="urn:Stuff" binding="wsHttpBinding" contract="ICalculator" name="WSHttpBinding_ICalculator">
-              <identity>
-                <servicePrincipalName value="host/localhost"/>
-              </identity>
-            </endpoint>
-            <endpoint address="urn:Stuff" binding="wsHttpBinding" contract="IEcho" name="WSHttpBinding_IEcho">
-              <identity>
-                <servicePrincipalName value="host/localhost"/>
-              </identity>
-            </endpoint>
-            <endpoint address="urn:OtherEcho" binding="wsHttpBinding" contract="IEcho" name="WSHttpBinding_IEcho1">
-              <identity>
-                <servicePrincipalName value="host/localhost"/>
-              </identity>
-            </endpoint>
-        </client>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <client>
+      <endpoint address="urn:Stuff" binding="wsHttpBinding" contract="ICalculator" name="WSHttpBinding_ICalculator">
+        <identity>
+          <servicePrincipalName value="host/localhost" />
+        </identity>
+      </endpoint>
+      <endpoint address="urn:Stuff" binding="wsHttpBinding" contract="IEcho" name="WSHttpBinding_IEcho">
+        <identity>
+          <servicePrincipalName value="host/localhost" />
+        </identity>
+      </endpoint>
+      <endpoint address="urn:OtherEcho" binding="wsHttpBinding" contract="IEcho" name="WSHttpBinding_IEcho1">
+        <identity>
+          <servicePrincipalName value="host/localhost" />
+        </identity>
+      </endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/client.csproj b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/client.csproj
index 7b1b2321a91..fb6819ddbb6 100644
--- a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,5 +42,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/service/service.csproj b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/service/service.csproj
index d237f6a01b8..2385f581fb7 100644
--- a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/CS/service/service.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,14 +44,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/VB/client/App.config b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/VB/client/App.config
index fee9723be0e..22b27da8afd 100644
--- a/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/VB/client/App.config
+++ b/framework/wcf/Basic/Services/MultipleEndpointsSingleUri/VB/client/App.config
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
       <endpoint address="urn:Stuff" binding="wsHttpBinding" contract="ICalculator" name="WSHttpBinding_ICalculator">
         <identity>
-          <servicePrincipalName value="host/localhost"/>
+          <servicePrincipalName value="host/localhost" />
         </identity>
       </endpoint>
       <endpoint address="urn:Stuff" binding="wsHttpBinding" contract="IEcho" name="WSHttpBinding_IEcho">
         <identity>
-          <servicePrincipalName value="host/localhost"/>
+          <servicePrincipalName value="host/localhost" />
         </identity>
       </endpoint>
       <endpoint address="urn:OtherEcho" binding="wsHttpBinding" contract="IEcho" name="WSHttpBinding_IEcho1">
         <identity>
-          <servicePrincipalName value="host/localhost"/>
+          <servicePrincipalName value="host/localhost" />
         </identity>
       </endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/OperationContextScope/CS/Client/App.config b/framework/wcf/Basic/Services/OperationContextScope/CS/Client/App.config
index e7b2a206190..995a0ecc24f 100644
--- a/framework/wcf/Basic/Services/OperationContextScope/CS/Client/App.config
+++ b/framework/wcf/Basic/Services/OperationContextScope/CS/Client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost:8000/MessageHeaderReader" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader"/>
+      <endpoint address="http://localhost:8000/MessageHeaderReader" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/OperationContextScope/CS/Client/Client.csproj b/framework/wcf/Basic/Services/OperationContextScope/CS/Client/Client.csproj
index bc25fb4fd89..2c1238443e5 100644
--- a/framework/wcf/Basic/Services/OperationContextScope/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Services/OperationContextScope/CS/Client/Client.csproj
@@ -1,22 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E396A329-100F-428C-9CD4-ACD45563604A}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -49,7 +43,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -57,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/OperationContextScope/CS/Service/App.config b/framework/wcf/Basic/Services/OperationContextScope/CS/Service/App.config
index 4aec7054bcc..df56825f470 100644
--- a/framework/wcf/Basic/Services/OperationContextScope/CS/Service/App.config
+++ b/framework/wcf/Basic/Services/OperationContextScope/CS/Service/App.config
@@ -1,29 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.MessageHeaderReader">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/MessageHeaderReader"/>
+            <add baseAddress="http://localhost:8000/MessageHeaderReader" />
           </baseAddresses>
         </host>
-        
-        <endpoint address="" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/OperationContextScope/CS/Service/Service.csproj b/framework/wcf/Basic/Services/OperationContextScope/CS/Service/Service.csproj
index c3e027b8f61..0aef8664919 100644
--- a/framework/wcf/Basic/Services/OperationContextScope/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Services/OperationContextScope/CS/Service/Service.csproj
@@ -1,24 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8996AD4E-F26F-4223-9F47-7C537EA73871}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,7 +44,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -59,4 +52,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/OperationContextScope/VB/Client/App.config b/framework/wcf/Basic/Services/OperationContextScope/VB/Client/App.config
index e7b2a206190..995a0ecc24f 100644
--- a/framework/wcf/Basic/Services/OperationContextScope/VB/Client/App.config
+++ b/framework/wcf/Basic/Services/OperationContextScope/VB/Client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost:8000/MessageHeaderReader" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader"/>
+      <endpoint address="http://localhost:8000/MessageHeaderReader" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/OperationContextScope/VB/Service/App.config b/framework/wcf/Basic/Services/OperationContextScope/VB/Service/App.config
index 37fc68f6f0c..df56825f470 100644
--- a/framework/wcf/Basic/Services/OperationContextScope/VB/Service/App.config
+++ b/framework/wcf/Basic/Services/OperationContextScope/VB/Service/App.config
@@ -1,29 +1,25 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.MessageHeaderReader">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/MessageHeaderReader"/>
+            <add baseAddress="http://localhost:8000/MessageHeaderReader" />
           </baseAddresses>
         </host>
-
-        <endpoint address="" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IMessageHeaderReader" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Reentrant/CS/Client/App.config b/framework/wcf/Basic/Services/Reentrant/CS/Client/App.config
index 17cff883d3c..343bd2d5592 100644
--- a/framework/wcf/Basic/Services/Reentrant/CS/Client/App.config
+++ b/framework/wcf/Basic/Services/Reentrant/CS/Client/App.config
@@ -1,18 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="net.tcp://localhost:8001/PingPong" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="IPingPong"/>
+      <endpoint address="net.tcp://localhost:8001/PingPong" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="IPingPong" />
     </client>
-
     <bindings>
       <netTcpBinding>
-        <binding name="netTcpBinding">
-        </binding>
+        <binding name="netTcpBinding"></binding>
       </netTcpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Reentrant/CS/Client/Client.csproj b/framework/wcf/Basic/Services/Reentrant/CS/Client/Client.csproj
index 92df0c39a73..dc3851cc7fc 100644
--- a/framework/wcf/Basic/Services/Reentrant/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Services/Reentrant/CS/Client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B59D7C4F-3233-46B7-BCC0-C39E1E5EA819}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,29 +47,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -97,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/Reentrant/CS/Service/App.config b/framework/wcf/Basic/Services/Reentrant/CS/Service/App.config
index 9d794e0c339..3bec196c1f7 100644
--- a/framework/wcf/Basic/Services/Reentrant/CS/Service/App.config
+++ b/framework/wcf/Basic/Services/Reentrant/CS/Service/App.config
@@ -1,36 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.PingPong" behaviorConfiguration="PingPongBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="net.tcp://localhost:8001/PingPong"/>
+            <add baseAddress="net.tcp://localhost:8001/PingPong" />
           </baseAddresses>
         </host>
-
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPingPong"/>
-        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPingPong" />
+        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <netTcpBinding>
-        <binding name="netTcpBinding">
-        </binding>
+        <binding name="netTcpBinding"></binding>
       </netTcpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="PingPongBehavior">
-          <serviceDebug includeExceptionDetailInFaults="False"/>
-          <serviceMetadata/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
+          <serviceMetadata />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Reentrant/CS/Service/Service.csproj b/framework/wcf/Basic/Services/Reentrant/CS/Service/Service.csproj
index 2cc1541da24..4f1217621a0 100644
--- a/framework/wcf/Basic/Services/Reentrant/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Services/Reentrant/CS/Service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8D92710C-6B86-44F1-8898-70C9B257BED6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,29 +46,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -96,4 +54,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/Reentrant/VB/Client/App.config b/framework/wcf/Basic/Services/Reentrant/VB/Client/App.config
index 17cff883d3c..343bd2d5592 100644
--- a/framework/wcf/Basic/Services/Reentrant/VB/Client/App.config
+++ b/framework/wcf/Basic/Services/Reentrant/VB/Client/App.config
@@ -1,18 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="net.tcp://localhost:8001/PingPong" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="IPingPong"/>
+      <endpoint address="net.tcp://localhost:8001/PingPong" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="IPingPong" />
     </client>
-
     <bindings>
       <netTcpBinding>
-        <binding name="netTcpBinding">
-        </binding>
+        <binding name="netTcpBinding"></binding>
       </netTcpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Reentrant/VB/Service/App.config b/framework/wcf/Basic/Services/Reentrant/VB/Service/App.config
index 9d794e0c339..3bec196c1f7 100644
--- a/framework/wcf/Basic/Services/Reentrant/VB/Service/App.config
+++ b/framework/wcf/Basic/Services/Reentrant/VB/Service/App.config
@@ -1,36 +1,30 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.PingPong" behaviorConfiguration="PingPongBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="net.tcp://localhost:8001/PingPong"/>
+            <add baseAddress="net.tcp://localhost:8001/PingPong" />
           </baseAddresses>
         </host>
-
-        <endpoint address="" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPingPong"/>
-        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="" binding="netTcpBinding" bindingConfiguration="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPingPong" />
+        <endpoint address="mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <netTcpBinding>
-        <binding name="netTcpBinding">
-        </binding>
+        <binding name="netTcpBinding"></binding>
       </netTcpBinding>
     </bindings>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="PingPongBehavior">
-          <serviceDebug includeExceptionDetailInFaults="False"/>
-          <serviceMetadata/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
+          <serviceMetadata />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/app.config b/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/app.config
index fd1726a5ad2..48033c3cdd8 100644
--- a/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/app.config
+++ b/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/app.config
@@ -1,28 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <wsHttpBinding>
-                <binding name="WSHttpBinding_IGetKey" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true"
-                    allowCookies="false">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <reliableSession ordered="true" inactivityTimeout="00:10:00"
-                        enabled="false" />
-                    <security mode="Transport">
-                    </security>
-                </binding>
-            </wsHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="https://full_machine_name/ExtendedProtection/GetKey.svc" binding="wsHttpBinding"
-                bindingConfiguration="WSHttpBinding_IGetKey" contract="IGetKey"
-                name="WSHttpBinding_IGetKey">
-            </endpoint>
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <wsHttpBinding>
+        <binding name="WSHttpBinding_IGetKey">
+          <readerQuotas />
+          <reliableSession ordered="true" inactivityTimeout="00:10:00" enabled="false" />
+          <security mode="Transport"></security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="https://full_machine_name/ExtendedProtection/GetKey.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IGetKey" contract="IGetKey" name="WSHttpBinding_IGetKey"></endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/client.csproj b/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/client.csproj
index 5a853d5cdd2..b6f97ee6565 100644
--- a/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/client/client.csproj
@@ -1,37 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{383AA980-ED7F-411A-9E4B-3616BB6CAE28}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ExtendedProtection</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,4 +54,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/service/service.csproj b/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/service/service.csproj
index 2bd1f4e80a0..80db37b550c 100644
--- a/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Security/ExtendedProtection/CS/service/service.csproj
@@ -1,21 +1,16 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5FBB75D5-03DE-45D2-8361-0ED3D24D8298}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ExtendedProtection</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,8 +47,8 @@
     <Compile Include="IGetKey.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -69,24 +64,22 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>50035</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\ExtendedProtection
-mkdir %25SystemDrive%25\inetpub\wwwroot\\ExtendedProtection\bin
-copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\ExtendedProtection\bin
-copy "$(ProjectDir)GetKey.svc" %25SystemDrive%25\inetpub\wwwroot\ExtendedProtection
-copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\ExtendedProtection
-
-</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\ExtendedProtection
+      mkdir %SystemDrive%\inetpub\wwwroot\\ExtendedProtection\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\ExtendedProtection\bin
+      copy "$(MSBuildProjectDirectory)\GetKey.svc" %SystemDrive%\inetpub\wwwroot\ExtendedProtection
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\ExtendedProtection
+    </PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/framework/wcf/Basic/Services/Security/Identity/CS/client/App.config b/framework/wcf/Basic/Services/Security/Identity/CS/client/App.config
index 4774564586a..c841e23bf6d 100644
--- a/framework/wcf/Basic/Services/Security/Identity/CS/client/App.config
+++ b/framework/wcf/Basic/Services/Security/Identity/CS/client/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-<system.serviceModel>
-  <behaviors>
-    <endpointBehaviors>
-      <behavior name="ClientCredentialsBehavior">
-        <clientCredentials>
-          <serviceCertificate>
-            <!-- 
+  <system.serviceModel>
+    <behaviors>
+      <endpointBehaviors>
+        <behavior name="ClientCredentialsBehavior">
+          <clientCredentials>
+            <serviceCertificate>
+              <!-- 
           Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
           is in the user's Trusted People store, then it will be trusted without performing a
           validation of the certificate's issuer chain. This setting is used here for convenience so that the 
@@ -14,53 +14,53 @@
           This setting is less secure than the default, ChainTrust. The security implications of this 
           setting should be carefully considered before using PeerOrChainTrust in production code. 
           -->
-            <authentication certificateValidationMode="PeerOrChainTrust"/>
-          </serviceCertificate>
-        </clientCredentials>
-      </behavior>
-    </endpointBehaviors>
-  </behaviors>
-  <bindings>
-    <wsHttpBinding>
-      <binding name="WSHttpBinding_ICalculator_Anonymous">
-        <security>
-          <message clientCredentialType="None" negotiateServiceCredential="true" establishSecurityContext="false"/>
-        </security>
-      </binding>
-      <binding name="WSHttpBinding_ICalculator_Windows">
-        <security>
-          <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="false"/>
-        </security>
-      </binding>
-    </wsHttpBinding>
-  </bindings>
-  <client>
-    <endpoint address="http://localhost:8003/servicemodelsamples/service/dnsidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="ICalculator" name="WSHttpBinding_ICalculator">
-      <identity>
-        <dns value="identity.com"/>
-      </identity>
-    </endpoint>
-    <endpoint address="http://localhost:8003/servicemodelsamples/service/certificateidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="ICalculator" name="WSHttpBinding_ICalculator1">
-      <identity>
-        <certificate encodedValue="AwAAAAEAAAAUAAAAJLvqbWsywhFvTiAdeZpTOOnlotogAAAAAQAAAMoBAAAwggHGMIIBdKADAgECAhAwPmD4y5aVgUgzb9ryCQu3MAkGBSsOAwIdBQAwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3kwHhcNMDYwODIzMDMzMTA0WhcNMzkxMjMxMjM1OTU5WjApMRAwDgYDVQQKEwdDb250b3NvMRUwEwYDVQQDEwxpZGVudGl0eS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaWCxw9ytQbGyPljoAoZsJ6zcNupQlvWFBmr7H7ss98FcQAJ41J3pT8NfehmXDnk1k2Rwg/SsfH2VnoX2b0I+szLdsbWssjwg4qzHInp9Riz9BCKu4OEsbZicjRY+a4p9qrRu5qCUf0B7jY9VeMaVlqm68QH+q2SIHWEKTXuAw5AgMBAAGjSzBJMEcGA1UdAQRAMD6AEBLkCS0GHR1PAI1hIdwWZGOhGDAWMRQwEgYDVQQDEwtSb290IEFnZW5jeYIQBjdsAKoAZIoRz7jUqlw19DAJBgUrDgMCHQUAA0EAYmFOJgIegB32rKmsQ7LWXvzwItghII0oOpbGY29GZiFz+WwOA4t5eRr4+YiyYh+rDzR7o8RW7SMZXEMgWo7d+g=="/>
-      </identity>
-    </endpoint>
-    <endpoint address="http://localhost:8003/servicemodelsamples/service/rsaidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="ICalculator" name="WSHttpBinding_ICalculator2">
-      <identity>
-        <rsa value="&lt;RSAKeyValue&gt;&lt;Modulus&gt;xpYLHD3K1BsbI+WOgChmwnrNw26lCW9YUGavsfuyz3wVxAAnjUnelPw196GZcOeTWTZHCD9Kx8fZWehfZvQj6zMt2xtayyPCDirMcien1GLP0EIq7g4SxtmJyNFj5rin2qtG7moJR/QHuNj1V4xpWWqbrxAf6rZIgdYQpNe4DDk=&lt;/Modulus&gt;&lt;Exponent&gt;AQAB&lt;/Exponent&gt;&lt;/RSAKeyValue&gt;"/>
-      </identity>
-    </endpoint>
-    <endpoint address="http://localhost:8003/servicemodelsamples/service/upnidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Windows" contract="ICalculator" name="WSHttpBinding_ICalculator3">
-      <identity>
-        <!-- The identity created here will depend on the UPN the service is running under. -->
-        <!-- The identity does not get checked when NTLM authentication is used which occurs -->
-        <!-- when the client and service are running on the same machine. -->
-        <!-- Setting negotiateServiceCredential="false" on the binding name="WSHttpBinding_ICalculator_Windows" -->
-        <!-- forces Kerberos authentication and this client call will then fail unless the value -->
-        <!-- for the UPN is changed below. e.g. value="host\myrealservice.com" -->
-          <userPrincipalName value="host\myservice.com"/>
-      </identity>
-    </endpoint>
-  </client>
-</system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
+            </serviceCertificate>
+          </clientCredentials>
+        </behavior>
+      </endpointBehaviors>
+    </behaviors>
+    <bindings>
+      <wsHttpBinding>
+        <binding name="WSHttpBinding_ICalculator_Anonymous">
+          <security>
+            <message clientCredentialType="None" negotiateServiceCredential="true" establishSecurityContext="false" />
+          </security>
+        </binding>
+        <binding name="WSHttpBinding_ICalculator_Windows">
+          <security>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="false" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:8003/servicemodelsamples/service/dnsidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="ICalculator" name="WSHttpBinding_ICalculator">
+        <identity>
+          <dns value="identity.com" />
+        </identity>
+      </endpoint>
+      <endpoint address="http://localhost:8003/servicemodelsamples/service/certificateidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="ICalculator" name="WSHttpBinding_ICalculator1">
+        <identity>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAJLvqbWsywhFvTiAdeZpTOOnlotogAAAAAQAAAMoBAAAwggHGMIIBdKADAgECAhAwPmD4y5aVgUgzb9ryCQu3MAkGBSsOAwIdBQAwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3kwHhcNMDYwODIzMDMzMTA0WhcNMzkxMjMxMjM1OTU5WjApMRAwDgYDVQQKEwdDb250b3NvMRUwEwYDVQQDEwxpZGVudGl0eS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaWCxw9ytQbGyPljoAoZsJ6zcNupQlvWFBmr7H7ss98FcQAJ41J3pT8NfehmXDnk1k2Rwg/SsfH2VnoX2b0I+szLdsbWssjwg4qzHInp9Riz9BCKu4OEsbZicjRY+a4p9qrRu5qCUf0B7jY9VeMaVlqm68QH+q2SIHWEKTXuAw5AgMBAAGjSzBJMEcGA1UdAQRAMD6AEBLkCS0GHR1PAI1hIdwWZGOhGDAWMRQwEgYDVQQDEwtSb290IEFnZW5jeYIQBjdsAKoAZIoRz7jUqlw19DAJBgUrDgMCHQUAA0EAYmFOJgIegB32rKmsQ7LWXvzwItghII0oOpbGY29GZiFz+WwOA4t5eRr4+YiyYh+rDzR7o8RW7SMZXEMgWo7d+g==" />
+        </identity>
+      </endpoint>
+      <endpoint address="http://localhost:8003/servicemodelsamples/service/rsaidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="ICalculator" name="WSHttpBinding_ICalculator2">
+        <identity>
+          <rsa value="&lt;RSAKeyValue&gt;&lt;Modulus&gt;xpYLHD3K1BsbI+WOgChmwnrNw26lCW9YUGavsfuyz3wVxAAnjUnelPw196GZcOeTWTZHCD9Kx8fZWehfZvQj6zMt2xtayyPCDirMcien1GLP0EIq7g4SxtmJyNFj5rin2qtG7moJR/QHuNj1V4xpWWqbrxAf6rZIgdYQpNe4DDk=&lt;/Modulus&gt;&lt;Exponent&gt;AQAB&lt;/Exponent&gt;&lt;/RSAKeyValue&gt;" />
+        </identity>
+      </endpoint>
+      <endpoint address="http://localhost:8003/servicemodelsamples/service/upnidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Windows" contract="ICalculator" name="WSHttpBinding_ICalculator3">
+        <identity>
+          <!-- The identity created here will depend on the UPN the service is running under. -->
+          <!-- The identity does not get checked when NTLM authentication is used which occurs -->
+          <!-- when the client and service are running on the same machine. -->
+          <!-- Setting negotiateServiceCredential="false" on the binding name="WSHttpBinding_ICalculator_Windows" -->
+          <!-- forces Kerberos authentication and this client call will then fail unless the value -->
+          <!-- for the UPN is changed below. e.g. value="host\myrealservice.com" -->
+          <userPrincipalName value="host\myservice.com" />
+        </identity>
+      </endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Security/Identity/CS/client/client.csproj b/framework/wcf/Basic/Services/Security/Identity/CS/client/client.csproj
index 62994ba5363..c44e1b14a7d 100644
--- a/framework/wcf/Basic/Services/Security/Identity/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/Security/Identity/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,8 +30,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel">
-    </Reference>
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -85,27 +62,5 @@
     </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Security/Identity/CS/service/App.config b/framework/wcf/Basic/Services/Security/Identity/CS/service/App.config
index 542cac326c3..52a839e2e48 100644
--- a/framework/wcf/Basic/Services/Security/Identity/CS/service/App.config
+++ b/framework/wcf/Basic/Services/Security/Identity/CS/service/App.config
@@ -1,14 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
-        <binding name="mexHttpBinding">
-        </binding>
+        <binding name="mexHttpBinding"></binding>
         <binding name="WSHttpBinding_Windows">
           <security mode="Message">
-            <message clientCredentialType="Windows" establishSecurityContext="false"/>
+            <message clientCredentialType="Windows" establishSecurityContext="false" />
           </security>
         </binding>
       </wsHttpBinding>
@@ -17,7 +15,7 @@
       <service name="Microsoft.Samples.Identity.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8003/servicemodelsamples/service/"/>
+            <add baseAddress="http://localhost:8003/servicemodelsamples/service/" />
           </baseAddresses>
         </host>
         <endpoint address="mex" behaviorConfiguration="" binding="wsHttpBinding" bindingConfiguration="mexHttpBinding" name="MexEndpoint" contract="IMetadataExchange">
@@ -31,21 +29,19 @@
         <endpoint address="upnidentity" behaviorConfiguration="" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_Windows" name="WSHttpBinding_ICalculator_Windows" contract="Microsoft.Samples.Identity.ICalculator">
           <!-- Set the UPN identity for this endpoint -->
           <identity>
-              <userPrincipalName value="host\myservice.com"/>
+            <userPrincipalName value="host\myservice.com" />
           </identity>
         </endpoint>
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="false"/>
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="false" />
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Security/Identity/CS/service/service.csproj b/framework/wcf/Basic/Services/Security/Identity/CS/service/service.csproj
index 14944e34ccb..e524494002b 100644
--- a/framework/wcf/Basic/Services/Security/Identity/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/Security/Identity/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,8 +36,7 @@
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel">
-    </Reference>
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -68,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/Security/Identity/VB/client/App.config b/framework/wcf/Basic/Services/Security/Identity/VB/client/App.config
index 805da930bb4..2e6d72f0b62 100644
--- a/framework/wcf/Basic/Services/Security/Identity/VB/client/App.config
+++ b/framework/wcf/Basic/Services/Security/Identity/VB/client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <behaviors>
@@ -14,7 +14,7 @@
           This setting is less secure than the default, ChainTrust. The security implications of this 
           setting should be carefully considered before using PeerOrChainTrust in production code. 
           -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
@@ -24,12 +24,12 @@
       <wsHttpBinding>
         <binding name="WSHttpBinding_ICalculator_Anonymous">
           <security>
-            <message clientCredentialType="None" negotiateServiceCredential="true" establishSecurityContext="false"/>
+            <message clientCredentialType="None" negotiateServiceCredential="true" establishSecurityContext="false" />
           </security>
         </binding>
         <binding name="WSHttpBinding_ICalculator_Windows">
           <security>
-            <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="false"/>
+            <message clientCredentialType="Windows" negotiateServiceCredential="true" establishSecurityContext="false" />
           </security>
         </binding>
       </wsHttpBinding>
@@ -37,17 +37,17 @@
     <client>
       <endpoint address="http://localhost:8003/servicemodelsamples/service/dnsidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="Microsoft.Samples.Identity.ICalculator" name="WSHttpBinding_ICalculator">
         <identity>
-          <dns value="identity.com"/>
+          <dns value="identity.com" />
         </identity>
       </endpoint>
       <endpoint address="http://localhost:8003/servicemodelsamples/service/certificateidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="Microsoft.Samples.Identity.ICalculator" name="WSHttpBinding_ICalculator1">
         <identity>
-          <certificate encodedValue="AwAAAAEAAAAUAAAAJLvqbWsywhFvTiAdeZpTOOnlotogAAAAAQAAAMoBAAAwggHGMIIBdKADAgECAhAwPmD4y5aVgUgzb9ryCQu3MAkGBSsOAwIdBQAwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3kwHhcNMDYwODIzMDMzMTA0WhcNMzkxMjMxMjM1OTU5WjApMRAwDgYDVQQKEwdDb250b3NvMRUwEwYDVQQDEwxpZGVudGl0eS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaWCxw9ytQbGyPljoAoZsJ6zcNupQlvWFBmr7H7ss98FcQAJ41J3pT8NfehmXDnk1k2Rwg/SsfH2VnoX2b0I+szLdsbWssjwg4qzHInp9Riz9BCKu4OEsbZicjRY+a4p9qrRu5qCUf0B7jY9VeMaVlqm68QH+q2SIHWEKTXuAw5AgMBAAGjSzBJMEcGA1UdAQRAMD6AEBLkVB0GHR1PAI1hIdwWZGOhGDAWMRQwEgYDVQQDEwtSb290IEFnZW5jeYIQBjdsAKoAZIoRz7jUqlw19DAJBgUrDgMCHQUAA0EAYmFOJgIegB32rKmsQ7LWXvzwItghII0oOpbGY29GZiFz+WwOA4t5eRr4+YiyYh+rDzR7o8RW7SMZXEMgWo7d+g=="/>
+          <certificate encodedValue="AwAAAAEAAAAUAAAAJLvqbWsywhFvTiAdeZpTOOnlotogAAAAAQAAAMoBAAAwggHGMIIBdKADAgECAhAwPmD4y5aVgUgzb9ryCQu3MAkGBSsOAwIdBQAwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3kwHhcNMDYwODIzMDMzMTA0WhcNMzkxMjMxMjM1OTU5WjApMRAwDgYDVQQKEwdDb250b3NvMRUwEwYDVQQDEwxpZGVudGl0eS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMaWCxw9ytQbGyPljoAoZsJ6zcNupQlvWFBmr7H7ss98FcQAJ41J3pT8NfehmXDnk1k2Rwg/SsfH2VnoX2b0I+szLdsbWssjwg4qzHInp9Riz9BCKu4OEsbZicjRY+a4p9qrRu5qCUf0B7jY9VeMaVlqm68QH+q2SIHWEKTXuAw5AgMBAAGjSzBJMEcGA1UdAQRAMD6AEBLkVB0GHR1PAI1hIdwWZGOhGDAWMRQwEgYDVQQDEwtSb290IEFnZW5jeYIQBjdsAKoAZIoRz7jUqlw19DAJBgUrDgMCHQUAA0EAYmFOJgIegB32rKmsQ7LWXvzwItghII0oOpbGY29GZiFz+WwOA4t5eRr4+YiyYh+rDzR7o8RW7SMZXEMgWo7d+g==" />
         </identity>
       </endpoint>
       <endpoint address="http://localhost:8003/servicemodelsamples/service/rsaidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Anonymous" contract="Microsoft.Samples.Identity.ICalculator" name="WSHttpBinding_ICalculator2">
         <identity>
-          <rsa value="&lt;RSAKeyValue&gt;&lt;Modulus&gt;xpYLHD3K1BsbI+WOgChmwnrNw26lCW9YUGavsfuyz3wVxAAnjUnelPw196GZcOeTWTZHCD9Kx8fZWehfZvQj6zMt2xtayyPCDirMcien1GLP0EIq7g4SxtmJyNFj5rin2qtG7moJR/QHuNj1V4xpWWqbrxAf6rZIgdYQpNe4DDk=&lt;/Modulus&gt;&lt;Exponent&gt;AQAB&lt;/Exponent&gt;&lt;/RSAKeyValue&gt;"/>
+          <rsa value="&lt;RSAKeyValue&gt;&lt;Modulus&gt;xpYLHD3K1BsbI+WOgChmwnrNw26lCW9YUGavsfuyz3wVxAAnjUnelPw196GZcOeTWTZHCD9Kx8fZWehfZvQj6zMt2xtayyPCDirMcien1GLP0EIq7g4SxtmJyNFj5rin2qtG7moJR/QHuNj1V4xpWWqbrxAf6rZIgdYQpNe4DDk=&lt;/Modulus&gt;&lt;Exponent&gt;AQAB&lt;/Exponent&gt;&lt;/RSAKeyValue&gt;" />
         </identity>
       </endpoint>
       <endpoint address="http://localhost:8003/servicemodelsamples/service/upnidentity" behaviorConfiguration="ClientCredentialsBehavior" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator_Windows" contract="Microsoft.Samples.Identity.ICalculator" name="WSHttpBinding_ICalculator3">
@@ -58,9 +58,9 @@
           <!-- Setting negotiateServiceCredential="false" on the binding name="WSHttpBinding_ICalculator_Windows" -->
           <!-- forces Kerberos authentication and this client call will then fail unless the value -->
           <!-- for the UPN is changed below. e.g. value="host\myrealservice.com" -->
-          <userPrincipalName value="host\myservice.com"/>
+          <userPrincipalName value="host\myservice.com" />
         </identity>
       </endpoint>
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/Security/Identity/VB/service/App.config b/framework/wcf/Basic/Services/Security/Identity/VB/service/App.config
index 441271c0275..4d5c048055e 100644
--- a/framework/wcf/Basic/Services/Security/Identity/VB/service/App.config
+++ b/framework/wcf/Basic/Services/Security/Identity/VB/service/App.config
@@ -1,14 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <bindings>
       <wsHttpBinding>
-        <binding name="mexHttpBinding">
-        </binding>
+        <binding name="mexHttpBinding"></binding>
         <binding name="WSHttpBinding_Windows">
           <security mode="Message">
-            <message clientCredentialType="Windows" establishSecurityContext="false"/>
+            <message clientCredentialType="Windows" establishSecurityContext="false" />
           </security>
         </binding>
       </wsHttpBinding>
@@ -17,7 +15,7 @@
       <service name="Microsoft.Samples.Identity.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8003/servicemodelsamples/service/"/>
+            <add baseAddress="http://localhost:8003/servicemodelsamples/service/" />
           </baseAddresses>
         </host>
         <endpoint address="mex" behaviorConfiguration="" binding="wsHttpBinding" bindingConfiguration="mexHttpBinding" name="MexEndpoint" contract="IMetadataExchange">
@@ -31,21 +29,19 @@
         <endpoint address="upnidentity" behaviorConfiguration="" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_Windows" name="WSHttpBinding_ICalculator_Windows" contract="Microsoft.Samples.Identity.ICalculator">
           <!-- Set the UPN identity for this endpoint -->
           <identity>
-            <userPrincipalName value="host\myservice.com"/>
+            <userPrincipalName value="host\myservice.com" />
           </identity>
         </endpoint>
       </service>
     </services>
-
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="false"/>
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="false" />
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/ServiceDescription/CS/client/App.config b/framework/wcf/Basic/Services/ServiceDescription/CS/client/App.config
index 0e4d9d778e3..0bc086023dd 100644
--- a/framework/wcf/Basic/Services/ServiceDescription/CS/client/App.config
+++ b/framework/wcf/Basic/Services/ServiceDescription/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IServiceDescriptionCalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IServiceDescriptionCalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/ServiceDescription/CS/client/client.csproj b/framework/wcf/Basic/Services/ServiceDescription/CS/client/client.csproj
index e373f0349d5..43e34525cbd 100644
--- a/framework/wcf/Basic/Services/ServiceDescription/CS/client/client.csproj
+++ b/framework/wcf/Basic/Services/ServiceDescription/CS/client/client.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -50,5 +42,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/ServiceDescription/CS/service/service.csproj b/framework/wcf/Basic/Services/ServiceDescription/CS/service/service.csproj
index d237f6a01b8..2385f581fb7 100644
--- a/framework/wcf/Basic/Services/ServiceDescription/CS/service/service.csproj
+++ b/framework/wcf/Basic/Services/ServiceDescription/CS/service/service.csproj
@@ -1,23 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,14 +44,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Basic/Services/ServiceDescription/VB/client/app.config b/framework/wcf/Basic/Services/ServiceDescription/VB/client/app.config
index 0e4d9d778e3..0bc086023dd 100644
--- a/framework/wcf/Basic/Services/ServiceDescription/VB/client/app.config
+++ b/framework/wcf/Basic/Services/ServiceDescription/VB/client/app.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IServiceDescriptionCalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IServiceDescriptionCalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/App.config b/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/App.config
index e12e890900f..49b62649fb3 100644
--- a/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/App.config
+++ b/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/App.config
@@ -1,24 +1,16 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_ICalculator" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost:8000/Samples/Service.svc/customEndpoint"
-                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ICalculator"
-                contract="ServiceReference1.ICalculator" name="BasicHttpBinding_ICalculator" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_ICalculator">
+          <readerQuotas />
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:8000/Samples/Service.svc/customEndpoint" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_ICalculator" contract="ServiceReference1.ICalculator" name="BasicHttpBinding_ICalculator" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/client.csproj b/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/client.csproj
index 63010744488..51063372079 100644
--- a/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/client.csproj
+++ b/framework/wcf/Basic/Services/StandardEndpoints/CS/Client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20417</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{65BE53C1-CE01-40DC-A0C3-D049F14827B6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.StandardEndpoints</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -89,4 +89,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/App.config b/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/App.config
index 69b1f3504c5..23e00c3d5f7 100644
--- a/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/App.config
+++ b/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
@@ -19,7 +19,7 @@
     <behaviors>
       <serviceBehaviors>
         <behavior>
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
diff --git a/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/service.csproj b/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/service.csproj
index c83894ef480..6ced775de67 100644
--- a/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/service.csproj
+++ b/framework/wcf/Basic/Services/StandardEndpoints/CS/Service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20417</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.StandardEndpoints</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,4 +58,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Syndication/DiagnosticsFeed/CS/DiagnosticsFeedService.csproj b/framework/wcf/Basic/Syndication/DiagnosticsFeed/CS/DiagnosticsFeedService.csproj
index c8bc133a811..dff0fabdf58 100644
--- a/framework/wcf/Basic/Syndication/DiagnosticsFeed/CS/DiagnosticsFeedService.csproj
+++ b/framework/wcf/Basic/Syndication/DiagnosticsFeed/CS/DiagnosticsFeedService.csproj
@@ -1,14 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C29A28EC-33F0-4929-8594-45F7408F4229}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.DiagnosticsFeed</RootNamespace>
     <AssemblyName>DiagnosticsFeed</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,7 +40,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProcessData.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/framework/wcf/Basic/Syndication/LooselyTypedExtensions/CS/LooselyTypedExtensions.csproj b/framework/wcf/Basic/Syndication/LooselyTypedExtensions/CS/LooselyTypedExtensions.csproj
index 3e7f7783b27..555bb4565b6 100644
--- a/framework/wcf/Basic/Syndication/LooselyTypedExtensions/CS/LooselyTypedExtensions.csproj
+++ b/framework/wcf/Basic/Syndication/LooselyTypedExtensions/CS/LooselyTypedExtensions.csproj
@@ -1,14 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B21E1DB1-AC9B-4CDF-B255-0D8C7D50C21B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.LooselyTypedExtensions</RootNamespace>
     <AssemblyName>SyndicationExtensions</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,7 +41,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -49,4 +49,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Client/Client.csproj b/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Client/Client.csproj
index fe6b3c98b99..19b7a51001b 100644
--- a/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Client/Client.csproj
@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -6,10 +7,9 @@
     <OutputType>Exe</OutputType>
     <NoStandardLibraries>false</NoStandardLibraries>
     <AssemblyName>AspNetCachingIntegrationClientSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RootNamespace>Microsoft.Samples.AspNetCachingIntegration</RootNamespace>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,4 +51,4 @@
   <ProjectExtensions>
     <VisualStudio AllowExistingFolder="true" />
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Common/CustomerType.csproj b/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Common/CustomerType.csproj
index 33fb14b6180..0bedb770f76 100644
--- a/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Common/CustomerType.csproj
+++ b/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Common/CustomerType.csproj
@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -6,10 +7,9 @@
     <OutputType>Library</OutputType>
     <NoStandardLibraries>false</NoStandardLibraries>
     <AssemblyName>AspNetCachingIntegrationCommonSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RootNamespace>Microsoft.Samples.AspNetCachingIntegration</RootNamespace>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,4 +45,4 @@
   <ProjectExtensions>
     <VisualStudio AllowExistingFolder="true" />
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Service/Service.csproj b/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Service/Service.csproj
index fa56ad70e92..4fbb2dc0ea3 100644
--- a/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Web/AspNetCachingIntegration/CS/Service/Service.csproj
@@ -1,16 +1,16 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20604</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{79D53420-55B0-4713-80BA-2636BAD41196}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.AspNetCachingIntegration</RootNamespace>
     <AssemblyName>AspNetCachingIntegrationServiceSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,10 +40,10 @@
     <Reference Include="System.Web.Entity" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Data.DataSetExtensions"/>
-    <Reference Include="System.Web.Extensions"/>
-    <Reference Include="System.Xml.Linq"/>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
@@ -66,8 +66,8 @@
       <Name>CustomerType</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -76,12 +76,10 @@
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>33693</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/framework/wcf/Basic/Web/BasicHttpService/CS/App.config b/framework/wcf/Basic/Web/BasicHttpService/CS/App.config
index 144909bdb2b..166efd18f3c 100644
--- a/framework/wcf/Basic/Web/BasicHttpService/CS/App.config
+++ b/framework/wcf/Basic/Web/BasicHttpService/CS/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
   <system.serviceModel>
     <standardEndpoints>
       <webHttpEndpoint>
         <!-- the "" standard endpoint is used by WebServiceHost for auto creating a web endpoint. -->
-        <standardEndpoint name="" helpEnabled="true"/>
+        <standardEndpoint name="" helpEnabled="true" />
       </webHttpEndpoint>
     </standardEndpoints>
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Basic/Web/BasicHttpService/CS/BasicHttpService.csproj b/framework/wcf/Basic/Web/BasicHttpService/CS/BasicHttpService.csproj
index 93da88b0f5f..46fdb326e33 100644
--- a/framework/wcf/Basic/Web/BasicHttpService/CS/BasicHttpService.csproj
+++ b/framework/wcf/Basic/Web/BasicHttpService/CS/BasicHttpService.csproj
@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -6,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <NoStandardLibraries>false</NoStandardLibraries>
     <AssemblyName>BasicHttpServiceSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RootNamespace>Microsoft.Samples.BasicHttpService</RootNamespace>
   </PropertyGroup>
@@ -50,4 +51,4 @@
   <ProjectExtensions>
     <VisualStudio AllowExistingFolder="true" />
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/Client.csproj b/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/Client.csproj
index 99d29b26bbd..f03b576f51a 100644
--- a/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/Client.csproj
+++ b/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/Client.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.SoapAndHttpEndpoints</RootNamespace>
     <AssemblyName>SoapAndHttpEndpointsClientSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,9 +36,9 @@
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml.Linq"/>
-    <Reference Include="System.Data.DataSetExtensions"/>
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -89,4 +90,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/app.config b/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/app.config
index 22cfb0ec6d2..547f7e08e88 100644
--- a/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/app.config
+++ b/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Client/app.config
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_IService" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
-                    </security>
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost:33692/Service.svc/Soap" binding="basicHttpBinding"
-                bindingConfiguration="BasicHttpBinding_IService" contract="ServiceReference.IService"
-                name="BasicHttpBinding_IService" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_IService">
+          <readerQuotas />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost:33692/Service.svc/Soap" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IService" contract="ServiceReference.IService" name="BasicHttpBinding_IService" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Service/Service.csproj b/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Service/Service.csproj
index 941e9029084..00b576e5daf 100644
--- a/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Service/Service.csproj
+++ b/framework/wcf/Basic/Web/SoapAndHttpEndpoints/CS/Service/Service.csproj
@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.SoapAndHttpEndpoints</RootNamespace>
     <AssemblyName>SoapAndHttpEndpointsServiceSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -35,19 +36,19 @@
     <Reference Include="System.Web.Entity" />
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Core"/>
+    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Runtime.Serialization"/>
-    <Reference Include="System.ServiceModel"/>
-    <Reference Include="System.ServiceModel.Web"/>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions"/>
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web.Mobile" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq"/>
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Service.svc" />
@@ -67,8 +68,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -77,12 +78,10 @@
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>33692</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>
-          </IISUrl>
+          <IISUrl></IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
-          <CustomServerUrl>
-          </CustomServerUrl>
+          <CustomServerUrl></CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
diff --git a/framework/wcf/Basic/Web/UriTemplate/CS/UriTemplate.csproj b/framework/wcf/Basic/Web/UriTemplate/CS/UriTemplate.csproj
index e880db1df2b..8c4c22e6b4d 100644
--- a/framework/wcf/Basic/Web/UriTemplate/CS/UriTemplate.csproj
+++ b/framework/wcf/Basic/Web/UriTemplate/CS/UriTemplate.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.UriTemplates</RootNamespace>
     <AssemblyName>UriTemplatesSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -38,7 +39,7 @@
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -46,4 +47,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/UriTemplateDispatcher/CS/UriTemplateDispatcher.csproj b/framework/wcf/Basic/Web/UriTemplateDispatcher/CS/UriTemplateDispatcher.csproj
index 33b7110e286..cc72891eddf 100644
--- a/framework/wcf/Basic/Web/UriTemplateDispatcher/CS/UriTemplateDispatcher.csproj
+++ b/framework/wcf/Basic/Web/UriTemplateDispatcher/CS/UriTemplateDispatcher.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -7,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.UriTemplateDispatcher</RootNamespace>
     <AssemblyName>UriTemplateDispatcherSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,9 +35,9 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -44,4 +45,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Basic/Web/UriTemplateTable/CS/UriTemplateTable.csproj b/framework/wcf/Basic/Web/UriTemplateTable/CS/UriTemplateTable.csproj
index e7ed81239fe..482d51cd76f 100644
--- a/framework/wcf/Basic/Web/UriTemplateTable/CS/UriTemplateTable.csproj
+++ b/framework/wcf/Basic/Web/UriTemplateTable/CS/UriTemplateTable.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -7,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.UriTemplateTables</RootNamespace>
     <AssemblyName>UriTemplateTableSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,7 +37,7 @@
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -44,4 +45,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/WSStreamedHttpBinding/WSStreamedHttpBinding.csproj b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/WSStreamedHttpBinding/WSStreamedHttpBinding.csproj
index 7dc53bbf84a..0fd1e6a633d 100644
--- a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/WSStreamedHttpBinding/WSStreamedHttpBinding.csproj
+++ b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/WSStreamedHttpBinding/WSStreamedHttpBinding.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{638585AD-3091-426F-A2ED-689C22143649}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.WSStreamedHttpBinding</RootNamespace>
     <AssemblyName>WSStreamedHttpBinding</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +49,12 @@
     <Compile Include="StreamedSecurityMode.cs" />
     <Compile Include="StreamedTransferMode.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)WSStreamedHttpBinding.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-     </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)WSStreamedHttpBinding.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/App.config b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/App.config
index 11fb413c18c..59b7add0153 100644
--- a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/App.config
+++ b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/App.config
@@ -1,18 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.serviceModel>
-        <extensions>
-            <bindingExtensions>
-                <add name="wsStreamedHttpBinding" type="Microsoft.Samples.WSStreamedHttpBinding.WSStreamedHttpBindingCollectionElement, WSStreamedHttpBinding, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"/>
-            </bindingExtensions>
-        </extensions>
-        <client>
-            <endpoint address="https://localhost/servicemodelsamples/service.svc" bindingConfiguration="Binding" binding="wsStreamedHttpBinding" contract="Microsoft.Samples.WSStreamedHttpBinding.IStreamedEchoService"/>
-        </client>
-        <bindings>
-            <wsStreamedHttpBinding>
-                <binding name="Binding" transferMode="Streamed"/>
-            </wsStreamedHttpBinding>
-        </bindings>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <extensions>
+      <bindingExtensions>
+        <add name="wsStreamedHttpBinding" type="Microsoft.Samples.WSStreamedHttpBinding.WSStreamedHttpBindingCollectionElement, WSStreamedHttpBinding, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
+      </bindingExtensions>
+    </extensions>
+    <client>
+      <endpoint address="https://localhost/servicemodelsamples/service.svc" bindingConfiguration="Binding" binding="wsStreamedHttpBinding" contract="Microsoft.Samples.WSStreamedHttpBinding.IStreamedEchoService" />
+    </client>
+    <bindings>
+      <wsStreamedHttpBinding>
+        <binding name="Binding" transferMode="Streamed" />
+      </wsStreamedHttpBinding>
+    </bindings>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/client.csproj b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/client.csproj
index 7e97bf4af58..f82c5deddf4 100644
--- a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/client/client.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9CD329D5-0514-42C3-B1EC-D8C7B1CDB7B7}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.WSStreamedHttpBinding</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,27 +61,5 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/service/service.csproj b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/service/service.csproj
index 2958d89ee64..b2c6d190ad7 100644
--- a/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Binding/WSStreamedHttpBinding/CS/service/service.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B82D45D6-660C-4B78-B41F-4A0F81DBD8AC}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.WSStreamedHttpBinding</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -74,36 +54,14 @@
     <None Include="service.svc" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChannelHelpers/ChannelHelpers.csproj b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChannelHelpers/ChannelHelpers.csproj
index 6c5e6af7300..90b90f061f2 100644
--- a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChannelHelpers/ChannelHelpers.csproj
+++ b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChannelHelpers/ChannelHelpers.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{33A7ACF0-7A02-47C4-9CF8-32F4A5D5A24C}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ChunkingChannel</RootNamespace>
     <AssemblyName>Microsoft.Samples.ChannelHelpers</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,29 +44,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TimeoutHelper.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -94,4 +52,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChunkingChannel/ChunkingChannel.csproj b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChunkingChannel/ChunkingChannel.csproj
index e93b197c616..b97642ae719 100644
--- a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChunkingChannel/ChunkingChannel.csproj
+++ b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/ChunkingChannel/ChunkingChannel.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C93E515C-ADC0-4C38-8F54-87E756211355}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ChunkingChannel</RootNamespace>
     <AssemblyName>ChunkingChannel</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,29 +60,7 @@
       <Name>ChannelHelpers</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -111,4 +68,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/App.config b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/App.config
index 6ba2637f2dd..cb766b17c96 100644
--- a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/App.config
+++ b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/App.config
@@ -1,4 +1,4 @@
-<configuration>
+<configuration>
   <!-- remove comment to enable diagnostics
   <system.diagnostics>
     <sources>
@@ -25,4 +25,4 @@
     <trace autoflush="true" />
   </system.diagnostics>
   -->
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/Client.csproj b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/Client.csproj
index ef3415bc30e..0c60daa5334 100644
--- a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9D01B696-9ABB-4ECB-8017-1CDAF57053BA}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ChunkingChannel</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -78,29 +58,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -108,4 +66,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/App.config b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/App.config
index b145ab21482..cd8b02643c0 100644
--- a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/App.config
+++ b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/App.config
@@ -1,2 +1 @@
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/Service.csproj b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/Service.csproj
index ab382249d83..213f9f1a46b 100644
--- a/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/Channels/ChunkingChannel/CS/Service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0980BC1D-6D13-4405-901C-73AFFA517B8E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ChunkingChannel</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,29 +53,7 @@
       <Name>ChunkingChannel</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -103,4 +61,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/Client.csproj b/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/Client.csproj
index a9259f94424..3fd39ac9f9f 100644
--- a/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9D7E8093-8C0F-481C-97B7-E91A05A42A9E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.CustomChannelDispatcher</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,30 +42,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Client.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/app.config b/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/app.config
+++ b/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Service/Service.csproj b/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Service/Service.csproj
index 142ce709b1c..d870e88a97c 100644
--- a/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/Channels/CustomChannelDispatcher/CS/Service/Service.csproj
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F7BA1775-D159-49A6-BC83-00DBC74FC651}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Samples.CustomChannelDispatcher</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,29 +45,6 @@
   <ItemGroup>
     <None Include="Service.svc" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -95,10 +53,12 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)Service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)Service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/App.config b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/App.config
index e7d29529fb1..f2b0435f062 100644
--- a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/App.config
+++ b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/App.config
@@ -1,39 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-  
   <system.serviceModel>
     <extensions>
       <bindingElementExtensions>
-        <add name="httpCookieSession" type="Microsoft.Samples.HttpCookieSession.HttpCookieSessionElement, HttpCookieSessionExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+        <add name="httpCookieSession" type="Microsoft.Samples.HttpCookieSession.HttpCookieSessionElement, HttpCookieSessionExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       </bindingElementExtensions>
       <bindingExtensions>
-        <add name="httpCookieSessionBinding" type="Microsoft.Samples.HttpCookieSession.HttpCookieSessionBindingCollectionElement, HttpCookieSessionExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+        <add name="httpCookieSessionBinding" type="Microsoft.Samples.HttpCookieSession.HttpCookieSessionBindingCollectionElement, HttpCookieSessionExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       </bindingExtensions>
     </extensions>
-
     <client>
-      <endpoint name="CookieSession" address="http://localhost/servicemodelsamples/service.svc" binding="httpCookieSessionBinding" bindingConfiguration="cookieSessionBinding" contract="Microsoft.Samples.HttpCookieSession.IShoppingCart"/>
-      <endpoint name="AllowCookies" address="http://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="allowCookiesBinding" contract="Microsoft.Samples.HttpCookieSession.IShoppingCart"/>
+      <endpoint name="CookieSession" address="http://localhost/servicemodelsamples/service.svc" binding="httpCookieSessionBinding" bindingConfiguration="cookieSessionBinding" contract="Microsoft.Samples.HttpCookieSession.IShoppingCart" />
+      <endpoint name="AllowCookies" address="http://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="allowCookiesBinding" contract="Microsoft.Samples.HttpCookieSession.IShoppingCart" />
     </client>
-    
     <bindings>
-      
       <httpCookieSessionBinding>
-        <binding name="cookieSessionBinding" exchangeTerminateMessage="true"/>
+        <binding name="cookieSessionBinding" exchangeTerminateMessage="true" />
       </httpCookieSessionBinding>
-      
       <customBinding>
         <binding name="allowCookiesBinding">
-          <textMessageEncoding messageVersion="Soap11WSAddressing10"/>
-          <httpCookieSession sessionTimeout="10" exchangeTerminateMessage="true"/>
-          <httpTransport allowCookies="true"/>
+          <textMessageEncoding messageVersion="Soap11WSAddressing10" />
+          <httpCookieSession sessionTimeout="10" exchangeTerminateMessage="true" />
+          <httpTransport allowCookies="true" />
         </binding>
       </customBinding>
-      
     </bindings>
   </system.serviceModel>
-
-<!-- remove comment to enable diagnostics
+  <!-- remove comment to enable diagnostics
   <system.diagnostics>
     <sources>
       <source name="System.Net">
@@ -60,5 +53,4 @@
     <trace autoflush="true" />
   </system.diagnostics>
 end diagnostics comment -->
-  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/Client.csproj b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/Client.csproj
index b1d38cadd14..cc29da81de1 100644
--- a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/Client.csproj
+++ b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1D4D4FA3-8C51-40D4-BA36-D24DE3D03824}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.HttpCookieSession</RootNamespace>
     <AssemblyName>HttpCookieSessionClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,29 +53,7 @@
       <Name>Extensions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -102,4 +61,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/extensions/Extensions.csproj b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/extensions/Extensions.csproj
index 083b38f755f..93ba5801fc9 100644
--- a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/extensions/Extensions.csproj
+++ b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/extensions/Extensions.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E40847BA-28FC-4620-B471-FF4BF65D91EE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.HttpCookieSession</RootNamespace>
     <AssemblyName>HttpCookieSessionExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,29 +61,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TimeoutHelper.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -110,4 +69,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/service/Service.csproj b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/service/Service.csproj
index 6f3110c4110..5c4f0dadfb6 100644
--- a/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/service/Service.csproj
+++ b/framework/wcf/Extensibility/Channels/HttpCookieSession/CS/service/Service.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C4C830A7-C09A-4FB0-AB3B-0F066B9F72B5}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.HttpCookieSession</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -74,29 +54,6 @@
       <Name>Extensions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -105,11 +62,13 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/LocalChannel/CS/ClientAndService/ClientAndService.csproj b/framework/wcf/Extensibility/Channels/LocalChannel/CS/ClientAndService/ClientAndService.csproj
index 6af35d4318c..3e685dbe63e 100644
--- a/framework/wcf/Extensibility/Channels/LocalChannel/CS/ClientAndService/ClientAndService.csproj
+++ b/framework/wcf/Extensibility/Channels/LocalChannel/CS/ClientAndService/ClientAndService.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BB9A3437-8DDE-48E9-8E42-5F2673C33155}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.LocalChannel</RootNamespace>
     <AssemblyName>ClientAndService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
@@ -54,4 +54,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/LocalChannel/CS/LocalChannel/LocalChannel.csproj b/framework/wcf/Extensibility/Channels/LocalChannel/CS/LocalChannel/LocalChannel.csproj
index 4770dd6e319..403a260d0bc 100644
--- a/framework/wcf/Extensibility/Channels/LocalChannel/CS/LocalChannel/LocalChannel.csproj
+++ b/framework/wcf/Extensibility/Channels/LocalChannel/CS/LocalChannel/LocalChannel.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4AC14F01-864E-4A27-8B5C-D2C9F359B91B}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.LocalChannel</RootNamespace>
     <AssemblyName>LocalChannel</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <StartupObject />
   </PropertyGroup>
@@ -66,4 +66,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/app.config b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/app.config
index 1648870749d..6d85f2983ae 100644
--- a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/app.config
+++ b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/app.config
@@ -1,26 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.serviceModel>
-        <client>
-            <endpoint name="sampleProxy" address="http://localhost:8000/windspeed/" bindingConfiguration="sampleBinding" binding="customBinding" contract="Microsoft.Samples.MessageInterceptor.ISampleContract"/>
-            <metadata>
-                <policyImporters>
-                    <extension type="Microsoft.Samples.MessageInterceptor.MessageModifierImporter, client"/>
-                </policyImporters>
-          </metadata>
-        </client>
-        <bindings>
-            <customBinding>
-                <binding name="sampleBinding">
-                    <messageModifier/>
-                    <httpTransport/>
-                </binding>
-            </customBinding>
-        </bindings>
-        <extensions>
-            <bindingElementExtensions>
-                <add name="messageModifier" type="Microsoft.Samples.MessageInterceptor.MessageModifierElement, client"/>
-            </bindingElementExtensions>
-        </extensions>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <client>
+      <endpoint name="sampleProxy" address="http://localhost:8000/windspeed/" bindingConfiguration="sampleBinding" binding="customBinding" contract="Microsoft.Samples.MessageInterceptor.ISampleContract" />
+      <metadata>
+        <policyImporters>
+          <extension type="Microsoft.Samples.MessageInterceptor.MessageModifierImporter, client" />
+        </policyImporters>
+      </metadata>
+    </client>
+    <bindings>
+      <customBinding>
+        <binding name="sampleBinding">
+          <messageModifier />
+          <httpTransport />
+        </binding>
+      </customBinding>
+    </bindings>
+    <extensions>
+      <bindingElementExtensions>
+        <add name="messageModifier" type="Microsoft.Samples.MessageInterceptor.MessageModifierElement, client" />
+      </bindingElementExtensions>
+    </extensions>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/client.csproj b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/client.csproj
index aa2dc818559..8e88e39ff66 100644
--- a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/client/client.csproj
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F86BF909-06ED-4B1F-8B2A-4C5EA9C8462D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,33 +42,11 @@
     <Compile Include="client.cs" />
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\library\library.csproj">
       <Project>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</Project>
       <Name>library</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/library/library.csproj b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/library/library.csproj
index 126d7719988..9d97ab4cf2f 100644
--- a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/library/library.csproj
+++ b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/library/library.csproj
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>MessageInterceptor</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,31 +51,8 @@
     <Compile Include="interceptingChannelListener.cs" />
     <Compile Include="TimeoutHelper.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/app.config b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/app.config
index fe12edc0583..56cfefc5f2f 100644
--- a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/app.config
+++ b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/app.config
@@ -1,21 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.serviceModel>
-        <protocolMapping>
-            <add scheme="http" binding="customBinding" />
-        </protocolMapping>
-        <bindings>
-            <customBinding>
-                <binding>
-                    <droppingInterceptor/>
-                    <httpTransport/>
-                </binding>
-            </customBinding>
-        </bindings>
-        <extensions>
-            <bindingElementExtensions>
-                <add name="droppingInterceptor" type="Microsoft.Samples.MessageInterceptor.DroppingServerElement, service"/>
-            </bindingElementExtensions>
-        </extensions>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <protocolMapping>
+      <add scheme="http" binding="customBinding" />
+    </protocolMapping>
+    <bindings>
+      <customBinding>
+        <binding>
+          <droppingInterceptor />
+          <httpTransport />
+        </binding>
+      </customBinding>
+    </bindings>
+    <extensions>
+      <bindingElementExtensions>
+        <add name="droppingInterceptor" type="Microsoft.Samples.MessageInterceptor.DroppingServerElement, service" />
+      </bindingElementExtensions>
+    </extensions>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/service.csproj b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/service.csproj
index 337479f67d0..1e8598909f8 100644
--- a/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Channels/MessageInterceptor/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6AED9F11-7B2C-4E43-B454-2508660EDC61}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,37 +43,14 @@
     <Compile Include="service.cs" />
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\library\library.csproj">
       <Project>{D067DEE6-D9F3-4169-981E-02732E8ABA72}</Project>
       <Name>library</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Client/Client.csproj b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Client/Client.csproj
index 9d655c0ad43..548b2953fd5 100644
--- a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Client/Client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E6CD89FB-FDD5-4FA1-B7A7-F6D757BFA6D3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ReliableSecureProfile</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -57,4 +57,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/MakeConnectionChannel/MakeConnectionChannel.csproj b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/MakeConnectionChannel/MakeConnectionChannel.csproj
index b216f88f61a..c68af8608b0 100644
--- a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/MakeConnectionChannel/MakeConnectionChannel.csproj
+++ b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/MakeConnectionChannel/MakeConnectionChannel.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{80C87312-A6A8-44DE-97E0-78A4517D2E61}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ReliableSecureProfile</RootNamespace>
     <AssemblyName>MakeConnectionChannel</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <StartupObject />
@@ -80,4 +80,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/Service.csproj b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/Service.csproj
index 877ea45e8f3..69bca2a3c29 100644
--- a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/Service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{0A3C5D6F-C57D-47C4-BEBF-5E905BA59CF0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ReliableSecureProfile</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -60,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/app.config b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/app.config
index 4a87a4fa5c8..cc50bea626c 100644
--- a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/app.config
+++ b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/Service/app.config
@@ -1,43 +1,39 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <system.serviceModel>
-        <behaviors>
-            <serviceBehaviors>
-                <behavior name="rspServiceBehavior">
-                    <serviceMetadata httpGetEnabled ="True" policyVersion="Policy15" />
-                    <serviceDebug includeExceptionDetailInFaults ="False" />
-                </behavior>
-            </serviceBehaviors>
-        </behaviors>
-        <bindings>
-            <customBinding>
-                <binding name="rspBinding">
-                    <reliableSession />
-                    <MakeConnectionBindingElement/>
-                    <textMessageEncoding />
-                    <httpTransport />
-                </binding>
-            </customBinding>
-        </bindings>
-        <extensions>
-            <bindingElementExtensions>
-                <add name="MakeConnectionBindingElement" type="Microsoft.Samples.ReliableSecureProfile.MakeConnectionElement, MakeConnectionChannel, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
-            </bindingElementExtensions>
-        </extensions>
-        <services>
-            <service behaviorConfiguration="rspServiceBehavior" name="Microsoft.Samples.ReliableSecureProfile.ProcessDataService">
-                <endpoint binding="customBinding" bindingConfiguration="rspBinding"
-                    contract="Microsoft.Samples.ReliableSecureProfile.IProcessDataDuplex"
-                    listenUriMode="Explicit">
-                </endpoint>
-                <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration=""
-                    contract="IMetadataExchange" />
-                <host>
-                    <baseAddresses>
-                        <add baseAddress="http://localhost/ProcessDataService" />
-                    </baseAddresses>
-                </host>
-            </service>
-        </services>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <behaviors>
+      <serviceBehaviors>
+        <behavior name="rspServiceBehavior">
+          <serviceMetadata httpGetEnabled="True" policyVersion="Policy15" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
+        </behavior>
+      </serviceBehaviors>
+    </behaviors>
+    <bindings>
+      <customBinding>
+        <binding name="rspBinding">
+          <reliableSession />
+          <MakeConnectionBindingElement />
+          <textMessageEncoding />
+          <httpTransport />
+        </binding>
+      </customBinding>
+    </bindings>
+    <extensions>
+      <bindingElementExtensions>
+        <add name="MakeConnectionBindingElement" type="Microsoft.Samples.ReliableSecureProfile.MakeConnectionElement, MakeConnectionChannel, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" />
+      </bindingElementExtensions>
+    </extensions>
+    <services>
+      <service behaviorConfiguration="rspServiceBehavior" name="Microsoft.Samples.ReliableSecureProfile.ProcessDataService">
+        <endpoint binding="customBinding" bindingConfiguration="rspBinding" contract="Microsoft.Samples.ReliableSecureProfile.IProcessDataDuplex" listenUriMode="Explicit"></endpoint>
+        <endpoint address="mex" binding="mexHttpBinding" bindingConfiguration="" contract="IMetadataExchange" />
+        <host>
+          <baseAddresses>
+            <add baseAddress="http://localhost/ProcessDataService" />
+          </baseAddresses>
+        </host>
+      </service>
+    </services>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/ServiceContract/ServiceContract.csproj b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/ServiceContract/ServiceContract.csproj
index b9558819d87..d94e09a7342 100644
--- a/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/ServiceContract/ServiceContract.csproj
+++ b/framework/wcf/Extensibility/Channels/ReliableSecureProfile/CS/ServiceContract/ServiceContract.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20702</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6CD7DC9E-909D-4870-B96E-6AE663C91CF7}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.ReliableSecureProfile</RootNamespace>
     <AssemblyName>ServiceContract</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
@@ -47,4 +47,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/App.config b/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/App.config
index 46b370f5246..fd3e336df03 100644
--- a/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/App.config
+++ b/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/App.config
@@ -1,29 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <basicHttpBinding>
-                <binding name="BasicHttpBinding_IPersonnelDataService" closeTimeout="00:01:00"
-                    openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
-                    allowCookies="false" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard"
-                    maxBufferSize="65536" maxBufferPoolSize="524288" maxReceivedMessageSize="65536"
-                    messageEncoding="Text" textEncoding="utf-8" transferMode="Buffered"
-                    useDefaultWebProxy="true">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
-                        maxBytesPerRead="4096" maxNameTableCharCount="16384" />
-                    <security mode="None">
-                        <transport clientCredentialType="None" proxyCredentialType="None"
-                            realm="" />
-                        <message clientCredentialType="UserName" algorithmSuite="Default" />
-                    </security>
-                </binding>
-            </basicHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost/servicemodelsamples/service.svc"
-                binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPersonnelDataService"
-                contract="IPersonnelDataService" name="BasicHttpBinding_IPersonnelDataService" />
-        </client>
-    </system.serviceModel>
-</configuration>
\ No newline at end of file
+  <system.serviceModel>
+    <bindings>
+      <basicHttpBinding>
+        <binding name="BasicHttpBinding_IPersonnelDataService">
+          <readerQuotas />
+          <security mode="None">
+            <transport clientCredentialType="None" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="UserName" algorithmSuite="Default" />
+          </security>
+        </binding>
+      </basicHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IPersonnelDataService" contract="IPersonnelDataService" name="BasicHttpBinding_IPersonnelDataService" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/Client.csproj b/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/Client.csproj
index c866a1c0c55..7b8b7f162e6 100644
--- a/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/DataContract/Surrogate/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{168D4931-F200-4703-8EF9-D2D71BA0EF26}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,29 +47,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -96,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/DataContract/Surrogate/CS/Service/Service.csproj b/framework/wcf/Extensibility/DataContract/Surrogate/CS/Service/Service.csproj
index a1d645bff6e..6be18ec08ed 100644
--- a/framework/wcf/Extensibility/DataContract/Surrogate/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/DataContract/Surrogate/CS/Service/Service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C915C9DD-F25C-4465-B1EC-7E5EFD4D59D4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,29 +49,6 @@
     <None Include="service.svc" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -100,11 +58,12 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config
index f12e9980297..8ead3360f7a 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config
@@ -1,11 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IErrorCalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.ServiceModel.Samples.IErrorCalculator" />
     </client>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj
index 15af4395b72..a4f8592d2fc 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.csproj b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.csproj
index bb88c6d8cf7..f6944405683 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,34 +47,12 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/App.config b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/App.config
index 0d690014f10..f3eddc5eae8 100644
--- a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/App.config
+++ b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/App.config
@@ -1,34 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="Calculator" address="http://localhost:8000/servicemodelsamples" binding="customBinding" bindingConfiguration="poxBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" behaviorConfiguration="enableHttpGetRequestsBehavior"/>
+      <endpoint name="Calculator" address="http://localhost:8000/servicemodelsamples" binding="customBinding" bindingConfiguration="poxBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" behaviorConfiguration="enableHttpGetRequestsBehavior" />
     </client>
-
     <bindings>
       <customBinding>
         <binding name="poxBinding">
-          <textMessageEncoding messageVersion="None"/>
-          <httpTransport manualAddressing="True"/>
+          <textMessageEncoding messageVersion="None" />
+          <httpTransport manualAddressing="True" />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="enableHttpGetRequestsBehavior">
-          <enableHttpGetRequests/>
+          <enableHttpGetRequests />
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
     <extensions>
       <behaviorExtensions>
         <!-- Enabling HTTP GET requests: Behavior Extension -->
-        <add name="enableHttpGetRequests" type="Microsoft.ServiceModel.Samples.EnableHttpGetRequestsBehaviorElement, QueryStringFormatter, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+        <add name="enableHttpGetRequests" type="Microsoft.ServiceModel.Samples.EnableHttpGetRequestsBehaviorElement, QueryStringFormatter, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       </behaviorExtensions>
     </extensions>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/Client.csproj b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/Client.csproj
index 0d8e60b907e..28e5193c54e 100644
--- a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6A70C6FC-E909-4EC2-B337-AD6993A4359F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,29 +52,7 @@
       <Name>QueryStringFormatter</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/QueryStringFormatter/QueryStringFormatter.csproj b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/QueryStringFormatter/QueryStringFormatter.csproj
index d1c838f7526..63d9bbd6431 100644
--- a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/QueryStringFormatter/QueryStringFormatter.csproj
+++ b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/QueryStringFormatter/QueryStringFormatter.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{2AE7CB56-CFBE-48EF-81F3-8A0B7D5F58BB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>QueryStringFormatter</RootNamespace>
     <AssemblyName>QueryStringFormatter</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,29 +49,7 @@
     <Compile Include="EnableHttpGetRequestsBehavior.cs" />
     <Compile Include="UriOperationSelector.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -99,4 +57,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/App.config b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/App.config
index 0a65a793ccc..ae78de6ad78 100644
--- a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/App.config
+++ b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
@@ -6,37 +6,33 @@
         <host>
           <!--When running sample across machine, replace localhost with the FQDN of the server machine-->
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/servicemodelsamples/"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/" />
           </baseAddresses>
         </host>
         <!-- ICalculator is exposed at the base address provided by host: http://localhost/servicemodelsamples/service.svc  -->
-        <endpoint address="" binding="customBinding" bindingConfiguration="poxBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" behaviorConfiguration="enableHttpGetRequestsBehavior"/>
+        <endpoint address="" binding="customBinding" bindingConfiguration="poxBinding" contract="Microsoft.ServiceModel.Samples.ICalculator" behaviorConfiguration="enableHttpGetRequestsBehavior" />
       </service>
     </services>
-
     <bindings>
       <customBinding>
         <binding name="poxBinding">
-          <textMessageEncoding messageVersion="None"/>
-          <httpTransport/>
+          <textMessageEncoding messageVersion="None" />
+          <httpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="enableHttpGetRequestsBehavior">
-          <enableHttpGetRequests/>
+          <enableHttpGetRequests />
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
     <extensions>
       <behaviorExtensions>
         <!-- Enabling HTTP GET requests: Behavior Extension -->
-        <add name="enableHttpGetRequests" type="Microsoft.ServiceModel.Samples.EnableHttpGetRequestsBehaviorElement, QueryStringFormatter, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+        <add name="enableHttpGetRequests" type="Microsoft.ServiceModel.Samples.EnableHttpGetRequestsBehaviorElement, QueryStringFormatter, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       </behaviorExtensions>
     </extensions>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/Service.csproj b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/Service.csproj
index 080db39a342..1097acac4db 100644
--- a/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/Formatters/QueryStringFormatter/CS/Service/Service.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E7A4D0B8-A861-4E9A-BA41-7FB2017FAACB}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Service</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,29 +53,7 @@
       <Name>QueryStringFormatter</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -103,4 +61,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/App.config b/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/App.config
index 7493204f5f0..e657997b8f8 100644
--- a/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/App.config
+++ b/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
- <!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
+<?xml version="1.0"?>
+<!--Copyright (c) Microsoft Corporation.  All Rights Reserved.-->
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.CustomServiceHost.ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.CustomServiceHost.ICalculator" />
     </client>
   </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/client.csproj b/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/client.csproj
index b1eb0f2c0f3..a4f8592d2fc 100644
--- a/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,22 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/service/service.csproj b/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/service/service.csproj
index 1bcd28087d8..fa053b6943e 100644
--- a/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Hosting/CustomServiceHost/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,33 +46,18 @@
   <ItemGroup>
     <Content Include="service.svc" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>rmdir /S /Q %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+    <PostBuildEvent>
+      rmdir /S /Q %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Durable/CS/client/App.config b/framework/wcf/Extensibility/Instancing/Durable/CS/client/App.config
index 01e3f0faabe..03973724f79 100644
--- a/framework/wcf/Extensibility/Instancing/Durable/CS/client/App.config
+++ b/framework/wcf/Extensibility/Instancing/Durable/CS/client/App.config
@@ -1,32 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-   <system.serviceModel>
-     <extensions>
-       <bindingElementExtensions>
-         <add name="durableInstanceContext" type="Microsoft.ServiceModel.Samples.DurableInstanceContextBindingElementSection, DurableInstanceContextExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
-       </bindingElementExtensions>
-     </extensions>
-
-     <client>
-       <endpoint address="http://localhost:8000/ServiceModelSamples/service" binding="customBinding" bindingConfiguration="TextOverHttp" contract="Microsoft.ServiceModel.Samples.IShoppingCart"/>       
-     </client>
-
-     <bindings>
-       <customBinding>
-         <binding name="TextOverHttp">
-           <!-- Uncomment this to customize the context store location>
+  <system.serviceModel>
+    <extensions>
+      <bindingElementExtensions>
+        <add name="durableInstanceContext" type="Microsoft.ServiceModel.Samples.DurableInstanceContextBindingElementSection, DurableInstanceContextExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
+      </bindingElementExtensions>
+    </extensions>
+    <client>
+      <endpoint address="http://localhost:8000/ServiceModelSamples/service" binding="customBinding" bindingConfiguration="TextOverHttp" contract="Microsoft.ServiceModel.Samples.IShoppingCart" />
+    </client>
+    <bindings>
+      <customBinding>
+        <binding name="TextOverHttp">
+          <!-- Uncomment this to customize the context store location>
            <durableInstanceContext contextType="HttpCookie" contextStoreLocation="C:\Temp">
-           --> 
-           
-           <!-- Comment this when using the customized context store location-->  
-           <durableInstanceContext contextType="HttpCookie"/>
-           
-           <reliableSession/>
-           <textMessageEncoding/>
-           <httpTransport/>
-         </binding>
-       </customBinding>
-     </bindings>
-
-   </system.serviceModel>
- <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+           -->
+          <!-- Comment this when using the customized context store location-->
+          <durableInstanceContext contextType="HttpCookie" />
+          <reliableSession />
+          <textMessageEncoding />
+          <httpTransport />
+        </binding>
+      </customBinding>
+    </bindings>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Durable/CS/client/Client.csproj b/framework/wcf/Extensibility/Instancing/Durable/CS/client/Client.csproj
index 1e45f9e8792..f13f9c00930 100644
--- a/framework/wcf/Extensibility/Instancing/Durable/CS/client/Client.csproj
+++ b/framework/wcf/Extensibility/Instancing/Durable/CS/client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BDB1DD52-5EAA-4AF6-8E56-F528A462F23E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,29 +52,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Durable/CS/extensions/extensions.csproj b/framework/wcf/Extensibility/Instancing/Durable/CS/extensions/extensions.csproj
index d3099a511eb..3f98c934af3 100644
--- a/framework/wcf/Extensibility/Instancing/Durable/CS/extensions/extensions.csproj
+++ b/framework/wcf/Extensibility/Instancing/Durable/CS/extensions/extensions.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{14F5456C-B357-4BAB-BD2D-2DF58B507304}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>DurableInstanceContextExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -99,29 +80,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -129,4 +88,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Durable/CS/service/App.config b/framework/wcf/Extensibility/Instancing/Durable/CS/service/App.config
index 4d96e5a5ada..b44dd6ebd5f 100644
--- a/framework/wcf/Extensibility/Instancing/Durable/CS/service/App.config
+++ b/framework/wcf/Extensibility/Instancing/Durable/CS/service/App.config
@@ -1,49 +1,42 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
-    <add key="SqlContextStore" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SamplDB.mdf;Integrated Security=True;User Instance=True"/>
+    <add key="SqlContextStore" value="Data Source=.\SQLEXPRESS;AttachDbFilename=|DataDirectory|\SamplDB.mdf;Integrated Security=True;User Instance=True" />
   </appSettings>
-  
   <system.serviceModel>
-	
     <extensions>
-			<bindingElementExtensions>
-				<add name="durableInstanceContext" type="Microsoft.ServiceModel.Samples.DurableInstanceContextBindingElementSection, DurableInstanceContextExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
-			</bindingElementExtensions>
-		</extensions>
-
+      <bindingElementExtensions>
+        <add name="durableInstanceContext" type="Microsoft.ServiceModel.Samples.DurableInstanceContextBindingElementSection, DurableInstanceContextExtension, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
+      </bindingElementExtensions>
+    </extensions>
     <services>
-			<service name="Microsoft.ServiceModel.Samples.ShoppingCart" behaviorConfiguration="ShoppingCartBehavior">
+      <service name="Microsoft.ServiceModel.Samples.ShoppingCart" behaviorConfiguration="ShoppingCartBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
           </baseAddresses>
         </host>
-				<!-- use base address provided by host -->
-				<endpoint address="" binding="customBinding" bindingConfiguration="TextOverHttp" contract="Microsoft.ServiceModel.Samples.IShoppingCart"/>
-			</service>
-		</services>
-		
+        <!-- use base address provided by host -->
+        <endpoint address="" binding="customBinding" bindingConfiguration="TextOverHttp" contract="Microsoft.ServiceModel.Samples.IShoppingCart" />
+      </service>
+    </services>
     <bindings>
-			<customBinding>
-				<binding name="TextOverHttp">
-					<durableInstanceContext contextType="HttpCookie"/>
-					<reliableSession/>
-					<textMessageEncoding/>
-					<httpTransport/>
-				</binding>
-			</customBinding>
-		</bindings>
-    
+      <customBinding>
+        <binding name="TextOverHttp">
+          <durableInstanceContext contextType="HttpCookie" />
+          <reliableSession />
+          <textMessageEncoding />
+          <httpTransport />
+        </binding>
+      </customBinding>
+    </bindings>
     <behaviors>
       <serviceBehaviors>
         <behavior name="ShoppingCartBehavior">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-	
   </system.serviceModel>
-  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Durable/CS/service/service.csproj b/framework/wcf/Extensibility/Instancing/Durable/CS/service/service.csproj
index 8999fbbbaed..6bb5c082db1 100644
--- a/framework/wcf/Extensibility/Instancing/Durable/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Instancing/Durable/CS/service/service.csproj
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>http://localhost/service/</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -84,41 +62,8 @@
       <Name>extensions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 2.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Sql.Server.Express.1.0">
-      <Visible>False</Visible>
-      <ProductName>SQL Server 2005 Express Edition</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Initialization/CS/client/App.config b/framework/wcf/Extensibility/Instancing/Initialization/CS/client/App.config
index 4d1e1a56187..3bf4d0a32a8 100644
--- a/framework/wcf/Extensibility/Instancing/Initialization/CS/client/App.config
+++ b/framework/wcf/Extensibility/Instancing/Initialization/CS/client/App.config
@@ -1,9 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-   <system.serviceModel>
-
-     <client>
-       <endpoint name="poolservice" address="net.tcp://localhost:8000/poolservice" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPoolService"/>       
-     </client>     
-   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <client>
+      <endpoint name="poolservice" address="net.tcp://localhost:8000/poolservice" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPoolService" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Initialization/CS/client/Client.csproj b/framework/wcf/Extensibility/Instancing/Initialization/CS/client/Client.csproj
index bda015f414b..ad4edd20bbc 100644
--- a/framework/wcf/Extensibility/Instancing/Initialization/CS/client/Client.csproj
+++ b/framework/wcf/Extensibility/Instancing/Initialization/CS/client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A14DAFDF-2D84-4DC3-A8CE-F81D36FC912F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,29 +45,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -95,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Initialization/CS/extensions/Extensions.csproj b/framework/wcf/Extensibility/Instancing/Initialization/CS/extensions/Extensions.csproj
index 3747f3e5969..74e14a14f09 100644
--- a/framework/wcf/Extensibility/Instancing/Initialization/CS/extensions/Extensions.csproj
+++ b/framework/wcf/Extensibility/Instancing/Initialization/CS/extensions/Extensions.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{24F59702-9923-4D05-BD39-F4A6D9F0ED78}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>InstancePoolingExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -77,29 +57,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -107,4 +65,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Initialization/CS/service/App.config b/framework/wcf/Extensibility/Instancing/Initialization/CS/service/App.config
index 91e63d6d70e..0d7bb403674 100644
--- a/framework/wcf/Extensibility/Instancing/Initialization/CS/service/App.config
+++ b/framework/wcf/Extensibility/Instancing/Initialization/CS/service/App.config
@@ -1,12 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.PoolService">
-        <endpoint address="net.tcp://localhost:8000/poolservice" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPoolService"/>
-
-        <endpoint address="net.tcp://localhost:8001/poolservice" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPoolService"/>
+        <endpoint address="net.tcp://localhost:8000/poolservice" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPoolService" />
+        <endpoint address="net.tcp://localhost:8001/poolservice" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IPoolService" />
       </service>
     </services>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Initialization/CS/service/Service.csproj b/framework/wcf/Extensibility/Instancing/Initialization/CS/service/Service.csproj
index 3d14e0b771d..49f4ef6d329 100644
--- a/framework/wcf/Extensibility/Instancing/Initialization/CS/service/Service.csproj
+++ b/framework/wcf/Extensibility/Instancing/Initialization/CS/service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AE58B0A0-F124-4ABE-8543-42110CFA8959}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,29 +51,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,4 +59,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/App.config b/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/App.config
index 5f366b7a8d5..5fb8f6c5d88 100644
--- a/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/App.config
+++ b/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/App.config
@@ -1,19 +1,16 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-   <system.serviceModel>
-
-     <client>
-       <endpoint name="echoservice" address="net.tcp://localhost:9000/echoservice" binding="customBinding" bindingConfiguration="textOverTcp" contract="Microsoft.ServiceModel.Samples.IEchoService"/>       
-     </client>
-
-     <bindings>
-       <customBinding>
-         <binding name="textOverTcp">
-           <textMessageEncoding/>
-           <tcpTransport/>
-         </binding>
-       </customBinding>
-     </bindings>
-     
-   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <client>
+      <endpoint name="echoservice" address="net.tcp://localhost:9000/echoservice" binding="customBinding" bindingConfiguration="textOverTcp" contract="Microsoft.ServiceModel.Samples.IEchoService" />
+    </client>
+    <bindings>
+      <customBinding>
+        <binding name="textOverTcp">
+          <textMessageEncoding />
+          <tcpTransport />
+        </binding>
+      </customBinding>
+    </bindings>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/Client.csproj b/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/Client.csproj
index 0916ba47535..21ddfd17148 100644
--- a/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/Client.csproj
+++ b/framework/wcf/Extensibility/Instancing/Lifetime/CS/client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{141A9C5A-0610-4F1B-BDD5-1EAF8416850E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,29 +47,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -97,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Lifetime/CS/extensions/Extensions.csproj b/framework/wcf/Extensibility/Instancing/Lifetime/CS/extensions/Extensions.csproj
index 011527897ea..7c4dfcc3e1d 100644
--- a/framework/wcf/Extensibility/Instancing/Lifetime/CS/extensions/Extensions.csproj
+++ b/framework/wcf/Extensibility/Instancing/Lifetime/CS/extensions/Extensions.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{286B7623-BDB9-409A-8489-A3D3FCEFEED4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>InstancePoolingExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,29 +63,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -113,4 +71,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/App.config b/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/App.config
index e51f2b9f27b..42708281ab6 100644
--- a/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/App.config
+++ b/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/App.config
@@ -1,20 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.EchoService">
-        <endpoint address="net.tcp://localhost:9000/Echoservice" binding="customBinding" bindingConfiguration="textOverTcp" contract="Microsoft.ServiceModel.Samples.IEchoService"/>
+        <endpoint address="net.tcp://localhost:9000/Echoservice" binding="customBinding" bindingConfiguration="textOverTcp" contract="Microsoft.ServiceModel.Samples.IEchoService" />
       </service>
     </services>
-
     <bindings>
       <customBinding>
         <binding name="textOverTcp">
-          <textMessageEncoding/>
-          <tcpTransport/>
+          <textMessageEncoding />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/Service.csproj b/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/Service.csproj
index 4ba11eda188..44e41fe699e 100644
--- a/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/Service.csproj
+++ b/framework/wcf/Extensibility/Instancing/Lifetime/CS/service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{E08400D5-2EE3-4798-A8E5-C0C2C1882E90}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,29 +53,7 @@
       <Name>Extensions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -103,4 +61,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Pooling/CS/client/App.config b/framework/wcf/Extensibility/Instancing/Pooling/CS/client/App.config
index b9504df4a75..acd54f483eb 100644
--- a/framework/wcf/Extensibility/Instancing/Pooling/CS/client/App.config
+++ b/framework/wcf/Extensibility/Instancing/Pooling/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-   <system.serviceModel>
-     <client>
-       <endpoint address="net.tcp://localhost:8000/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="WorkService"/>
-
-       <endpoint address="net.tcp://localhost:8001/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="ObjectPooledWorkService"/>
-     </client>
-   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <client>
+      <endpoint address="net.tcp://localhost:8000/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="WorkService" />
+      <endpoint address="net.tcp://localhost:8001/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="ObjectPooledWorkService" />
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Pooling/CS/client/Client.csproj b/framework/wcf/Extensibility/Instancing/Pooling/CS/client/Client.csproj
index bda015f414b..ad4edd20bbc 100644
--- a/framework/wcf/Extensibility/Instancing/Pooling/CS/client/Client.csproj
+++ b/framework/wcf/Extensibility/Instancing/Pooling/CS/client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A14DAFDF-2D84-4DC3-A8CE-F81D36FC912F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,29 +45,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -95,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Pooling/CS/extensions/Extensions.csproj b/framework/wcf/Extensibility/Instancing/Pooling/CS/extensions/Extensions.csproj
index a1b2921114d..849a3ae6dd7 100644
--- a/framework/wcf/Extensibility/Instancing/Pooling/CS/extensions/Extensions.csproj
+++ b/framework/wcf/Extensibility/Instancing/Pooling/CS/extensions/Extensions.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{24F59702-9923-4D05-BD39-F4A6D9F0ED78}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>InstancePoolingExtension</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,29 +56,7 @@
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -106,4 +64,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Instancing/Pooling/CS/service/App.config b/framework/wcf/Extensibility/Instancing/Pooling/CS/service/App.config
index 9c09fa32fb7..8e9584e789b 100644
--- a/framework/wcf/Extensibility/Instancing/Pooling/CS/service/App.config
+++ b/framework/wcf/Extensibility/Instancing/Pooling/CS/service/App.config
@@ -1,22 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.ServiceModel.Samples.WorkService" behaviorConfiguration="WorkServiceBehavior">
-        <endpoint address="net.tcp://localhost:8000/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="WorkService"/>
-        <endpoint address="net.tcp://localhost:8000/mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="net.tcp://localhost:8000/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="WorkService" />
+        <endpoint address="net.tcp://localhost:8000/mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
       <service name="Microsoft.ServiceModel.Samples.ObjectPooledWorkService" behaviorConfiguration="WorkServiceBehavior">
-        <endpoint address="net.tcp://localhost:8001/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="ObjectPooledWorkService"/>
-        <endpoint address="net.tcp://localhost:8001/mex" binding="mexTcpBinding" contract="IMetadataExchange"/>
+        <endpoint address="net.tcp://localhost:8001/" binding="netTcpBinding" contract="Microsoft.ServiceModel.Samples.IDoWork" name="ObjectPooledWorkService" />
+        <endpoint address="net.tcp://localhost:8001/mex" binding="mexTcpBinding" contract="IMetadataExchange" />
       </service>
     </services>
     <behaviors>
       <serviceBehaviors>
         <behavior name="WorkServiceBehavior">
-          <serviceMetadata/>
+          <serviceMetadata />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Instancing/Pooling/CS/service/Service.csproj b/framework/wcf/Extensibility/Instancing/Pooling/CS/service/Service.csproj
index 86940dc8291..d35b83b80fb 100644
--- a/framework/wcf/Extensibility/Instancing/Pooling/CS/service/Service.csproj
+++ b/framework/wcf/Extensibility/Instancing/Pooling/CS/service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{AE58B0A0-F124-4ABE-8543-42110CFA8959}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,29 +51,7 @@
       <Name>Extensions</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,4 +59,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/app.config b/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/app.config
index c719e9eff1a..95e3fb990f3 100644
--- a/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/app.config
+++ b/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/app.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.AdvancedDispatchBody.IGenericClient"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.AdvancedDispatchBody.IGenericClient" />
     </client>
-   
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/client.csproj b/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/client.csproj
index 1035be8ae82..d7ff9ba5419 100644
--- a/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/service/service.csproj b/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/service/service.csproj
index 1d90c23b11b..706167e3822 100644
--- a/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Interop/AdvancedDispatchByBody/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,36 +51,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/App.config b/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/App.config
index cb903402f67..dda7247aca6 100644
--- a/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/App.config
+++ b/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/App.config
@@ -1,12 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="ICalculator"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="ICalculator" />
     </client>
-
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/client.csproj b/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/client.csproj
index a0b530b172a..10b2e77103f 100644
--- a/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Interop/RouteByBody/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Interop/RouteByBody/CS/service/service.csproj b/framework/wcf/Extensibility/Interop/RouteByBody/CS/service/service.csproj
index 3b21f8b7089..2734738487d 100644
--- a/framework/wcf/Extensibility/Interop/RouteByBody/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Interop/RouteByBody/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,37 +51,15 @@
     <None Include="service.wsdl" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)service.wsdl" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\service.wsdl" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/Client.csproj b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/Client.csproj
index 9aebac1dbcb..d884f1ff264 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{97E8A065-31ED-4506-B3A4-6B2E2ED5B124}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.GZipEncoder</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,27 +54,5 @@
       <Name>GZipEncoder</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/app.config b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/app.config
index 6b6fb9dd944..5a7ff23e676 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/app.config
+++ b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Client/app.config
@@ -1,27 +1,26 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <extensions>
       <bindingElementExtensions>
-        <add name="gzipMessageEncoding" type="Microsoft.Samples.GZipEncoder.GZipMessageEncodingElement, GZipEncoder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+        <add name="gzipMessageEncoding" type="Microsoft.Samples.GZipEncoder.GZipMessageEncodingElement, GZipEncoder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
       </bindingElementExtensions>
     </extensions>
     <client>
-      <endpoint address="http://localhost:8000/samples/GZipEncoder" bindingConfiguration="ISampleServer" binding="customBinding" contract="ISampleServer">
-      </endpoint>
+      <endpoint address="http://localhost:8000/samples/GZipEncoder" bindingConfiguration="ISampleServer" binding="customBinding" contract="ISampleServer"></endpoint>
       <metadata>
         <policyImporters>
-          <extension type="Microsoft.Samples.GZipEncoder.GZipMessageEncodingBindingElementImporter, GZipEncoder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"/>
+          <extension type="Microsoft.Samples.GZipEncoder.GZipMessageEncodingBindingElementImporter, GZipEncoder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" />
         </policyImporters>
       </metadata>
     </client>
     <bindings>
       <customBinding>
         <binding name="ISampleServer">
-          <gzipMessageEncoding innerMessageEncoding="textMessageEncoding"/>
-          <httpTransport manualAddressing="false" authenticationScheme="Anonymous" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" proxyAuthenticationScheme="Anonymous" realm="" useDefaultWebProxy="true"/>
+          <gzipMessageEncoding innerMessageEncoding="textMessageEncoding" />
+          <httpTransport manualAddressing="false" authenticationScheme="Anonymous" bypassProxyOnLocal="false" hostNameComparisonMode="StrongWildcard" proxyAuthenticationScheme="Anonymous" realm="" useDefaultWebProxy="true" />
         </binding>
       </customBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/GZipEncoder/GZipEncoder.csproj b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/GZipEncoder/GZipEncoder.csproj
index e7ca1af23ef..e5366a84759 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/GZipEncoder/GZipEncoder.csproj
+++ b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/GZipEncoder/GZipEncoder.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3EB736C4-62EA-4887-B040-948B13EF29B9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Samples.GZipEncoder</RootNamespace>
     <AssemblyName>GZipEncoder</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,27 +42,5 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="GZipMessageEncodingBindingElementImporter.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/Server.csproj b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/Server.csproj
index 56480530d08..65b242f7f27 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/Server.csproj
+++ b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/Server.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9746FE53-56C5-4ED5-9214-D93F457A0560}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Samples.GZipEncoder</RootNamespace>
     <AssemblyName>Server</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,27 +47,5 @@
       <Name>GZipEncoder</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/app.config b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/app.config
index 83bfb8215ab..370388dabad 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/app.config
+++ b/framework/wcf/Extensibility/MessageEncoder/Compression/CS/Server/app.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <extensions>
@@ -12,8 +12,8 @@
     <bindings>
       <customBinding>
         <binding>
-          <gzipMessageEncoding innerMessageEncoding="textMessageEncoding"/>
-          <httpTransport hostNameComparisonMode="StrongWildcard" manualAddressing="False" maxReceivedMessageSize="65536" authenticationScheme="Anonymous" bypassProxyOnLocal="False" realm="" useDefaultWebProxy="True"/>
+          <gzipMessageEncoding innerMessageEncoding="textMessageEncoding" />
+          <httpTransport hostNameComparisonMode="StrongWildcard" manualAddressing="False" maxReceivedMessageSize="65536" authenticationScheme="Anonymous" bypassProxyOnLocal="False" realm="" useDefaultWebProxy="True" />
         </binding>
       </customBinding>
     </bindings>
@@ -22,10 +22,10 @@
     <sources>
       <source name="System.ServiceModel">
         <listeners>
-          <add name="sdt" type="System.Diagnostics.XmlWriterTraceListener" initializeData="TraceLog.e2e"/>
+          <add name="sdt" type="System.Diagnostics.XmlWriterTraceListener" initializeData="TraceLog.e2e" />
         </listeners>
       </source>
     </sources>
-    <trace autoflush="true"/>
+    <trace autoflush="true" />
   </system.diagnostics>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/App.config b/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/App.config
index aa73bf3cdb8..4139472bab8 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/App.config
+++ b/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/App.config
@@ -1,39 +1,29 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="default" address="http://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="DefaultBinding" contract="Microsoft.Samples.CustomTextMessageEncoder.ICalculator"/>
-
-      <endpoint name="secure" address="http://localhost/servicemodelsamples/service.svc/secure" binding="customBinding" bindingConfiguration="SecureBinding" contract="Microsoft.Samples.CustomTextMessageEncoder.ICalculator"/>
+      <endpoint name="default" address="http://localhost/servicemodelsamples/service.svc" binding="customBinding" bindingConfiguration="DefaultBinding" contract="Microsoft.Samples.CustomTextMessageEncoder.ICalculator" />
+      <endpoint name="secure" address="http://localhost/servicemodelsamples/service.svc/secure" binding="customBinding" bindingConfiguration="SecureBinding" contract="Microsoft.Samples.CustomTextMessageEncoder.ICalculator" />
     </client>
-
     <bindings>
-
       <customBinding>
-
         <binding name="DefaultBinding">
-          <customTextMessageEncoding encoding="ISO-8859-1"/>
-          <httpTransport/>
+          <customTextMessageEncoding encoding="ISO-8859-1" />
+          <httpTransport />
         </binding>
-
         <binding name="SecureBinding">
-          <customTextMessageEncoding encoding="ISO-8859-1"/>
+          <customTextMessageEncoding encoding="ISO-8859-1" />
           <security>
-            <secureConversationBootstrap/>
+            <secureConversationBootstrap />
           </security>
-          <httpTransport/>
+          <httpTransport />
         </binding>
-
       </customBinding>
-
     </bindings>
     <extensions>
       <bindingElementExtensions>
-        <add name="customTextMessageEncoding" type="Microsoft.Samples.CustomTextMessageEncoder.CustomTextMessageEncodingElement, CustomTextMessageEncoder"/>
+        <add name="customTextMessageEncoding" type="Microsoft.Samples.CustomTextMessageEncoder.CustomTextMessageEncodingElement, CustomTextMessageEncoder" />
       </bindingElementExtensions>
     </extensions>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/client.csproj b/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/client.csproj
index 7cdb1ddb41a..eceb2846f05 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/MessageEncoder/Text/CS/client/client.csproj
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -74,27 +53,5 @@
       <Name>CustomTextMessageEncoder</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Text/CS/library/CustomTextMessageEncoder.csproj b/framework/wcf/Extensibility/MessageEncoder/Text/CS/library/CustomTextMessageEncoder.csproj
index 7e16c820618..b8615200a61 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Text/CS/library/CustomTextMessageEncoder.csproj
+++ b/framework/wcf/Extensibility/MessageEncoder/Text/CS/library/CustomTextMessageEncoder.csproj
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8A42F86C-6977-4A0B-9889-3C697A0C1096}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>CustomTextMessageEncoder</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,27 +46,5 @@
     <Compile Include="MessageVersionConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageEncoder/Text/CS/service/service.csproj b/framework/wcf/Extensibility/MessageEncoder/Text/CS/service/service.csproj
index 2f1fe216c6b..60ba69650f7 100644
--- a/framework/wcf/Extensibility/MessageEncoder/Text/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/MessageEncoder/Text/CS/service/service.csproj
@@ -1,36 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,34 +55,14 @@
       <Name>CustomTextMessageEncoder</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
-    <PostBuildEvent>if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\
-    copy "$(TargetDir)*.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-    copy "$(ProjectDir)Web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-    copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin</PostBuildEvent>
+    <PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)*.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageFilter/CS/client/app.config b/framework/wcf/Extensibility/MessageFilter/CS/client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/MessageFilter/CS/client/app.config
+++ b/framework/wcf/Extensibility/MessageFilter/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/MessageFilter/CS/client/client.csproj b/framework/wcf/Extensibility/MessageFilter/CS/client/client.csproj
index ff6a3929e27..5884b447ba1 100644
--- a/framework/wcf/Extensibility/MessageFilter/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/MessageFilter/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,30 +41,8 @@
     <Compile Include="client.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageFilter/CS/service/service.csproj b/framework/wcf/Extensibility/MessageFilter/CS/service/service.csproj
index a108333746e..49fe70725b4 100644
--- a/framework/wcf/Extensibility/MessageFilter/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/MessageFilter/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,36 +51,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageFilter/CopySamples.csproj b/framework/wcf/Extensibility/MessageFilter/CopySamples.csproj
index a1901c4f593..346cc255350 100644
--- a/framework/wcf/Extensibility/MessageFilter/CopySamples.csproj
+++ b/framework/wcf/Extensibility/MessageFilter/CopySamples.csproj
@@ -1,18 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\cdf\sdk\NetFx40\Microsoft.SDK40.Settings.targets" />
-
   <!-- recursively select files and folders under specific dir -->
   <ItemGroup>
-    <MessageFilter Include=".\**\*.*" Exclude=".\**\*.bsl"/>
-    <MessageFilterTest Include=".\**\*.*"/>        
+    <MessageFilter Include=".\**\*.*" Exclude=".\**\*.bsl" />
+    <MessageFilterTest Include=".\**\*.*" />
   </ItemGroup>
   <Target Name="CopyForSDKCIT">
     <Copy OverwriteReadOnlyFiles="true" Retries="10" RetryDelayMilliseconds="500" SourceFiles="@(MessageFilter)" DestinationFiles="@(MessageFilter->'$(BinariesDirectory)\SuiteBin\CDF\SDK_CIT\WF_WCF_Samples\WCF\Extensibility\MessageFilter\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy OverwriteReadOnlyFiles="true" Retries="10" RetryDelayMilliseconds="500" SourceFiles="@(MessageFilter)" DestinationFiles="@(MessageFilter->'$(BinariesDirectory)\CDF\SDK\NetFx40\WF_WCF_Samples\WCF\Extensibility\MessageFilter\%(RecursiveDir)%(Filename)%(Extension)')" />
-
   </Target>
-
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\cdf\sdk\NetFx40\Microsoft.SDK40.targets" />
 </Project>
-
diff --git a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/MessageInspectors/MessageInspectors.csproj b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/MessageInspectors/MessageInspectors.csproj
index e32e5a2026e..6e3ae24127a 100644
--- a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/MessageInspectors/MessageInspectors.csproj
+++ b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/MessageInspectors/MessageInspectors.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A868F85-F6AA-456C-8E78-F695037CAF6E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>MessageInspectors</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,14 +36,8 @@
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Windows\Microsoft.NET\Framework\v3.0\Windows Communication Foundation\\System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Windows\Microsoft.NET\Framework\v3.0\Windows Communication Foundation\\System.ServiceModel.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -73,29 +48,7 @@
     <Compile Include="SchemaValidationBehaviorExtensionElement.cs" />
     <Compile Include="ValidationFault.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -104,7 +57,6 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/app.config b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/app.config
index 630cbbb1798..8bff918065c 100644
--- a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/app.config
+++ b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/app.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="IHelloService"/>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="IGenericClient"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="IHelloService" />
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="IGenericClient" />
     </client>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/client.csproj b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/client.csproj
index c4352c2b304..8fff1ccae8d 100644
--- a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,27 +58,5 @@
       <Name>MessageInspectors</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/service/service.csproj b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/service/service.csproj
index 17d41f42737..50fa4cfcd6f 100644
--- a/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/MessageInspectors/SchemaValidation/CS/service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,37 +58,16 @@
       <Name>MessageInspectors</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(TargetDir)MessageInspectors.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-        copy "$(ProjectDir)messages.xsd" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)MessageInspectors.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\messages.xsd" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/App.config b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/App.config
index 6750f28338b..5222bef74b3 100644
--- a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/App.config
+++ b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/App.config
@@ -1,7 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <appSettings>
     <!-- use appSetting to configure service mex address to retrieve metadata from -->
-    <add key="mexAddress" value="http://localhost/servicemodelsamples/service.svc/mex"/>
+    <add key="mexAddress" value="http://localhost/servicemodelsamples/service.svc/mex" />
   </appSettings>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/MetadataResolverClient.csproj b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/MetadataResolverClient.csproj
index c9f53bda4f4..77dda601f6e 100644
--- a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/MetadataResolverClient.csproj
+++ b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/MetadataResolverClient/MetadataResolverClient.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8200D99B-8A5B-4417-99EE-401BBF6A5A61}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,6 +35,7 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -66,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/Service/service.csproj b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/Service/service.csproj
index 6e7c930090f..37ca3364fc9 100644
--- a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/Service/service.csproj
+++ b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/Service/service.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,34 +46,12 @@
   <ItemGroup>
     <None Include="web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/App.config b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/App.config
index d109291dafb..b6662d0b2b3 100644
--- a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/App.config
+++ b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/App.config
@@ -1,21 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-    <system.serviceModel>
-        <bindings>
-            <wsHttpBinding>
-                <binding name="WSHttpBinding_ICalculator" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard" maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text" textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
-                    <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
-                    <reliableSession ordered="true" inactivityTimeout="00:01:00" enabled="true"/>
-                    <security mode="Message">
-                        <transport clientCredentialType="Windows" proxyCredentialType="None" realm=""/>
-                        <message clientCredentialType="Certificate" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true"/>
-                    </security>
-                </binding>
-            </wsHttpBinding>
-        </bindings>
-        <client>
-            <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator" contract="ICalculator" name="WSHttpBinding_ICalculator">
-            </endpoint>
-        </client>
-    </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  <system.serviceModel>
+    <bindings>
+      <wsHttpBinding>
+        <binding name="WSHttpBinding_ICalculator">
+          <readerQuotas />
+          <reliableSession ordered="true" inactivityTimeout="00:01:00" enabled="true" />
+          <security mode="Message">
+            <transport clientCredentialType="Windows" proxyCredentialType="None" realm="" />
+            <message clientCredentialType="Certificate" negotiateServiceCredential="true" algorithmSuite="Default" establishSecurityContext="true" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
+    <client>
+      <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_ICalculator" contract="ICalculator" name="WSHttpBinding_ICalculator"></endpoint>
+    </client>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/SvcutilClient.csproj b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/SvcutilClient.csproj
index 4650fab710e..3734e8c1682 100644
--- a/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/SvcutilClient.csproj
+++ b/framework/wcf/Extensibility/Metadata/CustomMexEndpoint/CS/SvcutilClient/SvcutilClient.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,6 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -65,27 +45,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/App.config b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/App.config
index 92b5150fe1a..b3455533ba4 100644
--- a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/App.config
+++ b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/App.config
@@ -1,16 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="ICalculator"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="ICalculator" />
       <metadata>
         <wsdlImporters>
-          <extension type="Microsoft.ServiceModel.Samples.WsdlDocumentationImporter, WsdlDocumentation"/>
+          <extension type="Microsoft.ServiceModel.Samples.WsdlDocumentationImporter, WsdlDocumentation" />
         </wsdlImporters>
       </metadata>
     </client>
-   
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/client.csproj b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/client.csproj
index c80364c9126..241ea443915 100644
--- a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/client/client.csproj
@@ -1,37 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,8 +20,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
+    <DocumentationFile></DocumentationFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -76,27 +54,5 @@
       <Name>library</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/library/library.csproj b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/library/library.csproj
index 7ee90db3975..6d012a6efd1 100644
--- a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/library/library.csproj
+++ b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/library/library.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1B3543EE-6721-437D-90D9-52EDA13F0F77}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>WsdlDocumentation</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,10 +35,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Runtime.Serialization, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Whidbey\Assemblies\System.Runtime.Serialization.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Xml" />
@@ -67,29 +45,6 @@
     <Compile Include="WsdlDocumentationAttribute.cs" />
     <Compile Include="WsdlDocumentationImporter.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,7 +56,8 @@
     <PostBuildEvent>
       mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
       mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-      copy "$(TargetDir)wsdldocumentation.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)wsdldocumentation.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/service/service.csproj b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/service/service.csproj
index 6c1137ab353..f3fa3a0b381 100644
--- a/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Metadata/WsdlDocumentation/CS/service/service.csproj
@@ -1,39 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,42 +48,20 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\library\library.csproj">
       <Project>{1B3543EE-6721-437D-90D9-52EDA13F0F77}</Project>
       <Name>library</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/PolicyLibrary/PolicyLibrary.csproj b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/PolicyLibrary/PolicyLibrary.csproj
index 49b639cf1b3..a287ca110fd 100644
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/PolicyLibrary/PolicyLibrary.csproj
+++ b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/PolicyLibrary/PolicyLibrary.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7D922471-13A2-4C41-9113-914B475B903D}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples.CustomAuthorizationPolicy</RootNamespace>
     <AssemblyName>PolicyLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,39 +35,15 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel">
-    </Reference>
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MyAuthorizationPolicy.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -95,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/App.config b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/App.config
index e412b434836..7b6fc7e95e5 100644
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/App.config
+++ b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/App.config
@@ -1,32 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- Username based endpoint -->
-      <endpoint name="Username" address="http://localhost:8001/servicemodelsamples/service/username" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator">
-      </endpoint>
+      <endpoint name="Username" address="http://localhost:8001/servicemodelsamples/service/username" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator"></endpoint>
       <!-- X509 certificate based endpoint -->
-      <endpoint name="Certificate" address="http://localhost:8001/servicemodelsamples/service/certificate" binding="wsHttpBinding" bindingConfiguration="Binding2" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator">
-      </endpoint>
+      <endpoint name="Certificate" address="http://localhost:8001/servicemodelsamples/service/certificate" binding="wsHttpBinding" bindingConfiguration="Binding2" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator"></endpoint>
     </client>
-
     <bindings>
-		  <wsHttpBinding>
+      <wsHttpBinding>
         <!-- Username binding -->
-			  <binding name="Binding1">
-					<security mode="Message">
-					  <message clientCredentialType="UserName"/>
-					</security>
-				</binding>
+        <binding name="Binding1">
+          <security mode="Message">
+            <message clientCredentialType="UserName" />
+          </security>
+        </binding>
         <!-- X509 certificate binding -->
         <binding name="Binding2">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
-		  </wsHttpBinding>
-	  </bindings>
+      </wsHttpBinding>
+    </bindings>
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -40,13 +36,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 3546e395e44..00000000000
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index ff4cd69ff1a..00000000000
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)" GeneratedClassNamespace="Properties" GeneratedClassName="Settings">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/client.csproj b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/client.csproj
index 23e0577b5cc..fe5e332486f 100644
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,49 +40,8 @@
     <Compile Include="client.cs" />
     <Compile Include="generatedClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/App.config b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/App.config
index f9cef7d64b5..06bbe40eb44 100644
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/App.config
@@ -1,47 +1,44 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.AuthorizationPolicy.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <!-- configure base address provided by host -->
-            <add baseAddress="http://localhost:8001/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8001/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host, provide two endpoints -->
-        <endpoint address="username" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator"/>
-        <endpoint address="certificate" binding="wsHttpBinding" bindingConfiguration="Binding2" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator"/>
+        <endpoint address="username" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator" />
+        <endpoint address="certificate" binding="wsHttpBinding" bindingConfiguration="Binding2" contract="Microsoft.Samples.AuthorizationPolicy.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <!-- Username binding -->
         <binding name="Binding1">
           <security mode="Message">
-	    <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
         <!-- X509 certificate binding -->
         <binding name="Binding2">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
             <!-- 
             The serviceCredentials behavior allows one to specify a custom validator for username/password combinations.				  
             -->
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.AuthorizationPolicy.MyCustomUserNameValidator, service"/>
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.AuthorizationPolicy.MyCustomUserNameValidator, service" />
             <!-- 
             The serviceCredentials behavior allows one to specify authentication constraints on client certificates.
             -->
@@ -54,27 +51,25 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </clientCertificate>
             <!-- 
             The serviceCredentials behavior allows one to define a service certificate.
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during the setup instructions.
             -->
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
           <serviceAuthorization serviceAuthorizationManagerType="Microsoft.Samples.AuthorizationPolicy.MyServiceAuthorizationManager, service">
             <!-- 
             The serviceAuthorization behavior allows one to specify custom authorization policies.
             -->
             <authorizationPolicies>
-              <add policyType="Microsoft.Samples.AuthorizationPolicy.CustomAuthorizationPolicy.MyAuthorizationPolicy, PolicyLibrary"/>
+              <add policyType="Microsoft.Samples.AuthorizationPolicy.CustomAuthorizationPolicy.MyAuthorizationPolicy, PolicyLibrary" />
             </authorizationPolicies>
           </serviceAuthorization>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/service.csproj b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/service.csproj
index d249dc135db..f1e5fd2225e 100644
--- a/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/AuthorizationPolicy/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -77,27 +57,5 @@
       <Name>PolicyLibrary</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/ClientValidation/CS/InternetClientValidator/InternetClientValidator.csproj b/framework/wcf/Extensibility/Security/ClientValidation/CS/InternetClientValidator/InternetClientValidator.csproj
index 0d4dc3a1571..8d767759482 100644
--- a/framework/wcf/Extensibility/Security/ClientValidation/CS/InternetClientValidator/InternetClientValidator.csproj
+++ b/framework/wcf/Extensibility/Security/ClientValidation/CS/InternetClientValidator/InternetClientValidator.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1690809B-62A4-4A9F-8746-9D9647177BF0}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>InternetClientValidator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,7 +36,7 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -65,29 +45,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -95,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/ClientValidation/CS/client/app.config b/framework/wcf/Extensibility/Security/ClientValidation/CS/client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/Security/ClientValidation/CS/client/app.config
+++ b/framework/wcf/Extensibility/Security/ClientValidation/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Security/ClientValidation/CS/client/client.csproj b/framework/wcf/Extensibility/Security/ClientValidation/CS/client/client.csproj
index 8c285977fab..e43e4872898 100644
--- a/framework/wcf/Extensibility/Security/ClientValidation/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/ClientValidation/CS/client/client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C8F5CD12-A639-4431-BC76-BA60B2B379CD}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>client</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,7 +35,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -70,32 +51,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -103,4 +62,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/ClientValidation/CS/service/App.config b/framework/wcf/Extensibility/Security/ClientValidation/CS/service/App.config
index 60edc7a6f3d..d3b8e42add2 100644
--- a/framework/wcf/Extensibility/Security/ClientValidation/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/ClientValidation/CS/service/App.config
@@ -1,66 +1,63 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.ClientValidation.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/ServiceModelSamples/service"/>
+            <add baseAddress="http://localhost:8000/ServiceModelSamples/service" />
           </baseAddresses>
         </host>
         <!--
             The CompositeDuplexBindingElement contained in this binding will make the
             validator throw an exception
         -->
-        <endpoint address="untrustedDual" binding="wsDualHttpBinding" contract="Microsoft.Samples.ClientValidation.ICalculator"/>
+        <endpoint address="untrustedDual" binding="wsDualHttpBinding" contract="Microsoft.Samples.ClientValidation.ICalculator" />
         <!--
             The ClientCredentialType being is set to Windows on the SecurityBindingElement of 
             this binding and will make the validator throw an exception
         -->
-        <endpoint address="untrustedNtlm" binding="wsHttpBinding" bindingConfiguration="untrustedNtlmBinding" contract="Microsoft.Samples.ClientValidation.ICalculator"/>
+        <endpoint address="untrustedNtlm" binding="wsHttpBinding" bindingConfiguration="untrustedNtlmBinding" contract="Microsoft.Samples.ClientValidation.ICalculator" />
         <!--
             The TransactionFlowBindingElement of this binding is set to true and will
             make the validator throw an exception
         -->
-        <endpoint address="untrustedTransaction" binding="wsHttpBinding" bindingConfiguration="untrustedTransactionBinding" contract="Microsoft.Samples.ClientValidation.ICalculator"/>
+        <endpoint address="untrustedTransaction" binding="wsHttpBinding" bindingConfiguration="untrustedTransactionBinding" contract="Microsoft.Samples.ClientValidation.ICalculator" />
         <!-- This enpoint will not make the validator throw -->
-        <endpoint address="safe" binding="basicHttpBinding" bindingConfiguration="safeBinding" contract="Microsoft.Samples.ClientValidation.ICalculator"/>
+        <endpoint address="safe" binding="basicHttpBinding" bindingConfiguration="safeBinding" contract="Microsoft.Samples.ClientValidation.ICalculator" />
         <!-- This is the mex endpoint -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <binding name="untrustedNtlmBinding">
           <security mode="Message">
-            <message clientCredentialType="Windows"/>
+            <message clientCredentialType="Windows" />
           </security>
         </binding>
         <binding name="untrustedTransactionBinding" transactionFlow="true">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </wsHttpBinding>
       <basicHttpBinding>
         <binding name="safeBinding">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </basicHttpBinding>
     </bindings>
-    
     <!--For debugging purposes set the includeExceptionDetailInFaults attribute to true-->
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceMetadata httpGetEnabled="True" />
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
             <clientCertificate>
               <!-- 
             Setting the certificateValidationMode to PeerOrChainTrust means that if the certificate 
@@ -70,13 +67,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </clientCertificate>
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/ClientValidation/CS/service/service.csproj b/framework/wcf/Extensibility/Security/ClientValidation/CS/service/service.csproj
index 871b6c26f15..14839340ddd 100644
--- a/framework/wcf/Extensibility/Security/ClientValidation/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/ClientValidation/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{95E424C0-E517-4607-B7F2-1E3A2F4B649D}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,7 +35,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -66,29 +46,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -96,4 +54,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/CustomToken/CS/Common/Common.csproj b/framework/wcf/Extensibility/Security/CustomToken/CS/Common/Common.csproj
index 6ba8fa98535..1783c55be77 100644
--- a/framework/wcf/Extensibility/Security/CustomToken/CS/Common/Common.csproj
+++ b/framework/wcf/Extensibility/Security/CustomToken/CS/Common/Common.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{81F88465-17E1-4D35-AFC4-64686D4900E3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Common</RootNamespace>
     <AssemblyName>Common</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,29 +51,7 @@
       <Name>CreditCardToken</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -102,4 +59,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/CustomToken/CS/CreditCardTokenLibrary/CreditCardToken.csproj b/framework/wcf/Extensibility/Security/CustomToken/CS/CreditCardTokenLibrary/CreditCardToken.csproj
index 6140962690a..a4fafd84480 100644
--- a/framework/wcf/Extensibility/Security/CustomToken/CS/CreditCardTokenLibrary/CreditCardToken.csproj
+++ b/framework/wcf/Extensibility/Security/CustomToken/CS/CreditCardTokenLibrary/CreditCardToken.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B6AA72DA-1BFD-40A0-B2DE-9B82FF0C3F37}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Common</RootNamespace>
     <AssemblyName>CreditCardToken</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,27 +56,5 @@
     <Compile Include="CreditCardTokenProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/CustomToken/CS/client/app.config b/framework/wcf/Extensibility/Security/CustomToken/CS/client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/Security/CustomToken/CS/client/app.config
+++ b/framework/wcf/Extensibility/Security/CustomToken/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Security/CustomToken/CS/client/client.csproj b/framework/wcf/Extensibility/Security/CustomToken/CS/client/client.csproj
index e8f1b24d056..c98bf8cd0cf 100644
--- a/framework/wcf/Extensibility/Security/CustomToken/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/CustomToken/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -74,30 +52,8 @@
       <Name>CreditCardToken</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/CustomToken/CS/service/service.csproj b/framework/wcf/Extensibility/Security/CustomToken/CS/service/service.csproj
index ed36dc13bba..bfb9b415e10 100644
--- a/framework/wcf/Extensibility/Security/CustomToken/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/CustomToken/CS/service/service.csproj
@@ -1,40 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -86,37 +63,15 @@
       <Name>CreditCardToken</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(TargetDir)common.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)CreditCardToken.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)CreditCardFile.txt" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(TargetDir)common.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)CreditCardToken.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\CreditCardFile.txt" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
     </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/App.config b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/App.config
index 127e186d5a6..3e507c34df1 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/App.config
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/App.config
@@ -1,29 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
   <system.serviceModel>
     <bindings>
-      <!-- Service binding using federation -->      
+      <!-- Service binding using federation -->
       <wsFederationHttpBinding>
         <!-- Service binding using federation -->
         <binding name="ServiceFed">
           <security mode="Message">
             <message issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1">
               <!-- Endpoint address and binding for Security Token Service -->
-              <issuer address="http://localhost:8000/sts/windows" binding="wsHttpBinding"/>
+              <issuer address="http://localhost:8000/sts/windows" binding="wsHttpBinding" />
             </message>
           </security>
         </binding>
       </wsFederationHttpBinding>
     </bindings>
-
     <client>
       <!-- Service endpoint -->
-      <endpoint name="ServiceFed" binding="wsFederationHttpBinding" bindingConfiguration="ServiceFed" behaviorConfiguration="Client" address="http://localhost:8010/fedservice/calc" contract="Microsoft.Samples.DurableIssuedTokenProvider.ICalculator"/>
+      <endpoint name="ServiceFed" binding="wsFederationHttpBinding" bindingConfiguration="ServiceFed" behaviorConfiguration="Client" address="http://localhost:8010/fedservice/calc" contract="Microsoft.Samples.DurableIssuedTokenProvider.ICalculator" />
     </client>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="Client">
@@ -37,14 +35,12 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
-              <defaultCertificate storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
+              <defaultCertificate storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/Client.csproj b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/Client.csproj
index cd6f7a9fe44..421952efb86 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{31740DB0-199C-4084-85AB-5916DD165312}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Demos.Security.Federation</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,8 +34,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Client.cs" />
@@ -74,27 +54,5 @@
       <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/DurableIssuedTokenClientCredentials/DurableIssuedTokenClientCredentials.csproj b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/DurableIssuedTokenClientCredentials/DurableIssuedTokenClientCredentials.csproj
index 1fd2737bc02..2b11fe73a7c 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/DurableIssuedTokenClientCredentials/DurableIssuedTokenClientCredentials.csproj
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/DurableIssuedTokenClientCredentials/DurableIssuedTokenClientCredentials.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{ECB3EECA-ABED-48FC-9355-617991C42D67}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples.Security.Federation</RootNamespace>
     <AssemblyName>DurableIssuedTokenClientCredentials</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,9 +35,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.Runtime.Serialization"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -66,29 +46,7 @@
     <Compile Include="IssuedTokenCache.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -96,4 +54,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/RSTRSTR/RSTRSTR.csproj b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/RSTRSTR/RSTRSTR.csproj
index b42ab18f6f6..d213de9088f 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/RSTRSTR/RSTRSTR.csproj
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/RSTRSTR/RSTRSTR.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EDAD158A-C895-48FB-A39C-282FE1C2E7CB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Samples.Security.RSTRSTR</RootNamespace>
     <AssemblyName>RSTRSTR</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,9 +35,9 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.Runtime.Serialization"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -67,29 +47,7 @@
     <Compile Include="RequestSecurityTokenBase.cs" />
     <Compile Include="RequestSecurityTokenResponse.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -97,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/App.config b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/App.config
index 6f69cbdaa01..c62bca659d3 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/App.config
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -9,28 +9,26 @@
         <!-- Set up base addresses -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/sts/"/>
+            <add baseAddress="http://localhost:8000/sts/" />
           </baseAddresses>
-        </host>        
+        </host>
         <!-- MEX endpoint(s) -->
-        <endpoint contract="IMetadataExchange" binding="mexHttpBinding" address="mex"/>
+        <endpoint contract="IMetadataExchange" binding="mexHttpBinding" address="mex" />
         <!-- Endpoint for clients who authenticate using Windows -->
-        <endpoint address="windows" binding="wsHttpBinding" contract="Microsoft.Samples.DurableIssuedTokenProvider.IWSTrust"/>
+        <endpoint address="windows" binding="wsHttpBinding" contract="Microsoft.Samples.DurableIssuedTokenProvider.IWSTrust" />
       </service>
     </services>
-    
     <behaviors>
       <serviceBehaviors>
         <behavior name="STSBehaviour">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <!-- 
           The serviceMetadata behavior allows one to enable metadata (e.g. WSDL, Policy) publishing.
           This configuration enables publishing of such data over HTTP GET.
           -->
-          <serviceMetadata httpGetEnabled="true"/>          
+          <serviceMetadata httpGetEnabled="true" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-  
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/SecurityTokenService.csproj b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/SecurityTokenService.csproj
index 869334a8ee9..2c3f383b20b 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/SecurityTokenService.csproj
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/SecurityTokenService/SecurityTokenService.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C0D12177-0B43-40EA-9D9A-1F08A902475F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Samples.Security.SecurityTokenService</RootNamespace>
     <AssemblyName>SecurityTokenService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,9 +34,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.Runtime.Serialization"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -74,29 +54,7 @@
       <Name>RSTRSTR</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -104,4 +62,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/App.config b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/App.config
index e553604c96a..2001d4af508 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/App.config
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/App.config
@@ -1,9 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
-	<system.serviceModel>
+  <system.serviceModel>
     <bindings>
       <!-- Service binding using federation -->
       <wsFederationHttpBinding>
@@ -14,7 +14,7 @@
               <!-- Metadata address for Security Token Service -->
               <issuerMetadata address="http://localhost:8000/sts/mex">
                 <identity>
-                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS"/>
+                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS" />
                 </identity>
               </issuerMetadata>
             </message>
@@ -22,29 +22,27 @@
         </binding>
       </wsFederationHttpBinding>
     </bindings>
-        
     <services>
       <service name="Microsoft.Samples.DurableIssuedTokenProvider.CalculatorService" behaviorConfiguration="ServiceBehaviour">
         <host>
           <!-- configure base address provided by host -->
           <baseAddresses>
-            <add baseAddress="http://localhost:8010/fedservice/"/>
+            <add baseAddress="http://localhost:8010/fedservice/" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host, provide one endpoint -->
-        <endpoint address="calc" binding="wsFederationHttpBinding" bindingConfiguration="ServiceFed" contract="Microsoft.Samples.DurableIssuedTokenProvider.ICalculator"/>
+        <endpoint address="calc" binding="wsFederationHttpBinding" bindingConfiguration="ServiceFed" contract="Microsoft.Samples.DurableIssuedTokenProvider.ICalculator" />
       </service>
     </services>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="ServiceBehaviour">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <!-- 
           The serviceMetadata behavior allows one to enable metadata (e.g. WSDL, Policy) publishing.
           This configuration enables publishing of such data over HTTP GET.
           -->
-          <serviceMetadata httpGetEnabled="true"/>
+          <serviceMetadata httpGetEnabled="true" />
           <serviceCredentials>
             <!-- 
             The serviceCredentials behavior allows one to define validation parameters for issued tokens.
@@ -53,10 +51,10 @@
             -->
             <issuedTokenAuthentication>
               <allowedAudienceUris>
-                <add allowedAudienceUri="http://localhost:8010/fedservice/calc"/>
+                <add allowedAudienceUri="http://localhost:8010/fedservice/calc" />
               </allowedAudienceUris>
               <knownCertificates>
-                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS"/>
+                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectDistinguishedName" findValue="CN=STS" />
               </knownCertificates>
             </issuedTokenAuthentication>
             <!-- 
@@ -64,12 +62,10 @@
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during setup of the sample.
             -->
-            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost"/>
+            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectDistinguishedName" findValue="CN=localhost" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
-	</system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/Service.csproj b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/Service.csproj
index 33f16f7b667..a91230d3586 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Service/Service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3613196C-2906-4679-96CA-E8B432DCA77C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Demos.Security.Federation</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,27 +50,5 @@
       <Name>Shared</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Shared/Shared.csproj b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Shared/Shared.csproj
index 4e175bdff43..c396ea3180c 100644
--- a/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Shared/Shared.csproj
+++ b/framework/wcf/Extensibility/Security/DurableIssuedTokenProvider/CS/Shared/Shared.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FC4B8FA4-5BC0-43DE-9EF8-40E2DA1EB56F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Gudge.Demos.Security.Shared</RootNamespace>
     <AssemblyName>Shared</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -63,29 +43,7 @@
     <Compile Include="ICalculator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -93,4 +51,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/App.config b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/App.config
index d8850f78b59..8971b8960a5 100644
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/App.config
+++ b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -6,26 +6,25 @@
   <system.serviceModel>
     <client>
       <!-- Endpoint that expect SAML tokens with Symmetric proof keys -->
-      <endpoint name="CalcSymm" address="http://localhost:8000/servicemodelsamples/service/calc/symm" binding="wsFederationHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.SamlTokenProvider.ICalculator"/>
+      <endpoint name="CalcSymm" address="http://localhost:8000/servicemodelsamples/service/calc/symm" binding="wsFederationHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.SamlTokenProvider.ICalculator" />
       <!-- Endpoint that expect SAML tokens with Asymmetric proof keys -->
-      <endpoint name="CalcAsymm" address="http://localhost:8000/servicemodelsamples/service/calc/asymm" binding="wsFederationHttpBinding" bindingConfiguration="Binding2" contract="Microsoft.Samples.SamlTokenProvider.ICalculator"/>
+      <endpoint name="CalcAsymm" address="http://localhost:8000/servicemodelsamples/service/calc/asymm" binding="wsFederationHttpBinding" bindingConfiguration="Binding2" contract="Microsoft.Samples.SamlTokenProvider.ICalculator" />
     </client>
-
     <bindings>
       <wsFederationHttpBinding>
         <!-- Binding that expect SAML tokens with Symmetric proof keys -->
         <binding name="Binding1">
           <security mode="Message">
-            <message negotiateServiceCredential="false" issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1"/>
+            <message negotiateServiceCredential="false" issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1" />
           </security>
         </binding>
         <!-- Binding that expect SAML tokens with Asymmetric proof keys -->
         <binding name="Binding2">
           <security mode="Message">
-            <message negotiateServiceCredential="false" issuedKeyType="AsymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1"/>
+            <message negotiateServiceCredential="false" issuedKeyType="AsymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1" />
           </security>
         </binding>
       </wsFederationHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 3546e395e44..00000000000
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index ff4cd69ff1a..00000000000
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)" GeneratedClassNamespace="Properties" GeneratedClassName="Settings">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/client.csproj b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/client.csproj
index 207506ea2e8..73879e83ad3 100644
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -59,54 +37,13 @@
   <ItemGroup>
     <Compile Include="client.cs" />
     <Compile Include="generatedClient.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
     <Compile Include="SamlClientCredential.cs" />
     <Compile Include="SamlSecurityTokenManager.cs" />
     <Compile Include="SamlSecurityTokenProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
     <Compile Include="SamlUtilities.cs" />
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/App.config b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/App.config
index 49ae19d7b4e..8eafcd98343 100644
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -9,34 +9,32 @@
         <host>
           <baseAddresses>
             <!-- configure base address provided by host -->
-            <add baseAddress="http://localhost:8000/servicemodelsamples/service/"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service/" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host -->
         <!-- Endpoint that expect SAML tokens with Symmetric proof keys -->
-        <endpoint address="calc/symm" binding="wsFederationHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.SamlTokenProvider.ICalculator"/>
+        <endpoint address="calc/symm" binding="wsFederationHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.SamlTokenProvider.ICalculator" />
         <!-- Endpoint that expect SAML tokens with Asymmetric proof keys -->
-        <endpoint address="calc/asymm" binding="wsFederationHttpBinding" bindingConfiguration="Binding2" contract="Microsoft.Samples.SamlTokenProvider.ICalculator"/>
+        <endpoint address="calc/asymm" binding="wsFederationHttpBinding" bindingConfiguration="Binding2" contract="Microsoft.Samples.SamlTokenProvider.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsFederationHttpBinding>
         <!-- Binding that expect SAML tokens with Symmetric proof keys -->
         <binding name="Binding1">
           <security mode="Message">
-            <message negotiateServiceCredential="false" issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1"/>
+            <message negotiateServiceCredential="false" issuedKeyType="SymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1" />
           </security>
         </binding>
         <!-- Binding that expect SAML tokens with Asymmetric proof keys -->
         <binding name="Binding2">
           <security mode="Message">
-            <message negotiateServiceCredential="false" issuedKeyType="AsymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1"/>
+            <message negotiateServiceCredential="false" issuedKeyType="AsymmetricKey" issuedTokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1" />
           </security>
-        </binding>        
+        </binding>
       </wsFederationHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
@@ -50,15 +48,13 @@
             <issuedTokenAuthentication allowUntrustedRsaIssuers="true">
               <!-- Add Alice to the list of certs trusted to issue SAML tokens -->
               <knownCertificates>
-                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="Alice"/>
+                <add storeLocation="LocalMachine" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="Alice" />
               </knownCertificates>
             </issuedTokenAuthentication>
-            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" findValue="localhost"/>
+            <serviceCertificate storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" findValue="localhost" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/service.csproj b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/service.csproj
index 6dfb93fd810..ce47d9e1cf3 100644
--- a/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/SamlTokenProvider/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,8 +35,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel">
-    </Reference>
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -67,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/SupportingTokens/CS/Common/Common.csproj b/framework/wcf/Extensibility/Security/SupportingTokens/CS/Common/Common.csproj
index 6457fe8e0c9..88f52843c16 100644
--- a/framework/wcf/Extensibility/Security/SupportingTokens/CS/Common/Common.csproj
+++ b/framework/wcf/Extensibility/Security/SupportingTokens/CS/Common/Common.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{939BD183-0187-4D15-A789-16D32E0C4C27}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Common</RootNamespace>
     <AssemblyName>Common</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -62,29 +42,7 @@
     <Compile Include="IEchoService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -92,4 +50,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/app.config b/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/app.config
+++ b/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/client.csproj b/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/client.csproj
index a6953ea8be1..f00f4f1ce30 100644
--- a/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/SupportingTokens/CS/client/client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8AE0D87F-BBE3-438C-8CCD-CB6EE4A56520}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>client</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,32 +48,10 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -101,4 +59,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Security/SupportingTokens/CS/service/service.csproj b/framework/wcf/Extensibility/Security/SupportingTokens/CS/service/service.csproj
index ddb95ca17f1..637dfcb3c73 100644
--- a/framework/wcf/Extensibility/Security/SupportingTokens/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/SupportingTokens/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{D043EF78-4466-428A-9BC6-1E6485170A98}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,29 +55,6 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -107,11 +64,12 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-	    copy "$(TargetDir)Common.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)Common.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/App.config b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/App.config
index 5bcdb779979..3e32a49c540 100644
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/App.config
+++ b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/App.config
@@ -1,19 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenAuthenticator.ICalculator">
-      </endpoint>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenAuthenticator.ICalculator"></endpoint>
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 3546e395e44..00000000000
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index ff4cd69ff1a..00000000000
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)" GeneratedClassNamespace="Properties" GeneratedClassName="Settings">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/client.csproj b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/client.csproj
index 6c7591b2704..dff5ddefebb 100644
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50215</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,6 +30,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
@@ -60,49 +39,8 @@
     <Compile Include="client.cs" />
     <Compile Include="generatedClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/App.config b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/App.config
index c90cb575ffa..e7242df684e 100644
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/App.config
@@ -1,46 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.TokenAuthenticator.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <!-- configure base address provided by host -->
-            <add baseAddress="http://localhost:8000/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host -->
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenAuthenticator.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenAuthenticator.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <!-- 
           The serviceCredentials behavior allows one to define a service certificate.
           A service certificate is used by a client to authenticate the service and provide message protection.
           This configuration references the "localhost" certificate installed during the setup instructions.
 	        -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/service.csproj b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/service.csproj
index 49d49f9ae72..37a64315708 100644
--- a/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/TokenAuthenticator/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,27 +51,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/App.config b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/App.config
index a6e8a4c1de5..a5c82ef69e8 100644
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/App.config
+++ b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/App.config
@@ -1,19 +1,17 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenProvider.ICalculator">
-      </endpoint>
+      <endpoint name="" address="http://localhost:8000/servicemodelsamples/service" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenProvider.ICalculator"></endpoint>
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 3546e395e44..00000000000
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index ff4cd69ff1a..00000000000
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)" GeneratedClassNamespace="Properties" GeneratedClassName="Settings">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/client.csproj b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/client.csproj
index 40b4a6a27e8..53ef76b9fbe 100644
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/TokenProvider/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -64,49 +42,8 @@
     <Compile Include="MyUserNameSecurityTokenManager.cs" />
     <Compile Include="MyUserNameTokenProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/service/App.config b/framework/wcf/Extensibility/Security/TokenProvider/CS/service/App.config
index ad02e198af0..fc5908af043 100644
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/TokenProvider/CS/service/App.config
@@ -1,45 +1,41 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.TokenProvider.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <!-- configure base address provided by host -->
-            <add baseAddress="http://localhost:8000/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8000/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host -->
-        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenProvider.ICalculator"/>
+        <endpoint address="" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TokenProvider.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="False"/>
+          <serviceDebug includeExceptionDetailInFaults="False" />
           <!-- 
         The serviceCredentials behavior allows one to define a service certificate.
         A service certificate is used by a client to authenticate the service and provide message protection.
         This configuration references the "localhost" certificate installed during the setup instructions.
         -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/TokenProvider/CS/service/service.csproj b/framework/wcf/Extensibility/Security/TokenProvider/CS/service/service.csproj
index c8c6034e421..6141aad7a31 100644
--- a/framework/wcf/Extensibility/Security/TokenProvider/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/TokenProvider/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +48,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/App.config b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/App.config
index 7a85353829a..01c42f5cf73 100644
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/App.config
+++ b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/App.config
@@ -1,26 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- Username based endpoint -->
-      <endpoint name="Username" address="http://localhost:8001/servicemodelsamples/service/username" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator">
-      </endpoint>
+      <endpoint name="Username" address="http://localhost:8001/servicemodelsamples/service/username" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator"></endpoint>
     </client>
-
     <bindings>
-		  <wsHttpBinding>
+      <wsHttpBinding>
         <!-- Username binding -->
-			  <binding name="Binding1">
-					<security mode="Message">
-					  <message clientCredentialType="UserName"/>
-					</security>
-				</binding>
-		  </wsHttpBinding>
-	  </bindings>
+        <binding name="Binding1">
+          <security mode="Message">
+            <message clientCredentialType="UserName" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -34,13 +31,11 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 3546e395e44..00000000000
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index ff4cd69ff1a..00000000000
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)" GeneratedClassNamespace="Properties" GeneratedClassName="Settings">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/client.csproj b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/client.csproj
index 6be9446c921..88c4a194280 100644
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,56 +31,15 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="client.cs" />
     <Compile Include="generatedProxy.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/App.config b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/App.config
index 2321383abb5..bf4e899f4f7 100644
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/App.config
@@ -1,34 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.UserNamePasswordValidator.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <!-- configure base address for host -->
-            <add baseAddress="http://localhost:8001/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8001/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host, provide one endpoint -->
-        <endpoint address="username" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator"/>
+        <endpoint address="username" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <!-- Username binding -->
         <binding name="Binding1">
           <security mode="Message">
-	          <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
-        </binding>        
+        </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior" includeExceptionDetailInFaults="True">
@@ -36,18 +33,16 @@
             <!-- 
             The serviceCredentials behavior allows one to specify a custom validator for username/password combinations.				  
             -->
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.UserNamePasswordValidator.CalculatorService+CustomUserNameValidator, service"/>
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.UserNamePasswordValidator.CalculatorService+CustomUserNameValidator, service" />
             <!-- 
             The serviceCredentials behavior allows one to define a service certificate.
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during the setup instructions.
             -->
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
-          </serviceCredentials>        
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
+          </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/service.csproj b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/service.csproj
index 8094ab04203..b782663acbd 100644
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -55,8 +35,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -67,27 +47,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/client/app.config b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/client/app.config
index 7a85353829a..01c42f5cf73 100644
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/client/app.config
+++ b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/client/app.config
@@ -1,26 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- Username based endpoint -->
-      <endpoint name="Username" address="http://localhost:8001/servicemodelsamples/service/username" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator">
-      </endpoint>
+      <endpoint name="Username" address="http://localhost:8001/servicemodelsamples/service/username" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator"></endpoint>
     </client>
-
     <bindings>
-		  <wsHttpBinding>
+      <wsHttpBinding>
         <!-- Username binding -->
-			  <binding name="Binding1">
-					<security mode="Message">
-					  <message clientCredentialType="UserName"/>
-					</security>
-				</binding>
-		  </wsHttpBinding>
-	  </bindings>
+        <binding name="Binding1">
+          <security mode="Message">
+            <message clientCredentialType="UserName" />
+          </security>
+        </binding>
+      </wsHttpBinding>
+    </bindings>
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -34,13 +31,11 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/service/app.config b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/service/app.config
index 2321383abb5..bf4e899f4f7 100644
--- a/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/service/app.config
+++ b/framework/wcf/Extensibility/Security/UserNamePasswordValidator/VB/service/app.config
@@ -1,34 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.UserNamePasswordValidator.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <host>
           <baseAddresses>
             <!-- configure base address for host -->
-            <add baseAddress="http://localhost:8001/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8001/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address provided by host, provide one endpoint -->
-        <endpoint address="username" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator"/>
+        <endpoint address="username" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.UserNamePasswordValidator.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <!-- Username binding -->
         <binding name="Binding1">
           <security mode="Message">
-	          <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
-        </binding>        
+        </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior" includeExceptionDetailInFaults="True">
@@ -36,18 +33,16 @@
             <!-- 
             The serviceCredentials behavior allows one to specify a custom validator for username/password combinations.				  
             -->
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.UserNamePasswordValidator.CalculatorService+CustomUserNameValidator, service"/>
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.UserNamePasswordValidator.CalculatorService+CustomUserNameValidator, service" />
             <!-- 
             The serviceCredentials behavior allows one to define a service certificate.
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during the setup instructions.
             -->
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
-          </serviceCredentials>        
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
+          </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/App.config b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/App.config
index 7b2dc423d13..f76ec44c21d 100644
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/App.config
+++ b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/App.config
@@ -1,23 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- X509 certificate based endpoint -->
-      <endpoint name="Certificate" address="http://localhost:8001/servicemodelsamples/service/certificate" binding="wsHttpBinding" bindingConfiguration="Binding" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.X509CertificateValidator.ICalculator">
-      </endpoint>
+      <endpoint name="Certificate" address="http://localhost:8001/servicemodelsamples/service/certificate" binding="wsHttpBinding" bindingConfiguration="Binding" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.X509CertificateValidator.ICalculator"></endpoint>
     </client>
-
     <bindings>
-		  <wsHttpBinding>
+      <wsHttpBinding>
         <!-- X509 certificate binding -->
         <binding name="Binding">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
-		  </wsHttpBinding>
-	  </bindings>
+      </wsHttpBinding>
+    </bindings>
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -31,13 +28,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 3546e395e44..00000000000
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index ff4cd69ff1a..00000000000
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)" GeneratedClassNamespace="Properties" GeneratedClassName="Settings">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/client.csproj b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/client.csproj
index b81c8c6d30e..1963d658494 100644
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
     <WarningLevel>4</WarningLevel>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -51,55 +29,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="client.cs" />
     <Compile Include="generatedClient.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/App.config b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/App.config
index 22977a57d45..f14719afd43 100644
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/App.config
+++ b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/App.config
@@ -1,35 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.X509CertificateValidator.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <!-- use host/baseAddresses to configure base address provided by host -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8001/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8001/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address specified above, provide one endpoint -->
-        <endpoint address="certificate" binding="wsHttpBinding" bindingConfiguration="Binding" contract="Microsoft.Samples.X509CertificateValidator.ICalculator"/>
+        <endpoint address="certificate" binding="wsHttpBinding" bindingConfiguration="Binding" contract="Microsoft.Samples.X509CertificateValidator.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <!-- X509 certificate binding -->
         <binding name="Binding">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
             <!-- 
             The serviceCredentials behavior allows one to specify authentication constraints on client certificates.
@@ -41,19 +38,17 @@
               validation beyond that performed by the custom validator. The security implications of this 
               setting should be carefully considered before using Custom in production code. 
               -->
-              <authentication certificateValidationMode="Custom" customCertificateValidatorType="Microsoft.Samples.X509CertificateValidator.CustomX509CertificateValidator, service"/>
+              <authentication certificateValidationMode="Custom" customCertificateValidatorType="Microsoft.Samples.X509CertificateValidator.CustomX509CertificateValidator, service" />
             </clientCertificate>
             <!-- 
             The serviceCredentials behavior allows one to define a service certificate.
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during the setup instructions.
             -->
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/service.csproj b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/service.csproj
index 5d9693a0308..97ded7aacb2 100644
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/service.csproj
+++ b/framework/wcf/Extensibility/Security/X509CertificateValidator/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66C5F965-7C66-479A-9960-A3CA6080A71B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -61,30 +41,8 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/client/app.config b/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/client/app.config
index b6140f8bf6f..f76ec44c21d 100644
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/client/app.config
+++ b/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/client/app.config
@@ -1,28 +1,20 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
       <!-- X509 certificate based endpoint -->
-      <endpoint name="Certificate" 
-                address="http://localhost:8001/servicemodelsamples/service/certificate" 
-                binding="wsHttpBinding" 
-                bindingConfiguration="Binding"
-                behaviorConfiguration="ClientCertificateBehavior" 
-                contract="Microsoft.Samples.X509CertificateValidator.ICalculator">
-      </endpoint>
+      <endpoint name="Certificate" address="http://localhost:8001/servicemodelsamples/service/certificate" binding="wsHttpBinding" bindingConfiguration="Binding" behaviorConfiguration="ClientCertificateBehavior" contract="Microsoft.Samples.X509CertificateValidator.ICalculator"></endpoint>
     </client>
-
     <bindings>
-		  <wsHttpBinding>
+      <wsHttpBinding>
         <!-- X509 certificate binding -->
         <binding name="Binding">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
-		  </wsHttpBinding>
-	  </bindings>
+      </wsHttpBinding>
+    </bindings>
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientCertificateBehavior">
@@ -36,13 +28,11 @@
             This setting is less secure than the default, ChainTrust. The security implications of this 
             setting should be carefully considered before using PeerOrChainTrust in production code. 
             -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/service/app.config b/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/service/app.config
index 22977a57d45..f14719afd43 100644
--- a/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/service/app.config
+++ b/framework/wcf/Extensibility/Security/X509CertificateValidator/VB/service/app.config
@@ -1,35 +1,32 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.X509CertificateValidator.CalculatorService" behaviorConfiguration="CalculatorServiceBehavior">
         <!-- use host/baseAddresses to configure base address provided by host -->
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8001/servicemodelsamples/service"/>
+            <add baseAddress="http://localhost:8001/servicemodelsamples/service" />
           </baseAddresses>
         </host>
         <!-- use base address specified above, provide one endpoint -->
-        <endpoint address="certificate" binding="wsHttpBinding" bindingConfiguration="Binding" contract="Microsoft.Samples.X509CertificateValidator.ICalculator"/>
+        <endpoint address="certificate" binding="wsHttpBinding" bindingConfiguration="Binding" contract="Microsoft.Samples.X509CertificateValidator.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <wsHttpBinding>
         <!-- X509 certificate binding -->
         <binding name="Binding">
           <security mode="Message">
-            <message clientCredentialType="Certificate"/>
+            <message clientCredentialType="Certificate" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="CalculatorServiceBehavior">
-          <serviceDebug includeExceptionDetailInFaults="true"/>
+          <serviceDebug includeExceptionDetailInFaults="true" />
           <serviceCredentials>
             <!-- 
             The serviceCredentials behavior allows one to specify authentication constraints on client certificates.
@@ -41,19 +38,17 @@
               validation beyond that performed by the custom validator. The security implications of this 
               setting should be carefully considered before using Custom in production code. 
               -->
-              <authentication certificateValidationMode="Custom" customCertificateValidatorType="Microsoft.Samples.X509CertificateValidator.CustomX509CertificateValidator, service"/>
+              <authentication certificateValidationMode="Custom" customCertificateValidatorType="Microsoft.Samples.X509CertificateValidator.CustomX509CertificateValidator, service" />
             </clientCertificate>
             <!-- 
             The serviceCredentials behavior allows one to define a service certificate.
             A service certificate is used by a client to authenticate the service and provide message protection.
             This configuration references the "localhost" certificate installed during the setup instructions.
             -->
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Syndication/JsonFeeds/CS/JsonFeeds.csproj b/framework/wcf/Extensibility/Syndication/JsonFeeds/CS/JsonFeeds.csproj
index 1f35eebedc1..6ada6d98ceb 100644
--- a/framework/wcf/Extensibility/Syndication/JsonFeeds/CS/JsonFeeds.csproj
+++ b/framework/wcf/Extensibility/Syndication/JsonFeeds/CS/JsonFeeds.csproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E2287AF-0FBC-4CBC-8779-26760FBA3FFB}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.JsonFeeds</RootNamespace>
     <AssemblyName>JsonFeeds</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -51,7 +51,7 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -59,4 +59,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Syndication/StreamingFeeds/CS/StreamingFeeds.csproj b/framework/wcf/Extensibility/Syndication/StreamingFeeds/CS/StreamingFeeds.csproj
index 471ab8235ac..8b1e2127b97 100644
--- a/framework/wcf/Extensibility/Syndication/StreamingFeeds/CS/StreamingFeeds.csproj
+++ b/framework/wcf/Extensibility/Syndication/StreamingFeeds/CS/StreamingFeeds.csproj
@@ -1,14 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{71C7E518-831C-4A3B-A29D-E253EE19F5D0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.StreamingFeeds</RootNamespace>
     <AssemblyName>StreamingFeeds</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,7 +43,7 @@
     <Compile Include="StreamedAtom10FeedFormatter.cs" />
     <Compile Include="StreamingFeedService.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/framework/wcf/Extensibility/Syndication/StronglyTypedExtensions/CS/StronglyTypedExtensions.csproj b/framework/wcf/Extensibility/Syndication/StronglyTypedExtensions/CS/StronglyTypedExtensions.csproj
index 7f1da0a35e4..f50631575a3 100644
--- a/framework/wcf/Extensibility/Syndication/StronglyTypedExtensions/CS/StronglyTypedExtensions.csproj
+++ b/framework/wcf/Extensibility/Syndication/StronglyTypedExtensions/CS/StronglyTypedExtensions.csproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5E2287AF-0FBC-4CBC-8779-26760FBA3FFB}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.StronglyTypedExtensions</RootNamespace>
     <AssemblyName>StronglyTypedExtensions</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,8 +31,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Core">
-    </Reference>
+    <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
@@ -46,7 +45,7 @@
     <Compile Include="ThreadedFeed.cs" />
     <Compile Include="ThreadedItem.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -54,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/MessageInspectors/MessageInspectors.csproj b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/MessageInspectors/MessageInspectors.csproj
index 55ae1b42de4..7aea871f5a2 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/MessageInspectors/MessageInspectors.csproj
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/MessageInspectors/MessageInspectors.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{9A868F85-F6AA-456C-8E78-F695037CAF6E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>MessageInspectors</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,29 +47,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -98,7 +56,6 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/App.config b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/App.config
index 228c185b23f..74763c16362 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/App.config
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/App.config
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <customBinding>
         <binding name="CustomBinding_IDatagramContract">
           <binaryMessageEncoding maxReadPoolSize="64" maxWritePoolSize="16" maxSessionSize="2048">
-            <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+            <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           </binaryMessageEncoding>
-          <UpdTransportElementClientSide maxBufferPoolSize="524288" maxMessageSize="65536" multicast="false"/>
+          <UpdTransportElementClientSide maxBufferPoolSize="524288" maxMessageSize="65536" multicast="false" />
         </binding>
       </customBinding>
       <sampleProfileUdpBinding>
-        <binding name="SampleProfileUdpBinding_ICalculatorContract" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" orderedSession="true" reliableSessionEnabled="true" sessionInactivityTimeout="00:10:00" clientBaseAddress="soap.udp://localhost:8003/"/>
+        <binding name="SampleProfileUdpBinding_ICalculatorContract" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" orderedSession="true" reliableSessionEnabled="true" sessionInactivityTimeout="00:10:00" clientBaseAddress="soap.udp://localhost:8003/" />
       </sampleProfileUdpBinding>
     </bindings>
     <client>
-      <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="SampleProfileUdpBinding_ICalculatorContract" contract="ICalculatorContract" name="SampleProfileUdpBinding_ICalculatorContract"/>
-      <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="CustomBinding_IDatagramContract" contract="IDatagramContract" name="CustomBinding_IDatagramContract"/>
+      <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="SampleProfileUdpBinding_ICalculatorContract" contract="ICalculatorContract" name="SampleProfileUdpBinding_ICalculatorContract" />
+      <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="CustomBinding_IDatagramContract" contract="IDatagramContract" name="CustomBinding_IDatagramContract" />
     </client>
     <extensions>
       <bindingElementExtensions>
-        <add name="UpdTransportElementClientSide" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport"/>
+        <add name="UpdTransportElementClientSide" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport" />
       </bindingElementExtensions>
       <!-- This was added manually because svcutil.exe does not add this extension to the file -->
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport" />
       </bindingExtensions>
     </extensions>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/UdpTestClient.csproj b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/UdpTestClient.csproj
index 763df1cf6cd..4e38419844c 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/UdpTestClient.csproj
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestClient/UdpTestClient.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{99F3F714-0C25-4752-B413-0A0E11D16F12}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UdpTestClient</RootNamespace>
     <AssemblyName>UdpTestClient</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -80,29 +60,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -110,4 +68,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/App.config b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/App.config
index 80da1614dae..dfbf7c526c4 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/App.config
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/App.config
@@ -1,8 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
-
     <!-- 
          add our udpTransport handler for use by binding declarations 
      -->
@@ -11,51 +9,45 @@
      -->
     <extensions>
       <bindingElementExtensions>
-        <add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport"/>
+        <add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport" />
       </bindingElementExtensions>
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport" />
       </bindingExtensions>
     </extensions>
-
     <services>
       <service name="Microsoft.ServiceModel.Samples.ConfigurableCalculatorService" behaviorConfiguration="udpServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/udpsample"/>
+            <add baseAddress="http://localhost:8000/udpsample" />
           </baseAddresses>
         </host>
-        <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.ServiceModel.Samples.ICalculatorContract"/>
-        <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.ServiceModel.Samples.IDatagramContract"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.ServiceModel.Samples.ICalculatorContract" />
+        <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.ServiceModel.Samples.IDatagramContract" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
-        <!-- 
+      <!-- 
          server bindings 
           -->
-        <sampleProfileUdpBinding>
-            <binding name="CalculatorServer" clientBaseAddress="soap.udp://localhost:8003/"/>
-            <binding name="DatagramServer" reliableSessionEnabled="false"/>
-        </sampleProfileUdpBinding>
-
-        <customBinding>
+      <sampleProfileUdpBinding>
+        <binding name="CalculatorServer" clientBaseAddress="soap.udp://localhost:8003/" />
+        <binding name="DatagramServer" reliableSessionEnabled="false" />
+      </sampleProfileUdpBinding>
+      <customBinding>
         <binding name="DatagramServer">
-            <binaryMessageEncoding/>
-            <udpTransport/>
+          <binaryMessageEncoding />
+          <udpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="udpServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/UdpTestService.csproj b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/UdpTestService.csproj
index 1845f10cc5d..08138398b85 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/UdpTestService.csproj
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTestService/UdpTestService.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5920E202-A11F-47C6-8A27-B00BFAE213A0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UdpTestService</RootNamespace>
     <AssemblyName>UdpTestService</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,29 +52,7 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -102,4 +60,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTransport/UdpTransport.csproj b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTransport/UdpTransport.csproj
index 6232169c0c7..28954370996 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTransport/UdpTransport.csproj
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/CS/UdpTransport/UdpTransport.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{37086881-1FD9-4DE1-8DB5-0AC8456C65A9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UdpTransport</RootNamespace>
     <AssemblyName>UdpTransport</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -86,27 +66,5 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestClient/app.config b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestClient/app.config
index 228c185b23f..74763c16362 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestClient/app.config
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestClient/app.config
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <customBinding>
         <binding name="CustomBinding_IDatagramContract">
           <binaryMessageEncoding maxReadPoolSize="64" maxWritePoolSize="16" maxSessionSize="2048">
-            <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+            <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           </binaryMessageEncoding>
-          <UpdTransportElementClientSide maxBufferPoolSize="524288" maxMessageSize="65536" multicast="false"/>
+          <UpdTransportElementClientSide maxBufferPoolSize="524288" maxMessageSize="65536" multicast="false" />
         </binding>
       </customBinding>
       <sampleProfileUdpBinding>
-        <binding name="SampleProfileUdpBinding_ICalculatorContract" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" orderedSession="true" reliableSessionEnabled="true" sessionInactivityTimeout="00:10:00" clientBaseAddress="soap.udp://localhost:8003/"/>
+        <binding name="SampleProfileUdpBinding_ICalculatorContract" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" orderedSession="true" reliableSessionEnabled="true" sessionInactivityTimeout="00:10:00" clientBaseAddress="soap.udp://localhost:8003/" />
       </sampleProfileUdpBinding>
     </bindings>
     <client>
-      <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="SampleProfileUdpBinding_ICalculatorContract" contract="ICalculatorContract" name="SampleProfileUdpBinding_ICalculatorContract"/>
-      <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="CustomBinding_IDatagramContract" contract="IDatagramContract" name="CustomBinding_IDatagramContract"/>
+      <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="SampleProfileUdpBinding_ICalculatorContract" contract="ICalculatorContract" name="SampleProfileUdpBinding_ICalculatorContract" />
+      <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="CustomBinding_IDatagramContract" contract="IDatagramContract" name="CustomBinding_IDatagramContract" />
     </client>
     <extensions>
       <bindingElementExtensions>
-        <add name="UpdTransportElementClientSide" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport"/>
+        <add name="UpdTransportElementClientSide" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport" />
       </bindingElementExtensions>
       <!-- This was added manually because svcutil.exe does not add this extension to the file -->
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport" />
       </bindingExtensions>
     </extensions>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestService/app.config b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestService/app.config
index 80da1614dae..dfbf7c526c4 100644
--- a/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestService/app.config
+++ b/framework/wcf/Extensibility/Transactions/TransactionMessagePropertyUdpTransport/VB/UdpTestService/app.config
@@ -1,8 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
-
     <!-- 
          add our udpTransport handler for use by binding declarations 
      -->
@@ -11,51 +9,45 @@
      -->
     <extensions>
       <bindingElementExtensions>
-        <add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport"/>
+        <add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpTransport" />
       </bindingElementExtensions>
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpTransport" />
       </bindingExtensions>
     </extensions>
-
     <services>
       <service name="Microsoft.ServiceModel.Samples.ConfigurableCalculatorService" behaviorConfiguration="udpServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/udpsample"/>
+            <add baseAddress="http://localhost:8000/udpsample" />
           </baseAddresses>
         </host>
-        <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.ServiceModel.Samples.ICalculatorContract"/>
-        <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.ServiceModel.Samples.IDatagramContract"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.ServiceModel.Samples.ICalculatorContract" />
+        <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.ServiceModel.Samples.IDatagramContract" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
-        <!-- 
+      <!-- 
          server bindings 
           -->
-        <sampleProfileUdpBinding>
-            <binding name="CalculatorServer" clientBaseAddress="soap.udp://localhost:8003/"/>
-            <binding name="DatagramServer" reliableSessionEnabled="false"/>
-        </sampleProfileUdpBinding>
-
-        <customBinding>
+      <sampleProfileUdpBinding>
+        <binding name="CalculatorServer" clientBaseAddress="soap.udp://localhost:8003/" />
+        <binding name="DatagramServer" reliableSessionEnabled="false" />
+      </sampleProfileUdpBinding>
+      <customBinding>
         <binding name="DatagramServer">
-            <binaryMessageEncoding/>
-            <udpTransport/>
+          <binaryMessageEncoding />
+          <udpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="udpServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/App.config b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/App.config
index 970e732d83c..2ab0e268b2e 100644
--- a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/App.config
+++ b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/App.config
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <bindings>
       <customBinding>
         <binding name="CustomBinding_IDatagramContract">
           <binaryMessageEncoding maxReadPoolSize="64" maxWritePoolSize="16" maxSessionSize="2048">
-            <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384"/>
+            <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384" maxBytesPerRead="4096" maxNameTableCharCount="16384" />
           </binaryMessageEncoding>
-          <UpdTransportElementClientSide maxBufferPoolSize="524288" maxMessageSize="65536" multicast="false"/>
+          <UpdTransportElementClientSide maxBufferPoolSize="524288" maxMessageSize="65536" multicast="false" />
         </binding>
       </customBinding>
       <sampleProfileUdpBinding>
-        <binding name="SampleProfileUdpBinding_ICalculatorContract" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" orderedSession="true" reliableSessionEnabled="true" sessionInactivityTimeout="00:10:00" clientBaseAddress="soap.udp://localhost:8003/"/>
+        <binding name="SampleProfileUdpBinding_ICalculatorContract" closeTimeout="00:01:00" openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00" orderedSession="true" reliableSessionEnabled="true" sessionInactivityTimeout="00:10:00" clientBaseAddress="soap.udp://localhost:8003/" />
       </sampleProfileUdpBinding>
     </bindings>
     <client>
-      <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="SampleProfileUdpBinding_ICalculatorContract" contract="ICalculatorContract" name="SampleProfileUdpBinding_ICalculatorContract"/>
-      <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="CustomBinding_IDatagramContract" contract="IDatagramContract" name="CustomBinding_IDatagramContract"/>
+      <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="SampleProfileUdpBinding_ICalculatorContract" contract="ICalculatorContract" name="SampleProfileUdpBinding_ICalculatorContract" />
+      <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="CustomBinding_IDatagramContract" contract="IDatagramContract" name="CustomBinding_IDatagramContract" />
     </client>
     <extensions>
       <bindingElementExtensions>
-        <add name="UpdTransportElementClientSide" type="Microsoft.Samples.Udp.UdpTransportElement, UdpTransport"/>
+        <add name="UpdTransportElementClientSide" type="Microsoft.Samples.Udp.UdpTransportElement, UdpTransport" />
       </bindingElementExtensions>
       <!-- This was added manually because svcutil.exe does not add this extension to the file -->
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.Samples.Udp.SampleProfileUdpBindingCollectionElement, UdpTransport"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.Samples.Udp.SampleProfileUdpBindingCollectionElement, UdpTransport" />
       </bindingExtensions>
     </extensions>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/UdpTestClient.csproj b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/UdpTestClient.csproj
index b89432aa7c2..73b3bd3dcd5 100644
--- a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/UdpTestClient.csproj
+++ b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestClient/UdpTestClient.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{99F3F714-0C25-4752-B413-0A0E11D16F12}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Udp</RootNamespace>
     <AssemblyName>UdpTestClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,29 +54,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -103,4 +62,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/App.config b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/App.config
index 0ec1a212c24..f6eb15c7233 100644
--- a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/App.config
+++ b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/App.config
@@ -1,8 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
-
     <!-- 
          add our udpTransport handler for use by binding declarations 
      -->
@@ -11,51 +9,45 @@
      -->
     <extensions>
       <bindingElementExtensions>
-        <add name="udpTransport" type="Microsoft.Samples.Udp.UdpTransportElement, UdpTransport"/>
+        <add name="udpTransport" type="Microsoft.Samples.Udp.UdpTransportElement, UdpTransport" />
       </bindingElementExtensions>
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.Samples.Udp.SampleProfileUdpBindingCollectionElement, UdpTransport"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.Samples.Udp.SampleProfileUdpBindingCollectionElement, UdpTransport" />
       </bindingExtensions>
     </extensions>
-
     <services>
       <service name="Microsoft.Samples.Udp.ConfigurableCalculatorService" behaviorConfiguration="udpServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/udpsample"/>
+            <add baseAddress="http://localhost:8000/udpsample" />
           </baseAddresses>
         </host>
-        <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.Samples.Udp.ICalculatorContract"/>
-        <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.Samples.Udp.IDatagramContract"/>
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="soap.udp://localhost:8001/" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.Samples.Udp.ICalculatorContract" />
+        <endpoint address="soap.udp://localhost:8002/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.Samples.Udp.IDatagramContract" />
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <bindings>
-        <!-- 
+      <!-- 
          server bindings 
           -->
-        <sampleProfileUdpBinding>
-            <binding name="CalculatorServer" clientBaseAddress="soap.udp://localhost:8003/"/>
-            <binding name="DatagramServer" reliableSessionEnabled="false"/>
-        </sampleProfileUdpBinding>
-
-        <customBinding>
+      <sampleProfileUdpBinding>
+        <binding name="CalculatorServer" clientBaseAddress="soap.udp://localhost:8003/" />
+        <binding name="DatagramServer" reliableSessionEnabled="false" />
+      </sampleProfileUdpBinding>
+      <customBinding>
         <binding name="DatagramServer">
-            <binaryMessageEncoding/>
-            <udpTransport/>
+          <binaryMessageEncoding />
+          <udpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="udpServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
+          <serviceMetadata httpGetEnabled="True" />
         </behavior>
       </serviceBehaviors>
     </behaviors>
-    
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/UdpTestService.csproj b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/UdpTestService.csproj
index f006fb9590b..3ce6342a1cf 100644
--- a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/UdpTestService.csproj
+++ b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTestService/UdpTestService.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{5920E202-A11F-47C6-8A27-B00BFAE213A0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Udp</RootNamespace>
     <AssemblyName>UdpTestService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,29 +53,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -102,4 +61,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTransport/UdpTransport.csproj b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTransport/UdpTransport.csproj
index 037b1142988..b0ba66c51d3 100644
--- a/framework/wcf/Extensibility/Transport/Udp/CS/UdpTransport/UdpTransport.csproj
+++ b/framework/wcf/Extensibility/Transport/Udp/CS/UdpTransport/UdpTransport.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{37086881-1FD9-4DE1-8DB5-0AC8456C65A9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Udp</RootNamespace>
     <AssemblyName>UdpTransport</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,27 +56,5 @@
     <Compile Include="UdpTransportBindingElement.cs" />
     <Compile Include="UdpTransportElement.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/App.config b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/App.config
index d266d4f4107..e540bc6dc60 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/App.config
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/App.config
@@ -1,8 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
-
   <system.serviceModel>
-
     <!-- 
          add our udpTransport handler for use by binding declarations 
      -->
@@ -11,41 +9,36 @@
      -->
     <extensions>
       <bindingElementExtensions>
-        <add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpActivation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6fa904d2da1848d6"/>
+        <add name="udpTransport" type="Microsoft.ServiceModel.Samples.UdpTransportElement, UdpActivation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6fa904d2da1848d6" />
       </bindingElementExtensions>
       <bindingExtensions>
-        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpActivation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6fa904d2da1848d6"/>
+        <add name="sampleProfileUdpBinding" type="Microsoft.ServiceModel.Samples.SampleProfileUdpBindingCollectionElement, UdpActivation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6fa904d2da1848d6" />
       </bindingExtensions>
     </extensions>
-
     <client>
       <metadata>
         <policyImporters>
-          <extension type="Microsoft.ServiceModel.Samples.UdpBindingElementConverter, UdpActivation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6fa904d2da1848d6"/>
+          <extension type="Microsoft.ServiceModel.Samples.UdpBindingElementConverter, UdpActivation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6fa904d2da1848d6" />
         </policyImporters>
       </metadata>
-      <endpoint name="calculator" address="net.udp://localhost:8080/servicemodelsamples/Service.svc/calculator" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.ServiceModel.Samples.ICalculatorContract">
-      </endpoint>
-      <endpoint name="datagram" address="net.udp://localhost:8080/servicemodelsamples/Service.svc/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.ServiceModel.Samples.IDatagramContract">
-      </endpoint>
-      <endpoint name="status" address="http://localhost/servicemodelsamples/Service.svc/status" binding="basicHttpBinding" bindingConfiguration="StatusServer" contract="Microsoft.ServiceModel.Samples.IStatusContract"/>
+      <endpoint name="calculator" address="net.udp://localhost:8080/servicemodelsamples/Service.svc/calculator" binding="sampleProfileUdpBinding" bindingConfiguration="CalculatorServer" contract="Microsoft.ServiceModel.Samples.ICalculatorContract"></endpoint>
+      <endpoint name="datagram" address="net.udp://localhost:8080/servicemodelsamples/Service.svc/datagram" binding="customBinding" bindingConfiguration="DatagramServer" contract="Microsoft.ServiceModel.Samples.IDatagramContract"></endpoint>
+      <endpoint name="status" address="http://localhost/servicemodelsamples/Service.svc/status" binding="basicHttpBinding" bindingConfiguration="StatusServer" contract="Microsoft.ServiceModel.Samples.IStatusContract" />
     </client>
     <bindings>
       <sampleProfileUdpBinding>
-        <binding name="CalculatorServer"/>
-        <binding name="DatagramServer" reliableSessionEnabled="false"/>
+        <binding name="CalculatorServer" />
+        <binding name="DatagramServer" reliableSessionEnabled="false" />
       </sampleProfileUdpBinding>
-
       <customBinding>
         <binding name="DatagramServer">
-          <binaryMessageEncoding/>
-          <udpTransport/>
+          <binaryMessageEncoding />
+          <udpTransport />
         </binding>
       </customBinding>
       <basicHttpBinding>
-        <binding name="StatusServer" maxReceivedMessageSize="1000000"/>
+        <binding name="StatusServer" maxReceivedMessageSize="1000000" />
       </basicHttpBinding>
     </bindings>
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/Client.csproj b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/Client.csproj
index 954e50d31d0..aafe2df00a5 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/Client.csproj
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Client/Client.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EB0D023D-1EA6-4370-9E7D-2591366A482C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
     <!--StartupObject>Microsoft.ServiceModel.Samples.Client</StartupObject-->
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -71,27 +52,5 @@
       <Name>UDPActivation</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/Service.csproj b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/Service.csproj
index 66e6e6ed04e..841da5ad33a 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/Service.csproj
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/Service.csproj
@@ -1,35 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{378C01C5-A821-46AF-ADF4-C9CC6BB9911F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.ServiceModel.Samples</RootNamespace>
     <AssemblyName>Service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -71,29 +52,6 @@
       <Name>UDPActivation</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -103,13 +61,14 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>
-if not exist %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy /y $(ProjectDir)hello.aspx %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\.
-copy /y $(ProjectDir)Service.svc %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\.
-copy /y $(ProjectDir)Web.config %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\.
-copy "$(TargetDir)Service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-copy "$(TargetDir)Service.pdb" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-call $(ProjectDir)SetupApp.bat
-</PostBuildEvent>
+      if not exist %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy /y "$(MSBuildProjectDirectory)\hello.aspx" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy /y "$(MSBuildProjectDirectory)\Service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy /y "$(MSBuildProjectDirectory)\Web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\
+      copy "$(TargetDir)Service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)Service.pdb" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      call "$(MSBuildProjectDirectory)\SetupApp.bat"
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/SetupApp.bat b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/SetupApp.bat
index 3d1a5b83bab..a5ee4b571c8 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/SetupApp.bat
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/Service/SetupApp.bat
@@ -18,3 +18,5 @@ if "%ISVISTA%" == "1" (
 )
 
 @echo on
+
+exit 0
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/UDPActivation/UDPActivation.csproj b/framework/wcf/Extensibility/Transport/UdpActivation/CS/UDPActivation/UDPActivation.csproj
index 0f71ed55838..24e4675c126 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/UDPActivation/UDPActivation.csproj
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/UDPActivation/UDPActivation.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FE5DA43A-9746-48EE-AB5C-9EE52A1EF2CA}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
@@ -12,27 +12,8 @@
     <AssemblyName>UDPActivation</AssemblyName>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>UDPActivation.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -136,29 +117,6 @@
   <ItemGroup>
     <None Include="UDPActivation.snk" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -167,7 +125,9 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>"$(FrameworkSDKDir)bin\NETFX 4.0 Tools\gacutil.exe" /f /i "$(TargetDir)UDPActivation.dll"
-</PostBuildEvent>
+    <PostBuildEvent Condition="'$(CI)' != 'true'">
+      "gacutil.exe" /f /i "$(TargetDir)UDPActivation.dll"
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/WASNetActivator.csproj b/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/WASNetActivator.csproj
index 66d20050a8f..fe05c70febc 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/WASNetActivator.csproj
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/WASNetActivator.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3D21C55B-00DC-45A2-A9F4-83D23944D0C6}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples.Channels</RootNamespace>
     <AssemblyName>WASNetActivator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
-    <UpgradeBackupLocation />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -67,8 +48,7 @@
     <Compile Include="WASNetActivator.Designer.cs">
       <DependentUpon>WASNetActivator.cs</DependentUpon>
     </Compile>
-    <Compile Include="Main.cs">
-    </Compile>
+    <Compile Include="Main.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="WASNetActivator.resx">
       <SubType>Designer</SubType>
@@ -101,29 +81,7 @@
       <Name>UDPActivation</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -131,4 +89,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/app.config b/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/app.config
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/WASNetActivator/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Transport/UdpActivation/CS/snippets.5000.json b/framework/wcf/Extensibility/Transport/UdpActivation/CS/snippets.5000.json
new file mode 100644
index 00000000000..9493e733615
--- /dev/null
+++ b/framework/wcf/Extensibility/Transport/UdpActivation/CS/snippets.5000.json
@@ -0,0 +1,3 @@
+{
+    "host": "visualstudio"
+}
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/WseTcpTransport.csproj b/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/WseTcpTransport.csproj
index cbde3e5ecd5..d0d9edc4dae 100644
--- a/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/WseTcpTransport.csproj
+++ b/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/WseTcpTransport.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{EA93D43D-BD71-46EF-83C0-C56B051E0805}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ServiceModel.Samples.Transport</RootNamespace>
     <AssemblyName>WseTcpTransport</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,30 +52,8 @@
     <Compile Include="WseTcpDuplexSessionChannel.cs" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/app.config b/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/app.config
+++ b/framework/wcf/Extensibility/Transport/WseTcpInterop/CS/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Extensibility/Web/FormPost/CS/FormPost.csproj b/framework/wcf/Extensibility/Web/FormPost/CS/FormPost.csproj
index 67ed6ea8dca..572eeec175d 100644
--- a/framework/wcf/Extensibility/Web/FormPost/CS/FormPost.csproj
+++ b/framework/wcf/Extensibility/Web/FormPost/CS/FormPost.csproj
@@ -1,4 +1,5 @@
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -6,10 +7,9 @@
     <OutputType>Exe</OutputType>
     <NoStandardLibraries>false</NoStandardLibraries>
     <AssemblyName>FormPostSample</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <RootNamespace>Microsoft.Samples.FormPost</RootNamespace>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,4 +66,4 @@
   <ProjectExtensions>
     <VisualStudio AllowExistingFolder="true" />
   </ProjectExtensions>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/Web/FormPost/CS/HtmlFormProcessing/HtmlFormProcessing.csproj b/framework/wcf/Extensibility/Web/FormPost/CS/HtmlFormProcessing/HtmlFormProcessing.csproj
index a863ce1c877..4047a70c4d6 100644
--- a/framework/wcf/Extensibility/Web/FormPost/CS/HtmlFormProcessing/HtmlFormProcessing.csproj
+++ b/framework/wcf/Extensibility/Web/FormPost/CS/HtmlFormProcessing/HtmlFormProcessing.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.FormPost</RootNamespace>
     <AssemblyName>HtmlFormProcessing</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -35,7 +36,7 @@
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Web" />
     <Reference Include="System.XML" />
-    <Reference Include="Microsoft.CSharp"/>
+    <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="HtmlFormProcessingBehavior.cs" />
@@ -52,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/JsonObjectLibrary/JsonObjectLibrary.csproj b/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/JsonObjectLibrary/JsonObjectLibrary.csproj
index a34284f0c79..c9166b5e210 100644
--- a/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/JsonObjectLibrary/JsonObjectLibrary.csproj
+++ b/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/JsonObjectLibrary/JsonObjectLibrary.csproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{1295E10F-DCA3-4F32-B72E-C14129A2FAEA}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WeaklyTypedJsonLibrary</RootNamespace>
     <AssemblyName>JsonObjectLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -33,8 +33,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization">
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel.Web">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
@@ -44,7 +43,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="WeaklyTypedJson.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/WeaklyTypedJson/WeaklyTypedJson.csproj b/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/WeaklyTypedJson/WeaklyTypedJson.csproj
index 03b86e442f3..91be610cae1 100644
--- a/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/WeaklyTypedJson/WeaklyTypedJson.csproj
+++ b/framework/wcf/Scenario/Ajax/WeaklyTypedJson/CS/WeaklyTypedJson/WeaklyTypedJson.csproj
@@ -1,16 +1,14 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{877DCD9F-871D-4561-9663-F78059C5F65C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.WeaklyTypedJson</RootNamespace>
     <AssemblyName>WeaklyTypedJson</AssemblyName>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,7 +51,7 @@
       <Name>JsonObjectLibrary</Name>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/App.config b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/App.config
index c12d7d7d702..ec574d585ab 100644
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/App.config
+++ b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-    <system.serviceModel>
-        <client>
-            <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.DataBinding.IAlbumService">
-            </endpoint>
-        </client>
-	</system.serviceModel>
+  <system.serviceModel>
+    <client>
+      <endpoint address="http://localhost/ServiceModelSamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.DataBinding.IAlbumService"></endpoint>
+    </client>
+  </system.serviceModel>
 </configuration>
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 8fc53d033a6..00000000000
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.Samples.DataBinding.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.ServiceModel.Samples.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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Resources.resx b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Resources.resx
deleted file mode 100644
index 3e18af958a2..00000000000
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index 03ed0a4fd09..00000000000
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.Samples.DataBinding.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Settings.settings b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Settings.settings
deleted file mode 100644
index 4024694778b..00000000000
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/client.csproj b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/client.csproj
index 6f910e7e525..59294bd78f4 100644
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/client.csproj
+++ b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/client/client.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,30 +12,9 @@
     <TargetType>$(OutputType)</TargetType>
     <!-- Most people will use Publish dialog in Visual Studio to increment this -->
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -53,12 +33,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="System.Runtime.Serialization">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
@@ -87,51 +63,10 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <None Include="App.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
     <AppDesigner Include="Properties\" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/service/service.csproj b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/service/service.csproj
index a5998eb969a..484515c253b 100644
--- a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/service/service.csproj
+++ b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/service/service.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{BCFCB3AA-50D3-492F-A3F6-A7AB0AA836D3}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlbumService</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -69,36 +48,14 @@
     <None Include="Web.config" />
     <None Include="service.svc" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/snippets.5000.json b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/snippets.5000.json
new file mode 100644
index 00000000000..9493e733615
--- /dev/null
+++ b/framework/wcf/Scenario/DataBinding/WPFDataBinding/CS/snippets.5000.json
@@ -0,0 +1,3 @@
+{
+    "host": "visualstudio"
+}
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WebForms/CS/WebForms.sln b/framework/wcf/Scenario/DataBinding/WebForms/CS/WebForms.sln
index 5ac289547ff..30400837331 100644
--- a/framework/wcf/Scenario/DataBinding/WebForms/CS/WebForms.sln
+++ b/framework/wcf/Scenario/DataBinding/WebForms/CS/WebForms.sln
@@ -1,9 +1,11 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34321.82
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "client", "client\", "{5A30DAD7-80A5-4462-89CF-6C76496378B7}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.8"
 		Debug.AspNetCompiler.VirtualPath = "/client"
 		Debug.AspNetCompiler.PhysicalPath = "client\"
 		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\client\"
@@ -19,6 +21,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "client", "client\", "{5A30D
 		Release.AspNetCompiler.FixedNames = "true"
 		Release.AspNetCompiler.Debug = "False"
 		VWDPort = "40810"
+		SlnRelativePath = "client\"
 		DefaultWebSiteLanguage = "Visual C#"
 	EndProjectSection
 EndProject
@@ -58,4 +61,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8EA2F12C-DF83-462B-91F5-C17C177D6EAC}
+	EndGlobalSection
 EndGlobal
diff --git a/framework/wcf/Scenario/DataBinding/WebForms/CS/client/Web.Config b/framework/wcf/Scenario/DataBinding/WebForms/CS/client/Web.Config
index b5307a43e3e..f21869d968c 100644
--- a/framework/wcf/Scenario/DataBinding/WebForms/CS/client/Web.Config
+++ b/framework/wcf/Scenario/DataBinding/WebForms/CS/client/Web.Config
@@ -1,24 +1,34 @@
 <?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
-	<system.serviceModel>
-		<client>
-			<endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.WebForms.IWeatherService"/>
-		</client>
-	</system.serviceModel>
-	<system.web>
-		<compilation debug="true" targetFramework="4.0">
-			<assemblies>
-				
-				
-				
-				</assemblies></compilation>
-		<pages controlRenderingCompatibilityVersion="3.5"/></system.web>
-	<system.codedom>
-		<compilers>
-			<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4" compilerOptions="/warnaserror-">
-				<providerOption name="CompilerVersion" value="v4.0"/></compiler>
-			<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" compilerOptions="/optioninfer+">
-				<providerOption name="CompilerVersion" value="v4.0"/></compiler></compilers></system.codedom>
-	<system.webServer>
-	</system.webServer></configuration>
+  <system.serviceModel>
+    <client>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="wsHttpBinding" contract="Microsoft.Samples.WebForms.IWeatherService"/>
+    </client>
+  </system.serviceModel>
+  <!--
+    For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
+
+    The following attributes can be set on the <httpRuntime> tag.
+      <system.Web>
+        <httpRuntime targetFramework="4.8" />
+      </system.Web>
+  -->
+  <system.web>
+    <compilation debug="true" targetFramework="4.6.2">
+      <assemblies/>
+    </compilation>
+    <pages controlRenderingCompatibilityVersion="3.5"/>
+  </system.web>
+  <system.codedom>
+    <compilers>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" warningLevel="4" compilerOptions="/warnaserror-">
+        <providerOption name="CompilerVersion" value="v4.0"/>
+      </compiler>
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" compilerOptions="/optioninfer+">
+        <providerOption name="CompilerVersion" value="v4.0"/>
+      </compiler>
+    </compilers>
+  </system.codedom>
+  <system.webServer/>
+</configuration>
diff --git a/framework/wcf/Scenario/DataBinding/WebForms/CS/service/service.csproj b/framework/wcf/Scenario/DataBinding/WebForms/CS/service/service.csproj
index 5406a7ddedf..e24460ae4aa 100644
--- a/framework/wcf/Scenario/DataBinding/WebForms/CS/service/service.csproj
+++ b/framework/wcf/Scenario/DataBinding/WebForms/CS/service/service.csproj
@@ -1,36 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{CDD7B00A-5A65-4350-8088-2D0C83DE32D1}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service1</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -66,29 +47,6 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -97,11 +55,13 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/DataBinding/WebForms/CS/snippets.5000.json b/framework/wcf/Scenario/DataBinding/WebForms/CS/snippets.5000.json
new file mode 100644
index 00000000000..9493e733615
--- /dev/null
+++ b/framework/wcf/Scenario/DataBinding/WebForms/CS/snippets.5000.json
@@ -0,0 +1,3 @@
+{
+    "host": "visualstudio"
+}
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/App.config b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/App.config
index 505cd02b555..e3294911ce1 100644
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/App.config
+++ b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/App.config
@@ -1,10 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved. -->
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.WindowsForms.IWeatherService"/>
+      <endpoint address="http://localhost/servicemodelsamples/service.svc" binding="basicHttpBinding" contract="Microsoft.Samples.WindowsForms.IWeatherService" />
     </client>
-  
   </system.serviceModel>
- </configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Form1.resx b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Form1.resx
deleted file mode 100644
index d58980a38d7..00000000000
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Form1.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Resources.Designer.cs b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Resources.Designer.cs
deleted file mode 100644
index 0054c7d8691..00000000000
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace client.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("client.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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Resources.resx b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Resources.resx
deleted file mode 100644
index af7dbebbace..00000000000
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Settings.Designer.cs b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Settings.Designer.cs
deleted file mode 100644
index d3badf95968..00000000000
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace client.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Settings.settings b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Settings.settings
deleted file mode 100644
index 39645652af6..00000000000
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/client.csproj b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/client.csproj
index 0da61a542d8..9c42668668f 100644
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/client.csproj
+++ b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/client/client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{43BF7495-8DC0-4954-8629-C286F7418840}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>client</RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,12 +36,8 @@
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.Serialization">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.ServiceModel">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
@@ -73,53 +49,8 @@
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
     <Compile Include="WeatherService.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/service/service.csproj b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/service/service.csproj
index 2e0111988b2..9b0e02be88f 100644
--- a/framework/wcf/Scenario/DataBinding/WindowsForms/CS/service/service.csproj
+++ b/framework/wcf/Scenario/DataBinding/WindowsForms/CS/service/service.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.20727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{C148B349-3664-4EFE-9A29-BDD087F485C9}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>service</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -65,29 +45,6 @@
     <None Include="service.svc" />
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -96,11 +53,13 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            mkdir %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\servicemodelsamples
-</PostBuildEvent>
+    <PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/App.config b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/App.config
index cbf5bf712eb..e9704ae772f 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/App.config
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/App.config
@@ -1,18 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract" />
     </client>
-
     <bindings>
       <wsDualHttpBinding>
-		<!--If running in cross machine then replace localhost with the FQDN of the machine on whihc datasource.exe is run-->
-        <binding name="Binding1" clientBaseAddress="http://localhost:8000/myClient/"/>
+        <!--If running in cross machine then replace localhost with the FQDN of the machine on whihc datasource.exe is run-->
+        <binding name="Binding1" clientBaseAddress="http://localhost:8000/myClient/" />
       </wsDualHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/client.csproj b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/client.csproj
index b45194bd31e..5f9f6fb479f 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/client.csproj
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/client/client.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F6D8FC2E-62D0-4554-AC3E-1964042590E3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/App.config b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/App.config
index c073081c428..059e53b7435 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/App.config
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/App.config
@@ -1,18 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract" />
     </client>
-
     <bindings>
       <wsDualHttpBinding>
-		<!--If running in cross machine then replace localhost with the FQDN of the client machine-->
-        <binding name="Binding1" clientBaseAddress="http://localhost:9000/myClient/"/>
+        <!--If running in cross machine then replace localhost with the FQDN of the client machine-->
+        <binding name="Binding1" clientBaseAddress="http://localhost:9000/myClient/" />
       </wsDualHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/datasource.csproj b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/datasource.csproj
index 52d2bc46816..780df3ef161 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/datasource.csproj
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/datasource/datasource.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{94968F83-7408-473B-9792-D8C986293B29}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>datasource</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -68,27 +46,5 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/service/service.csproj b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/service/service.csproj
index 23516eb59c0..be8dd7955a0 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/service/service.csproj
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/CS/service/service.csproj
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50110</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{73D6E51B-9EAB-4EBE-BAA3-794D636BD176}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,36 +48,14 @@
   <ItemGroup>
     <None Include="Web.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
   <PropertyGroup>
     <PostBuildEvent>
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
-            copy "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-            copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
-        </PostBuildEvent>
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      mkdir %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(TargetDir)service.dll" %SystemDrive%\inetpub\wwwroot\servicemodelsamples\bin
+      copy "$(MSBuildProjectDirectory)\service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/client/App.config b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/client/App.config
index 504540a9ff1..a0a919fcc59 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/client/App.config
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/client/App.config
@@ -1,17 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract" />
     </client>
-
     <bindings>
       <wsDualHttpBinding>
-        <binding name="Binding1" clientBaseAddress="http://localhost:8000/myClient/"/>
+        <binding name="Binding1" clientBaseAddress="http://localhost:8000/myClient/" />
       </wsDualHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/datasource/App.config b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/datasource/App.config
index 8cbec8d41e2..b6a44da3ed8 100644
--- a/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/datasource/App.config
+++ b/framework/wcf/Scenario/DesignPatterns/ListBasedPublishSubscribe/VB/datasource/App.config
@@ -1,17 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
-
     <client>
-      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract"/>
+      <endpoint name="" address="http://localhost/servicemodelsamples/service.svc" binding="wsDualHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.ServiceModel.Samples.ISampleContract" />
     </client>
-
     <bindings>
       <wsDualHttpBinding>
-        <binding name="Binding1" clientBaseAddress="http://localhost:9000/myClient/"/>
+        <binding name="Binding1" clientBaseAddress="http://localhost:9000/myClient/" />
       </wsDualHttpBinding>
     </bindings>
-
   </system.serviceModel>
-
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/DiscoveryScenario/CS/AnnouncementListener/AnnouncementListener.csproj b/framework/wcf/Scenario/DiscoveryScenario/CS/AnnouncementListener/AnnouncementListener.csproj
index f4d9ba4fb67..a7297e7cdcf 100644
--- a/framework/wcf/Scenario/DiscoveryScenario/CS/AnnouncementListener/AnnouncementListener.csproj
+++ b/framework/wcf/Scenario/DiscoveryScenario/CS/AnnouncementListener/AnnouncementListener.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{8C5DD68E-FF16-4BB3-B3C9-DA3CDB5B4DD7}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>AnnouncementListener</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -53,4 +53,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/DiscoveryScenario/CS/Client/App.config b/framework/wcf/Scenario/DiscoveryScenario/CS/Client/App.config
index 59c4d8cebf9..1a1baeb6d29 100644
--- a/framework/wcf/Scenario/DiscoveryScenario/CS/Client/App.config
+++ b/framework/wcf/Scenario/DiscoveryScenario/CS/Client/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. -->
 <configuration>
-   <!--Register the secure endpoint extension-->
+  <!--Register the secure endpoint extension-->
   <system.serviceModel>
     <extensions>
       <endpointExtensions>
@@ -10,13 +10,9 @@
     </extensions>
     <client>
       <!--application endpoint-->
-      <endpoint address=""
-          binding="wsHttpBinding"
-          contract="ICalculatorService"/>
+      <endpoint address="" binding="wsHttpBinding" contract="ICalculatorService" />
       <!--secure discovery endpoint-->
-      <endpoint name="udpSecureDiscoveryEndpoint"
-                kind="udpSecureDiscoveryEndpoint"
-                endpointConfiguration="udpSecureDiscoveryEndpointConfiguration" />
+      <endpoint name="udpSecureDiscoveryEndpoint" kind="udpSecureDiscoveryEndpoint" endpointConfiguration="udpSecureDiscoveryEndpointConfiguration" />
     </client>
     <standardEndpoints>
       <udpSecureDiscoveryEndpoint>
@@ -24,10 +20,9 @@
           <!--Uncomment next line and specify store settings for received certificates to use other values than default-->
           <!--<receivedCertificatesStoreSettings storeName="My" storeLocation="LocalMachine" />-->
           <!--Signing certificate details-->
-          <signingCertificateSettings storeName="My" storeLocation="LocalMachine" x509FindType="FindBySubjectDistinguishedName" 
-                                      findValue="CN=DiscoverySecureClientCertificate"/>
+          <signingCertificateSettings storeName="My" storeLocation="LocalMachine" x509FindType="FindBySubjectDistinguishedName" findValue="CN=DiscoverySecureClientCertificate" />
         </standardEndpoint>
-        </udpSecureDiscoveryEndpoint>
-      </standardEndpoints>
+      </udpSecureDiscoveryEndpoint>
+    </standardEndpoints>
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Scenario/DiscoveryScenario/CS/Client/client.csproj b/framework/wcf/Scenario/DiscoveryScenario/CS/Client/client.csproj
index 1f2b13ebc74..95c1bcde77f 100644
--- a/framework/wcf/Scenario/DiscoveryScenario/CS/Client/client.csproj
+++ b/framework/wcf/Scenario/DiscoveryScenario/CS/Client/client.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{68A87B1B-36AC-44E1-8D35-977816811572}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,4 +58,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/DiscoveryScenario/CS/CompactSignatureSecurity/CompactSignatureSecurity.csproj b/framework/wcf/Scenario/DiscoveryScenario/CS/CompactSignatureSecurity/CompactSignatureSecurity.csproj
index d346de0353e..cf702124adc 100644
--- a/framework/wcf/Scenario/DiscoveryScenario/CS/CompactSignatureSecurity/CompactSignatureSecurity.csproj
+++ b/framework/wcf/Scenario/DiscoveryScenario/CS/CompactSignatureSecurity/CompactSignatureSecurity.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DB189E70-01C6-4926-AD9B-32B88E74899F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>CompactSignatureSecurity</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -77,4 +77,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/DiscoveryScenario/CS/Service/App.config b/framework/wcf/Scenario/DiscoveryScenario/CS/Service/App.config
index cfe9f4a511d..71e283430d7 100644
--- a/framework/wcf/Scenario/DiscoveryScenario/CS/Service/App.config
+++ b/framework/wcf/Scenario/DiscoveryScenario/CS/Service/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--Copyright (c) Microsoft Corporation. All rights reserved.-->
 <configuration>
   <system.serviceModel>
@@ -11,13 +11,9 @@
     <services>
       <service name="Microsoft.Samples.Discovery.CalculatorService" behaviorConfiguration="calculatorServiceBehavior">
         <!--application endpoint-->
-        <endpoint address=""
-                  binding="wsHttpBinding"
-                  contract="Microsoft.Samples.Discovery.ICalculatorService" />
+        <endpoint address="" binding="wsHttpBinding" contract="Microsoft.Samples.Discovery.ICalculatorService" />
         <!--secure discovery endpoint-->
-        <endpoint name="udpSecureDiscoveryEndpoint"
-                  kind="udpSecureDiscoveryEndpoint"
-                  endpointConfiguration="udpSecureDiscoveryEndpointConfiguration" />
+        <endpoint name="udpSecureDiscoveryEndpoint" kind="udpSecureDiscoveryEndpoint" endpointConfiguration="udpSecureDiscoveryEndpointConfiguration" />
       </service>
     </services>
     <behaviors>
@@ -25,9 +21,7 @@
         <behavior name="calculatorServiceBehavior">
           <serviceDiscovery>
             <announcementEndpoints>
-              <endpoint name="udpSecureAnnouncementEndpoint"
-                 kind="udpSecureAnnouncementEndpoint"
-                 endpointConfiguration="udpSecureAnnouncementEndpointConfiguration" />
+              <endpoint name="udpSecureAnnouncementEndpoint" kind="udpSecureAnnouncementEndpoint" endpointConfiguration="udpSecureAnnouncementEndpointConfiguration" />
             </announcementEndpoints>
           </serviceDiscovery>
         </behavior>
@@ -39,17 +33,16 @@
           <!--The store location and name where we are looking for client certificates-->
           <receivedCertificatesStoreSettings storeName="My" storeLocation="LocalMachine" />
           <!--Signing certificate details-->
-          <signingCertificateSettings storeName="My" storeLocation="LocalMachine" x509FindType="FindBySubjectDistinguishedName"
-                                      findValue="CN=DiscoverySecureServiceCertificate"/>
+          <signingCertificateSettings storeName="My" storeLocation="LocalMachine" x509FindType="FindBySubjectDistinguishedName" findValue="CN=DiscoverySecureServiceCertificate" />
         </standardEndpoint>
       </udpSecureDiscoveryEndpoint>
       <udpSecureAnnouncementEndpoint>
         <standardEndpoint name="udpSecureAnnouncementEndpointConfiguration" discoveryVersion="WSDiscovery11">
           <!--Use default settings for certificates store: storeName="My" storeLocation="LocalMachine" -->
           <!--Signing certificate details: use default values for store-->
-          <signingCertificateSettings findValue="CN=DiscoverySecureServiceCertificate"/>
+          <signingCertificateSettings findValue="CN=DiscoverySecureServiceCertificate" />
         </standardEndpoint>
       </udpSecureAnnouncementEndpoint>
     </standardEndpoints>
   </system.serviceModel>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/framework/wcf/Scenario/DiscoveryScenario/CS/Service/service.csproj b/framework/wcf/Scenario/DiscoveryScenario/CS/Service/service.csproj
index 0b6328f490b..61890214013 100644
--- a/framework/wcf/Scenario/DiscoveryScenario/CS/Service/service.csproj
+++ b/framework/wcf/Scenario/DiscoveryScenario/CS/Service/service.csproj
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.20815</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B3857098-A417-426E-8EC1-3445F0A99DFC}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Samples.Discovery</RootNamespace>
     <AssemblyName>service</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,4 +58,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreClient/App.config b/framework/wcf/Scenario/Federation/CS/BookStoreClient/App.config
index 9b9b86c63b1..b1cd5b976e0 100644
--- a/framework/wcf/Scenario/Federation/CS/BookStoreClient/App.config
+++ b/framework/wcf/Scenario/Federation/CS/BookStoreClient/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -10,7 +10,7 @@
         <binding name="BookStoreSTS">
           <security mode="Message">
             <message>
-              <issuer address="http://localhost/FederationSample/HomeRealmSTS/STS.svc" binding="wsHttpBinding" bindingConfiguration="HomeRealmSTS"/>
+              <issuer address="http://localhost/FederationSample/HomeRealmSTS/STS.svc" binding="wsHttpBinding" bindingConfiguration="HomeRealmSTS" />
             </message>
           </security>
         </binding>
@@ -20,7 +20,7 @@
             <message>
               <issuer address="http://localhost/FederationSample/BookStoreSTS/STS.svc" binding="wsFederationHttpBinding" bindingConfiguration="BookStoreSTS">
                 <identity>
-                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreSTS.com"/>
+                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreSTS.com" />
                 </identity>
               </issuer>
             </message>
@@ -30,15 +30,14 @@
       <wsHttpBinding>
         <!-- This is the binding for the BrowseBooks endpoint at BookStore Service -->
         <binding name="WSHttpBinding_IBrowseBooks">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
         <!-- This is the binding used to communicate with the HomeRealm STS -->
         <binding name="HomeRealmSTS">
-          <security mode="Message"/>          
+          <security mode="Message" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="BuyBookClientBehavior">
@@ -52,22 +51,19 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
     <client>
-      
-      <endpoint name="WSHttpBinding_IBrowseBooks" address="http://localhost/FederationSample/BookStoreService/store.svc/browse" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IBrowseBooks" contract="IBrowseBooks"/>
+      <endpoint name="WSHttpBinding_IBrowseBooks" address="http://localhost/FederationSample/BookStoreService/store.svc/browse" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IBrowseBooks" contract="IBrowseBooks" />
       <endpoint name="WSFederationHttpBinding_IBuyBook" address="http://localhost/FederationSample/BookStoreService/store.svc/buy" binding="wsFederationHttpBinding" bindingConfiguration="WSFederationHttpBinding_IBuyBook" behaviorConfiguration="BuyBookClientBehavior" contract="IBuyBook">
         <identity>
-          <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreService.com"/>
+          <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreService.com" />
         </identity>
       </endpoint>
     </client>
-    
-      </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreClient/BookStoreClient.csproj b/framework/wcf/Scenario/Federation/CS/BookStoreClient/BookStoreClient.csproj
index f5796a5ca0b..b097cd8d309 100644
--- a/framework/wcf/Scenario/Federation/CS/BookStoreClient/BookStoreClient.csproj
+++ b/framework/wcf/Scenario/Federation/CS/BookStoreClient/BookStoreClient.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{679328F3-0BFE-4144-963F-2B052AD2D642}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FederationSample</RootNamespace>
     <AssemblyName>BookStoreClient</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,26 +59,7 @@
       <DependentUpon>BookStoreClientForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <None Include="App.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.csproj">
@@ -106,27 +67,5 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Resources.Designer.cs b/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Resources.Designer.cs
deleted file mode 100644
index d383d4f3640..00000000000
--- a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.21019.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FederationSample.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FederationSample.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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Resources.resx b/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Resources.resx
deleted file mode 100644
index af7dbebbace..00000000000
--- a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Settings.Designer.cs b/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Settings.Designer.cs
deleted file mode 100644
index d277e1cbd87..00000000000
--- a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.21019.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace FederationSample.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Settings.settings b/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Settings.settings
deleted file mode 100644
index 39645652af6..00000000000
--- a/framework/wcf/Scenario/Federation/CS/BookStoreClient/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreSTS/BookStoreSTS.csproj b/framework/wcf/Scenario/Federation/CS/BookStoreSTS/BookStoreSTS.csproj
index 1c392738df3..54348cff560 100644
--- a/framework/wcf/Scenario/Federation/CS/BookStoreSTS/BookStoreSTS.csproj
+++ b/framework/wcf/Scenario/Federation/CS/BookStoreSTS/BookStoreSTS.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3D879B25-E8E3-4ADF-9004-2F9B5C8FA960}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FederationSample</RootNamespace>
     <AssemblyName>BookStoreSTS</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -85,35 +64,15 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>md %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreSTS\bin
-copy "$(TargetDir)BookStoreSTS.dll" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreSTS\bin
-copy "$(TargetDir)Common.dll" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreSTS\bin
-copy "$(ProjectDir)STS.svc" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreSTS
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreSTS
-copy "$(ProjectDir)BookDB.txt" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreSTS</PostBuildEvent>
+    <PostBuildEvent>
+      md %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreSTS\bin
+      copy "$(TargetDir)BookStoreSTS.dll" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreSTS\bin
+      copy "$(TargetDir)Common.dll" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreSTS\bin
+      copy "$(MSBuildProjectDirectory)\STS.svc" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreSTS
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreSTS
+      copy "$(MSBuildProjectDirectory)\BookDB.txt" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreSTS
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/Federation/CS/BookStoreService/BookStoreService.csproj b/framework/wcf/Scenario/Federation/CS/BookStoreService/BookStoreService.csproj
index 93d7920150f..e7b576e4e52 100644
--- a/framework/wcf/Scenario/Federation/CS/BookStoreService/BookStoreService.csproj
+++ b/framework/wcf/Scenario/Federation/CS/BookStoreService/BookStoreService.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{18B2A3EC-94D3-406E-8823-C1C8054BA469}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FederationSample</RootNamespace>
     <AssemblyName>BookStoreService</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -87,36 +66,15 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>md %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreService\bin
-copy "$(TargetDir)BookStoreService.dll" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreService\bin
-copy "$(TargetDir)Common.dll" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreService\bin
-copy "$(ProjectDir)store.svc" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreService
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreService
-copy "$(ProjectDir)BookDB.txt" %25SystemDrive%25\inetpub\wwwroot\FederationSample\BookStoreService
-</PostBuildEvent>
+    <PostBuildEvent>
+      md %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreService\bin
+      copy "$(TargetDir)BookStoreService.dll" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreService\bin
+      copy "$(TargetDir)Common.dll" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreService\bin
+      copy "$(MSBuildProjectDirectory)\store.svc" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreService
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreService
+      copy "$(MSBuildProjectDirectory)\BookDB.txt" %SystemDrive%\inetpub\wwwroot\FederationSample\BookStoreService
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/Federation/CS/Common/Common.csproj b/framework/wcf/Scenario/Federation/CS/Common/Common.csproj
index 29aa15819fb..3e748431eb9 100644
--- a/framework/wcf/Scenario/Federation/CS/Common/Common.csproj
+++ b/framework/wcf/Scenario/Federation/CS/Common/Common.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{B22E58A4-A415-4D85-A7C2-9636E6413A3F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Common</RootNamespace>
     <AssemblyName>Common</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -54,14 +33,13 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel"/>
-    <Reference Include="System.Runtime.Serialization"/>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
-    <Reference Include="System.ServiceModel"/>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -79,30 +57,8 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
+    <PostBuildEvent></PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/Federation/CS/HomeRealmSTS/HomeRealmSTS.csproj b/framework/wcf/Scenario/Federation/CS/HomeRealmSTS/HomeRealmSTS.csproj
index f0ce237f6ab..1ab2b534b18 100644
--- a/framework/wcf/Scenario/Federation/CS/HomeRealmSTS/HomeRealmSTS.csproj
+++ b/framework/wcf/Scenario/Federation/CS/HomeRealmSTS/HomeRealmSTS.csproj
@@ -1,39 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6DD2CA1E-3FDE-4CBA-9A7B-ED0624A03238}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FederationSample</RootNamespace>
     <AssemblyName>HomeRealmSTS</AssemblyName>
-    <StartupObject>
-    </StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
+    <StartupObject></StartupObject>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -79,35 +58,14 @@
       <Name>Common</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>md %25SystemDrive%25\inetpub\wwwroot\FederationSample\HomeRealmSTS\bin
-copy "$(TargetDir)HomeRealmSTS.dll" %25SystemDrive%25\inetpub\wwwroot\FederationSample\HomeRealmSTS\bin
-copy "$(TargetDir)Common.dll" %25SystemDrive%25\inetpub\wwwroot\FederationSample\HomeRealmSTS\bin
-copy "$(ProjectDir)STS.svc" %25SystemDrive%25\inetpub\wwwroot\FederationSample\HomeRealmSTS
-copy "$(ProjectDir)web.config" %25SystemDrive%25\inetpub\wwwroot\FederationSample\HomeRealmSTS
-</PostBuildEvent>
+    <PostBuildEvent>
+      md %SystemDrive%\inetpub\wwwroot\FederationSample\HomeRealmSTS\bin
+      copy "$(TargetDir)HomeRealmSTS.dll" %SystemDrive%\inetpub\wwwroot\FederationSample\HomeRealmSTS\bin
+      copy "$(TargetDir)Common.dll" %SystemDrive%\inetpub\wwwroot\FederationSample\HomeRealmSTS\bin
+      copy "$(MSBuildProjectDirectory)\STS.svc" %SystemDrive%\inetpub\wwwroot\FederationSample\HomeRealmSTS
+      copy "$(MSBuildProjectDirectory)\web.config" %SystemDrive%\inetpub\wwwroot\FederationSample\HomeRealmSTS
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Scenario/Federation/CS/snippets.5000.json b/framework/wcf/Scenario/Federation/CS/snippets.5000.json
new file mode 100644
index 00000000000..9493e733615
--- /dev/null
+++ b/framework/wcf/Scenario/Federation/CS/snippets.5000.json
@@ -0,0 +1,3 @@
+{
+    "host": "visualstudio"
+}
\ No newline at end of file
diff --git a/framework/wcf/Scenario/Federation/VB/BookStoreClient/App.config b/framework/wcf/Scenario/Federation/VB/BookStoreClient/App.config
index 9b9b86c63b1..b1cd5b976e0 100644
--- a/framework/wcf/Scenario/Federation/VB/BookStoreClient/App.config
+++ b/framework/wcf/Scenario/Federation/VB/BookStoreClient/App.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    Copyright (c) Microsoft Corporation.  All rights reserved.
 -->
@@ -10,7 +10,7 @@
         <binding name="BookStoreSTS">
           <security mode="Message">
             <message>
-              <issuer address="http://localhost/FederationSample/HomeRealmSTS/STS.svc" binding="wsHttpBinding" bindingConfiguration="HomeRealmSTS"/>
+              <issuer address="http://localhost/FederationSample/HomeRealmSTS/STS.svc" binding="wsHttpBinding" bindingConfiguration="HomeRealmSTS" />
             </message>
           </security>
         </binding>
@@ -20,7 +20,7 @@
             <message>
               <issuer address="http://localhost/FederationSample/BookStoreSTS/STS.svc" binding="wsFederationHttpBinding" bindingConfiguration="BookStoreSTS">
                 <identity>
-                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreSTS.com"/>
+                  <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreSTS.com" />
                 </identity>
               </issuer>
             </message>
@@ -30,15 +30,14 @@
       <wsHttpBinding>
         <!-- This is the binding for the BrowseBooks endpoint at BookStore Service -->
         <binding name="WSHttpBinding_IBrowseBooks">
-          <security mode="None"/>
+          <security mode="None" />
         </binding>
         <!-- This is the binding used to communicate with the HomeRealm STS -->
         <binding name="HomeRealmSTS">
-          <security mode="Message"/>          
+          <security mode="Message" />
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="BuyBookClientBehavior">
@@ -52,22 +51,19 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
-
     <client>
-      
-      <endpoint name="WSHttpBinding_IBrowseBooks" address="http://localhost/FederationSample/BookStoreService/store.svc/browse" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IBrowseBooks" contract="IBrowseBooks"/>
+      <endpoint name="WSHttpBinding_IBrowseBooks" address="http://localhost/FederationSample/BookStoreService/store.svc/browse" binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IBrowseBooks" contract="IBrowseBooks" />
       <endpoint name="WSFederationHttpBinding_IBuyBook" address="http://localhost/FederationSample/BookStoreService/store.svc/buy" binding="wsFederationHttpBinding" bindingConfiguration="WSFederationHttpBinding_IBuyBook" behaviorConfiguration="BuyBookClientBehavior" contract="IBuyBook">
         <identity>
-          <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreService.com"/>
+          <certificateReference storeLocation="CurrentUser" storeName="TrustedPeople" x509FindType="FindBySubjectName" findValue="BookStoreService.com" />
         </identity>
       </endpoint>
     </client>
-    
-      </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+  </system.serviceModel>
+</configuration>
diff --git a/framework/wcf/Scenario/TrustedFacade/CS/BackendService/App.config b/framework/wcf/Scenario/TrustedFacade/CS/BackendService/App.config
index 2054233cb99..8eed089d416 100644
--- a/framework/wcf/Scenario/TrustedFacade/CS/BackendService/App.config
+++ b/framework/wcf/Scenario/TrustedFacade/CS/BackendService/App.config
@@ -1,30 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.TrustedFacade.BackendService" behaviorConfiguration="BackendServiceBehavior">
-        <endpoint address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+        <endpoint address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <customBinding>
         <binding name="Binding1">
-          <security authenticationMode="UserNameOverTransport"/>
-          <windowsStreamSecurity/>
-          <tcpTransport/>
+          <security authenticationMode="UserNameOverTransport" />
+          <windowsStreamSecurity />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="BackendServiceBehavior">
           <serviceCredentials>
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, BackendService"/>
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, BackendService" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/TrustedFacade/CS/BackendService/BackendService.csproj b/framework/wcf/Scenario/TrustedFacade/CS/BackendService/BackendService.csproj
index 304c05158df..db9d4b9960c 100644
--- a/framework/wcf/Scenario/TrustedFacade/CS/BackendService/BackendService.csproj
+++ b/framework/wcf/Scenario/TrustedFacade/CS/BackendService/BackendService.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{FD3C52F1-586A-47EC-A1D0-8CBFA615CBD6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BackendService</RootNamespace>
     <AssemblyName>BackendService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,10 +36,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel">
-    </Reference>
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -69,29 +47,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -99,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/TrustedFacade/CS/Client/App.config b/framework/wcf/Scenario/TrustedFacade/CS/Client/App.config
index 3b6706576a7..2508e81cca1 100644
--- a/framework/wcf/Scenario/TrustedFacade/CS/Client/App.config
+++ b/framework/wcf/Scenario/TrustedFacade/CS/Client/App.config
@@ -1,20 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-        <endpoint name="" address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientUserNameBehavior" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+      <endpoint name="" address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientUserNameBehavior" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientUserNameBehavior">
@@ -28,11 +26,11 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/TrustedFacade/CS/Client/Client.csproj b/framework/wcf/Scenario/TrustedFacade/CS/Client/Client.csproj
index 770249e6115..86031d61889 100644
--- a/framework/wcf/Scenario/TrustedFacade/CS/Client/Client.csproj
+++ b/framework/wcf/Scenario/TrustedFacade/CS/Client/Client.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{317CA326-EFB3-4A35-A1DE-D073B4E8DD53}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Client</RootNamespace>
     <AssemblyName>Client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,8 +36,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -68,29 +47,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -98,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/App.config b/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/App.config
index 35989ad6b12..872e06fb5ac 100644
--- a/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/App.config
+++ b/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/App.config
@@ -1,56 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.TrustedFacade.FacadeService" behaviorConfiguration="FacadeServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/FacadeService"/>
+            <add baseAddress="http://localhost:8000/FacadeService" />
           </baseAddresses>
         </host>
-        <endpoint address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+        <endpoint address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/FacadeService/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <client>
-      <endpoint name="" address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="ClientBinding" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+      <endpoint name="" address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="ClientBinding" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
       <customBinding>
         <binding name="ClientBinding">
-          <security authenticationMode="UserNameOverTransport"/>
-          <windowsStreamSecurity/>
-          <tcpTransport/>
+          <security authenticationMode="UserNameOverTransport" />
+          <windowsStreamSecurity />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="FacadeServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-
+          <serviceMetadata httpGetEnabled="True" />
           <!-- 
           The serviceCredentials behavior allows one to define a service certificate.
           A service certificate is used by the service to authenticate itself to its clients and to provide message protection.
           This configuration references the "localhost" certificate installed during the setup instructions.
           -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, FacadeService"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, FacadeService" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/FacadeService.csproj b/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/FacadeService.csproj
index e03c14b2c54..c4bbbf87240 100644
--- a/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/FacadeService.csproj
+++ b/framework/wcf/Scenario/TrustedFacade/CS/FacadeService/FacadeService.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F0D42A09-93B8-4ED1-A3BB-05BAB632E376}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FacadeService</RootNamespace>
     <AssemblyName>FacadeService</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,10 +36,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.IdentityModel">
-    </Reference>
-    <Reference Include="System.ServiceModel">
-    </Reference>
+    <Reference Include="System.IdentityModel" />
+    <Reference Include="System.ServiceModel" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -70,29 +48,7 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -100,4 +56,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Scenario/TrustedFacade/VB/BackendService/App.config b/framework/wcf/Scenario/TrustedFacade/VB/BackendService/App.config
index 2054233cb99..8eed089d416 100644
--- a/framework/wcf/Scenario/TrustedFacade/VB/BackendService/App.config
+++ b/framework/wcf/Scenario/TrustedFacade/VB/BackendService/App.config
@@ -1,30 +1,28 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.TrustedFacade.BackendService" behaviorConfiguration="BackendServiceBehavior">
-        <endpoint address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+        <endpoint address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
       </service>
     </services>
-
     <bindings>
       <customBinding>
         <binding name="Binding1">
-          <security authenticationMode="UserNameOverTransport"/>
-          <windowsStreamSecurity/>
-          <tcpTransport/>
+          <security authenticationMode="UserNameOverTransport" />
+          <windowsStreamSecurity />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="BackendServiceBehavior">
           <serviceCredentials>
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, BackendService"/>
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, BackendService" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/TrustedFacade/VB/Client/App.config b/framework/wcf/Scenario/TrustedFacade/VB/Client/App.config
index a4f848a32c2..2508e81cca1 100644
--- a/framework/wcf/Scenario/TrustedFacade/VB/Client/App.config
+++ b/framework/wcf/Scenario/TrustedFacade/VB/Client/App.config
@@ -1,20 +1,18 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <client>
-      <endpoint name="" address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientUserNameBehavior" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+      <endpoint name="" address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" behaviorConfiguration="ClientUserNameBehavior" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
     </bindings>
-
     <behaviors>
       <endpointBehaviors>
         <behavior name="ClientUserNameBehavior">
@@ -28,11 +26,11 @@
               This setting is less secure than the default, ChainTrust. The security implications of this 
               setting should be carefully considered before using PeerOrChainTrust in production code. 
               -->
-              <authentication certificateValidationMode="PeerOrChainTrust"/>
+              <authentication certificateValidationMode="PeerOrChainTrust" />
             </serviceCertificate>
           </clientCredentials>
         </behavior>
       </endpointBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Scenario/TrustedFacade/VB/FacadeService/App.config b/framework/wcf/Scenario/TrustedFacade/VB/FacadeService/App.config
index 35989ad6b12..872e06fb5ac 100644
--- a/framework/wcf/Scenario/TrustedFacade/VB/FacadeService/App.config
+++ b/framework/wcf/Scenario/TrustedFacade/VB/FacadeService/App.config
@@ -1,56 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <configuration>
   <system.serviceModel>
     <services>
       <service name="Microsoft.Samples.TrustedFacade.FacadeService" behaviorConfiguration="FacadeServiceBehavior">
         <host>
           <baseAddresses>
-            <add baseAddress="http://localhost:8000/FacadeService"/>
+            <add baseAddress="http://localhost:8000/FacadeService" />
           </baseAddresses>
         </host>
-        <endpoint address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+        <endpoint address="http://localhost:8000/FacadeService" binding="wsHttpBinding" bindingConfiguration="Binding1" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
         <!-- the mex endpoint is exposed at http://localhost:8000/FacadeService/mex -->
-        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange"/>
+        <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
       </service>
     </services>
-
     <client>
-      <endpoint name="" address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="ClientBinding" contract="Microsoft.Samples.TrustedFacade.ICalculator"/>
+      <endpoint name="" address="net.tcp://localhost:8001/BackendService" binding="customBinding" bindingConfiguration="ClientBinding" contract="Microsoft.Samples.TrustedFacade.ICalculator" />
     </client>
-
     <bindings>
       <wsHttpBinding>
         <binding name="Binding1">
           <security mode="Message">
-            <message clientCredentialType="UserName"/>
+            <message clientCredentialType="UserName" />
           </security>
         </binding>
       </wsHttpBinding>
       <customBinding>
         <binding name="ClientBinding">
-          <security authenticationMode="UserNameOverTransport"/>
-          <windowsStreamSecurity/>
-          <tcpTransport/>
+          <security authenticationMode="UserNameOverTransport" />
+          <windowsStreamSecurity />
+          <tcpTransport />
         </binding>
       </customBinding>
     </bindings>
-
     <behaviors>
       <serviceBehaviors>
         <behavior name="FacadeServiceBehavior">
-          <serviceMetadata httpGetEnabled="True"/>
-
+          <serviceMetadata httpGetEnabled="True" />
           <!-- 
           The serviceCredentials behavior allows one to define a service certificate.
           A service certificate is used by the service to authenticate itself to its clients and to provide message protection.
           This configuration references the "localhost" certificate installed during the setup instructions.
           -->
           <serviceCredentials>
-            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName"/>
-            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, FacadeService"/>
+            <serviceCertificate findValue="localhost" storeLocation="LocalMachine" storeName="My" x509FindType="FindBySubjectName" />
+            <userNameAuthentication userNamePasswordValidationMode="Custom" customUserNamePasswordValidatorType="Microsoft.Samples.TrustedFacade.MyUserNamePasswordValidator, FacadeService" />
           </serviceCredentials>
         </behavior>
       </serviceBehaviors>
     </behaviors>
   </system.serviceModel>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+</configuration>
diff --git a/framework/wcf/Setup/FindPrivateKey/CS/FindPrivateKey.csproj b/framework/wcf/Setup/FindPrivateKey/CS/FindPrivateKey.csproj
index b2345915330..68952667da9 100644
--- a/framework/wcf/Setup/FindPrivateKey/CS/FindPrivateKey.csproj
+++ b/framework/wcf/Setup/FindPrivateKey/CS/FindPrivateKey.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{F58C5713-2550-4820-8CAF-D083B8483A53}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FindPrivateKey</RootNamespace>
     <AssemblyName>FindPrivateKey</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
     <StartupObject>Microsoft.Samples.Tools.FindPrivateKey.FindPrivateKey</StartupObject>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -64,32 +44,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -97,4 +55,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Setup/FindPrivateKey/CS/app.config b/framework/wcf/Setup/FindPrivateKey/CS/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Setup/FindPrivateKey/CS/app.config
+++ b/framework/wcf/Setup/FindPrivateKey/CS/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Tools/ConfigurationCodeGenerator/CS/ConfigurationCodeGenerator.csproj b/framework/wcf/Tools/ConfigurationCodeGenerator/CS/ConfigurationCodeGenerator.csproj
index 29ca9c2cef5..1b857c1396f 100644
--- a/framework/wcf/Tools/ConfigurationCodeGenerator/CS/ConfigurationCodeGenerator.csproj
+++ b/framework/wcf/Tools/ConfigurationCodeGenerator/CS/ConfigurationCodeGenerator.csproj
@@ -1,37 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{13127AAF-79C9-4F07-B669-6E0E5BE71B99}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.ChannelSDK.Tools.ConfigurationCodeGenerator</RootNamespace>
     <AssemblyName>ConfigurationCodeGenerator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>4.0</OldToolsVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -70,32 +50,9 @@
     <Compile Include="StandardBindingSectionGenerator.cs" />
   </ItemGroup>
   <ItemGroup />
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -104,6 +61,7 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>copy "$(ProjectDir)SampleRun.cmd" "$(TargetDir)SampleRun.cmd"</PostBuildEvent>
+    <PostBuildEvent>copy "$(MSBuildProjectDirectory)\SampleRun.cmd" "$(TargetDir)SampleRun.cmd"</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/framework/wcf/Tools/ConfigurationCodeGenerator/CS/app.config b/framework/wcf/Tools/ConfigurationCodeGenerator/CS/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Tools/ConfigurationCodeGenerator/CS/app.config
+++ b/framework/wcf/Tools/ConfigurationCodeGenerator/CS/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>
diff --git a/framework/wcf/Tools/CustomChannelsTester/CS/CustomChannelsTester.csproj b/framework/wcf/Tools/CustomChannelsTester/CS/CustomChannelsTester.csproj
index c6df1275ae5..5e0ef7b2ab6 100644
--- a/framework/wcf/Tools/CustomChannelsTester/CS/CustomChannelsTester.csproj
+++ b/framework/wcf/Tools/CustomChannelsTester/CS/CustomChannelsTester.csproj
@@ -1,38 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{DCB577D2-21F6-4BB3-BDF1-6479BDF569B0}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>System.ServiceModel.Samples.CustomChannelsTester</RootNamespace>
     <AssemblyName>CustomChannelsTester</AssemblyName>
     <StartupObject>Microsoft.Samples.Tools.CustomChannelsTester.CustomChannelsTester</StartupObject>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,26 +56,7 @@
     <Compile Include="Log.cs" />
     <Compile Include="Parameters.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <None Include="app.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
     <Compile Include="SchemaValidator.cs" />
     <Compile Include="Server.cs" />
     <Compile Include="TestRunner.cs" />
@@ -119,29 +80,6 @@
   <ItemGroup>
     <Content Include="TestSpec.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
@@ -151,9 +89,10 @@
   -->
   <PropertyGroup>
     <PostBuildEvent>
-      copy "$(ProjectDir)SampleRun.cmd" "$(TargetDir)SampleRun.cmd"
-      copy "$(ProjectDir)TestSpec.xml" "$(TargetDir)TestSpec.xml"
-      copy "$(ProjectDir)TestSpec.xsd" "$(TargetDir)TestSpec.xsd"
+      copy "$(MSBuildProjectDirectory)\SampleRun.cmd" "$(TargetDir)SampleRun.cmd"
+      copy "$(MSBuildProjectDirectory)\TestSpec.xml" "$(TargetDir)TestSpec.xml"
+      copy "$(MSBuildProjectDirectory)\TestSpec.xsd" "$(TargetDir)TestSpec.xsd"
     </PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Resources.Designer.cs b/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Resources.Designer.cs
deleted file mode 100644
index 49958bbbe9a..00000000000
--- a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.Samples.Tools.CustomChannelsTester.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // 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.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    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() {
-        }
-        
-        /// <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 (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Samples.Tools.CustomChannelsTester.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 {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Resources.resx b/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Resources.resx
deleted file mode 100644
index af7dbebbace..00000000000
--- a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Settings.Designer.cs b/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Settings.Designer.cs
deleted file mode 100644
index 4eb494a1cc3..00000000000
--- a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-//----------------------------------------------------------------
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//----------------------------------------------------------------
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.20915.0
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Microsoft.Samples.Tools.CustomChannelsTester.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.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/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Settings.settings b/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Settings.settings
deleted file mode 100644
index 39645652af6..00000000000
--- a/framework/wcf/Tools/CustomChannelsTester/CS/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
diff --git a/framework/wcf/Tools/CustomChannelsTester/CS/app.config b/framework/wcf/Tools/CustomChannelsTester/CS/app.config
index e3656033377..15ae7946751 100644
--- a/framework/wcf/Tools/CustomChannelsTester/CS/app.config
+++ b/framework/wcf/Tools/CustomChannelsTester/CS/app.config
@@ -1,3 +1,2 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+<?xml version="1.0"?>
+<configuration></configuration>