diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config
index f12e9980297..80896cfafea 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/App.config
@@ -7,5 +7,4 @@
     </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/Connected Services/Microsoft.ServiceModel.Samples/ConnectedService.json b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Connected Services/Microsoft.ServiceModel.Samples/ConnectedService.json
new file mode 100644
index 00000000000..77d4156f6cc
--- /dev/null
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Connected Services/Microsoft.ServiceModel.Samples/ConnectedService.json	
@@ -0,0 +1,17 @@
+{
+  "ExtendedData": {
+    "inputs": [
+      "http://localhost/servicemodelsamples/service.svc"
+    ],
+    "collectionTypes": [
+      "System.Array",
+      "System.Collections.Generic.Dictionary`2"
+    ],
+    "namespaceMappings": [
+      "*, Microsoft.ServiceModel.Samples"
+    ],
+    "sync": true,
+    "targetFramework": "net6.0",
+    "typeReuseMode": "None"
+  }
+}
\ No newline at end of file
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Connected Services/Microsoft.ServiceModel.Samples/Reference.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Connected Services/Microsoft.ServiceModel.Samples/Reference.cs
new file mode 100644
index 00000000000..19086c3d422
--- /dev/null
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Connected Services/Microsoft.ServiceModel.Samples/Reference.cs	
@@ -0,0 +1,194 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.ServiceModel.Samples
+{
+    
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.1.0")]
+    [System.ServiceModel.ServiceContractAttribute(Namespace="http://Microsoft.ServiceModel.Samples", ConfigurationName="Microsoft.ServiceModel.Samples.IErrorCalculator")]
+    public interface IErrorCalculator
+    {
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Add", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/AddResponse")]
+        int Add(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Add", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/AddResponse")]
+        System.Threading.Tasks.Task<int> AddAsync(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Subtract", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/SubtractResponse")]
+        int Subtract(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Subtract", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/SubtractResponse")]
+        System.Threading.Tasks.Task<int> SubtractAsync(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Multiply", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/MultiplyResponse")]
+        int Multiply(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Multiply", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/MultiplyResponse")]
+        System.Threading.Tasks.Task<int> MultiplyAsync(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Divide", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/DivideResponse")]
+        int Divide(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Divide", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/DivideResponse")]
+        System.Threading.Tasks.Task<int> DivideAsync(int n1, int n2);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Factorial", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/FactorialResponse")]
+        int Factorial(int n);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://Microsoft.ServiceModel.Samples/IErrorCalculator/Factorial", ReplyAction="http://Microsoft.ServiceModel.Samples/IErrorCalculator/FactorialResponse")]
+        System.Threading.Tasks.Task<int> FactorialAsync(int n);
+    }
+    
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.1.0")]
+    public interface IErrorCalculatorChannel : Microsoft.ServiceModel.Samples.IErrorCalculator, System.ServiceModel.IClientChannel
+    {
+    }
+    
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "2.1.0")]
+    public partial class ErrorCalculatorClient : System.ServiceModel.ClientBase<Microsoft.ServiceModel.Samples.IErrorCalculator>, Microsoft.ServiceModel.Samples.IErrorCalculator
+    {
+        
+        /// <summary>
+        /// Implement this partial method to configure the service endpoint.
+        /// </summary>
+        /// <param name="serviceEndpoint">The endpoint to configure</param>
+        /// <param name="clientCredentials">The client credentials</param>
+        static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials);
+        
+        public ErrorCalculatorClient() : 
+                base(ErrorCalculatorClient.GetDefaultBinding(), ErrorCalculatorClient.GetDefaultEndpointAddress())
+        {
+            this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_IErrorCalculator.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public ErrorCalculatorClient(EndpointConfiguration endpointConfiguration) : 
+                base(ErrorCalculatorClient.GetBindingForEndpoint(endpointConfiguration), ErrorCalculatorClient.GetEndpointAddress(endpointConfiguration))
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public ErrorCalculatorClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : 
+                base(ErrorCalculatorClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress))
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public ErrorCalculatorClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(ErrorCalculatorClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress)
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+        
+        public ErrorCalculatorClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(binding, remoteAddress)
+        {
+        }
+        
+        public int Add(int n1, int n2)
+        {
+            return base.Channel.Add(n1, n2);
+        }
+        
+        public System.Threading.Tasks.Task<int> AddAsync(int n1, int n2)
+        {
+            return base.Channel.AddAsync(n1, n2);
+        }
+        
+        public int Subtract(int n1, int n2)
+        {
+            return base.Channel.Subtract(n1, n2);
+        }
+        
+        public System.Threading.Tasks.Task<int> SubtractAsync(int n1, int n2)
+        {
+            return base.Channel.SubtractAsync(n1, n2);
+        }
+        
+        public int Multiply(int n1, int n2)
+        {
+            return base.Channel.Multiply(n1, n2);
+        }
+        
+        public System.Threading.Tasks.Task<int> MultiplyAsync(int n1, int n2)
+        {
+            return base.Channel.MultiplyAsync(n1, n2);
+        }
+        
+        public int Divide(int n1, int n2)
+        {
+            return base.Channel.Divide(n1, n2);
+        }
+        
+        public System.Threading.Tasks.Task<int> DivideAsync(int n1, int n2)
+        {
+            return base.Channel.DivideAsync(n1, n2);
+        }
+        
+        public int Factorial(int n)
+        {
+            return base.Channel.Factorial(n);
+        }
+        
+        public System.Threading.Tasks.Task<int> FactorialAsync(int n)
+        {
+            return base.Channel.FactorialAsync(n);
+        }
+        
+        public virtual System.Threading.Tasks.Task OpenAsync()
+        {
+            return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndOpen));
+        }
+        
+        private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
+        {
+            if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_IErrorCalculator))
+            {
+                System.ServiceModel.BasicHttpBinding result = new System.ServiceModel.BasicHttpBinding();
+                result.MaxBufferSize = int.MaxValue;
+                result.ReaderQuotas = System.Xml.XmlDictionaryReaderQuotas.Max;
+                result.MaxReceivedMessageSize = int.MaxValue;
+                result.AllowCookies = true;
+                return result;
+            }
+            throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
+        }
+        
+        private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
+        {
+            if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_IErrorCalculator))
+            {
+                return new System.ServiceModel.EndpointAddress("http://localhost/servicemodelsamples/service.svc");
+            }
+            throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
+        }
+        
+        private static System.ServiceModel.Channels.Binding GetDefaultBinding()
+        {
+            return ErrorCalculatorClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_IErrorCalculator);
+        }
+        
+        private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress()
+        {
+            return ErrorCalculatorClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_IErrorCalculator);
+        }
+        
+        public enum EndpointConfiguration
+        {
+            
+            BasicHttpBinding_IErrorCalculator,
+        }
+    }
+}
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/AssemblyInfo.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/AssemblyInfo.cs
deleted file mode 100644
index b8c905afe00..00000000000
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-#region Using directives
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Security.Permissions;
-
-#endregion
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
-[assembly: AssemblyTitle("client")]
-[assembly: AssemblyDescription("Error Logging")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("client")]
-[assembly: AssemblyCopyright("Copyright @ Microsoft 2004")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.*")]
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Resources.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Resources.cs
deleted file mode 100644
index db82d9baa27..00000000000
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Resources.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.40903.19
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </autogenerated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    /// <summary>
-    ///    A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the Strongly Typed Resource Builder
-    // class via a tool like ResGen or Visual Studio.NET.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    class Resources {
-        
-        private static System.Resources.ResourceManager _resMgr;
-        
-        private static System.Globalization.CultureInfo _resCulture;
-        
-        /*FamANDAssem*/ internal Resources() {
-        }
-        
-        /// <summary>
-        ///    Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static System.Resources.ResourceManager ResourceManager {
-            get {
-                if ((_resMgr == null)) {
-                    System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Properties.Resources", typeof(Resources).Assembly);
-                    _resMgr = temp;
-                }
-                return _resMgr;
-            }
-        }
-        
-        /// <summary>
-        ///    Overrides the current thread's CurrentUICulture property for all
-        ///    resource lookups using this strongly typed resource class.
-        /// </summary>
-        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static System.Globalization.CultureInfo Culture {
-            get {
-                return _resCulture;
-            }
-            set {
-                _resCulture = value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Resources.resx b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Resources.resx
deleted file mode 100644
index fe52bb6e966..00000000000
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/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/ErrorHandling/ErrorLogging/CS/client/Properties/Settings.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Settings.cs
deleted file mode 100644
index 2a1d033374d..00000000000
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Settings.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-//------------------------------------------------------------------------------
-// <autogenerated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.40903.19
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </autogenerated>
-//------------------------------------------------------------------------------
-
-namespace Properties {
-    
-    
-    sealed partial class Settings : System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings m_Value;
-        
-        private static object m_SyncObject = new object();
-        
-        [System.Diagnostics.DebuggerNonUserCode()]
-        public static Settings Value {
-            get {
-                if ((Settings.m_Value == null)) {
-                    System.Threading.Monitor.Enter(Settings.m_SyncObject);
-                    if ((Settings.m_Value == null)) {
-                        try {
-                            Settings.m_Value = new Settings();
-                        }
-                        finally {
-                            System.Threading.Monitor.Exit(Settings.m_SyncObject);
-                        }
-                    }
-                }
-                return Settings.m_Value;
-            }
-        }
-    }
-}
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Settings.settings b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/Properties/Settings.settings
deleted file mode 100644
index 099a656bee6..00000000000
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/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/ErrorHandling/ErrorLogging/CS/client/client.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.cs
index 119347dd694..c7f0ff67d9a 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.cs
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.cs
@@ -2,8 +2,6 @@
 //  Copyright (c) Microsoft Corporation.  All Rights Reserved.
 
 using System;
-
-using System.ServiceModel.Channels;
 using System.ServiceModel;
 
 namespace Microsoft.ServiceModel.Samples
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj
index 15af4395b72..eeec9b3a2b1 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/client/client.csproj
@@ -1,92 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <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>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>
-    </RootNamespace>
-    <AssemblyName>client</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</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 />
+    <Title>Client</Title>
+    <Description>Error Logging</Description>
+    <Company>Microsoft Corporation</Company>
+    <Product>Windows Communication Foundation and Windows Workflow Foundation SDK</Product>
+    <Copyright>Copyright (c) Microsoft Corporation</Copyright>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <None Remove="Connected Services\Microsoft.ServiceModel.Samples\ConnectedService.json" />
+    <Compile Remove="Connected Services\Microsoft.ServiceModel.Samples\Reference.cs" />
+    <None Include="Connected Services\Microsoft.ServiceModel.Samples\Reference.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="client.cs" />
-    <Compile Include="generatedClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <None Remove="App.config" />
+    <Compile Remove="generatedClient.cs" />
+    <None Include="generatedClient.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <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 Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="System.ServiceModel.Primitives" Version="6.*" />
+    <PackageReference Include="System.ServiceModel.Http" Version="6.*" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Properties/AssemblyInfo.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Properties/AssemblyInfo.cs
index 6ed37ac9f4b..45fc355421f 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Properties/AssemblyInfo.cs
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Properties/AssemblyInfo.cs
@@ -2,9 +2,7 @@
 
 using System;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Security.Permissions;
 
 #endregion
 
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Web.config b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Web.config
index a8764666d0f..c369438dd61 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Web.config
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/Web.config
@@ -12,5 +12,4 @@
     </behaviors>
 
   </system.serviceModel>
-
 </configuration>
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.cs b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.cs
index 3fae531dbd4..47d361005a3 100644
--- a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.cs
+++ b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.cs
@@ -3,7 +3,6 @@
 
 using System;
 using System.IO;
-using System.Runtime.Serialization;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
@@ -12,7 +11,7 @@
 namespace Microsoft.ServiceModel.Samples
 {
     // Define a service contract
-    [ServiceContract(Namespace="http://Microsoft.ServiceModel.Samples")]
+    [ServiceContract(Namespace = "http://Microsoft.ServiceModel.Samples")]
     public interface IErrorCalculator
     {
         [OperationContract]
@@ -36,20 +35,11 @@ public interface IErrorCalculator
     [ErrorBehavior(typeof(CalculatorErrorHandler))]
     public class CalculatorService : IErrorCalculator
     {
-        public int Add(int n1, int n2)
-        {
-            return n1 + n2;
-        }
+        public int Add(int n1, int n2) => n1 + n2;
 
-        public int Subtract(int n1, int n2)
-        {
-            return n1 - n2;
-        }
+        public int Subtract(int n1, int n2) => n1 - n2;
 
-        public int Multiply(int n1, int n2)
-        {
-            return n1 * n2;
-        }
+        public int Multiply(int n1, int n2) => n1 * n2;
 
         public int Divide(int n1, int n2)
         {
@@ -106,17 +96,9 @@ public bool HandleError(Exception error)
     // This attribute can be used to install a custom error handler for a service
     public sealed class ErrorBehaviorAttribute : Attribute, IServiceBehavior
     {
-        Type errorHandlerType;
+        public ErrorBehaviorAttribute(Type errorHandlerType) => ErrorHandlerType = errorHandlerType;
 
-        public ErrorBehaviorAttribute(Type errorHandlerType)
-        {
-            this.errorHandlerType = errorHandlerType;
-        }
- 
-        public Type ErrorHandlerType
-        {
-            get { return this.errorHandlerType; }
-        }
+        public Type ErrorHandlerType { get; }
 
         void IServiceBehavior.Validate(ServiceDescription description, ServiceHostBase serviceHostBase)
         {
@@ -132,7 +114,7 @@ void IServiceBehavior.ApplyDispatchBehavior(ServiceDescription description, Serv
 
             try
             {
-                errorHandler = (IErrorHandler)Activator.CreateInstance(errorHandlerType);
+                errorHandler = (IErrorHandler)Activator.CreateInstance(ErrorHandlerType);
             }
             catch (MissingMethodException e)
             {
@@ -147,7 +129,7 @@ void IServiceBehavior.ApplyDispatchBehavior(ServiceDescription description, Serv
             {
                 ChannelDispatcher channelDispatcher = channelDispatcherBase as ChannelDispatcher;
                 channelDispatcher.ErrorHandlers.Add(errorHandler);
-            }                                                
+            }
         }
     }
 }
diff --git a/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.csproj b/framework/wcf/Extensibility/ErrorHandling/ErrorLogging/CS/service/service.csproj
index bb88c6d8cf7..782fe387504 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>
@@ -42,6 +21,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -51,6 +31,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -68,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" />
+  <Import Project="$(MSBuildToolsPath)\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 "$(ProjectDir)service.svc" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+      copy "$(ProjectDir)web.config" %SystemDrive%\inetpub\wwwroot\servicemodelsamples
+    </PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>