diff --git a/System.ServiceModel.sln b/System.ServiceModel.sln
index 161e8472379..09459d5609d 100644
--- a/System.ServiceModel.sln
+++ b/System.ServiceModel.sln
@@ -49,8 +49,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Encoding.MessageVersion.Int
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensibility.MessageEncoder.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Extensibility\MessageEncoder\Extensibility.MessageEncoder.IntegrationTests.csproj", "{76361777-321D-4588-87F9-38992A758350}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensibility.MessageInterceptor.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Extensibility\MessageInterceptor\Extensibility.MessageInterceptor.IntegrationTests.csproj", "{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Extensibility.WebSockets.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Extensibility\WebSockets\Extensibility.WebSockets.IntegrationTests.csproj", "{C8CA16D3-5B1E-4EC0-A817-205A798DC272}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure.IntegrationTests", "src\System.Private.ServiceModel\tests\Scenarios\Infrastructure\Infrastructure.IntegrationTests.csproj", "{719E874A-AEFA-44D5-9530-9C41BD0FA4E8}"
@@ -209,10 +207,6 @@ Global
 		{76361777-321D-4588-87F9-38992A758350}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{76361777-321D-4588-87F9-38992A758350}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{76361777-321D-4588-87F9-38992A758350}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8CA16D3-5B1E-4EC0-A817-205A798DC272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8CA16D3-5B1E-4EC0-A817-205A798DC272}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8CA16D3-5B1E-4EC0-A817-205A798DC272}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -337,7 +331,6 @@ Global
 		{48C41A27-631F-45FA-ACD5-7D7EDD4A4931} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
 		{36DD97F6-1F78-4843-A9C0-58C59D367603} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
 		{76361777-321D-4588-87F9-38992A758350} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
-		{ACCCB1B8-5ABE-4F3B-BFEF-9A9C15AA1267} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
 		{C8CA16D3-5B1E-4EC0-A817-205A798DC272} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
 		{719E874A-AEFA-44D5-9530-9C41BD0FA4E8} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
 		{E878E412-F0AB-4D87-8A7A-3114AAC48CD5} = {D6302510-AB10-4775-BCE9-98FA96FDEB76}
diff --git a/azure-pipelines-arcade-PR.yml b/azure-pipelines-arcade-PR.yml
index 75d0f693d55..869100a6d4d 100644
--- a/azure-pipelines-arcade-PR.yml
+++ b/azure-pipelines-arcade-PR.yml
@@ -200,7 +200,6 @@ stages:
               --projects $(Build.SourcesDirectory)/eng/SendToHelix.proj
               $(_TestArgs)
               /p:TestJob=Linux
-              /p:RunWithCoreWcfService=$($Env:_RunWithCoreWcfService)
               /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/SendToHelix.binlog
             displayName: Linux - Run Helix Tests
             env:
@@ -208,11 +207,13 @@ stages:
               ServiceHost: $(_serviceUri)
               RunAsPublic: $(_RunAsPublic)
               RunAsInternal: $(_RunAsInternal)
+              RunWithCoreWcfService: $(_RunWithCoreWcfService)
               IsWindowsBuild: false
 
       # Only build and test MacOS in PR and CI builds.
       - ${{ if eq(variables._RunAsPublic, True) }}:
         - job: MacOS
+          condition: ne(variables._RunWithCoreWcfService, True)
           timeoutInMinutes: 90
           pool:
             name: NetCore-Public
diff --git a/eng/SendToHelix.proj b/eng/SendToHelix.proj
index c07575f4bf7..b3628eb579b 100644
--- a/eng/SendToHelix.proj
+++ b/eng/SendToHelix.proj
@@ -1,20 +1,35 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
+<Project Sdk="Microsoft.DotNet.Helix.Sdk" InitialTargets="InstallDotNet;BuildProjects;Test">
   <PropertyGroup>
     <HelixSource Condition=" '$(RunAsPublic)' == 'true' ">pr/dotnet/wcf/$(BUILD_SOURCEBRANCH)/</HelixSource>
     <HelixSource Condition=" '$(RunAsInternal)' == 'true' ">official/dotnet/wcf/$(BUILD_SOURCEBRANCH)/</HelixSource>
     <HelixType>test/product/</HelixType>
     <HelixBuild>$(BUILD_BUILDNUMBER)</HelixBuild>
     <HelixBuild Condition="'$(HelixBuild)' == ''">123460.01</HelixBuild>
-	<DotNetCliPackageType>sdk</DotNetCliPackageType>
-    <DotNetCliVersion>8.0.100</DotNetCliVersion>
-    <IncludeDotNetCli>true</IncludeDotNetCli>
 
+    <!-- Read global.json so we know the version of the dotnet cli we need -->
+    <GlobalJsonContent>$([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))</GlobalJsonContent>
+    <DotNetCliPackageType>sdk</DotNetCliPackageType>
+    <DotNetCliVersion>$([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F&lt;="dotnet": ").*(%3F=")'))</DotNetCliVersion>
+
+    <IncludeDotNetCli>true</IncludeDotNetCli>
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <TestRunNamePrefix>$(AGENT_JOBNAME)</TestRunNamePrefix>
-
     <EnableXUnitReporter>true</EnableXUnitReporter>
   </PropertyGroup>
-
+  
+  <Target Name="InstallDotNet">
+    <ItemGroup>
+      <AdditionalDotNetPackage Include="8.0.8">
+        <PackageType>aspnetcore-runtime</PackageType>
+        <Channel>Current</Channel>
+      </AdditionalDotNetPackage>
+    </ItemGroup>
+  </Target>
+  
+  <Target Name="BuildProjects">
+    <MSBuild Targets="Restore;Publish" Projects="..\src\System.Private.ServiceModel\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj"/>
+  </Target>
+    
   <ItemGroup>
     <XUnitProject Include="..\src\System.Private.ServiceModel\tests\Scenarios\**\*.IntegrationTests.csproj">
       <TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework>
@@ -53,19 +68,46 @@
     <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator>
     <Creator Condition=" '$(Creator)' == ''">anon</Creator>
   </PropertyGroup>
-  
-  <PropertyGroup Condition="!$(HelixTargetQueue.StartsWith('Windows'))">
+
+  <PropertyGroup>
+    <RunWithCoreWCFService Condition="'$(RunWithCoreWCFService)' == ''">false</RunWithCoreWCFService>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TestJob)' != 'Windows'" >
     <HelixPreCommands>$(HelixPreCommands);chmod a+x $HELIX_CORRELATION_PAYLOAD/InstallRootCertificate.sh</HelixPreCommands>
     <HelixPreCommands>$(HelixPreCommands);sudo -E -n $HELIX_CORRELATION_PAYLOAD/InstallRootCertificate.sh --service-host $(ServiceHost) --cert-file /tmp/wcfrootca.crt</HelixPreCommands>
   </PropertyGroup>
 
-  <Target Name="Pack"/>
+  <PropertyGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunWithCoreWCFService)' == 'true'">
+    <HelixPreCommands>$(HelixPreCommands);set PATH=%HELIX_CORRELATION_PAYLOAD%\dotnet-cli%3B%PATH%</HelixPreCommands>
+    <!-- %3B is an escaped ; -->
+    <HelixPreCommands>$(HelixPreCommands);set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\dotnet-cli;set DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);set DOTNET_CLI_HOME=%HELIX_WORKITEM_ROOT%\.dotnet</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);set NUGET_PACKAGES=%HELIX_WORKITEM_ROOT%\.nuget</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);set ServiceUri=localhost</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);set RunWithCoreWCF=true</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);%HELIX_CORRELATION_PAYLOAD%\SelfHostedCoreWCFService\$(Configuration)\net8.0\SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TestJob)' != 'Windows' AND '$(RunWithCoreWCFService)' == 'true'">
+    <HelixPreCommands>$(HelixPreCommands);export PATH=$HELIX_CORRELATION_PAYLOAD/dotnet-cli:$PATH</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);export DOTNET_ROOT=$HELIX_CORRELATION_PAYLOAD/dotnet-cli;export DOTNET_CLI_TELEMETRY_OPTOUT=1</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);export DOTNET_CLI_HOME=$HELIX_WORKITEM_ROOT/.dotnet</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);export NUGET_PACKAGES=$HELIX_WORKITEM_ROOT/.nuget</HelixPreCommands>    
+    <HelixPreCommands>$(HelixPreCommands);export ServiceUri=localhost</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);export RunWithCoreWCF=true</HelixPreCommands>
+    <HelixPreCommands>$(HelixPreCommands);dotnet exec --roll-forward Major $HELIX_CORRELATION_PAYLOAD/SelfHostedCoreWCFService/$(Configuration)/net8.0/SelfHostedCoreWCFService.dll bootstrap:true</HelixPreCommands>
+  </PropertyGroup>
 
   <ItemGroup>
     <!-- Directory that is zipped up and sent as a correlation payload to Helix -->
     <HelixCorrelationPayload Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\src\System.Private.ServiceModel\tools\scripts'))" >
       <PayloadDirectory>%(Identity)</PayloadDirectory>
     </HelixCorrelationPayload>
+	
+    <HelixCorrelationPayload Include="$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)\..\artifacts\bin\SelfHostedCoreWCFService'))" >
+      <Destination>SelfHostedCoreWCFService</Destination>
+    </HelixCorrelationPayload>
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalTestDetectors.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalTestDetectors.cs
index 9c237866760..82b63a682b7 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalTestDetectors.cs
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalTestDetectors.cs
@@ -142,18 +142,17 @@ public static bool IsWindows()
             return OSID.AnyWindows.MatchesCurrent();
         }
 
-        public static bool IsWindowsOrSelfHosted()
+        // Returns 'true' if the server is running with CoreWCF Service
+        public static bool IsRunWithCoreWCFService()
         {
-            if (IsWindows())
-            {
-                return true;
-            }
-            else if (!IsIISHosted())
+            string runWithCoreWCFService = TestProperties.GetProperty(TestProperties.RunWithCoreWCF_PropertyName);
+
+            if (String.IsNullOrWhiteSpace(runWithCoreWCFService))
             {
-                return true;
+                return false;
             }
 
-            return false;
+            return true;
         }
 
         // Returns 'true' if the server is running as localhost.
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalWcfTest.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalWcfTest.cs
index e46570bdc5f..f5f1f035095 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalWcfTest.cs
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ConditionalWcfTest.cs
@@ -328,7 +328,7 @@ public static bool Windows_Authentication_Available()
             // Temporarily use the simple heuristic that if we are running the services locally, it is.
             // Refactor this after integration to address https://github.com/dotnet/wcf/issues/1024 
             return GetConditionValue(nameof(Windows_Authentication_Available),
-                                     Server_Is_LocalHost);
+                                     Server_Is_LocalHost) && Is_Windows();
         }
 
         // Returns true if NTLM is available to use.
@@ -351,11 +351,6 @@ public static bool SSL_Available()
                                      ConditionalTestDetectors.IsWindows);
         }
 
-        public static bool WindowsOrSelfHosted()
-        {
-            return GetConditionValue(nameof(WindowsOrSelfHosted), ConditionalTestDetectors.IsWindowsOrSelfHosted);
-        }
-
         // Returns the Domain if available.
         // TestProperties takes precedence, but if it has not been specified
         // and this is a Windows client, we infer it.
@@ -387,5 +382,13 @@ public static string GetSPN()
         {
             return ConditionalTestDetectors.GetSPN();
         }
+
+        // Returns 'false' if run with CoreWCF Service,
+        // skip failed test
+        public static bool Skip_CoreWCFService_FailedTest()
+        {
+            return !GetConditionValue(nameof(Skip_CoreWCFService_FailedTest),
+                                     ConditionalTestDetectors.IsRunWithCoreWCFService);
+        }
     }
 }
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs
index 99637924039..086e3157c66 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/ServiceUtilHelper.cs
@@ -530,8 +530,8 @@ public static string GetEndpointAddress(string endpoint, string protocol = "http
 
     private static string GetResourceAddress(string resource, string protocol = "http")
     {
-        string host = TestProperties.GetProperty(TestProperties.ServiceUri_PropertyName);
-        return string.Format(@"{0}://{1}/{2}/{3}", protocol, host, TestHostUtilitiesService, resource);
+        var baseUri = BuildBaseUri(protocol);
+        return new Uri(baseUri, $"{TestHostUtilitiesService}/{resource}").ToString();
     }
 
     public static string GetResourceFromServiceAsString(string resource)
@@ -542,7 +542,14 @@ public static string GetResourceFromServiceAsString(string resource)
         using (HttpClient httpClient = new HttpClient())
         {
             HttpResponseMessage response = httpClient.GetAsync(requestUri).GetAwaiter().GetResult();
-            return response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+            if (response.IsSuccessStatusCode)
+            {
+                return response.Content.ReadAsStringAsync().GetAwaiter().GetResult();
+            }
+            else
+            {
+                throw new Exception($"Got Status code {response.StatusCode} from {requestUri}.");
+            }
         }
     }
 
@@ -554,7 +561,14 @@ public static byte[] GetResourceFromServiceAsByteArray(string resource)
         using (HttpClient httpClient = new HttpClient())
         {
             HttpResponseMessage response = httpClient.GetAsync(requestUri).GetAwaiter().GetResult();
-            return response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
+            if (response.IsSuccessStatusCode)
+            {
+                return response.Content.ReadAsByteArrayAsync().GetAwaiter().GetResult();
+            }
+            else
+            {
+                throw new Exception($"Got Status code {response.StatusCode} from {requestUri}.");
+            }
         }
     }
 
@@ -566,7 +580,14 @@ public static async Task<byte[]> GetResourceFromServiceAsByteArrayAsync(string r
         using (HttpClient httpClient = new HttpClient())
         {
             HttpResponseMessage response = await httpClient.GetAsync(requestUri);
-            return await response.Content.ReadAsByteArrayAsync();
+            if (response.IsSuccessStatusCode)
+            {
+                return await response.Content.ReadAsByteArrayAsync();
+            }
+            else
+            {
+                throw new Exception($"Got Status code {response.StatusCode} from {requestUri}.");
+            }
         }
     }
 }
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.props b/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.props
index 0fad0893561..67cd0d824a9 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.props
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.props
@@ -2,149 +2,152 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 
-    <!-- Set default values for any TestProperties not already specified.
+  <!-- Set default values for any TestProperties not already specified.
            When adding or removing TestProperties, update testproperties.targets
            to generate code at build time.
     -->
-    <PropertyGroup Condition="'$(ServicePort)' == ''">
-      <ServicePort>44283</ServicePort>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(ServicePort)' == ''">
+    <ServicePort>44283</ServicePort>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(ServiceHttpPort)' == ''">
-      <ServiceHttpPort>8081</ServiceHttpPort>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(ServiceHttpPort)' == ''">
+    <ServiceHttpPort>8081</ServiceHttpPort>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(ServiceHttpsPort)' == ''">
-      <ServiceHttpsPort>44285</ServiceHttpsPort>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(ServiceHttpsPort)' == ''">
+    <ServiceHttpsPort>44285</ServiceHttpsPort>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(ServiceTcpPort)' == ''">
-      <ServiceTcpPort>809</ServiceTcpPort>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(ServiceTcpPort)' == ''">
+    <ServiceTcpPort>8808</ServiceTcpPort>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(ServiceWebSocketPort)' == ''">
-      <ServiceWebSocketPort>8083</ServiceWebSocketPort>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(ServiceWebSocketPort)' == ''">
+    <ServiceWebSocketPort>8083</ServiceWebSocketPort>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(ServiceSecureWebSocketPort)' == ''">
-      <ServiceSecureWebSocketPort>8084</ServiceSecureWebSocketPort>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(ServiceSecureWebSocketPort)' == ''">
+    <ServiceSecureWebSocketPort>8084</ServiceSecureWebSocketPort>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(TestRootCertificatePassword)' == ''">
-      <TestRootCertificatePassword>test</TestRootCertificatePassword>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(TestRootCertificatePassword)' == ''">
+    <TestRootCertificatePassword>test</TestRootCertificatePassword>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(TestRootCertificateValidityPeriod)' == ''">
-      <TestRootCertificateValidityPeriod>7.00:00:00</TestRootCertificateValidityPeriod>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(TestRootCertificateValidityPeriod)' == ''">
+    <TestRootCertificateValidityPeriod>7.00:00:00</TestRootCertificateValidityPeriod>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(MaxTestTimeSpan)' == ''">
-      <MaxTestTimeSpan>00:01:00</MaxTestTimeSpan>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(MaxTestTimeSpan)' == ''">
+    <MaxTestTimeSpan>00:01:00</MaxTestTimeSpan>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(NegotiateTestRealm)' == ''">
-      <NegotiateTestRealm></NegotiateTestRealm>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(NegotiateTestRealm)' == ''">
+    <NegotiateTestRealm></NegotiateTestRealm>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(NegotiateTestDomain)' == ''">
-      <NegotiateTestDomain></NegotiateTestDomain>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(NegotiateTestDomain)' == ''">
+    <NegotiateTestDomain></NegotiateTestDomain>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(NegotiateTestSpn)' == ''">
-      <NegotiateTestSpn></NegotiateTestSpn>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(NegotiateTestSpn)' == ''">
+    <NegotiateTestSpn></NegotiateTestSpn>
+  </PropertyGroup>
 
-    <PropertyGroup Condition="'$(NegotiateTestUpn)' == ''">
-      <NegotiateTestUpn></NegotiateTestUpn>
-    </PropertyGroup>
+  <PropertyGroup Condition="'$(NegotiateTestUpn)' == ''">
+    <NegotiateTestUpn></NegotiateTestUpn>
+  </PropertyGroup>
 
-    <!-- Convention for TestProperties values to use by [ConditionalFact]:
+  <!-- Convention for TestProperties values to use by [ConditionalFact]:
       'true' = yes, the condition is satisfied
       'false' = no, the condition is not satisfied
       empty string = self-detect at runtime if possible, else assume 'false'
     -->
-    <PropertyGroup Condition="'$(Domain_Joined)' == ''">
-      <Domain_Joined></Domain_Joined>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Server_Domain_Joined)' == ''">
-      <Server_Domain_Joined></Server_Domain_Joined>
-    </PropertyGroup>
-  
-    <PropertyGroup Condition="'$(Root_Certificate_Installed)' == ''">
-      <Root_Certificate_Installed></Root_Certificate_Installed>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Client_Certificate_Installed)' == ''">
-      <Client_Certificate_Installed></Client_Certificate_Installed>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Peer_Certificate_Installed)' == ''">
-      <Peer_Certificate_Installed></Peer_Certificate_Installed>
-    </PropertyGroup>
-    
-    <PropertyGroup Condition="'$(OSXPeer_Certificate_Installed)' == ''">
-      <OSXPeer_Certificate_Installed></OSXPeer_Certificate_Installed>
-    </PropertyGroup>
-  
-    <PropertyGroup Condition="'$(SPN_Available)' == ''">
-      <SPN_Available></SPN_Available>
-    </PropertyGroup>
-    
-     <PropertyGroup Condition="'$(NTLM_Available)' == ''">
-      <NTLM_Available></NTLM_Available>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Ambient_Credentials_Available)' == ''">
-      <Ambient_Credentials_Available></Ambient_Credentials_Available>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Explicit_Credentials_Available)' == ''">
-      <Explicit_Credentials_Available></Explicit_Credentials_Available>
-    </PropertyGroup>
-  
-    <PropertyGroup Condition="'$(Server_Accepts_Certificates)' == ''">
-      <Server_Accepts_Certificates></Server_Accepts_Certificates>
-    </PropertyGroup>
-  
-    <PropertyGroup Condition="'$(Basic_Authentication_Available)' == ''">
-      <Basic_Authentication_Available></Basic_Authentication_Available>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(Digest_Authentication_Available)' == ''">
-      <Digest_Authentication_Available></Digest_Authentication_Available>
-    </PropertyGroup>
-  
-    <PropertyGroup Condition="'$(Windows_Authentication_Available)' == ''">
-      <Windows_Authentication_Available></Windows_Authentication_Available>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(ServiceUri)' == ''">
-      <ServiceUri >localhost</ServiceUri >
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(ExplicitUserName)' == ''">
-      <ExplicitUserName ></ExplicitUserName >
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(ExplicitPassword)' == ''">
-      <ExplicitPassword ></ExplicitPassword >
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(SSL_Available)' == ''">
-      <SSL_Available></SSL_Available>
-    </PropertyGroup>
-
-    <!-- The default value of $(IncludeTestsWithIssues) is blank, which is equivalent fo 'false'.
+  <PropertyGroup Condition="'$(Domain_Joined)' == ''">
+    <Domain_Joined></Domain_Joined>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Server_Domain_Joined)' == ''">
+    <Server_Domain_Joined></Server_Domain_Joined>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Root_Certificate_Installed)' == ''">
+    <Root_Certificate_Installed></Root_Certificate_Installed>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Client_Certificate_Installed)' == ''">
+    <Client_Certificate_Installed></Client_Certificate_Installed>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Peer_Certificate_Installed)' == ''">
+    <Peer_Certificate_Installed></Peer_Certificate_Installed>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(OSXPeer_Certificate_Installed)' == ''">
+    <OSXPeer_Certificate_Installed></OSXPeer_Certificate_Installed>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(SPN_Available)' == ''">
+    <SPN_Available></SPN_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(NTLM_Available)' == ''">
+    <NTLM_Available></NTLM_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Ambient_Credentials_Available)' == ''">
+    <Ambient_Credentials_Available></Ambient_Credentials_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Explicit_Credentials_Available)' == ''">
+    <Explicit_Credentials_Available></Explicit_Credentials_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Server_Accepts_Certificates)' == ''">
+    <Server_Accepts_Certificates></Server_Accepts_Certificates>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Basic_Authentication_Available)' == ''">
+    <Basic_Authentication_Available></Basic_Authentication_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Digest_Authentication_Available)' == ''">
+    <Digest_Authentication_Available></Digest_Authentication_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Windows_Authentication_Available)' == ''">
+    <Windows_Authentication_Available></Windows_Authentication_Available>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ServiceUri)' == ''">
+    <ServiceUri >localhost</ServiceUri >
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ExplicitUserName)' == ''">
+    <ExplicitUserName ></ExplicitUserName >
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(ExplicitPassword)' == ''">
+    <ExplicitPassword ></ExplicitPassword >
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(SSL_Available)' == ''">
+    <SSL_Available></SSL_Available>
+  </PropertyGroup>
+
+  <!-- The default value of $(IncludeTestsWithIssues) is blank, which is equivalent fo 'false'.
          The check of $(WithCategories) preserves the convention used by other repo's where the
          keyword 'failing' inside $(WithCategories) asks that tests with [ActiveIssue] be run.
          Optionally, $(IncludeTestsWithIssues) can be a semicolon-separated list of issue numbers.
          Tests marked with an [Issue] whose issue number is in this list will be run rather than skipped.
     -->
-    <PropertyGroup Condition="'$(IncludeTestsWithIssues)' == '' and $(WithCategories.ToLower().Contains('failing'))">
-      <IncludeTestsWithIssues>true</IncludeTestsWithIssues>
-    </PropertyGroup>
-  
+  <PropertyGroup Condition="'$(IncludeTestsWithIssues)' == '' and $(WithCategories.ToLower().Contains('failing'))">
+    <IncludeTestsWithIssues>true</IncludeTestsWithIssues>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(RunWithCoreWCF)' == ''">
+    <RunWithCoreWCF></RunWithCoreWCF>
+  </PropertyGroup>
   <!--
      GeneratedTestPropertiesFileName:
      The full path of the C# file that will be generated at build time to
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.targets b/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.targets
index 8a5b33afb90..23f6bcb8953 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.targets
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/testproperties.targets
@@ -50,6 +50,7 @@ namespace Infrastructure.Common
         public static readonly string ExplicitPassword_PropertyName = "ExplicitPassword"%3B
         public static readonly string SSL_Available_PropertyName = "SSL_Available"%3B
         public static readonly string IncludeTestsWithIssues_PropertyName = "IncludeTestsWithIssues"%3B
+        public static readonly string RunWithCoreWCF_PropertyName = "RunWithCoreWCF"%3B
                 
         static partial void Initialize(Dictionary<string, string> properties)
         {
@@ -86,6 +87,7 @@ namespace Infrastructure.Common
             properties["ExplicitPassword"] = "$(ExplicitPassword)"%3B
             properties["SSL_Available"] = "$(SSL_Available)"%3B
             properties["IncludeTestsWithIssues"] = "$(IncludeTestsWithIssues)"%3B
+            properties["RunWithCoreWCF"] = "$(RunWithCoreWCF)"%3B
         }
     }
 }
diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
index 27a3eabfa38..324200a1d64 100644
--- a/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
+++ b/src/System.Private.ServiceModel/tests/Common/Scenarios/Endpoints.cs
@@ -20,7 +20,7 @@ private static string GetEndpointAddress(string endpoint, string protocol = "htt
     // HTTP Addresses
     public static string DefaultCustomHttp_Address
     {
-        get { return GetEndpointAddress("DefaultCustomHttp.svc//default-custom-http"); }
+        get { return GetEndpointAddress("DefaultCustomHttp.svc/default-custom-http"); }
     }
 
     public static string HttpBaseAddress_Basic_Text
@@ -40,18 +40,18 @@ public static string HttpBaseAddress_BasicDecomp
 
     public static string HttpBaseAddress_BasicService1
     {
-        get { return GetEndpointAddress("BasicService1.svc//Service1"); }
+        get { return GetEndpointAddress("BasicService1.svc/Service1"); }
     }
 
     // Endpoint that relies on post-1.1.0 features
     public static string HttpBaseAddress_4_4_0_Basic
     {
-        get { return GetEndpointAddress("BasicHttp_4_4_0.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttp_4_4_0.svc/Basic"); }
     }
 
     public static string HttpBaseAddress_Basic_Soap
     {
-        get { return GetEndpointAddress("BasicHttpSoap.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpSoap.svc/Basic"); }
     }
 
     public static string HttpBaseAddress_NetHttp
@@ -61,37 +61,37 @@ public static string HttpBaseAddress_NetHttp
 
     public static string HttpSoap11_Address
     {
-        get { return GetEndpointAddress("HttpSoap11.svc//http-soap11"); }
+        get { return GetEndpointAddress("HttpSoap11.svc/http-soap11"); }
     }
 
     public static string HttpSoap11WSA10_Address
     {
-        get { return GetEndpointAddress("HttpSoap11WSA10.svc//http-Soap11WSA10"); }
+        get { return GetEndpointAddress("HttpSoap11WSA10.svc/http-Soap11WSA10"); }
     }
 
     public static string HttpSoap11WSA2004_Address
 	{
-		get { return GetEndpointAddress("HttpSoap11WSA2004.svc//http-Soap11WSA2004"); }
+		get { return GetEndpointAddress("HttpSoap11WSA2004.svc/http-Soap11WSA2004"); }
 	}
 
     public static string HttpSoap12_Address
     {
-        get { return GetEndpointAddress("HttpSoap12.svc//http-soap12"); }
+        get { return GetEndpointAddress("HttpSoap12.svc/http-soap12"); }
     }
 
     public static string HttpSoap12WSANone_Address
     {
-        get { return GetEndpointAddress("HttpSoap12WSANone.svc//http-Soap12WSANone"); }
+        get { return GetEndpointAddress("HttpSoap12WSANone.svc/http-Soap12WSANone"); }
     }
 
     public static string HttpSoap12WSA2004_Address
 	{
-		get { return GetEndpointAddress("HttpSoap12WSA2004.svc//http-Soap12WSA2004"); }
+		get { return GetEndpointAddress("HttpSoap12WSA2004.svc/http-Soap12WSA2004"); }
 	}
 
     public static string HttpBinary_Address
     {
-        get { return GetEndpointAddress("HttpBinary.svc//http-binary"); }
+        get { return GetEndpointAddress("HttpBinary.svc/http-binary"); }
     }
 
     public static string HttpProtocolError_Address
@@ -101,52 +101,52 @@ public static string HttpProtocolError_Address
 
     public static string HttpBaseAddress_ChannelExtensibility
     {
-        get { return GetEndpointAddress("ChannelExtensibility.svc//ChannelExtensibility"); }
+        get { return GetEndpointAddress("ChannelExtensibility.svc/ChannelExtensibility"); }
     }
 
     public static string UnderstoodHeaders
     {
-        get { return GetEndpointAddress("UnderstoodHeaders.svc//UnderstoodHeaders"); }
+        get { return GetEndpointAddress("UnderstoodHeaders.svc/UnderstoodHeaders"); }
     }
 
     public static string XmlSFAttribute_Address
     {
-        get { return GetEndpointAddress("XmlSFAttribute.svc//XmlSFAttribute"); }
+        get { return GetEndpointAddress("XmlSFAttribute.svc/XmlSFAttribute"); }
     }
 
     public static string BasicHttpRpcEncSingleNs_Address
     {
-        get { return GetEndpointAddress("BasicHttpRpcEncSingleNs.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpRpcEncSingleNs.svc/Basic"); }
     }
 
     public static string BasicHttpRpcLitSingleNs_Address
     {
-        get { return GetEndpointAddress("BasicHttpRpcLitSingleNs.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpRpcLitSingleNs.svc/Basic"); }
     }
 
     public static string BasicHttpDocLitSingleNs_Address
     {
-        get { return GetEndpointAddress("BasicHttpDocLitSingleNs.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpDocLitSingleNs.svc/Basic"); }
     }
 
     public static string BasicHttpRpcEncDualNs_Address
     {
-        get { return GetEndpointAddress("BasicHttpRpcEncDualNs.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpRpcEncDualNs.svc/Basic"); }
     }
 
     public static string BasicHttpRpcLitDualNs_Address
     {
-        get { return GetEndpointAddress("BasicHttpRpcLitDualNs.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpRpcLitDualNs.svc/Basic"); }
     }
 
     public static string BasicHttpDocLitDualNs_Address
     {
-        get { return GetEndpointAddress("BasicHttpDocLitDualNs.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpDocLitDualNs.svc/Basic"); }
     }
 
     public static string BasicHttpRpcEncWithHeaders_Address
     {
-        get { return GetEndpointAddress("BasicHttpRpcEncWithHeaders.svc//Basic"); }
+        get { return GetEndpointAddress("BasicHttpRpcEncWithHeaders.svc/Basic"); }
     }
 
     public static string ReliableSession_NetHttp
@@ -177,22 +177,22 @@ public static string WSHttpBindingBaseAddress
     #region WebSocket Addresses
     public static string HttpBaseAddress_NetHttpWebSockets
     {
-        get { return GetEndpointAddress("NetHttpWebSockets.svc//NetHttpWebSockets", "ws"); }
+        get { return GetEndpointAddress("NetHttpWebSockets.svc/NetHttpWebSockets", "ws"); }
     }
 
     public static string HttpBaseAddress_NetHttpsWebSockets
     {
-        get { return GetEndpointAddress("NetHttpsWebSockets.svc//NetHttpsWebSockets", protocol: "wss"); }
+        get { return GetEndpointAddress("NetHttpsWebSockets.svc/NetHttpsWebSockets", protocol: "wss"); }
     }
 
     public static string NetHttpWebSocketTransport_Address
     {
-        get { return GetEndpointAddress("WebSocketTransport.svc//http-requestreplywebsockets-transportusagealways", protocol: "ws"); }
+        get { return GetEndpointAddress("WebSocketTransport.svc/http-requestreplywebsockets-transportusagealways", protocol: "ws"); }
     }
 
     public static string NetHttpDuplexWebSocket_Address
     {
-        get { return GetEndpointAddress("DuplexWebSocket.svc//http-defaultduplexwebsockets", protocol: "ws"); }
+        get { return GetEndpointAddress("DuplexWebSocket.svc/http-defaultduplexwebsockets", protocol: "ws"); }
     }
 
     public static string WebSocketHttpDuplexStreamed_Address
@@ -217,44 +217,44 @@ public static string WebSocketHttpDuplexBuffered_Address
 
     public static string WebSocketHttpVerifyWebSocketsUsed_Address
     {
-        get { return GetEndpointAddress("WebSocketHttpVerifyWebSocketsUsed.svc//WebSocketHttpVerifyWebSocketsUsed", protocol: "ws"); }
+        get { return GetEndpointAddress("WebSocketHttpVerifyWebSocketsUsed.svc/WebSocketHttpVerifyWebSocketsUsed", protocol: "ws"); }
     }
     #endregion WebSocket Addresses
 
     #region Service Contract Addresses
     public static string ServiceContractAsyncIntOut_Address
     {
-        get { return GetEndpointAddress("ServiceContractAsyncIntOut.svc//ServiceContractIntOut"); }
+        get { return GetEndpointAddress("ServiceContractAsyncIntOut.svc/ServiceContractIntOut"); }
     }
 
     public static string ServiceContractAsyncUniqueTypeOut_Address
     {
-        get { return GetEndpointAddress("ServiceContractAsyncUniqueTypeOut.svc//ServiceContractUniqueTypeOut"); }
+        get { return GetEndpointAddress("ServiceContractAsyncUniqueTypeOut.svc/ServiceContractUniqueTypeOut"); }
     }
 
     public static string ServiceContractAsyncIntRef_Address
     {
-        get { return GetEndpointAddress("ServiceContractAsyncIntRef.svc//ServiceContractIntRef"); }
+        get { return GetEndpointAddress("ServiceContractAsyncIntRef.svc/ServiceContractIntRef"); }
     }
 
     public static string ServiceContractAsyncUniqueTypeRef_Address
     {
-        get { return GetEndpointAddress("ServiceContractAsyncUniqueTypeRef.svc//ServiceContractAsyncUniqueTypeRef"); }
+        get { return GetEndpointAddress("ServiceContractAsyncUniqueTypeRef.svc/ServiceContractAsyncUniqueTypeRef"); }
     }
 
     public static string ServiceContractSyncUniqueTypeOut_Address
     {
-        get { return GetEndpointAddress("ServiceContractSyncUniqueTypeOut.svc//ServiceContractUniqueTypeOutSync"); }
+        get { return GetEndpointAddress("ServiceContractSyncUniqueTypeOut.svc/ServiceContractUniqueTypeOutSync"); }
     }
 
     public static string ServiceContractSyncUniqueTypeRef_Address
     {
-        get { return GetEndpointAddress("ServiceContractSyncUniqueTypeRef.svc//ServiceContractUniqueTypeRefSync"); }
+        get { return GetEndpointAddress("ServiceContractSyncUniqueTypeRef.svc/ServiceContractUniqueTypeRefSync"); }
     }
 
     public static string DataContractResolver_Address
     {
-        get { return GetEndpointAddress("DataContractResolver.svc//DataContractResolver"); }
+        get { return GetEndpointAddress("DataContractResolver.svc/DataContractResolver"); }
     }
 
     #endregion Service Contract Addresses
@@ -263,12 +263,12 @@ public static string DataContractResolver_Address
 
     public static string CustomTextEncoderBuffered_Address
     {
-        get { return GetEndpointAddress("CustomTextEncoderBuffered.svc//http-customtextencoder"); }
+        get { return GetEndpointAddress("CustomTextEncoderBuffered.svc/http-customtextencoder"); }
     }
 
     public static string CustomTextEncoderStreamed_Address
     {
-        get { return GetEndpointAddress("CustomTextEncoderStreamed.svc//http-customtextencoder-streamed"); }
+        get { return GetEndpointAddress("CustomTextEncoderStreamed.svc/http-customtextencoder-streamed"); }
     }
     #endregion Custom Message Encoder Addresses
     #endregion HTTP Addresses
@@ -303,7 +303,7 @@ public static string Https_NtlmAuth_Address
     {
         get
         {
-            return GetEndpointAddress("WindowAuthenticationNtlm/HttpsNtlm.svc//https-ntlm", protocol: "https");
+            return GetEndpointAddress("WindowAuthenticationNtlm/HttpsNtlm.svc/https-ntlm", protocol: "https");
         }
     }
 
@@ -351,7 +351,7 @@ public static string HttpsSoap11_Address
     {
         get
         {
-            return GetEndpointAddress("HttpsSoap11.svc//https-soap11", protocol: "https");
+            return GetEndpointAddress("HttpsSoap11.svc/https-soap11", protocol: "https");
         }
     }
 
@@ -359,7 +359,7 @@ public static string HttpsSoap12_Address
     {
         get
         {
-            return GetEndpointAddress("HttpsSoap12.svc//https-soap12", protocol: "https");
+            return GetEndpointAddress("HttpsSoap12.svc/https-soap12", protocol: "https");
         }
     }
 
@@ -383,7 +383,7 @@ public static string Https_SecModeTrans_ClientCredTypeNone_ServerCertValModePeer
     {
         get
         {
-            return GetEndpointAddress("HttpsCertValModePeerTrust.svc//https-server-cert-valmode-peertrust", protocol: "https");
+            return GetEndpointAddress("HttpsCertValModePeerTrust.svc/https-server-cert-valmode-peertrust", protocol: "https");
         }
     }
 
@@ -391,7 +391,7 @@ public static string Https_SecModeTrans_ClientCredTypeNone_ServerCertValModeChai
     {
         get
         {
-            return GetEndpointAddress("HttpsCertValModeChainTrust.svc//https-server-cert-valmode-chaintrust", protocol: "https");
+            return GetEndpointAddress("HttpsCertValModeChainTrust.svc/https-server-cert-valmode-chaintrust", protocol: "https");
         }
     }
 
@@ -399,7 +399,7 @@ public static string Https_SecModeTransWithMessCred_ClientCredTypeCert
     {
         get
         {
-            return GetEndpointAddress("HttpsTransSecMessCredsCert.svc//https-message-credentials-cert", protocol: "https");
+            return GetEndpointAddress("HttpsTransSecMessCredsCert.svc/https-message-credentials-cert", protocol: "https");
         }
     }
 
@@ -407,7 +407,7 @@ public static string Https_SecModeTransWithMessCred_ClientCredTypeUserName
     {
         get
         {
-            return GetEndpointAddress("HttpsTransSecMessCredsUserName.svc//https-message-credentials-username", protocol: "https");
+            return GetEndpointAddress("HttpsTransSecMessCredsUserName.svc/https-message-credentials-username", protocol: "https");
         }
     }
 
@@ -415,7 +415,7 @@ public static string Https2007_SecModeTransWithMessCred_ClientCredTypeCert
     {
         get
         {
-            return GetEndpointAddress("HttpsTransSecMessCredsCert.svc//https2007-message-credentials-cert", protocol: "https");
+            return GetEndpointAddress("HttpsTransSecMessCredsCert.svc/https2007-message-credentials-cert", protocol: "https");
         }
     }
 
@@ -423,7 +423,7 @@ public static string Https2007_SecModeTransWithMessCred_ClientCredTypeUserName
     {
         get
         {
-            return GetEndpointAddress("HttpsTransSecMessCredsUserName.svc//https2007-message-credentials-username", protocol: "https");
+            return GetEndpointAddress("HttpsTransSecMessCredsUserName.svc/https2007-message-credentials-username", protocol: "https");
         }
     }
 
@@ -431,7 +431,7 @@ public static string BasicHttps_SecModeTransWithMessCred_ClientCredTypeCert
     {
         get
         {
-            return GetEndpointAddress("BasicHttpsTransSecMessCredsCert.svc//https-message-credentials-cert", protocol: "https");
+            return GetEndpointAddress("BasicHttpsTransSecMessCredsCert.svc/https-message-credentials-cert", protocol: "https");
         }
     }
 
@@ -439,7 +439,7 @@ public static string BasicHttpsBinding_SecModeTransWithMessCred_ClientCredTypeCe
     {
         get
         {
-            return GetEndpointAddress("BasicHttpsBindingTransSecMessCredsCert.svc//https-transwithmessage-credentials-cert", protocol: "https");
+            return GetEndpointAddress("BasicHttpsBindingTransSecMessCredsCert.svc/https-transwithmessage-credentials-cert", protocol: "https");
         }
     }
 
@@ -447,7 +447,7 @@ public static string BasicHttps_SecModeTransWithMessCred_ClientCredTypeUserName
     {
         get
         {
-            return GetEndpointAddress("BasicHttpsTransSecMessCredsUserName.svc//https-message-credentials-username", protocol: "https");
+            return GetEndpointAddress("BasicHttpsTransSecMessCredsUserName.svc/https-message-credentials-username", protocol: "https");
         }
     }
 
@@ -506,24 +506,24 @@ public static string WebSocketHttpsDuplexBuffered_Address
     // net.tcp Addresses
     public static string Tcp_DefaultBinding_Address
     {
-        get { return GetEndpointAddress("TcpDefault.svc//tcp-default", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("TcpDefault.svc/tcp-default", protocol: "net.tcp"); }
     }
 
     public static string Tcp_NoSecurity_Address
     {
-        get { return GetEndpointAddress("TcpNoSecurity.svc//tcp-nosecurity", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("TcpNoSecurity.svc/tcp-nosecurity", protocol: "net.tcp"); }
     }
 
     public static string Tcp_Streamed_NoSecurity_Address
     {
-        get { return GetEndpointAddress("TcpStreamedNoSecurity.svc//tcp-streamed-nosecurity", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("TcpStreamedNoSecurity.svc/tcp-streamed-nosecurity", protocol: "net.tcp"); }
     }
 
     public static string Tcp_VerifyDNS_Address
     {
         get
         {
-            return GetEndpointAddress("TcpVerifyDNS.svc//tcp-VerifyDNS", protocol: "net.tcp");
+            return GetEndpointAddress("TcpVerifyDNS.svc/tcp-VerifyDNS", protocol: "net.tcp");
         }
     }
 
@@ -539,7 +539,7 @@ public static string Tcp_ExpiredServerCertResource_Address
     {
         get
         {
-            return GetEndpointAddress("TcpExpiredServerCert.svc//tcp-ExpiredServerCert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpExpiredServerCert.svc/tcp-ExpiredServerCert", protocol: "net.tcp");
         }
     }
 
@@ -555,7 +555,7 @@ public static string Tcp_InvalidEkuServerCertResource_Address
     {
         get
         {
-            return GetEndpointAddress("TcpInvalidEkuServerCert.svc//tcp-InvalidEkuServerCert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpInvalidEkuServerCert.svc/tcp-InvalidEkuServerCert", protocol: "net.tcp");
         }
     }
 
@@ -571,7 +571,7 @@ public static string Tcp_RevokedServerCertResource_Address
     {
         get
         {
-            return GetEndpointAddress("TcpRevokedServerCert.svc//tcp-RevokedServerCert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpRevokedServerCert.svc/tcp-RevokedServerCert", protocol: "net.tcp");
         }
     }
 
@@ -586,32 +586,32 @@ public static string Tcp_ExpiredServerCertResource_HostName
 
     public static string Tcp_NoSecurity_Callback_Address
     {
-        get { return GetEndpointAddress("Duplex.svc//tcp-nosecurity-callback", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("Duplex.svc/tcp-nosecurity-callback", protocol: "net.tcp"); }
     }
 
     public static string Tcp_CustomBinding_NoSecurity_Text_Address
     {
-        get { return GetEndpointAddress("TcpNoSecurityText.svc//tcp-custombinding-nosecurity-text", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("TcpNoSecurityText.svc/tcp-custombinding-nosecurity-text", protocol: "net.tcp"); }
     }
 
     public static string Tcp_NoSecurity_TaskReturn_Address
     {
-        get { return GetEndpointAddress("DuplexChannelCallbackReturn.svc//tcp-nosecurity-taskreturn", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("DuplexChannelCallbackReturn.svc/tcp-nosecurity-taskreturn", protocol: "net.tcp"); }
     }
 
     public static string Tcp_NoSecurity_DuplexCallback_Address
     {
-        get { return GetEndpointAddress("DuplexCallback.svc//tcp-nosecurity-typedproxy-duplexcallback", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("DuplexCallback.svc/tcp-nosecurity-typedproxy-duplexcallback", protocol: "net.tcp"); }
     }
 
     public static string Tcp_NoSecurity_DataContractDuplexCallback_Address
     {
-        get { return GetEndpointAddress("DuplexCallbackDataContractComplexType.svc//tcp-nosecurity-callback", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("DuplexCallbackDataContractComplexType.svc/tcp-nosecurity-callback", protocol: "net.tcp"); }
     }
 
     public static string Tcp_NoSecurity_XmlDuplexCallback_Address
     {
-        get { return GetEndpointAddress("DuplexCallbackXmlComplexType.svc//tcp-nosecurity-callback", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("DuplexCallbackXmlComplexType.svc/tcp-nosecurity-callback", protocol: "net.tcp"); }
     }
 
 
@@ -619,7 +619,7 @@ public static string Tcp_CustomBinding_SslStreamSecurity_Address
     {
         get
         {
-            return GetEndpointAddress("TcpTransportSecurityWithSsl.svc//tcp-server-ssl-security", protocol: "net.tcp");
+            return GetEndpointAddress("TcpTransportSecurityWithSsl.svc/tcp-server-ssl-security", protocol: "net.tcp");
         }
     }
 
@@ -635,7 +635,7 @@ public static string Tcp_ClientCredentialType_Certificate_Address
     {
         get
         {
-            return GetEndpointAddress("TcpTransportSecuritySslClientCredentialTypeCertificate.svc//tcp-server-ssl-security-clientcredentialtype-certificate", protocol: "net.tcp");
+            return GetEndpointAddress("TcpTransportSecuritySslClientCredentialTypeCertificate.svc/tcp-server-ssl-security-clientcredentialtype-certificate", protocol: "net.tcp");
         }
     }
 
@@ -643,7 +643,7 @@ public static string Tcp_ClientCredentialType_Certificate_CustomValidation_Addre
     {
         get
         {
-            return GetEndpointAddress("TcpTransportSecuritySslCustomCertValidation.svc//tcp-server-ssl-security-clientcredentialtype-certificate-customvalidator", protocol: "net.tcp");
+            return GetEndpointAddress("TcpTransportSecuritySslCustomCertValidation.svc/tcp-server-ssl-security-clientcredentialtype-certificate-customvalidator", protocol: "net.tcp");
         }
     }
 
@@ -651,7 +651,7 @@ public static string Tcp_ClientCredentialType_Certificate_With_ServerAltName_Add
     {
         get
         {
-            return GetEndpointAddress("TcpCertificateWithServerAltName.svc//tcp-server-alt-name-cert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpCertificateWithServerAltName.svc/tcp-server-alt-name-cert", protocol: "net.tcp");
         }
     }
 
@@ -659,7 +659,7 @@ public static string Tcp_ClientCredentialType_Certificate_With_CanonicalName_Loc
     {
         get
         {
-            return GetEndpointAddress("TcpCertificateWithSubjectCanonicalNameLocalhost.svc//tcp-server-subject-cn-localhost-cert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpCertificateWithSubjectCanonicalNameLocalhost.svc/tcp-server-subject-cn-localhost-cert", protocol: "net.tcp");
         }
     }
 
@@ -667,7 +667,7 @@ public static string Tcp_ClientCredentialType_Certificate_With_CanonicalName_Dom
     {
         get
         {
-            return GetEndpointAddress("TcpCertificateWithSubjectCanonicalNameDomainName.svc//tcp-server-subject-cn-domainname-cert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpCertificateWithSubjectCanonicalNameDomainName.svc/tcp-server-subject-cn-domainname-cert", protocol: "net.tcp");
         }
     }
 
@@ -675,7 +675,7 @@ public static string Tcp_ClientCredentialType_Certificate_With_CanonicalName_Fqd
     {
         get
         {
-            return GetEndpointAddress("TcpCertificateWithSubjectCanonicalNameFqdn.svc//tcp-server-subject-cn-fqdn-cert", protocol: "net.tcp");
+            return GetEndpointAddress("TcpCertificateWithSubjectCanonicalNameFqdn.svc/tcp-server-subject-cn-fqdn-cert", protocol: "net.tcp");
         }
     }
 
@@ -691,7 +691,7 @@ public static string NetTcp_SecModeTrans_ClientCredTypeNone_ServerCertValModePee
     {
         get
         {
-            return GetEndpointAddress("NetTcpCertValModePeerTrust.svc//nettcp-server-cert-valmode-peertrust", protocol: "net.tcp");
+            return GetEndpointAddress("NetTcpCertValModePeerTrust.svc/nettcp-server-cert-valmode-peertrust", protocol: "net.tcp");
         }
     }
 
@@ -734,12 +734,12 @@ public static string TcpSoap11WSA10_Address
 
     public static string Tcp_SecModeTransWithMessCred_ClientCredTypeCert
     {
-        get { return GetEndpointAddress("TcpTransSecMessCredsCert.svc//tcp-message-credentials-cert", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("TcpTransSecMessCredsCert.svc/tcp-message-credentials-cert", protocol: "net.tcp"); }
     }
 
     public static string Tcp_SecModeTransWithMessCred_ClientCredTypeUserName
     {
-        get { return GetEndpointAddress("TcpTransSecMessCredsUserName.svc//tcp-message-credentials-username", protocol: "net.tcp"); }
+        get { return GetEndpointAddress("TcpTransSecMessCredsUserName.svc/tcp-message-credentials-username", protocol: "net.tcp"); }
     }
 
     public static string ReliableSession_NetTcp
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpBindingTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpBindingTests.4.0.0.cs
index defec06f556..6f13b3d931e 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpBindingTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpBindingTests.4.0.0.cs
@@ -7,9 +7,10 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class Binding_Http_NetHttpBindingTests
+public class Binding_Http_NetHttpBindingTests : ConditionalWcfTest
 {
     [WcfTheory]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpsBindingTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpsBindingTests.4.1.0.cs
index ce697fead8d..59f6e1f2f1e 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpsBindingTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/NetHttpsBindingTests.4.1.0.cs
@@ -15,7 +15,8 @@ public class Binding_Http_NetHttpsBindingTests : ConditionalWcfTest
     [InlineData(NetHttpMessageEncoding.Mtom)]
     [Issue(3572, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void DefaultCtor_NetHttps_Echo_RoundTrips_String(NetHttpMessageEncoding messageEncoding)
     {
@@ -82,7 +83,8 @@ public static void TransportWithMessageCredential_NotSupported_NetHttps()
     [WcfFact]
     [Issue(3572, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NonDefaultCtor_NetHttps_Echo_RoundTrips_String()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetHttpBindingTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetHttpBindingTests.cs
index d190c2015c5..ad0210aa19b 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetHttpBindingTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetHttpBindingTests.cs
@@ -14,10 +14,11 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class Binding_ReliableSession_NetHttpBindingTests
+public class Binding_ReliableSession_NetHttpBindingTests : ConditionalWcfTest
 {
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task EchoCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -56,6 +57,7 @@ public static async Task EchoCall(ReliableMessagingVersion rmVersion, bool order
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task OneWayCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -93,6 +95,7 @@ public static async Task OneWayCall(ReliableMessagingVersion rmVersion, bool ord
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task ResendFailedRequest(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -176,6 +179,7 @@ public static async Task ResendFailedRequest(ReliableMessagingVersion rmVersion,
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task RetryCountApplied(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -257,6 +261,7 @@ public static async Task RetryCountApplied(ReliableMessagingVersion rmVersion, b
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task MaxTransferWindowSizeApplied(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -345,6 +350,7 @@ public static async Task MaxTransferWindowSizeApplied(ReliableMessagingVersion r
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task InactivityTimeoutApplied(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetTcpBindingTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetTcpBindingTests.cs
index 25778c90e9b..b028ebe4eff 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetTcpBindingTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/NetTcpBindingTests.cs
@@ -9,10 +9,11 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class Binding_ReliableSession_NetTcpBindingTests
+public class Binding_ReliableSession_NetTcpBindingTests : ConditionalWcfTest
 {
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task EchoCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -50,6 +51,7 @@ public static async Task EchoCall(ReliableMessagingVersion rmVersion, bool order
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task OneWayCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -86,6 +88,7 @@ public static async Task OneWayCall(ReliableMessagingVersion rmVersion, bool ord
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task DuplexEchoCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/WSHttpBindingTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/WSHttpBindingTests.cs
index 7424bc58621..be90740fbcb 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/WSHttpBindingTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/ReliableSession/WSHttpBindingTests.cs
@@ -14,10 +14,11 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static class Binding_ReliableSession_WSHttpBindingTests
+public class Binding_ReliableSession_WSHttpBindingTests : ConditionalWcfTest
 {
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task EchoCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -56,6 +57,7 @@ public static async Task EchoCall(ReliableMessagingVersion rmVersion, bool order
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task OneWayCall(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -93,6 +95,7 @@ public static async Task OneWayCall(ReliableMessagingVersion rmVersion, bool ord
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task ResendFailedRequest(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -176,6 +179,7 @@ public static async Task ResendFailedRequest(ReliableMessagingVersion rmVersion,
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task RetryCountApplied(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -257,6 +261,7 @@ public static async Task RetryCountApplied(ReliableMessagingVersion rmVersion, b
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task MaxTransferWindowSizeApplied(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
@@ -345,6 +350,7 @@ public static async Task MaxTransferWindowSizeApplied(ReliableMessagingVersion r
 
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task InactivityTimeoutApplied(ReliableMessagingVersion rmVersion, bool ordered, string endpointSuffix)
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/NetTcpBindingTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/NetTcpBindingTests.4.1.0.cs
index a6b0c43607e..b306ce7f62b 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/NetTcpBindingTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/NetTcpBindingTests.4.1.0.cs
@@ -13,8 +13,7 @@ public partial class Binding_Tcp_NetTcpBindingTests : ConditionalWcfTest
     //                         - SecurityMode = Transport
     //                         - ClientCredentialType = Windows
     [WcfFact]
-    [Condition(nameof(Windows_Authentication_Available),
-               nameof(WindowsOrSelfHosted))]
+    [Condition(nameof(Windows_Authentication_Available))]
     [OuterLoop]
     public static void DefaultSettings_Echo_RoundTrips_String()
     {
@@ -50,8 +49,7 @@ public static void DefaultSettings_Echo_RoundTrips_String()
     // By default ClientCredentialType will be 'Windows'
     // SecurityMode is Transport by default with NetTcpBinding, this test explicitly sets it.
     [WcfFact]
-    [Condition(nameof(Windows_Authentication_Available),
-               nameof(WindowsOrSelfHosted))]
+    [Condition(nameof(Windows_Authentication_Available))]
     [OuterLoop]
     public static void SecurityModeTransport_Echo_RoundTrips_String()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/FederationHttp/WSFederationHttpBindingTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/FederationHttp/WSFederationHttpBindingTests.cs
index 7dd6697437b..6cdbea3edb7 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/FederationHttp/WSFederationHttpBindingTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/FederationHttp/WSFederationHttpBindingTests.cs
@@ -17,7 +17,8 @@ public class WSFederationHttpBindingTests : ConditionalWcfTest
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
            nameof(Client_Certificate_Installed),
-           nameof(SSL_Available))]
+           nameof(SSL_Available),
+           nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     [WcfTheory]
     [MemberData(nameof(GetTestVariations))]
@@ -78,7 +79,8 @@ public static void WSFederationHttpBindingTests_Succeeds(MessageSecurityVersion
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
        nameof(Client_Certificate_Installed),
-       nameof(SSL_Available))]
+       nameof(SSL_Available),
+       nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     [WcfFact]
     public static void WSTrustTokeParameters_WSStaticHelper()
@@ -128,8 +130,9 @@ public static void WSTrustTokeParameters_WSStaticHelper()
 
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
-   nameof(Client_Certificate_Installed),
-   nameof(SSL_Available))]
+        nameof(Client_Certificate_Installed),
+        nameof(SSL_Available),
+        nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     [WcfFact]
     public static void WS2007TrustTokeParameters_WSStaticHelper()
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs
index e01fd5ebe9a..d034935ab93 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/BasicHttpTransportWithMessageCredentialSecurityTests.cs
@@ -57,7 +57,8 @@ public static void BasicHttps_SecModeTransWithMessCred_CertClientCredential_Succ
 
     [WcfTheory]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     [InlineData(TransferMode.Buffered)]
     [InlineData(TransferMode.Streamed)]
@@ -107,7 +108,8 @@ public static void BasicHttps_SecModeTransWithMessCred_UserNameClientCredential_
 
     [WcfFact]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Https_SecModeTransWithMessCred_UserNameClientCredential_Succeeds()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs
index bd8d7787d3e..bbb9040c85c 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WS2007HttpTransportWithMessageCredentialsSecurityTests.cs
@@ -15,7 +15,8 @@ public class WS2007HttpTransportWithMessageCredentialsSecurityTests : Conditiona
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
        nameof(Client_Certificate_Installed),
-       nameof(SSL_Available))]
+       nameof(SSL_Available),
+       nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds()
     {
@@ -61,7 +62,8 @@ public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds(
 
     [WcfFact]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Https_SecModeTransWithMessCred_UserNameClientCredential_Succeeds()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs
index 400aa085a05..83cd529abcb 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSHttpTransportWithMessageCredentialSecurityTests.cs
@@ -16,7 +16,8 @@ public class WSHttpTransportWithMessageCredentialSecurityTests : ConditionalWcfT
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
            nameof(Client_Certificate_Installed),
-           nameof(SSL_Available))]
+           nameof(SSL_Available),
+           nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds()
     {
@@ -62,7 +63,8 @@ public static void Https_SecModeTransWithMessCred_CertClientCredential_Succeeds(
 
     [WcfFact]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Https_SecModeTransWithMessCred_UserNameClientCredential_Succeeds()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs
index 58bbb4563a9..c450c68714f 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/WS/TransportWithMessageCredentialSecurity/WSNetTcpTransportWithMessageCredentialSecurityTests.cs
@@ -18,7 +18,8 @@ public class WSNetTcpTransportWithMessageCredentialSecurityTests : ConditionalWc
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
            nameof(Client_Certificate_Installed),
-           nameof(SSL_Available))]
+           nameof(SSL_Available),
+           nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NetTcp_SecModeTransWithMessCred_CertClientCredential_Succeeds()
     {
@@ -65,7 +66,8 @@ public static void NetTcp_SecModeTransWithMessCred_CertClientCredential_Succeeds
     [WcfFact]
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NetTcp_SecModeTransWithMessCred_UserNameClientCredential_Succeeds()
     {
@@ -114,7 +116,8 @@ public static void NetTcp_SecModeTransWithMessCred_UserNameClientCredential_Succ
     [WcfFact]
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NetTcp_SecModeTransWithMessCred_UserNameClientCredential_Succeeds_WithSingleThreadedSyncContext()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/DuplexChannelWithSynchronizationContext.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/DuplexChannelWithSynchronizationContext.cs
index ca3c67b24d4..813604a217c 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/DuplexChannelWithSynchronizationContext.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/DuplexChannelWithSynchronizationContext.cs
@@ -17,7 +17,8 @@ public class DuplexChannelWithSynchronizationContext : ConditionalWcfTest
     [Issue(1945, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void SingleThreadedSyncContext_SetOnInstanceContext()
     {
@@ -77,7 +78,8 @@ public static void SingleThreadedSyncContext_SetOnInstanceContext()
     [Issue(1945, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void SingleThreadedSyncContext_AmbientCapture()
     {
@@ -141,7 +143,8 @@ public static void SingleThreadedSyncContext_AmbientCapture()
     [Issue(1945, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void SingleThreadedSyncContext_CallbackUsingDefaultSyncCtx_SyncCallNotBlocked()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs
index 27de2bfa506..a85534bf10c 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/RequestReplyChannelShapeTests.4.1.0.cs
@@ -18,7 +18,8 @@ public partial class RequestReplyChannelShapeTests : ConditionalWcfTest
     [WcfFact]
     [Issue(3572, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void IRequestChannel_Https_NetHttpsBinding()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs
index 1257c5ab8eb..c2792c6195e 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.0.0.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class ClientBaseTests
+public partial class ClientBaseTests
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.1.0.cs
index 5a3f7d5c1ae..e03e55d9527 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/ClientBaseTests.4.1.0.cs
@@ -10,7 +10,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class ClientBaseTests
+public partial class ClientBaseTests : ConditionalWcfTest
 {
     [WcfFact]
     [OuterLoop]
@@ -55,6 +55,7 @@ public static void DefaultSettings_Echo_Cookie()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void DefaultSettings_SetCookieOnServerSide()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/DuplexClientBaseTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/DuplexClientBaseTests.4.1.0.cs
index cb225f8a340..d6beb3a5155 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/DuplexClientBaseTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/DuplexClientBaseTests.4.1.0.cs
@@ -58,6 +58,7 @@ public static void DuplexClientBaseOfT_OverHttp_Call_Throws_InvalidOperation()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void DuplexClientBaseOfT_OverNetTcp_Synchronous_Call()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/CallbackDebugBehaviorTests.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/CallbackDebugBehaviorTests.cs
index c7a9d5d8e79..d04ba254649 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/CallbackDebugBehaviorTests.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/CallbackDebugBehaviorTests.cs
@@ -12,6 +12,7 @@
 public partial class ExpectedExceptionTests : ConditionalWcfTest
 {
     [WcfTheory]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [InlineData(true)]
     [InlineData(false)]
     public static void DuplexCallbackDebugBehavior_IncludeExceptionDetailInFaults_True(bool includeExceptionDetailInFaults)
@@ -47,7 +48,7 @@ public static void DuplexCallbackDebugBehavior_IncludeExceptionDetailInFaults_Tr
         }
 
         serviceProxy = factory.CreateChannel();
-        
+
         // *** EXECUTE *** \\
         try
         {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs
index 1356f110b8c..88b61ed3343 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.0.0.cs
@@ -180,6 +180,7 @@ public static void FaultException_Throws_WithFaultDetail()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void UnexpectedException_Throws_FaultException()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
index 91079d22962..84057089052 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/ExpectedExceptionTests.4.1.0.cs
@@ -185,6 +185,7 @@ public static void UnknownUrl_Throws_EndpointNotFoundException()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void UnknownUrl_Throws_ProtocolException()
     {
@@ -328,6 +329,7 @@ public static void DuplexCallback_Throws_FaultException_ReturnsFaultedTask()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Verify product throws MessageSecurityException when the Dns identity from the server does not match the expectation
     public static void TCP_ServiceCertExpired_Throw_MessageSecurityException()
@@ -371,6 +373,7 @@ public static void TCP_ServiceCertExpired_Throw_MessageSecurityException()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Verify product throws SecurityNegotiationException when the service cert is revoked
     public static void TCP_ServiceCertRevoked_Throw_SecurityNegotiationException()
@@ -418,6 +421,7 @@ public static void TCP_ServiceCertRevoked_Throw_SecurityNegotiationException()
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Verify product throws SecurityNegotiationException when the service cert only has the ClientAuth usage
     public static void TCP_ServiceCertInvalidEKU_Throw_SecurityNegotiationException()
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs
index 05e7408b36b..2c2b94a4019 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.0.0.cs
@@ -11,7 +11,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class TypedProxyTests
+public partial class TypedProxyTests : ConditionalWcfTest
 {
     // ServiceContract typed proxy tests create a ChannelFactory using a provided [ServiceContract] Interface which...
     //       returns a generated proxy based on that Interface.
@@ -567,6 +567,7 @@ private static void ServiceContract_TypedProxy_AsyncTask_Call_TestImpl(Binding b
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static async Task ServiceContract_TypedProxy_Task_Call_AsyncLocal_NonCapture()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs
index 859856a75b6..388350b16a2 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/TypedProxyTests.4.1.0.cs
@@ -13,7 +13,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class TypedProxyTests
+public partial class TypedProxyTests
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs
index 639c7abad0b..fb4e3792d88 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.0.0.cs
@@ -9,7 +9,7 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class DataContractTests
+public partial class DataContractTests
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.0.cs
index 2427c35dbac..92b25a64ce1 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.0.cs
@@ -8,10 +8,11 @@
 using Infrastructure.Common;
 using Xunit;
 
-public static partial class DataContractTests
+public partial class DataContractTests : ConditionalWcfTest
 {
     // Verify that a callback contract correctly returns a complex type when this type is not part of the contract with the ServiceContract attribute.
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NetTcpBinding_DuplexCallback_ReturnsDataContractComplexType()
     {
@@ -50,6 +51,7 @@ public static void NetTcpBinding_DuplexCallback_ReturnsDataContractComplexType()
 
     // Verify that a callback contract correctly returns a complex type using Xml instead of DataContract when this type is not part of the contract with the ServiceContract attribute.
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NetTcpBinding_DuplexCallback_ReturnsXmlComplexType()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs
index 38241b41bad..f427a22b6ab 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/DataContractTests.4.1.1.cs
@@ -13,7 +13,7 @@
 using System.Xml;
 using System.Linq;
 
-public static partial class DataContractTests
+public partial class DataContractTests
 {
     [WcfFact]
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs
index e0288d7d553..f017a7b7fda 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/TextTests.4.1.0.cs
@@ -1,6 +1,5 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
 
 
 using System;
@@ -10,10 +9,8 @@
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Infrastructure.Common;
 using Extensibility.MessageEncoder.Tests;
+using Infrastructure.Common;
 using Xunit;
 
 public static class TextTests
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/AsyncResult.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/AsyncResult.cs
deleted file mode 100644
index d3ce0b4fee5..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/AsyncResult.cs
+++ /dev/null
@@ -1,236 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Diagnostics;
-using System.Threading;
-
-/// <summary>
-/// A generic base class for IAsyncResult implementations
-/// that wraps a ManualResetEvent.
-/// </summary>
-internal abstract class AsyncResult : IAsyncResult
-{
-    private AsyncCallback _callback;
-    private object _state;
-    private bool _completedSynchronously;
-    private bool _endCalled;
-    private Exception _exception;
-    private bool _isCompleted;
-    private ManualResetEvent _manualResetEvent;
-    private object _thisLock;
-
-    protected AsyncResult(AsyncCallback callback, object state)
-    {
-        this._callback = callback;
-        this._state = state;
-        this._thisLock = new object();
-    }
-
-    public object AsyncState
-    {
-        get
-        {
-            return _state;
-        }
-    }
-
-    public WaitHandle AsyncWaitHandle
-    {
-        get
-        {
-            if (_manualResetEvent != null)
-            {
-                return _manualResetEvent;
-            }
-
-            lock (ThisLock)
-            {
-                if (_manualResetEvent == null)
-                {
-                    _manualResetEvent = new ManualResetEvent(_isCompleted);
-                }
-            }
-
-            return _manualResetEvent;
-        }
-    }
-
-    public bool CompletedSynchronously
-    {
-        get
-        {
-            return _completedSynchronously;
-        }
-    }
-
-    public bool IsCompleted
-    {
-        get
-        {
-            return _isCompleted;
-        }
-    }
-
-    private object ThisLock
-    {
-        get
-        {
-            return this._thisLock;
-        }
-    }
-
-    // Call this version of complete when your asynchronous operation is complete.  This will update the state
-    // of the operation and notify the callback.
-    protected void Complete(bool completedSynchronously)
-    {
-        if (_isCompleted)
-        {
-            // It is a bug to call Complete twice.
-            throw new InvalidOperationException("Cannot call Complete twice");
-        }
-
-        this._completedSynchronously = completedSynchronously;
-
-        if (completedSynchronously)
-        {
-            // If we completedSynchronously, then there is no chance that the manualResetEvent was created so
-            // we do not need to worry about a race condition.
-            Debug.Assert(this._manualResetEvent == null, "No ManualResetEvent should be created for a synchronous AsyncResult.");
-            this._isCompleted = true;
-        }
-        else
-        {
-            lock (ThisLock)
-            {
-                this._isCompleted = true;
-                if (this._manualResetEvent != null)
-                {
-                    this._manualResetEvent.Set();
-                }
-            }
-        }
-
-        // If the callback throws, there is a bug in the callback implementation
-        if (_callback != null)
-        {
-            _callback(this);
-        }
-    }
-
-    // Call this version of complete if you raise an exception during processing.  In addition to notifying
-    // the callback, it will capture the exception and store it to be thrown during AsyncResult.End.
-    protected void Complete(bool completedSynchronously, Exception exception)
-    {
-        this._exception = exception;
-        Complete(completedSynchronously);
-    }
-
-    // End should be called when the End function for the asynchronous operation is complete.  It
-    // ensures the asynchronous operation is complete, and does some common validation.
-    protected static TAsyncResult End<TAsyncResult>(IAsyncResult result)
-        where TAsyncResult : AsyncResult
-    {
-        if (result == null)
-        {
-            throw new ArgumentNullException("result");
-        }
-
-        TAsyncResult asyncResult = result as TAsyncResult;
-
-        if (asyncResult == null)
-        {
-            throw new ArgumentException("Invalid async result.", "result");
-        }
-
-        if (asyncResult._endCalled)
-        {
-            throw new InvalidOperationException("Async object already ended.");
-        }
-
-        asyncResult._endCalled = true;
-
-        if (!asyncResult._isCompleted)
-        {
-            asyncResult.AsyncWaitHandle.WaitOne();
-        }
-
-        if (asyncResult._manualResetEvent != null)
-        {
-            asyncResult._manualResetEvent.Dispose();
-        }
-
-        if (asyncResult._exception != null)
-        {
-            throw asyncResult._exception;
-        }
-
-        return asyncResult;
-    }
-}
-
-//An AsyncResult that completes as soon as it is instantiated.
-internal class CompletedAsyncResult : AsyncResult
-{
-    public CompletedAsyncResult(AsyncCallback callback, object state)
-        : base(callback, state)
-    {
-        Complete(true);
-    }
-
-    public static void End(IAsyncResult result)
-    {
-        AsyncResult.End<CompletedAsyncResult>(result);
-    }
-}
-
-//A strongly typed AsyncResult
-internal abstract class TypedAsyncResult<T> : AsyncResult
-{
-    private T _data;
-
-    protected TypedAsyncResult(AsyncCallback callback, object state)
-        : base(callback, state)
-    {
-    }
-
-    public T Data
-    {
-        get { return _data; }
-    }
-
-    protected void Complete(T data, bool completedSynchronously)
-    {
-        this._data = data;
-        Complete(completedSynchronously);
-    }
-
-    public static T End(IAsyncResult result)
-    {
-        TypedAsyncResult<T> typedResult = AsyncResult.End<TypedAsyncResult<T>>(result);
-        return typedResult.Data;
-    }
-}
-
-//A strongly typed AsyncResult that completes as soon as it is instantiated.
-internal class TypedCompletedAsyncResult<T> : TypedAsyncResult<T>
-{
-    public TypedCompletedAsyncResult(T data, AsyncCallback callback, object state)
-        : base(callback, state)
-    {
-        Complete(data, true);
-    }
-
-    public new static T End(IAsyncResult result)
-    {
-        TypedCompletedAsyncResult<T> completedResult = result as TypedCompletedAsyncResult<T>;
-        if (completedResult == null)
-        {
-            throw new ArgumentException("Invalid async result.", "result");
-        }
-
-        return TypedAsyncResult<T>.End(completedResult);
-    }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/ChainedAsyncResult.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/ChainedAsyncResult.cs
deleted file mode 100644
index bb310b27ab2..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/ChainedAsyncResult.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-
-    internal delegate IAsyncResult ChainedBeginHandler(TimeSpan timeout, AsyncCallback asyncCallback, object state);
-    internal delegate void ChainedEndHandler(IAsyncResult result);
-
-class ChainedAsyncResult : AsyncResult
-{
-    ChainedBeginHandler begin2;
-    ChainedEndHandler end1;
-    ChainedEndHandler end2;
-    TimeoutHelper timeoutHelper;
-    static AsyncCallback begin1Callback = new AsyncCallback(Begin1Callback);
-    static AsyncCallback begin2Callback = new AsyncCallback(Begin2Callback);
-
-    protected ChainedAsyncResult(TimeSpan timeout, AsyncCallback callback, object state)
-        : base(callback, state)
-    {
-        this.timeoutHelper = new TimeoutHelper(timeout);
-    }
-
-    public ChainedAsyncResult(TimeSpan timeout, AsyncCallback callback, object state, ChainedBeginHandler begin1, ChainedEndHandler end1, ChainedBeginHandler begin2, ChainedEndHandler end2)
-        : base(callback, state)
-    {
-        this.timeoutHelper = new TimeoutHelper(timeout);
-        Begin(begin1, end1, begin2, end2);
-    }
-
-    protected void Begin(ChainedBeginHandler begin1, ChainedEndHandler end1, ChainedBeginHandler begin2, ChainedEndHandler end2)
-    {
-        this.end1 = end1;
-        this.begin2 = begin2;
-        this.end2 = end2;
-
-        IAsyncResult result = begin1(this.timeoutHelper.RemainingTime(), begin1Callback, this);
-        if (!result.CompletedSynchronously)
-            return;
-
-        if (Begin1Completed(result))
-        {
-            this.Complete(true);
-        }
-    }
-
-    static void Begin1Callback(IAsyncResult result)
-    {
-        if (result.CompletedSynchronously)
-            return;
-
-        ChainedAsyncResult thisPtr = (ChainedAsyncResult)result.AsyncState;
-
-        bool completeSelf = false;
-        Exception completeException = null;
-
-        try
-        {
-            completeSelf = thisPtr.Begin1Completed(result);
-        }
-        catch (Exception exception)
-        {
-            completeSelf = true;
-            completeException = exception;
-        }
-
-        if (completeSelf)
-        {
-            thisPtr.Complete(false, completeException);
-        }
-    }
-
-    bool Begin1Completed(IAsyncResult result)
-    {
-        end1(result);
-
-        result = begin2(this.timeoutHelper.RemainingTime(), begin2Callback, this);
-        if (!result.CompletedSynchronously)
-        {
-            return false;
-        }
-
-        end2(result);
-        return true;
-    }
-
-    static void Begin2Callback(IAsyncResult result)
-    {
-        if (result.CompletedSynchronously)
-            return;
-
-        ChainedAsyncResult thisPtr = (ChainedAsyncResult)result.AsyncState;
-
-        Exception completeException = null;
-
-        try
-        {
-            thisPtr.end2(result);
-        }
-        catch (Exception exception)
-        {
-            completeException = exception;
-        }
-
-        thisPtr.Complete(false, completeException);
-    }
-
-    public static void End(IAsyncResult result)
-    {
-        AsyncResult.End<ChainedAsyncResult>(result);
-    }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/ChannelMessageInterceptor.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/ChannelMessageInterceptor.cs
deleted file mode 100644
index 0331b08d791..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/ChannelMessageInterceptor.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System.ServiceModel.Channels;
-
-public abstract class ChannelMessageInterceptor
-{
-    public virtual void OnSend(ref Message message) { }
-    public virtual void OnReceive(ref Message message) { }
-
-    public abstract ChannelMessageInterceptor Clone();
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.IntegrationTests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.IntegrationTests.csproj
deleted file mode 100644
index 0067cc32adc..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.IntegrationTests.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>$(ScenarioTestTargetFrameworks)</TargetFrameworks>
-    <CLSCompliant>false</CLSCompliant>
-    <IsTestProject>true</IsTestProject>
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\System.ServiceModel.Primitives\src\System.ServiceModel.Primitives.csproj" />
-    <ProjectReference Include="..\..\..\..\..\System.ServiceModel.Http\src\System.ServiceModel.Http.csproj" />
-    <ProjectReference Include="..\..\..\..\..\System.ServiceModel.NetTcp\src\System.ServiceModel.NetTcp.csproj" />
-    <ProjectReference Include='$(WcfScenarioTestCommonProj)' />
-    <ProjectReference Include="$(WcfInfrastructureCommonProj)" />
-  </ItemGroup>
-</Project>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingBindingElement.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingBindingElement.cs
deleted file mode 100644
index bfb5d1c26c1..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingBindingElement.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.ServiceModel.Channels;
-
-public class InterceptingBindingElement : BindingElement
-{
-    ChannelMessageInterceptor interceptor;
-
-    public InterceptingBindingElement(ChannelMessageInterceptor interceptor)
-    {
-        this.interceptor = interceptor;
-    }
-
-    protected InterceptingBindingElement(InterceptingBindingElement other)
-        : base(other)
-    {
-        this.interceptor = other.Interceptor;
-    }
-
-    public ChannelMessageInterceptor Interceptor
-    {
-        get
-        {
-            if (this.interceptor != null)
-            {
-                return this.interceptor.Clone();
-            }
-            else
-            {
-                return new NullMessageInterceptor();
-            }
-        }
-    }
-
-    public override BindingElement Clone()
-    {
-        return new InterceptingBindingElement(this);
-    }
-
-    public override bool CanBuildChannelFactory<TChannel>(BindingContext context)
-    {
-        return context.CanBuildInnerChannelFactory<TChannel>();
-    }
-
-    public override IChannelFactory<TChannel> BuildChannelFactory<TChannel>(BindingContext context)
-    {
-        return new InterceptingChannelFactory<TChannel>(this.Interceptor, context);
-    }
-
-    public override T GetProperty<T>(BindingContext context)
-    {
-        if (typeof(T) == typeof(ChannelMessageInterceptor))
-        {
-            return (T)(object)this.Interceptor;
-        }
-
-        return context.GetInnerProperty<T>();
-    }
-
-    class NullMessageInterceptor : ChannelMessageInterceptor
-    {
-        public override ChannelMessageInterceptor Clone()
-        {
-            return new NullMessageInterceptor();
-        }
-    }
-}
-
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingChannelBase.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingChannelBase.cs
deleted file mode 100644
index a97c90688b5..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingChannelBase.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.ServiceModel.Channels;
-
-/// <summary>
-/// Base channel class that uses an ChannelMessageInterceptor
-/// </summary>
-class InterceptingChannelBase<TChannel> : ChannelBase
-    where TChannel : class, IChannel
-{
-    ChannelMessageInterceptor interceptor;
-    TChannel innerChannel;
-
-    protected InterceptingChannelBase(
-        ChannelManagerBase manager, ChannelMessageInterceptor interceptor, TChannel innerChannel)
-        : base(manager)
-    {
-        if (innerChannel == null)
-        {
-            throw new ArgumentException("InterceptingChannelBase requires a non-null inner channel.", "innerChannel");
-        }
-
-        this.interceptor = interceptor;
-        this.innerChannel = innerChannel;
-    }
-
-    protected TChannel InnerChannel
-    {
-        get
-        {
-            return this.innerChannel;
-        }
-    }
-
-    public override T GetProperty<T>()
-    {
-        T baseProperty = base.GetProperty<T>();
-        if (baseProperty != null)
-        {
-            return baseProperty;
-        }
-
-        return this.InnerChannel.GetProperty<T>();
-    }
-
-    protected override void OnAbort()
-    {
-        this.innerChannel.Abort();
-    }
-
-    protected override IAsyncResult OnBeginClose(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        return this.innerChannel.BeginClose(timeout, callback, state);
-    }
-
-    protected override IAsyncResult OnBeginOpen(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        return this.innerChannel.BeginOpen(timeout, callback, state);
-    }
-
-    protected override void OnClose(TimeSpan timeout)
-    {
-        this.innerChannel.Close(timeout);
-    }
-
-    protected override void OnEndClose(IAsyncResult result)
-    {
-        this.innerChannel.EndClose(result);
-    }
-
-    protected override void OnEndOpen(IAsyncResult result)
-    {
-        this.innerChannel.EndOpen(result);
-    }
-
-    protected override void OnOpen(TimeSpan timeout)
-    {
-        this.innerChannel.Open(timeout);
-    }
-
-    protected void OnReceive(ref Message message)
-    {
-        this.interceptor.OnReceive(ref message);
-    }
-
-    protected void OnSend(ref Message message)
-    {
-        this.interceptor.OnSend(ref message);
-    }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingChannelFactory.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingChannelFactory.cs
deleted file mode 100644
index daf69e979fb..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingChannelFactory.cs
+++ /dev/null
@@ -1,391 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-
-/// <summary>
-/// ChannelFactory that performs message Interception
-/// </summary>
-class InterceptingChannelFactory<TChannel>
-    : ChannelFactoryBase<TChannel>
-{
-    ChannelMessageInterceptor interceptor;
-    IChannelFactory<TChannel> innerChannelFactory;
-
-    public InterceptingChannelFactory(ChannelMessageInterceptor interceptor, BindingContext context)
-    {
-        this.interceptor = interceptor;
-        this.innerChannelFactory = context.BuildInnerChannelFactory<TChannel>();
-        if (this.innerChannelFactory == null)
-        {
-            throw new InvalidOperationException("InterceptingChannelFactory requires an inner IChannelFactory.");
-        }
-    }
-
-    public ChannelMessageInterceptor Interceptor
-    {
-        get { return this.interceptor; }
-    }
-
-    public override T GetProperty<T>()
-    {
-        T baseProperty = base.GetProperty<T>();
-        if (baseProperty != null)
-        {
-            return baseProperty;
-        }
-
-        return this.innerChannelFactory.GetProperty<T>();
-    }
-
-    protected override void OnOpen(TimeSpan timeout)
-    {
-        this.innerChannelFactory.Open(timeout);
-    }
-
-    protected override IAsyncResult OnBeginOpen(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        return this.innerChannelFactory.BeginOpen(timeout, callback, state);
-    }
-
-    protected override void OnEndOpen(IAsyncResult result)
-    {
-        this.innerChannelFactory.EndOpen(result);
-    }
-
-    protected override void OnAbort()
-    {
-        base.OnAbort();
-        this.innerChannelFactory.Abort();
-    }
-
-    protected override void OnClose(TimeSpan timeout)
-    {
-        TimeoutHelper timeoutHelper = new TimeoutHelper(timeout);
-        base.OnClose(timeoutHelper.RemainingTime());
-        this.innerChannelFactory.Close(timeoutHelper.RemainingTime());
-    }
-
-    protected override IAsyncResult OnBeginClose(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        return new ChainedAsyncResult(timeout, callback, state, base.OnBeginClose, base.OnEndClose, innerChannelFactory.BeginClose, innerChannelFactory.EndClose);
-    }
-
-    protected override void OnEndClose(IAsyncResult result)
-    {
-        ChainedAsyncResult.End(result);
-    }
-
-    protected override TChannel OnCreateChannel(EndpointAddress to, Uri via)
-    {
-        TChannel innerChannel = this.innerChannelFactory.CreateChannel(to, via);
-        if (typeof(TChannel) == typeof(IOutputChannel))
-        {
-            return (TChannel)(object)new InterceptingOutputChannel(this, (IOutputChannel)innerChannel);
-        }
-        else if (typeof(TChannel) == typeof(IRequestChannel))
-        {
-            return (TChannel)(object)new InterceptingRequestChannel(this, (IRequestChannel)innerChannel);
-        }
-        else if (typeof(TChannel) == typeof(IDuplexChannel))
-        {
-            return (TChannel)(object)new InterceptingDuplexChannel(this, Interceptor, (IDuplexChannel)innerChannel);
-        }
-        else if (typeof(TChannel) == typeof(IOutputSessionChannel))
-        {
-            return (TChannel)(object)new InterceptingOutputSessionChannel(this, (IOutputSessionChannel)innerChannel);
-        }
-        else if (typeof(TChannel) == typeof(IRequestSessionChannel))
-        {
-            return (TChannel)(object)new InterceptingRequestSessionChannel(this,
-                (IRequestSessionChannel)innerChannel);
-        }
-        else if (typeof(TChannel) == typeof(IDuplexSessionChannel))
-        {
-            return (TChannel)(object)new InterceptingDuplexSessionChannel(this, Interceptor, (IDuplexSessionChannel)innerChannel);
-        }
-
-        throw new InvalidOperationException();
-    }
-
-    class InterceptingOutputChannel
-        : InterceptingChannelBase<IOutputChannel>, IOutputChannel
-    {
-        public InterceptingOutputChannel(InterceptingChannelFactory<TChannel> factory, IOutputChannel innerChannel)
-            : base(factory, factory.Interceptor, innerChannel)
-        {
-            // empty
-        }
-
-        public EndpointAddress RemoteAddress
-        {
-            get
-            {
-                return this.InnerChannel.RemoteAddress;
-            }
-        }
-
-        public Uri Via
-        {
-            get
-            {
-                return this.InnerChannel.Via;
-            }
-        }
-
-        public IAsyncResult BeginSend(Message message, AsyncCallback callback, object state)
-        {
-            return BeginSend(message, DefaultSendTimeout, callback, state);
-        }
-
-        public IAsyncResult BeginSend(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            this.OnSend(ref message);
-            return new SendAsyncResult(this, message, timeout, callback, state);
-        }
-
-        public void EndSend(IAsyncResult result)
-        {
-            SendAsyncResult.End(result);
-        }
-
-        public void Send(Message message)
-        {
-            Send(message, DefaultSendTimeout);
-        }
-
-        public void Send(Message message, TimeSpan timeout)
-        {
-            base.OnSend(ref message);
-
-            if (message != null)
-            {
-                this.InnerChannel.Send(message, timeout);
-            }
-        }
-
-        class SendAsyncResult : AsyncResult
-        {
-            IOutputChannel channel;
-            AsyncCallback sendCallback = new AsyncCallback(OnSend);
-
-            public SendAsyncResult(IOutputChannel channel, Message message, TimeSpan timeout, AsyncCallback callback, object state)
-                : base(callback, state)
-            {
-                if (message != null)
-                {
-                    this.channel = channel;
-
-                    IAsyncResult sendResult = channel.BeginSend(message, timeout, sendCallback, this);
-                    if (!sendResult.CompletedSynchronously)
-                    {
-                        return;
-                    }
-
-                    CompleteSend(sendResult);
-                }
-
-                base.Complete(true);
-            }
-
-            void CompleteSend(IAsyncResult result)
-            {
-                channel.EndSend(result);
-            }
-
-            static void OnSend(IAsyncResult result)
-            {
-                if (result.CompletedSynchronously)
-                {
-                    return;
-                }
-
-                SendAsyncResult thisPtr = (SendAsyncResult)result.AsyncState;
-                Exception completionException = null;
-
-                try
-                {
-                    thisPtr.CompleteSend(result);
-                }
-                catch (Exception e)
-                {
-                    completionException = e;
-                }
-
-                thisPtr.Complete(false, completionException);
-            }
-
-            public static void End(IAsyncResult result)
-            {
-                AsyncResult.End<SendAsyncResult>(result);
-            }
-        }
-    }
-
-    class InterceptingRequestChannel
-        : InterceptingChannelBase<IRequestChannel>, IRequestChannel
-    {
-        public InterceptingRequestChannel(
-            InterceptingChannelFactory<TChannel> factory, IRequestChannel innerChannel)
-            : base(factory, factory.Interceptor, innerChannel)
-        {
-            // empty
-        }
-
-        public EndpointAddress RemoteAddress
-        {
-            get
-            {
-                return this.InnerChannel.RemoteAddress;
-            }
-        }
-
-        public Uri Via
-        {
-            get
-            {
-                return this.InnerChannel.Via;
-            }
-        }
-
-        public IAsyncResult BeginRequest(Message message, AsyncCallback callback, object state)
-        {
-            return BeginRequest(message, this.DefaultSendTimeout, callback, state);
-        }
-
-        public IAsyncResult BeginRequest(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            base.OnSend(ref message);
-            return new RequestAsyncResult(this, message, timeout, callback, state);
-        }
-
-        public Message EndRequest(IAsyncResult result)
-        {
-            Message reply = RequestAsyncResult.End(result);
-            this.OnReceive(ref reply);
-            return reply;
-        }
-
-        public Message Request(Message message)
-        {
-            return Request(message, this.DefaultSendTimeout);
-        }
-
-        public Message Request(Message message, TimeSpan timeout)
-        {
-            this.OnSend(ref message);
-            Message reply = null;
-            if (message != null)
-            {
-                reply = this.InnerChannel.Request(message);
-            }
-
-            this.OnReceive(ref reply);
-            return reply;
-        }
-
-        class RequestAsyncResult : AsyncResult
-        {
-            Message replyMessage;
-            InterceptingRequestChannel channel;
-            AsyncCallback requestCallback = new AsyncCallback(OnRequest);
-
-            public RequestAsyncResult(InterceptingRequestChannel channel, Message message, TimeSpan timeout, AsyncCallback callback, object state)
-                : base(callback, state)
-            {
-                if (message != null)
-                {
-                    this.channel = channel;
-
-                    IAsyncResult requestResult = channel.InnerChannel.BeginRequest(message, timeout, requestCallback, this);
-                    if (!requestResult.CompletedSynchronously)
-                    {
-                        return;
-                    }
-
-                    CompleteRequest(requestResult);
-                }
-
-                base.Complete(true);
-            }
-
-            void CompleteRequest(IAsyncResult result)
-            {
-                replyMessage = channel.InnerChannel.EndRequest(result);
-            }
-
-            static void OnRequest(IAsyncResult result)
-            {
-                if (result.CompletedSynchronously)
-                {
-                    return;
-                }
-
-                RequestAsyncResult thisPtr = (RequestAsyncResult)result.AsyncState;
-                Exception completionException = null;
-
-                try
-                {
-                    thisPtr.CompleteRequest(result);
-                }
-                catch (Exception e)
-                {
-                    completionException = e;
-                }
-
-                thisPtr.Complete(false, completionException);
-            }
-
-            public static Message End(IAsyncResult result)
-            {
-                RequestAsyncResult thisPtr = AsyncResult.End<RequestAsyncResult>(result);
-                return thisPtr.replyMessage;
-            }
-        }
-
-    }
-
-    class InterceptingOutputSessionChannel : InterceptingOutputChannel, IOutputSessionChannel
-    {
-        IOutputSessionChannel innerSessionChannel;
-
-        public InterceptingOutputSessionChannel(
-            InterceptingChannelFactory<TChannel> factory, IOutputSessionChannel innerChannel)
-            : base(factory, innerChannel)
-        {
-            this.innerSessionChannel = innerChannel;
-        }
-
-        public IOutputSession Session
-        {
-            get
-            {
-                return this.innerSessionChannel.Session;
-            }
-        }
-    }
-
-    class InterceptingRequestSessionChannel : InterceptingRequestChannel, IRequestSessionChannel
-    {
-        IRequestSessionChannel innerSessionChannel;
-
-        public InterceptingRequestSessionChannel(
-            InterceptingChannelFactory<TChannel> factory, IRequestSessionChannel innerChannel)
-            : base(factory, innerChannel)
-        {
-            this.innerSessionChannel = innerChannel;
-        }
-
-        public IOutputSession Session
-        {
-            get
-            {
-                return this.innerSessionChannel.Session;
-            }
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingDuplexChannel.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingDuplexChannel.cs
deleted file mode 100644
index 018808336dd..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/InterceptingDuplexChannel.cs
+++ /dev/null
@@ -1,335 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-
-class InterceptingInputChannel<TChannel>
-    : InterceptingChannelBase<TChannel>, IInputChannel
-    where TChannel : class, IInputChannel
-{
-    public InterceptingInputChannel(
-        ChannelManagerBase manager, ChannelMessageInterceptor interceptor, TChannel innerChannel)
-        : base(manager, interceptor, innerChannel)
-    {
-        // empty
-    }
-
-    public EndpointAddress LocalAddress
-    {
-        get
-        {
-            return this.InnerChannel.LocalAddress;
-        }
-    }
-
-    bool ProcessReceivedMessage(ref Message message)
-    {
-        Message originalMessage = message;
-        this.OnReceive(ref message);
-        return (message != null || originalMessage == null);
-    }
-
-    public Message Receive()
-    {
-        return Receive(DefaultReceiveTimeout);
-    }
-
-    public Message Receive(TimeSpan timeout)
-    {
-        Message message;
-        while (true)
-        {
-            message = this.InnerChannel.Receive(timeout);
-            if (ProcessReceivedMessage(ref message))
-            {
-                break;
-            }
-        }
-
-        return message;
-    }
-
-    public IAsyncResult BeginReceive(AsyncCallback callback, object state)
-    {
-        return BeginReceive(DefaultReceiveTimeout, callback, state);
-    }
-
-    public IAsyncResult BeginReceive(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        ReceiveAsyncResult<TChannel> result = new ReceiveAsyncResult<TChannel>(this, timeout, callback, state);
-        result.Begin();
-        return result;
-    }
-
-    public Message EndReceive(IAsyncResult result)
-    {
-        return ReceiveAsyncResult<TChannel>.End(result);
-    }
-
-    public bool TryReceive(TimeSpan timeout, out Message message)
-    {
-        bool result;
-        while (true)
-        {
-            result = this.InnerChannel.TryReceive(timeout, out message);
-            if (ProcessReceivedMessage(ref message))
-            {
-                break;
-            }
-        }
-
-        return result;
-    }
-
-    public IAsyncResult BeginTryReceive(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        TryReceiveAsyncResult<TChannel> result = new TryReceiveAsyncResult<TChannel>(this, timeout, callback, state);
-        result.Begin();
-        return result;
-    }
-
-    public bool EndTryReceive(IAsyncResult result, out Message message)
-    {
-        return TryReceiveAsyncResult<TChannel>.End(result, out message);
-    }
-
-    public bool WaitForMessage(TimeSpan timeout)
-    {
-        return this.InnerChannel.WaitForMessage(timeout);
-    }
-
-    public IAsyncResult BeginWaitForMessage(TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        return this.InnerChannel.BeginWaitForMessage(timeout, callback, state);
-    }
-
-    public bool EndWaitForMessage(IAsyncResult result)
-    {
-        return this.InnerChannel.EndWaitForMessage(result);
-    }
-
-    abstract class ReceiveAsyncResultBase<TInputChannel> : AsyncResult
-        where TInputChannel : class, IInputChannel
-    {
-        Message message;
-        InterceptingInputChannel<TInputChannel> channel;
-        AsyncCallback onReceive;
-
-        protected ReceiveAsyncResultBase(InterceptingInputChannel<TInputChannel> channel,
-            AsyncCallback callback, object state)
-            : base(callback, state)
-        {
-            this.channel = channel;
-            this.onReceive = new AsyncCallback(OnReceive);
-        }
-
-        protected Message Message
-        {
-            get { return this.message; }
-        }
-
-        public void Begin()
-        {
-            IAsyncResult result = BeginReceive(onReceive, null);
-            if (result.CompletedSynchronously)
-            {
-                if (HandleReceiveComplete(result))
-                {
-                    base.Complete(true);
-                }
-            }
-        }
-
-        protected abstract IAsyncResult BeginReceive(AsyncCallback callback, object state);
-        protected abstract Message EndReceive(IAsyncResult result);
-
-        bool HandleReceiveComplete(IAsyncResult result)
-        {
-            while (true)
-            {
-                this.message = EndReceive(result);
-                if (channel.ProcessReceivedMessage(ref message))
-                {
-                    return true;
-                }
-
-                // try again
-                result = BeginReceive(onReceive, null);
-                if (!result.CompletedSynchronously)
-                {
-                    return false;
-                }
-            }
-        }
-
-        void OnReceive(IAsyncResult result)
-        {
-            if (result.CompletedSynchronously)
-            {
-                return;
-            }
-
-            bool completeSelf = false;
-            Exception completeException = null;
-            try
-            {
-                completeSelf = HandleReceiveComplete(result);
-            }
-            catch (Exception e)
-            {
-                completeException = e;
-                completeSelf = true;
-            }
-
-            if (completeSelf)
-            {
-                base.Complete(false, completeException);
-            }
-        }
-    }
-
-    class TryReceiveAsyncResult<TInputChannel> : ReceiveAsyncResultBase<TInputChannel>
-        where TInputChannel : class, IInputChannel
-    {
-        TInputChannel innerChannel;
-        TimeSpan timeout;
-        bool returnValue;
-
-        public TryReceiveAsyncResult(InterceptingInputChannel<TInputChannel> channel, TimeSpan timeout,
-            AsyncCallback callback, object state)
-            : base(channel, callback, state)
-        {
-            this.innerChannel = channel.InnerChannel;
-            this.timeout = timeout;
-        }
-
-        protected override IAsyncResult BeginReceive(AsyncCallback callback, object state)
-        {
-            return this.innerChannel.BeginTryReceive(this.timeout, callback, state);
-        }
-
-        protected override Message EndReceive(IAsyncResult result)
-        {
-            Message message;
-            this.returnValue = this.innerChannel.EndTryReceive(result, out message);
-            return message;
-        }
-
-        public static bool End(IAsyncResult result, out Message message)
-        {
-            TryReceiveAsyncResult<TInputChannel> thisPtr = AsyncResult.End<TryReceiveAsyncResult<TInputChannel>>(result);
-            message = thisPtr.Message;
-            return thisPtr.returnValue;
-        }
-    }
-
-    class ReceiveAsyncResult<TInputChannel> : ReceiveAsyncResultBase<TInputChannel>
-       where TInputChannel : class, IInputChannel
-    {
-        TInputChannel innerChannel;
-        TimeSpan timeout;
-
-        public ReceiveAsyncResult(InterceptingInputChannel<TInputChannel> channel, TimeSpan timeout,
-            AsyncCallback callback, object state)
-            : base(channel, callback, state)
-        {
-            this.innerChannel = channel.InnerChannel;
-            this.timeout = timeout;
-        }
-
-        protected override IAsyncResult BeginReceive(AsyncCallback callback, object state)
-        {
-            return this.innerChannel.BeginReceive(this.timeout, callback, state);
-        }
-
-        protected override Message EndReceive(IAsyncResult result)
-        {
-            return this.innerChannel.EndReceive(result);
-        }
-
-        public static Message End(IAsyncResult result)
-        {
-            ReceiveAsyncResult<TInputChannel> thisPtr = AsyncResult.End<ReceiveAsyncResult<TInputChannel>>(result);
-            return thisPtr.Message;
-        }
-    }
-}
-
-class InterceptingDuplexChannel
-    : InterceptingInputChannel<IDuplexChannel>, IDuplexChannel
-{
-    public InterceptingDuplexChannel(
-        ChannelManagerBase manager, ChannelMessageInterceptor interceptor, IDuplexChannel innerChannel)
-        : base(manager, interceptor, innerChannel)
-    {
-        // empty
-    }
-
-    public EndpointAddress RemoteAddress
-    {
-        get
-        {
-            return this.InnerChannel.RemoteAddress;
-        }
-    }
-
-    public Uri Via
-    {
-        get
-        {
-            return this.InnerChannel.Via;
-        }
-    }
-
-    public void Send(Message message)
-    {
-        Send(message, DefaultSendTimeout);
-    }
-
-    public void Send(Message message, TimeSpan timeout)
-    {
-        this.OnSend(ref message);
-        this.InnerChannel.Send(message, timeout);
-    }
-
-    public IAsyncResult BeginSend(Message message, AsyncCallback callback, object state)
-    {
-        return BeginSend(message, DefaultSendTimeout, callback, state);
-    }
-
-    public IAsyncResult BeginSend(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-    {
-        this.OnSend(ref message);
-        return this.InnerChannel.BeginSend(message, timeout, callback, state);
-    }
-
-    public void EndSend(IAsyncResult result)
-    {
-        this.InnerChannel.EndSend(result);
-    }
-}
-
-
-class InterceptingDuplexSessionChannel : InterceptingDuplexChannel, IDuplexSessionChannel
-{
-    IDuplexSessionChannel innerSessionChannel;
-
-    public InterceptingDuplexSessionChannel(
-        ChannelManagerBase manager, ChannelMessageInterceptor interceptor, IDuplexSessionChannel innerChannel)
-        : base(manager, interceptor, innerChannel)
-    {
-        this.innerSessionChannel = innerChannel;
-    }
-
-    public IDuplexSession Session
-    {
-        get
-        {
-            return this.innerSessionChannel.Session;
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/MessageInterceptorTests.4.1.1.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/MessageInterceptorTests.4.1.1.cs
deleted file mode 100644
index 35ae0addf1e..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/MessageInterceptorTests.4.1.1.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-using Infrastructure.Common;
-using Xunit;
-
-public partial class MessageInterceptorTests : ConditionalWcfTest
-{
-    public class MessageModifier : ChannelMessageInterceptor
-    {
-        int send = 0;
-
-        public override void OnSend(ref Message msg)
-        {
-            send++;
-            if (send % 2 == 0)
-            {
-                // Add extra header so that when the message arrives on service side, the message won't be dropped
-                msg.Headers.Add(MessageHeader.CreateHeader("ByPass", "urn:InterceptorNamespace", "ByPassPassword"));
-            }
-        }
-
-        public override ChannelMessageInterceptor Clone()
-        {
-            return new MessageModifier();
-        }
-    }
-
-    [WcfFact]
-    [OuterLoop]
-    public static void CustomBinding_Message_Interceptor()
-    {
-        ChannelFactory<IWcfChannelExtensibilityContract> factory = null;
-        IWcfChannelExtensibilityContract serviceProxy = null;
-
-        try
-        {
-            // *** SETUP *** \\
-            CustomBinding binding = new CustomBinding(
-                new InterceptingBindingElement(new MessageModifier()),
-                new HttpTransportBindingElement());
-
-            factory = new ChannelFactory<IWcfChannelExtensibilityContract>(binding, new EndpointAddress(Endpoints.HttpBaseAddress_ChannelExtensibility));
-            serviceProxy = factory.CreateChannel();
-
-            // *** EXECUTE & VALIDATE *** \\
-            int[] windSpeeds = new int[] { 100, 90, 80, 70, 60, 50, 40, 30, 20, 10 };
-            for (int i = 0; i < 10; i++)
-            {
-                serviceProxy.ReportWindSpeed(windSpeeds[i]);
-            }
-
-            // *** CLEANUP *** \\
-            ((ICommunicationObject)serviceProxy).Close();
-            factory.Close();
-        }
-        finally
-        {
-            // *** ENSURE CLEANUP *** \\
-            ScenarioTestHelpers.CloseCommunicationObjects((ICommunicationObject)serviceProxy, factory);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/TimeoutHelper.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/TimeoutHelper.cs
deleted file mode 100644
index 9868e6e1f98..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/TimeoutHelper.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-
-using System;
-using System.Threading;
-
-public struct TimeoutHelper
-{
-    public static TimeSpan DefaultTimeout { get { return TimeSpan.FromMinutes(2); } }
-    public static TimeSpan DefaultShortTimeout { get { return TimeSpan.FromSeconds(4); } }
-    public static TimeSpan Infinite { get { return TimeSpan.MaxValue; } }
-
-    private DateTime _deadline;
-    private TimeSpan _originalTimeout;
-
-    public TimeoutHelper(TimeSpan timeout)
-    {
-        if (timeout < TimeSpan.Zero)
-        {
-            throw new ArgumentOutOfRangeException("timeout");
-        }
-
-        this._originalTimeout = timeout;
-        if (timeout == TimeSpan.MaxValue)
-        {
-            this._deadline = DateTime.MaxValue;
-        }
-        else
-        {
-            this._deadline = DateTime.UtcNow + timeout;
-        }
-    }
-
-    public TimeSpan OriginalTimeout
-    {
-        get { return this._originalTimeout; }
-    }
-
-    public TimeSpan RemainingTime()
-    {
-        if (this._deadline == DateTime.MaxValue)
-        {
-            return TimeSpan.MaxValue;
-        }
-        else
-        {
-            TimeSpan remaining = this._deadline - DateTime.UtcNow;
-            if (remaining <= TimeSpan.Zero)
-            {
-                return TimeSpan.Zero;
-            }
-            else
-            {
-                return remaining;
-            }
-        }
-    }
-    public void SetTimer(TimerCallback callback, Object state)
-    {
-        Timer timer = new Timer(callback, state, TimeoutHelper.ToMilliseconds(this.RemainingTime()), Timeout.Infinite);
-    }
-
-    public static TimeSpan FromMilliseconds(int milliseconds)
-    {
-        if (milliseconds == Timeout.Infinite)
-        {
-            return TimeSpan.MaxValue;
-        }
-        else
-        {
-            return TimeSpan.FromMilliseconds(milliseconds);
-        }
-    }
-
-    public static int ToMilliseconds(TimeSpan timeout)
-    {
-        if (timeout == TimeSpan.MaxValue)
-        {
-            return Timeout.Infinite;
-        }
-        else
-        {
-            long ticks = Ticks.FromTimeSpan(timeout);
-            if (ticks / TimeSpan.TicksPerMillisecond > int.MaxValue)
-            {
-                return int.MaxValue;
-            }
-            return Ticks.ToMilliseconds(ticks);
-        }
-    }
-
-    public static TimeSpan Add(TimeSpan timeout1, TimeSpan timeout2)
-    {
-        return Ticks.ToTimeSpan(Ticks.Add(Ticks.FromTimeSpan(timeout1), Ticks.FromTimeSpan(timeout2)));
-    }
-
-    public static DateTime Add(DateTime time, TimeSpan timeout)
-    {
-        if (timeout >= TimeSpan.Zero && DateTime.MaxValue - time <= timeout)
-        {
-            return DateTime.MaxValue;
-        }
-        if (timeout <= TimeSpan.Zero && DateTime.MinValue - time >= timeout)
-        {
-            return DateTime.MinValue;
-        }
-        return time + timeout;
-    }
-
-    public static DateTime Subtract(DateTime time, TimeSpan timeout)
-    {
-        return Add(time, TimeSpan.Zero - timeout);
-    }
-
-    public static TimeSpan Divide(TimeSpan timeout, int factor)
-    {
-        if (timeout == TimeSpan.MaxValue)
-        {
-            return TimeSpan.MaxValue;
-        }
-
-        return Ticks.ToTimeSpan((Ticks.FromTimeSpan(timeout) / factor) + 1);
-    }
-
-    public static bool WaitOne(WaitHandle waitHandle, TimeSpan timeout, bool exitSync)
-    {
-        if (timeout == TimeSpan.MaxValue)
-        {
-            waitHandle.WaitOne();
-            return true;
-        }
-        else
-        {
-            TimeSpan maxWait = TimeSpan.FromMilliseconds(Int32.MaxValue);
-
-            while (timeout > maxWait)
-            {
-                bool signaled = waitHandle.WaitOne(maxWait);
-
-                if (signaled)
-                {
-                    return true;
-                }
-
-                timeout -= maxWait;
-            }
-
-            return waitHandle.WaitOne(timeout);
-        }
-    }
-
-    private static class Ticks
-    {
-        public static long FromMilliseconds(int milliseconds)
-        {
-            return (long)milliseconds * TimeSpan.TicksPerMillisecond;
-        }
-
-        public static int ToMilliseconds(long ticks)
-        {
-            return checked((int)(ticks / TimeSpan.TicksPerMillisecond));
-        }
-
-        public static long FromTimeSpan(TimeSpan duration)
-        {
-            return duration.Ticks;
-        }
-
-        public static TimeSpan ToTimeSpan(long ticks)
-        {
-            return new TimeSpan(ticks);
-        }
-
-        public static long Add(long firstTicks, long secondTicks)
-        {
-            if (firstTicks == long.MaxValue || firstTicks == long.MinValue)
-            {
-                return firstTicks;
-            }
-            if (secondTicks == long.MaxValue || secondTicks == long.MinValue)
-            {
-                return secondTicks;
-            }
-            if (firstTicks >= 0 && long.MaxValue - firstTicks <= secondTicks)
-            {
-                return long.MaxValue - 1;
-            }
-            if (firstTicks <= 0 && long.MinValue - firstTicks >= secondTicks)
-            {
-                return long.MinValue + 1;
-            }
-            return checked(firstTicks + secondTicks);
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs
index 2bc4ddf09b1..0457ba55f7d 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs
@@ -14,6 +14,7 @@
 public class WebSocketTests : ConditionalWcfTest
 {
     [WcfTheory]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
@@ -246,6 +247,7 @@ public static void WebSocket_Http_Duplex_Buffered_KeepAlive(NetHttpMessageEncodi
     }
 
     [WcfTheory]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
@@ -346,7 +348,8 @@ public static void WebSocket_Https_Duplex_Streamed(NetHttpMessageEncoding messag
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
-    [Condition(nameof(Root_Certificate_Installed))]
+    [Condition(nameof(Root_Certificate_Installed),
+        nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(3572, OS = OSID.OSX)]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
@@ -483,6 +486,7 @@ public static void WebSocket_Http_RequestReply_Streamed(NetHttpMessageEncoding m
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void WebSocket_Http_RequestReply_Buffered(NetHttpMessageEncoding messageEncoding)
     {
@@ -536,6 +540,7 @@ public static void WebSocket_Http_RequestReply_Buffered(NetHttpMessageEncoding m
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
     public static void WebSocket_Http_RequestReply_Buffered_KeepAlive(NetHttpMessageEncoding messageEncoding)
@@ -590,7 +595,8 @@ public static void WebSocket_Http_RequestReply_Buffered_KeepAlive(NetHttpMessage
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
-    [Condition(nameof(Root_Certificate_Installed))]
+    [Condition(nameof(Root_Certificate_Installed),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(3572, OS = OSID.OSX)]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
@@ -645,7 +651,8 @@ public static void WebSocket_Https_RequestReply_Buffered(NetHttpMessageEncoding
     [InlineData(NetHttpMessageEncoding.Binary)]
     [InlineData(NetHttpMessageEncoding.Text)]
     [InlineData(NetHttpMessageEncoding.Mtom)]
-    [Condition(nameof(Root_Certificate_Installed))]
+    [Condition(nameof(Root_Certificate_Installed),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(3572, OS = OSID.OSX)]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
@@ -699,6 +706,7 @@ public static void WebSocket_Https_RequestReply_Buffered_KeepAlive(NetHttpMessag
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
     public static void WebSocket_Http_WSTransportUsageDefault_DuplexCallback_GuidRoundtrip()
@@ -739,6 +747,7 @@ public static void WebSocket_Http_WSTransportUsageDefault_DuplexCallback_GuidRou
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
     public static void WebSocket_Http_WSTransportUsageAlways_DuplexCallback_GuidRoundtrip()
@@ -779,6 +788,7 @@ public static void WebSocket_Http_WSTransportUsageAlways_DuplexCallback_GuidRoun
     }
 
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
     public static void WebSocket_WSScheme_WSTransportUsageAlways_DuplexCallback_GuidRoundtrip()
@@ -826,6 +836,7 @@ public static void WebSocket_WSScheme_WSTransportUsageAlways_DuplexCallback_Guid
     // When not using a callback you can still force WCF to use WebSockets.
     // This test verifies that it actually uses WebSockets when not using a callback.
     [WcfFact]
+    [Condition(nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
     public static void WebSocket_Http_VerifyWebSocketsUsed()
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Http/ClientCredentialTypeTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Http/ClientCredentialTypeTests.4.1.0.cs
index 5f8939f5732..500098b8764 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Http/ClientCredentialTypeTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Http/ClientCredentialTypeTests.4.1.0.cs
@@ -138,7 +138,7 @@ public static void HttpExpect100Continue_DigestAuthentication_True()
     }
 
     [WcfFact]
-    [Condition(nameof(Windows_Authentication_Available), nameof(Is_Windows))]
+    [Condition(nameof(Windows_Authentication_Available), nameof(Is_Windows), nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void WindowsAuthentication_RoundTrips_Echo()
     {
@@ -149,7 +149,7 @@ public static void WindowsAuthentication_RoundTrips_Echo()
     }
 
     [WcfFact]
-    [Condition(nameof(Windows_Authentication_Available), nameof(Is_Windows))]
+    [Condition(nameof(Windows_Authentication_Available), nameof(Is_Windows), nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void IntegratedWindowsAuthentication_Negotiate_RoundTrips_Echo()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/ClientCredentialTypeTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/ClientCredentialTypeTests.4.1.0.cs
index 4372c8f6c08..03d24b19bdb 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/ClientCredentialTypeTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/ClientCredentialTypeTests.4.1.0.cs
@@ -206,7 +206,8 @@ public static void BasicAuthenticationEmptyUser_throw_ArgumentException()
     [Condition(nameof(Server_Domain_Joined),
                nameof(Root_Certificate_Installed),
                nameof(Digest_Authentication_Available),
-               nameof(Explicit_Credentials_Available))]
+               nameof(Explicit_Credentials_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -227,7 +228,7 @@ public static void DigestAuthentication_RoundTrips_Echo()
     }
 
     [WcfFact]
-    [Condition(nameof(NTLM_Available), nameof(Root_Certificate_Installed))]
+    [Condition(nameof(NTLM_Available), nameof(Root_Certificate_Installed), nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NtlmAuthentication_RoundTrips_Echo()
     {
@@ -238,7 +239,7 @@ public static void NtlmAuthentication_RoundTrips_Echo()
     }
 
     [WcfFact]
-    [Condition(nameof(NTLM_Available), nameof(Root_Certificate_Installed))]
+    [Condition(nameof(NTLM_Available), nameof(Root_Certificate_Installed), nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void IntegratedWindowsAuthentication_Ntlm_RoundTrips_Echo()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.0.cs
index 55450b5cf0e..28667bb5919 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.0.cs
@@ -452,7 +452,8 @@ public static void HttpExpect100Continue_ClientCertificate_True()
     [Condition(nameof(Root_Certificate_Installed),
            nameof(Client_Certificate_Installed),
            nameof(Server_Accepts_Certificates),
-           nameof(SSL_Available))]
+           nameof(SSL_Available),
+           nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(3572, OS = OSID.OSX)]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
@@ -511,7 +512,8 @@ public static void WebSocket_RequestReply_CertificateCredentials()
     [Condition(nameof(Root_Certificate_Installed),
        nameof(Client_Certificate_Installed),
        nameof(Server_Accepts_Certificates),
-       nameof(SSL_Available))]
+       nameof(SSL_Available),
+       nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(3572, OS = OSID.OSX)]
     [Issue(1438, OS = OSID.Windows_7)]  // not supported on Win7
     [OuterLoop]
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.1.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.1.cs
index 86f10638b6a..83fda85cadf 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.1.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Https/HttpsTests.4.1.1.cs
@@ -125,7 +125,8 @@ public static void Https_SecModeTrans_CertValMode_PeerTrust_Fails_Not_In_Trusted
     [WcfFact]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [Issue(1945, OS = OSID.OSX)] // OSX doesn't support the TrustedPeople certificate store
     [OuterLoop]
     // Asking for PeerOrChainTrust should succeed if the certificate is
@@ -174,7 +175,8 @@ public static void Https_SecModeTrans_CertValMode_PeerOrChainTrust_Succeeds_Chai
     [Issue(2870, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Asking for ChainTrust should succeed if the certificate is
     // chain-trusted.
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Http_Tests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Http_Tests.4.1.0.cs
index c51f12844a6..ea9b928b745 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Http_Tests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Http_Tests.4.1.0.cs
@@ -60,7 +60,8 @@ public class NegotiateStream_Http_Tests : ConditionalWcfTest
     [WcfFact]
     [Condition(nameof(Windows_Authentication_Available),
                nameof(Root_Certificate_Installed),
-               nameof(Ambient_Credentials_Available))]
+               nameof(Ambient_Credentials_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NegotiateStream_Http_AmbientCredentials()
     {
@@ -108,7 +109,8 @@ public static void NegotiateStream_Http_AmbientCredentials()
     [Condition(nameof(Windows_Authentication_Available),
                nameof(Root_Certificate_Installed),
                nameof(Explicit_Credentials_Available),
-               nameof(Domain_Available))]
+               nameof(Domain_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -159,7 +161,8 @@ public static void NegotiateStream_Http_With_ExplicitUserNameAndPassword()
     [Condition(nameof(Windows_Authentication_Available),
               nameof(Root_Certificate_Installed),
               nameof(Explicit_Credentials_Available),
-              nameof(Domain_Available))]
+              nameof(Domain_Available),
+              nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -210,7 +213,8 @@ public static void NegotiateStream_Http_With_ExplicitUserNameAndPasswordForNet50
     [WcfFact]
     [Condition(nameof(Windows_Authentication_Available),
                nameof(Root_Certificate_Installed),
-               nameof(SPN_Available))]
+               nameof(SPN_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -304,7 +308,8 @@ public static void NegotiateStream_Http_With_Upn()
                nameof(Root_Certificate_Installed),
                nameof(Explicit_Credentials_Available),
                nameof(Domain_Available),
-               nameof(SPN_Available))]
+               nameof(SPN_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Tcp_Tests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Tcp_Tests.4.1.0.cs
index e6d5880f0a0..e8d7777c3df 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Tcp_Tests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Tcp_Tests.4.1.0.cs
@@ -56,8 +56,7 @@ public class NegotiateStream_Tcp_Tests : ConditionalWcfTest
 
     [WcfFact]
     [Condition(nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NegotiateStream_Tcp_AmbientCredentials()
     {
@@ -93,7 +92,7 @@ public static void NegotiateStream_Tcp_AmbientCredentials()
     [Condition(nameof(Windows_Authentication_Available),
                nameof(Explicit_Credentials_Available),
                nameof(Domain_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -140,8 +139,7 @@ public static void NegotiateStream_Tcp_With_ExplicitUserNameAndPassword()
 
     [WcfFact]
     [Condition(nameof(Windows_Authentication_Available),
-               nameof(SPN_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(SPN_Available))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -185,8 +183,7 @@ public static void NegotiateStream_Tcp_With_ExplicitSpn()
 
     [WcfFact]
     [Condition(nameof(Windows_Authentication_Available),
-               nameof(SPN_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(SPN_Available))]
     [OuterLoop]
     public static void NegotiateStream_Tcp_With_SPN()
     {
@@ -229,7 +226,7 @@ public static void NegotiateStream_Tcp_With_SPN()
                nameof(Explicit_Credentials_Available),
                nameof(Domain_Available),
                nameof(SPN_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Test Requirements \\
     // The following environment variables must be set...
@@ -284,7 +281,8 @@ public static void NegotiateStream_Tcp_With_ExplicitUserNameAndPassword_With_Spn
     [Condition(nameof(Windows_Authentication_Available),
                nameof(Explicit_Credentials_Available),
                nameof(Domain_Available),
-               nameof(UPN_Available))]
+               nameof(UPN_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void NegotiateStream_Tcp_With_ExplicitUserNameAndPassword_With_Upn()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeCertificateCanonicalNameTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeCertificateCanonicalNameTests.4.1.0.cs
index 6d6417b894b..7066f485d83 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeCertificateCanonicalNameTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeCertificateCanonicalNameTests.4.1.0.cs
@@ -25,7 +25,9 @@ public class Tcp_ClientCredentialTypeCertificateCanonicalNameTests : Conditional
     // to pass a variation or fail a variation. 
 
     [WcfFact]
-    [Condition(nameof(Root_Certificate_Installed))]
+    [Issue(3572, OS = OSID.OSX)]
+    [Condition(nameof(Root_Certificate_Installed),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Certificate_With_CanonicalName_Localhost_Address_EchoString()
     {
@@ -96,7 +98,8 @@ public static void Certificate_With_CanonicalName_Localhost_Address_EchoString()
     }
 
     [WcfFact]
-    [Condition(nameof(Root_Certificate_Installed))]
+    [Issue(3572, OS = OSID.OSX)]
+    [Condition(nameof(Root_Certificate_Installed), nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Certificate_With_CanonicalName_DomainName_Address_EchoString()
     {
@@ -173,7 +176,7 @@ public static void Certificate_With_CanonicalName_DomainName_Address_EchoString(
 
     [WcfFact]
     [Issue(3572, OS = OSID.OSX)]
-    [Condition(nameof(Root_Certificate_Installed))]
+    [Condition(nameof(Root_Certificate_Installed), nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     public static void Certificate_With_CanonicalName_Fqdn_Address_EchoString()
     {
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeTests.4.1.1.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeTests.4.1.1.cs
index 7f3a4c6bdf6..bcb9182c638 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeTests.4.1.1.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/ClientCredentialTypeTests.4.1.1.cs
@@ -18,7 +18,8 @@ public partial class Tcp_ClientCredentialTypeTests : ConditionalWcfTest
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Peer_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Asking for PeerTrust alone should succeed
     // if the certificate is in the TrustedPeople store.  For this test
@@ -124,7 +125,8 @@ public static void NetTcp_SecModeTrans_CertValMode_PeerTrust_Fails_Not_In_Truste
     [Issue(1945, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Asking for PeerOrChainTrust should succeed if the certificate is
     // chain-trusted, even though it is not in the TrustedPeople store.
@@ -219,7 +221,8 @@ public static void NetTcp_SecModeTrans_CertValMode_ChainTrust_Succeeds_ChainTrus
     [Issue(1945, OS = OSID.OSX)]
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
-               nameof(SSL_Available))]
+               nameof(SSL_Available),
+               nameof(Skip_CoreWCFService_FailedTest))]
     [OuterLoop]
     // Asking for ChainTrust only should succeed if the certificate is
     // chain-trusted.
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/StreamingTests.4.1.0.cs b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/StreamingTests.4.1.0.cs
index 86cf4a96e8b..be3f6be1b41 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/StreamingTests.4.1.0.cs
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Tcp/StreamingTests.4.1.0.cs
@@ -21,8 +21,7 @@ public class StreamingTests : ConditionalWcfTest
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_StreamedRequest_RoundTrips_String()
     {
@@ -62,8 +61,7 @@ public static void NetTcp_TransportSecurity_StreamedRequest_RoundTrips_String()
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
                
     [OuterLoop]
     public static void NetTcp_TransportSecurity_StreamedResponse_RoundTrips_String()
@@ -103,8 +101,7 @@ public static void NetTcp_TransportSecurity_StreamedResponse_RoundTrips_String()
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_Streamed_RoundTrips_String()
     {
@@ -145,8 +142,7 @@ public static void NetTcp_TransportSecurity_Streamed_RoundTrips_String()
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_Streamed_MultipleReads()
     {
@@ -255,8 +251,7 @@ public static void NetTcp_TransportSecurity_Streamed_TimeOut_Long_Running_Operat
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_Streamed_Async_RoundTrips_String()
     {
@@ -297,8 +292,7 @@ public static void NetTcp_TransportSecurity_Streamed_Async_RoundTrips_String()
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_StreamedRequest_Async_RoundTrips_String()
     {
@@ -339,8 +333,7 @@ public static void NetTcp_TransportSecurity_StreamedRequest_Async_RoundTrips_Str
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_StreamedResponse_Async_RoundTrips_String()
     {
@@ -381,8 +374,7 @@ public static void NetTcp_TransportSecurity_StreamedResponse_Async_RoundTrips_St
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_Streamed_RoundTrips_String_WithSingleThreadedSyncContext()
     {
@@ -400,8 +392,7 @@ public static void NetTcp_TransportSecurity_Streamed_RoundTrips_String_WithSingl
     [Condition(nameof(Root_Certificate_Installed),
                nameof(Client_Certificate_Installed),
                nameof(Windows_Authentication_Available),
-               nameof(Ambient_Credentials_Available),
-               nameof(WindowsOrSelfHosted))]
+               nameof(Ambient_Credentials_Available))]
     [OuterLoop]
     public static void NetTcp_TransportSecurity_Streamed_Async_RoundTrips_String_WithSingleThreadedSyncContext()
     {
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.sln b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.sln
index 3f6b91d2469..e90cafbf4e0 100644
--- a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.sln
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.sln
@@ -1,22 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.438
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34321.82
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CertificateGenerator", "CertificateGenerator.csproj", "{99C31CA4-03FF-4378-93E3-85389341C6C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CertificateGeneratorLibrary", "CertificateGeneratorLibrary\CertificateGeneratorLibrary.csproj", "{07CA0DD3-755A-47B0-AA32-ADC249227B0F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CertificateGenerator", "CertificateGenerator\CertificateGenerator.csproj", "{F8E24E54-71E3-46C5-B4A7-92E3AE36CBD2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{99C31CA4-03FF-4378-93E3-85389341C6C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{99C31CA4-03FF-4378-93E3-85389341C6C3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07CA0DD3-755A-47B0-AA32-ADC249227B0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07CA0DD3-755A-47B0-AA32-ADC249227B0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07CA0DD3-755A-47B0-AA32-ADC249227B0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07CA0DD3-755A-47B0-AA32-ADC249227B0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8E24E54-71E3-46C5-B4A7-92E3AE36CBD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8E24E54-71E3-46C5-B4A7-92E3AE36CBD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8E24E54-71E3-46C5-B4A7-92E3AE36CBD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8E24E54-71E3-46C5-B4A7-92E3AE36CBD2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F6B453F0-0829-4C2F-BBB6-9B22EE6A1E58}
+		SolutionGuid = {CEC7E1AA-8CED-4E37-A8AD-AC8DD206A54B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/App.config b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/App.config
similarity index 100%
rename from src/System.Private.ServiceModel/tools/CertificateGenerator/App.config
rename to src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/App.config
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/CertificateGenerator.csproj
similarity index 68%
rename from src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj
rename to src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/CertificateGenerator.csproj
index 4b9aca82c82..aa0f59bf3c2 100644
--- a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.csproj
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/CertificateGenerator.csproj
@@ -1,12 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net471</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Crypto.dll" Version="$(BouncyCastleCryptodllPackageVersion)" />
+    <ProjectReference Include="..\CertificateGeneratorLibrary\CertificateGeneratorLibrary.csproj" />
   </ItemGroup>
+
   <ItemGroup>
     <Reference Include="System.Configuration" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/Program.cs b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/Program.cs
new file mode 100644
index 00000000000..f75744c1033
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator/Program.cs
@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Configuration;
+
+namespace CertUtil
+{
+    internal class Program
+    {
+        private static string s_testserverbase = string.Empty;
+        private static string s_crlFileLocation = string.Empty;
+        private static TimeSpan s_validatePeriod;
+
+        private static void Usage()
+        {
+            Console.WriteLine("Supported argument is -Uninstall");
+            Console.WriteLine("                      -help");
+        }
+        private static int Main(string[] args)
+        {
+            ApplyAppSettings();
+
+            if (args.Length > 0)
+            {
+                if (string.Compare(args[0], "-Uninstall", true) == 0)
+                {
+                    CertificateGeneratorLibrary.UninstallAllCerts();
+                    return 0;
+                }
+                else if (string.Compare(args[0], "-help", true) == 0)
+                {
+                    Usage();
+                    return 0;
+                }
+                else
+                {
+                    Usage();
+                    return 1;
+                }
+            }
+
+            CertificateGeneratorLibrary.SetupCerts(s_testserverbase, s_validatePeriod, s_crlFileLocation);
+
+            return 0;
+        }
+
+        private static void ApplyAppSettings()
+        {
+            var appSettings = ConfigurationManager.AppSettings;
+            s_testserverbase = appSettings["testserverbase"] ?? string.Empty;
+            s_validatePeriod = TimeSpan.FromDays(int.Parse(appSettings["CertExpirationInDay"]));
+            s_crlFileLocation = appSettings["CrlFileLocation"];
+        }
+    }
+}
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateCreationSettings.cs b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateCreationSettings.cs
similarity index 100%
rename from src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateCreationSettings.cs
rename to src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateCreationSettings.cs
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.cs b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGenerator.cs
similarity index 87%
rename from src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.cs
rename to src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGenerator.cs
index 876878b6818..a663857336e 100644
--- a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGenerator.cs
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGenerator.cs
@@ -4,10 +4,12 @@
 
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.X509;
 using Org.BouncyCastle.Crypto;
@@ -44,10 +46,10 @@ public class CertificateGenerator
         // Give the cert a grace period in case there's a time skew between machines
         private readonly TimeSpan _gracePeriod = TimeSpan.FromHours(1);
 
-        private const string _authorityCanonicalName = "DO_NOT_TRUST_WcfBridgeRootCA";
+        private readonly string _authorityCanonicalName = "DO_NOT_TRUST_WcfBridgeRootCA";
         private readonly string _signatureAlgorithm = Org.BouncyCastle.Asn1.Pkcs.PkcsObjectIdentifiers.Sha256WithRsaEncryption.Id;
-        private const string _upnObjectId = "1.3.6.1.4.1.311.20.2.3";
-        private const int _keyLengthInBits = 2048;
+        private readonly string _upnObjectId = "1.3.6.1.4.1.311.20.2.3";
+        private readonly int _keyLengthInBits = 2048;
 
         private static readonly X509V3CertificateGenerator s_certGenerator = new X509V3CertificateGenerator();
         private static readonly X509V2CrlGenerator s_crlGenerator = new X509V2CrlGenerator();
@@ -87,7 +89,7 @@ public void Initialize()
                     throw new ArgumentException("CrlUri must be a valid relative URI", "CrlUriRelativePath");
                 }
 
-                _crlUri = string.Format("http://{0}{1}", _crlServiceUri, _crlUriRelativePath);
+                _crlUri = new Uri(string.Format("http://{0}{1}", _crlServiceUri, _crlUriRelativePath)).AbsoluteUri;
 
                 _initializationDateTime = DateTime.UtcNow;
                 _defaultValidityNotBefore = _initializationDateTime.Subtract(_gracePeriod);
@@ -232,6 +234,24 @@ public X509CertificateContainer CreateUserCertificate(CertificateCreationSetting
             return CreateCertificate(false, false, _authorityCertificate.InternalCertificate, creationSettings);
         }
 
+        public static BigInteger HashFriendlyName(string input)
+        {
+            using (SHA256 sha256 = SHA256.Create())
+            {
+                // Convert the input string to a byte array
+                byte[] inputBytes = Encoding.UTF8.GetBytes(input);
+
+                // Compute the hash value of the input bytes, and take the first 20 bytes
+                byte[] hashBytes = sha256.ComputeHash(inputBytes).Take(20).ToArray();
+
+                // return a Positive BigInt of the hash
+                var bigInteger = new BigInteger(1, hashBytes.ToArray());
+                return bigInteger;
+            }
+        }
+
+        public static string HashFriendlyNameToString(string input) => HashFriendlyName(input).ToString(16).ToUpper();
+
         // Only the ctor should be calling with isAuthority = true
         // if isAuthority, value for isMachineCert doesn't matter
         private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMachineCert, X509Certificate signingCertificate, CertificateCreationSettings certificateCreationSettings)
@@ -285,7 +305,17 @@ private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMach
 
             // Tag on the generation time to prevent caching of the cert CRL in Linux
             X509Name authorityX509Name = CreateX509Name(string.Format("{0} {1}", _authorityCanonicalName, DateTime.Now.ToString("s")));
-            var serialNum = new BigInteger(64 /*sizeInBits*/, _random).Abs();
+            BigInteger serialNum;
+
+            // Search by serial number in Linux/MacOS
+            if (!CertificateHelper.CurrentOperatingSystem.IsWindows() && certificateCreationSettings.FriendlyName != null)
+            {
+                serialNum = HashFriendlyName(certificateCreationSettings.FriendlyName);
+            }
+            else
+            {
+                serialNum = new BigInteger(64 /*sizeInBits*/, _random).Abs();
+            }
 
             var keyPair = isAuthority ? _authorityKeyPair : _keyPairGenerator.GenerateKeyPair();
             if (isAuthority)
@@ -304,7 +334,7 @@ private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMach
             else
             {
                 X509Name subjectName = CreateX509Name(subject);
-                s_certGenerator.SetIssuerDN(PrincipalUtilities.GetSubjectX509Principal(signingCertificate));
+                s_certGenerator.SetIssuerDN(signingCertificate.SubjectDN);
                 s_certGenerator.SetSubjectDN(subjectName);
 
                 s_certGenerator.AddExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(_authorityKeyPair.Public));
@@ -321,7 +351,7 @@ private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMach
             s_certGenerator.AddExtension(X509Extensions.BasicConstraints, true, new BasicConstraints(isAuthority));
             if (certificateCreationSettings.EKU == null || certificateCreationSettings.EKU.Count == 0)
             {
-                s_certGenerator.AddExtension(X509Extensions.ExtendedKeyUsage, false, new ExtendedKeyUsage(KeyPurposeID.IdKPServerAuth, KeyPurposeID.IdKPClientAuth));
+                s_certGenerator.AddExtension(X509Extensions.ExtendedKeyUsage, false, new ExtendedKeyUsage(KeyPurposeID.id_kp_serverAuth, KeyPurposeID.id_kp_clientAuth));
             }
             else
             {
@@ -373,7 +403,7 @@ private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMach
 
             if (isAuthority || certificateCreationSettings.IncludeCrlDistributionPoint)
             {
-                var crlDistributionPoints = new DistributionPoint[1] 
+                var crlDistributionPoints = new DistributionPoint[1]
                 {
                     new DistributionPoint(
                         new DistributionPointName(
@@ -422,7 +452,7 @@ private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMach
                 container.Pfx = stream.ToArray();
             }
 
-            X509Certificate2 outputCert;
+            X509Certificate2 outputCert = null;
 
             if (isAuthority)
             {
@@ -433,7 +463,34 @@ private X509CertificateContainer CreateCertificate(bool isAuthority, bool isMach
             {
                 // Otherwise, allow encode with the private key. note that X509Certificate2.RawData will not provide the private key
                 // you will have to re-export this cert if needed
-                outputCert = new X509Certificate2(container.Pfx, _password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
+                if (CertificateHelper.CurrentOperatingSystem.IsMacOS())
+                {
+                    //string tempKeychainFilePath = Path.GetTempFileName();
+                    string tempKeychainFilePath = Path.Combine(Environment.CurrentDirectory, Path.GetRandomFileName());
+                    System.Security.Cryptography.X509Certificates.X509Store MacOsTempStore = CertificateHelper.GetMacOSX509Store(tempKeychainFilePath);
+                    MacOsTempStore.Certificates.Import(container.Pfx, _password, X509KeyStorageFlags.Exportable);
+                    MacOsTempStore.Close();
+                    MacOsTempStore.Dispose();
+
+                    MacOsTempStore = CertificateHelper.GetMacOSX509Store(tempKeychainFilePath);
+
+                    outputCert = ((IEnumerable<X509Certificate2>)MacOsTempStore.Certificates).FirstOrDefault();
+
+                    if (outputCert == null)
+                    {
+                        Console.WriteLine("Couldn't find Certificate..");
+                    }
+
+                    MacOsTempStore.Dispose();
+                    if (File.Exists(tempKeychainFilePath))
+                    {
+                        File.Delete(tempKeychainFilePath);
+                    }
+                }
+                else
+                {
+                    outputCert = new X509Certificate2(container.Pfx, _password, X509KeyStorageFlags.MachineKeySet | X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
+                }
             }
 
             container.Subject = subject;
@@ -475,7 +532,7 @@ private X509Crl CreateCrl(X509Certificate signingCertificate)
             s_crlGenerator.SetThisUpdate(updateTime);
             //There is no need to update CRL.
             s_crlGenerator.SetNextUpdate(now.Add(ValidityPeriod));
-            s_crlGenerator.SetIssuerDN(PrincipalUtilities.GetSubjectX509Principal(signingCertificate));
+            s_crlGenerator.SetIssuerDN(signingCertificate.SubjectDN);
 
             s_crlGenerator.AddExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(signingCertificate));
 
@@ -525,8 +582,8 @@ private static X509Name CreateX509Name(string canonicalName)
         {
             X509Name authorityX509Name;
 
-            IList authorityKeyIdOrder = new ArrayList();
-            IDictionary authorityKeyIdName = new Hashtable();
+            IList<DerObjectIdentifier> authorityKeyIdOrder = new List<DerObjectIdentifier>();
+            IDictionary<DerObjectIdentifier, string> authorityKeyIdName = new Dictionary<DerObjectIdentifier, string>();
 
             authorityKeyIdOrder.Add(X509Name.OU);
             authorityKeyIdOrder.Add(X509Name.O);
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGeneratorLibrary.cs b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGeneratorLibrary.cs
new file mode 100644
index 00000000000..09d1b13e7e1
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGeneratorLibrary.cs
@@ -0,0 +1,187 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections.Generic;
+using System.Security.Cryptography.X509Certificates;
+using WcfTestCommon;
+using X509Certificate2 = System.Security.Cryptography.X509Certificates.X509Certificate2;
+using System.IO;
+using System.Net;
+
+public class CertificateGeneratorLibrary
+{
+    private const string ClientCertificateSubject = "WCF Client Certificate";
+    private const string CertificateIssuer = "DO_NOT_TRUST_WcfBridgeRootCA";
+
+    private static string s_fqdn = Dns.GetHostEntry("127.0.0.1").HostName;
+    private static string s_hostname = Dns.GetHostEntry("127.0.0.1").HostName.Split('.')[0];
+    private static string s_testserverbase = string.Empty;
+    private static string s_crlFileLocation = string.Empty;
+    private static TimeSpan s_validatePeriod;
+
+    private static void RemoveCertificatesFromStore(StoreName storeName, StoreLocation storeLocation)
+    {
+        X509Store store = CertificateHelper.GetX509Store(storeName, storeLocation);
+        Console.WriteLine("  Checking StoreName '{0}', StoreLocation '{1}'", storeName, store.Location);
+        {
+            if (!CertificateHelper.CurrentOperatingSystem.IsMacOS()) 
+            {
+                store.Open(OpenFlags.ReadWrite | OpenFlags.IncludeArchived);
+            }
+
+            foreach (var cert in store.Certificates.Find(X509FindType.FindByIssuerName, CertificateIssuer, false))
+            {
+                Console.Write("    {0}. Subject: '{1}'", cert.Thumbprint, cert.SubjectName.Name);
+                store.Remove(cert);
+                Console.WriteLine(" ... removed");
+            }
+        }
+        Console.WriteLine();
+    }
+
+    public static void UninstallAllCerts()
+    {
+        RemoveCertificatesFromStore(StoreName.My, StoreLocation.CurrentUser);
+        RemoveCertificatesFromStore(StoreName.My, StoreLocation.LocalMachine);
+
+        RemoveCertificatesFromStore(StoreName.Root, StoreLocation.LocalMachine);
+        RemoveCertificatesFromStore(StoreName.Root, StoreLocation.CurrentUser);
+
+        RemoveCertificatesFromStore(StoreName.TrustedPeople, StoreLocation.LocalMachine);
+        RemoveCertificatesFromStore(StoreName.TrustedPeople, StoreLocation.CurrentUser);
+    }
+
+    public static int SetupCerts(string testserverbase, TimeSpan validatePeriod, string crlFileLocation, int httpPort=80)
+    {
+        s_testserverbase = testserverbase;
+        s_validatePeriod = validatePeriod;
+        s_crlFileLocation = crlFileLocation;
+
+        UninstallAllCerts();
+
+        CertificateGenerator certificateGenerate = new CertificateGenerator();
+        certificateGenerate.CertificatePassword = "test";
+
+        certificateGenerate.CrlServiceUri = $"{s_fqdn}:{httpPort}";
+        certificateGenerate.ValidityPeriod = s_validatePeriod;
+
+        if (!string.IsNullOrEmpty(s_testserverbase))
+        {
+            certificateGenerate.CrlUriRelativePath += "/" + s_testserverbase;
+        }
+        certificateGenerate.CrlUriRelativePath += "/TestHost.svc/Crl";
+
+        //Create and install root and server cert
+        CertificateManager.CreateAndInstallLocalMachineCertificates(certificateGenerate);
+
+        //Create and Install expired cert
+        CertificateCreationSettings certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpExpiredServerCertResource",
+            ValidityType = CertificateValidityType.Expired,
+            ValidityNotBefore = DateTime.UtcNow - TimeSpan.FromDays(4),
+            ValidityNotAfter = DateTime.UtcNow - TimeSpan.FromDays(2),
+            //If you specify multiple subjects, the first one becomes the subject, and all of them become Subject Alt Names.
+            //In this case, the certificate subject is  CN=fqdn, OU=..., O=... , and SANs will be  fqdn, hostname, localhost
+            //We do this so that a single WCF service setup can deal with all the possible addresses that a client might use.
+            Subject = s_fqdn,
+            SubjectAlternativeNames = new string[] { s_fqdn, s_hostname, "localhost" }
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+
+        //Create and Install TcpCertificateWithServerAltName
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpCertificateWithServerAltNameResource",
+            Subject = "not-real-subject-name",
+            SubjectAlternativeNames = new string[] { "not-real-subject-name", "not-real-subject-name.example.com", s_fqdn, s_hostname, "localhost" }
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //TcpCertificateWithSubjectCanonicalNameDomainName
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpCertificateWithSubjectCanonicalNameDomainNameResource",
+            Subject = s_hostname,
+            SubjectAlternativeNames = new string[0],
+            ValidityType = CertificateValidityType.NonAuthoritativeForMachine
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //WCF Bridge - TcpCertificateWithSubjectCanonicalNameFqdn
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpCertificateWithSubjectCanonicalNameFqdnResource",
+            Subject = s_fqdn,
+            SubjectAlternativeNames = new string[0],
+            ValidityType = CertificateValidityType.NonAuthoritativeForMachine
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //TcpCertificateWithSubjectCanonicalNameLocalhost
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpCertificateWithSubjectCanonicalNameLocalhostResource",
+            Subject = "localhost",
+            SubjectAlternativeNames = new string[0],
+            ValidityType = CertificateValidityType.NonAuthoritativeForMachine
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //TcpRevokedServerCert
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpRevokedServerCertResource",
+            ValidityType = CertificateValidityType.Revoked,
+            Subject = s_fqdn,
+            SubjectAlternativeNames = new string[] { s_fqdn, s_hostname, "localhost" }
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //TcpInvalidEkuServerCert
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - TcpInvalidEkuServerCert",
+            ValidityType = CertificateValidityType.Valid,
+            Subject = s_fqdn,
+            SubjectAlternativeNames = new string[] { s_fqdn, s_hostname, "localhost" },
+            EKU = new List<Org.BouncyCastle.Asn1.X509.KeyPurposeID> { Org.BouncyCastle.Asn1.X509.KeyPurposeID.id_kp_clientAuth }
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //STSMetaData
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - STSMetaData",
+            ValidityType = CertificateValidityType.Valid,
+            Subject = "STSMetaData",
+            EKU = new List<Org.BouncyCastle.Asn1.X509.KeyPurposeID>()
+        };
+        CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
+
+        //Create and install client cert
+        certificateCreationSettings = new CertificateCreationSettings()
+        {
+            FriendlyName = "WCF Bridge - UserCertificateResource",
+            Subject = "WCF Client Certificate",
+        };
+        X509Certificate2 certificate = certificateGenerate.CreateUserCertificate(certificateCreationSettings).Certificate;
+        CertificateManager.AddToStoreIfNeeded(StoreName.My, StoreLocation.LocalMachine, certificate);
+
+        //Create CRL and save it
+        FileInfo file = new FileInfo(s_crlFileLocation);
+        file.Directory.Create();
+
+        File.WriteAllBytes(s_crlFileLocation, certificateGenerate.CrlEncoded);
+
+        return 0;
+    }
+
+    private static void CreateAndInstallMachineCertificate(CertificateGenerator certificateGenerate, CertificateCreationSettings certificateCreationSettings)
+    {
+        X509Certificate2 certificate = certificateGenerate.CreateMachineCertificate(certificateCreationSettings).Certificate;
+        CertificateManager.AddToStoreIfNeeded(StoreName.My, StoreLocation.LocalMachine, certificate);
+    }
+}
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGeneratorLibrary.csproj b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGeneratorLibrary.csproj
new file mode 100644
index 00000000000..d539f59a920
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateGeneratorLibrary.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\IISHostedWcfService\App_code\CertificateHelper\CertificateHelper.cs" Link="CertificateHelper.cs" />
+    <Compile Include="..\..\IISHostedWcfService\App_code\CertificateHelper\SafeKeychainHandle.cs" Link="SafeKeychainHandle.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateManager.cs b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateManager.cs
similarity index 96%
rename from src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateManager.cs
rename to src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateManager.cs
index 0c9edc14574..e3fc2c15089 100644
--- a/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateManager.cs
+++ b/src/System.Private.ServiceModel/tools/CertificateGenerator/CertificateGeneratorLibrary/CertificateManager.cs
@@ -5,8 +5,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
-using System.Linq;
 using System.Net;
 using System.Security.Cryptography.X509Certificates;
 
@@ -44,25 +42,26 @@ private static X509Certificate2 CertificateFromThumbprint(X509Store store, strin
 
         // Adds the given certificate to the given store unless it is
         // already present.  Returns 'true' if the certificate was added.
-        public static bool AddToStoreIfNeeded(StoreName storeName,
-                                               StoreLocation storeLocation,
-                                               X509Certificate2 certificate)
+        public static bool AddToStoreIfNeeded(StoreName storeName, StoreLocation storeLocation, X509Certificate2 certificate)
         {
             X509Store store = null;
             X509Certificate2 existingCert = null;
             try
             {
-                store = new X509Store(storeName, storeLocation);
+                store = CertificateHelper.GetX509Store(storeName, storeLocation);
 
                 // We assume Bridge is running elevated
-                store.Open(OpenFlags.ReadWrite);
+                if (!CertificateHelper.CurrentOperatingSystem.IsMacOS())
+                {
+                    store.Open(OpenFlags.ReadWrite);
+                }
                 existingCert = CertificateFromThumbprint(store, certificate.Thumbprint);
                 if (existingCert == null)
                 {
                     store.Add(certificate);
                     Trace.WriteLine(string.Format("[CertificateManager] Added certificate to store: "));
-                    Trace.WriteLine(string.Format("    {0} = {1}", "StoreName", storeName));
-                    Trace.WriteLine(string.Format("    {0} = {1}", "StoreLocation", storeLocation));
+                    Trace.WriteLine(string.Format("    {0} = {1}", "StoreName", store.Name));
+                    Trace.WriteLine(string.Format("    {0} = {1}", "StoreLocation", store.Location));
                     Trace.WriteLine(string.Format("    {0} = {1}", "CN", certificate.SubjectName.Name));
                     Trace.WriteLine(string.Format("    {0} = {1}", "HasPrivateKey", certificate.HasPrivateKey));
                     Trace.WriteLine(string.Format("    {0} = {1}", "Thumbprint", certificate.Thumbprint));
diff --git a/src/System.Private.ServiceModel/tools/CertificateGenerator/Program.cs b/src/System.Private.ServiceModel/tools/CertificateGenerator/Program.cs
deleted file mode 100644
index 2fa379d47f0..00000000000
--- a/src/System.Private.ServiceModel/tools/CertificateGenerator/Program.cs
+++ /dev/null
@@ -1,221 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Security.Cryptography;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using WcfTestCommon;
-using X509Certificate2 = System.Security.Cryptography.X509Certificates.X509Certificate2;
-using X509KeyStorageFlags = System.Security.Cryptography.X509Certificates.X509KeyStorageFlags;
-using System.IO;
-using System.Net;
-using System.Configuration;
-
-namespace CertUtil
-{
-    internal class Program
-    {
-        private const string ClientCertificateSubject = "WCF Client Certificate";
-        private const string CertificateIssuer = "DO_NOT_TRUST_WcfBridgeRootCA";
-
-        private static string s_fqdn = Dns.GetHostEntry("127.0.0.1").HostName;
-        private static string s_hostname = Dns.GetHostEntry("127.0.0.1").HostName.Split('.')[0];
-        private static string s_testserverbase = string.Empty;
-        private static string s_CrlFileLocation = string.Empty;
-        private static TimeSpan s_ValidatePeriod;
-
-        private static void RemoveCertificatesFromStore(StoreName storeName, StoreLocation storeLocation)
-        {
-            Console.WriteLine("  Checking StoreName '{0}', StoreLocation '{1}'", storeName, storeLocation);
-
-            X509Store store = new X509Store(storeName, storeLocation);
-            {
-                store.Open(OpenFlags.ReadWrite | OpenFlags.IncludeArchived);
-
-                foreach (var cert in store.Certificates.Find(X509FindType.FindByIssuerName, CertificateIssuer, false))
-                {
-                    Console.Write("    {0}. Subject: '{1}'", cert.Thumbprint, cert.SubjectName.Name);
-                    store.Remove(cert);
-                    Console.Write(" ... removed");
-                }
-            }
-            Console.WriteLine();
-        }
-
-        private static void UninstallAllCerts()
-        {
-            RemoveCertificatesFromStore(StoreName.My, StoreLocation.CurrentUser);
-            RemoveCertificatesFromStore(StoreName.My, StoreLocation.LocalMachine);
-
-            RemoveCertificatesFromStore(StoreName.Root, StoreLocation.LocalMachine);
-            RemoveCertificatesFromStore(StoreName.Root, StoreLocation.CurrentUser);
-
-            RemoveCertificatesFromStore(StoreName.TrustedPeople, StoreLocation.LocalMachine);
-            RemoveCertificatesFromStore(StoreName.TrustedPeople, StoreLocation.CurrentUser);
-        }
-
-        private static void Usage()
-        {
-            Console.WriteLine("Supported argument is -Uninstall");
-            Console.WriteLine("                      -help");
-        }
-        private static int Main(string[] args)
-        {
-            ApplyAppSettings();
-
-            if (args.Length > 0)
-            {
-                if (string.Compare(args[0], "-Uninstall", true) == 0)
-                {
-                    UninstallAllCerts();
-                    return 0;
-                }
-                else if (string.Compare(args[0], "-help", true) == 0)
-                {
-                    Usage();
-                    return 0;
-                }
-                else
-                {
-                    Usage();
-                    return 1;
-                }
-            }
-
-            UninstallAllCerts();
-
-            CertificateGenerator certificateGenerate = new CertificateGenerator();
-            certificateGenerate.CertificatePassword = "test";
-            certificateGenerate.CrlServiceUri = s_fqdn;
-            certificateGenerate.ValidityPeriod = s_ValidatePeriod;
-
-            if (!string.IsNullOrEmpty(s_testserverbase))
-            {
-                certificateGenerate.CrlUriRelativePath += "/" + s_testserverbase;
-            }
-            certificateGenerate.CrlUriRelativePath += "/TestHost.svc/Crl";
-
-            //Create and install root and server cert
-            CertificateManager.CreateAndInstallLocalMachineCertificates(certificateGenerate);
-
-            //Create and Install expired cert
-            CertificateCreationSettings certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpExpiredServerCertResource",
-                ValidityType = CertificateValidityType.Expired,
-                ValidityNotBefore = DateTime.UtcNow - TimeSpan.FromDays(4),
-                ValidityNotAfter = DateTime.UtcNow - TimeSpan.FromDays(2),
-                //If you specify multiple subjects, the first one becomes the subject, and all of them become Subject Alt Names.
-                //In this case, the certificate subject is  CN=fqdn, OU=..., O=... , and SANs will be  fqdn, hostname, localhost
-                //We do this so that a single WCF service setup can deal with all the possible addresses that a client might use.
-                Subject = s_fqdn,
-                SubjectAlternativeNames = new string[] { s_fqdn, s_hostname, "localhost" }
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-
-            //Create and Install TcpCertificateWithServerAltName
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpCertificateWithServerAltNameResource",
-                Subject = "not-real-subject-name",
-                SubjectAlternativeNames = new string[] { "not-real-subject-name", "not-real-subject-name.example.com", s_fqdn, s_hostname, "localhost" }
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //TcpCertificateWithSubjectCanonicalNameDomainName
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpCertificateWithSubjectCanonicalNameDomainNameResource",
-                Subject = s_hostname,
-                SubjectAlternativeNames = new string[0],
-                ValidityType = CertificateValidityType.NonAuthoritativeForMachine
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //WCF Bridge - TcpCertificateWithSubjectCanonicalNameFqdn
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpCertificateWithSubjectCanonicalNameFqdnResource",
-                Subject = s_fqdn,
-                SubjectAlternativeNames = new string[0],
-                ValidityType = CertificateValidityType.NonAuthoritativeForMachine
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //TcpCertificateWithSubjectCanonicalNameLocalhost
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpCertificateWithSubjectCanonicalNameLocalhostResource",
-                Subject = "localhost",
-                SubjectAlternativeNames = new string[0],
-                ValidityType = CertificateValidityType.NonAuthoritativeForMachine
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //TcpRevokedServerCert
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpRevokedServerCertResource",
-                ValidityType = CertificateValidityType.Revoked,
-                Subject = s_fqdn,
-                SubjectAlternativeNames = new string[] { s_fqdn, s_hostname, "localhost" }
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //TcpInvalidEkuServerCert
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - TcpInvalidEkuServerCert",
-                ValidityType = CertificateValidityType.Valid,
-                Subject = s_fqdn,
-                SubjectAlternativeNames = new string[] { s_fqdn, s_hostname, "localhost" },
-                EKU = new List<Org.BouncyCastle.Asn1.X509.KeyPurposeID> { Org.BouncyCastle.Asn1.X509.KeyPurposeID.IdKPClientAuth }
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //STSMetaData
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - STSMetaData",
-                ValidityType = CertificateValidityType.Valid,
-                Subject = "STSMetaData",
-                EKU = new List<Org.BouncyCastle.Asn1.X509.KeyPurposeID>()
-            };
-            CreateAndInstallMachineCertificate(certificateGenerate, certificateCreationSettings);
-
-            //Create and install client cert
-            certificateCreationSettings = new CertificateCreationSettings()
-            {
-                FriendlyName = "WCF Bridge - UserCertificateResource",
-                Subject = "WCF Client Certificate",
-            };
-            X509Certificate2 certificate = certificateGenerate.CreateUserCertificate(certificateCreationSettings).Certificate;
-            CertificateManager.AddToStoreIfNeeded(StoreName.My, StoreLocation.LocalMachine, certificate);
-
-            //Create CRL and save it
-            File.WriteAllBytes(s_CrlFileLocation, certificateGenerate.CrlEncoded);
-
-            return 0;
-        }
-
-        private static void ApplyAppSettings()
-        {
-            var appSettings = ConfigurationManager.AppSettings;
-            s_testserverbase = appSettings["testserverbase"] ?? string.Empty;
-            s_ValidatePeriod = TimeSpan.FromDays(int.Parse(appSettings["CertExpirationInDay"]));
-            s_CrlFileLocation = appSettings["CrlFileLocation"];
-        }
-
-        private static void CreateAndInstallMachineCertificate(CertificateGenerator certificateGenerate, CertificateCreationSettings certificateCreationSettings)
-        {
-            X509Certificate2 certificate = certificateGenerate.CreateMachineCertificate(certificateCreationSettings).Certificate;
-            CertificateManager.AddToStoreIfNeeded(StoreName.My, StoreLocation.LocalMachine, certificate);
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ActivationServiceHostFactory.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ActivationServiceHostFactory.cs
index 9998bcffc3d..3b3e0f7bd1f 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ActivationServiceHostFactory.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ActivationServiceHostFactory.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
@@ -16,3 +17,4 @@ public override ServiceHostBase CreateServiceHost(string constructorString, Uri[
         }
     }
 }
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/AsyncResult.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/AsyncResult.cs
deleted file mode 100644
index 428961d250c..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/AsyncResult.cs
+++ /dev/null
@@ -1,238 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics;
-using System.Threading;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    /// <summary>
-    /// A generic base class for IAsyncResult implementations
-    /// that wraps a ManualResetEvent.
-    /// </summary>
-    internal abstract class AsyncResult : IAsyncResult
-    {
-        private AsyncCallback _callback;
-        private object _state;
-        private bool _completedSynchronously;
-        private bool _endCalled;
-        private Exception _exception;
-        private bool _isCompleted;
-        private ManualResetEvent _manualResetEvent;
-        private object _thisLock;
-
-        protected AsyncResult(AsyncCallback callback, object state)
-        {
-            _callback = callback;
-            _state = state;
-            _thisLock = new object();
-        }
-
-        public object AsyncState
-        {
-            get
-            {
-                return _state;
-            }
-        }
-
-        public WaitHandle AsyncWaitHandle
-        {
-            get
-            {
-                if (_manualResetEvent != null)
-                {
-                    return _manualResetEvent;
-                }
-
-                lock (ThisLock)
-                {
-                    if (_manualResetEvent == null)
-                    {
-                        _manualResetEvent = new ManualResetEvent(_isCompleted);
-                    }
-                }
-
-                return _manualResetEvent;
-            }
-        }
-
-        public bool CompletedSynchronously
-        {
-            get
-            {
-                return _completedSynchronously;
-            }
-        }
-
-        public bool IsCompleted
-        {
-            get
-            {
-                return _isCompleted;
-            }
-        }
-
-        private object ThisLock
-        {
-            get
-            {
-                return _thisLock;
-            }
-        }
-
-        // Call this version of complete when your asynchronous operation is complete.  This will update the state
-        // of the operation and notify the callback.
-        protected void Complete(bool completedSynchronously)
-        {
-            if (_isCompleted)
-            {
-                // It is a bug to call Complete twice.
-                throw new InvalidOperationException("Cannot call Complete twice");
-            }
-
-            _completedSynchronously = completedSynchronously;
-
-            if (completedSynchronously)
-            {
-                // If we completedSynchronously, then there is no chance that the manualResetEvent was created so
-                // we do not need to worry about a race condition.
-                Debug.Assert(_manualResetEvent == null, "No ManualResetEvent should be created for a synchronous AsyncResult.");
-                _isCompleted = true;
-            }
-            else
-            {
-                lock (ThisLock)
-                {
-                    _isCompleted = true;
-                    if (_manualResetEvent != null)
-                    {
-                        _manualResetEvent.Set();
-                    }
-                }
-            }
-
-            // If the callback throws, there is a bug in the callback implementation
-            if (_callback != null)
-            {
-                _callback(this);
-            }
-        }
-
-        // Call this version of complete if you raise an exception during processing.  In addition to notifying
-        // the callback, it will capture the exception and store it to be thrown during AsyncResult.End.
-        protected void Complete(bool completedSynchronously, Exception exception)
-        {
-            _exception = exception;
-            Complete(completedSynchronously);
-        }
-
-        // End should be called when the End function for the asynchronous operation is complete.  It
-        // ensures the asynchronous operation is complete, and does some common validation.
-        protected static TAsyncResult End<TAsyncResult>(IAsyncResult result)
-            where TAsyncResult : AsyncResult
-        {
-            if (result == null)
-            {
-                throw new ArgumentNullException("result");
-            }
-
-            TAsyncResult asyncResult = result as TAsyncResult;
-
-            if (asyncResult == null)
-            {
-                throw new ArgumentException("Invalid async result.", "result");
-            }
-
-            if (asyncResult._endCalled)
-            {
-                throw new InvalidOperationException("Async object already ended.");
-            }
-
-            asyncResult._endCalled = true;
-
-            if (!asyncResult._isCompleted)
-            {
-                asyncResult.AsyncWaitHandle.WaitOne();
-            }
-
-            if (asyncResult._manualResetEvent != null)
-            {
-                asyncResult._manualResetEvent.Close();
-            }
-
-            if (asyncResult._exception != null)
-            {
-                throw asyncResult._exception;
-            }
-
-            return asyncResult;
-        }
-    }
-
-    //An AsyncResult that completes as soon as it is instantiated.
-    internal class CompletedAsyncResult : AsyncResult
-    {
-        public CompletedAsyncResult(AsyncCallback callback, object state)
-            : base(callback, state)
-        {
-            Complete(true);
-        }
-
-        public static void End(IAsyncResult result)
-        {
-            AsyncResult.End<CompletedAsyncResult>(result);
-        }
-    }
-
-    //A strongly typed AsyncResult
-    internal abstract class TypedAsyncResult<T> : AsyncResult
-    {
-        private T _data;
-
-        protected TypedAsyncResult(AsyncCallback callback, object state)
-            : base(callback, state)
-        {
-        }
-
-        public T Data
-        {
-            get { return _data; }
-        }
-
-        protected void Complete(T data, bool completedSynchronously)
-        {
-            _data = data;
-            Complete(completedSynchronously);
-        }
-
-        public static T End(IAsyncResult result)
-        {
-            TypedAsyncResult<T> typedResult = AsyncResult.End<TypedAsyncResult<T>>(result);
-            return typedResult.Data;
-        }
-    }
-
-    //A strongly typed AsyncResult that completes as soon as it is instantiated.
-    internal class TypedCompletedAsyncResult<T> : TypedAsyncResult<T>
-    {
-        public TypedCompletedAsyncResult(T data, AsyncCallback callback, object state)
-            : base(callback, state)
-        {
-            Complete(data, true);
-        }
-
-        public new static T End(IAsyncResult result)
-        {
-            TypedCompletedAsyncResult<T> completedResult = result as TypedCompletedAsyncResult<T>;
-            if (completedResult == null)
-            {
-                throw new ArgumentException("Invalid async result.", "result");
-            }
-
-            return TypedAsyncResult<T>.End(completedResult);
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/BasicServiceAuthorizationManager.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/BasicServiceAuthorizationManager.cs
index b339abf8366..3c47af44aa2 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/BasicServiceAuthorizationManager.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/BasicServiceAuthorizationManager.cs
@@ -2,15 +2,22 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Description;
+using CoreWCF.Dispatcher;
+#else
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Net;
-using System.Security.Principal;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
+#endif
+using System.Collections.ObjectModel;
+using System.Net;
+using System.Security.Principal;
 using System.Text;
 
 namespace WcfService
@@ -45,6 +52,7 @@ private bool Authorized(BasicAuthenticationState basicState, OperationContext op
             return true;
         }
 
+        [Obsolete]
         public override bool CheckAccess(OperationContext operationContext, ref Message message)
         {
             var basicState = new BasicAuthenticationState(operationContext, GetRealm(ref message));
@@ -122,18 +130,15 @@ private struct BasicAuthenticationState
             private readonly string _realm;
             private string _username;
             private string _password;
-            private bool? _authorized;
 
             public BasicAuthenticationState(OperationContext operationContext, string realm)
             {
                 _operationContext = operationContext;
                 _realm = realm;
                 _username = _password = string.Empty;
-                _authorized = new bool?();
                 _authorizationHeader = GetAuthorizationHeader(operationContext);
                 if (_authorizationHeader.Length < BasicAuthenticationMechanismLength)
                 {
-                    _authorized = false;
                     return;
                 }
 
@@ -143,7 +148,6 @@ public BasicAuthenticationState(OperationContext operationContext, string realm)
                 int colonPos = authDecoded.IndexOf(':');
                 if(colonPos <= 0)
                 {
-                    _authorized = false;
                     return;
                 }
                 _username = authDecoded.Substring(0, colonPos);
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CertificateHelper/CertificateHelper.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CertificateHelper/CertificateHelper.cs
new file mode 100644
index 00000000000..5d07500ab9e
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CertificateHelper/CertificateHelper.cs
@@ -0,0 +1,126 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.IO;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Security.Cryptography.X509Certificates;
+using Infrastructure.Common;
+
+namespace WcfTestCommon
+{
+    public static class CertificateHelper
+    {
+        public static class CurrentOperatingSystem
+        {
+            /// <summary>
+            /// Returns true if current OS is Windows
+            /// </summary>
+            public static bool IsWindows()
+            {
+                return IsOSPlatform(OSPlatform.Windows);
+            }
+
+            /// <summary>
+            /// Returns true if current OS is Linux
+            /// </summary>
+            public static bool IsLinux()
+            {
+                return IsOSPlatform(OSPlatform.Linux);
+            }
+
+            /// <summary>
+            /// Returns true if current OS is OSX
+            /// </summary>
+            public static bool IsMacOS()
+            {
+                return IsOSPlatform(OSPlatform.OSX);
+            }
+
+            /// <summary>
+            /// Returns true if current OS matches OSPlatform
+            /// </summary>
+            /// <param name="os">OS Platform to check for</param>
+            public static bool IsOSPlatform(OSPlatform osPlatform)
+            {
+                return RuntimeInformation.IsOSPlatform(osPlatform);
+            }
+        }
+
+        public static X509Store GetX509Store(StoreName storeName, StoreLocation storeLocation)
+        {
+            X509Store store = null;
+            if (CurrentOperatingSystem.IsWindows())
+            {
+                store = new X509Store(storeName, storeLocation);
+            }
+            else if (CurrentOperatingSystem.IsLinux())
+            {
+                // Store the certificates in CurrentUser Scope
+                store = new X509Store(storeName, StoreLocation.CurrentUser);
+            }
+            else if (CurrentOperatingSystem.IsMacOS())
+            {
+                // MacOS SafeKeychainHandle
+                store = GetMacOSX509Store();
+            }
+
+            store = EnsureStoreIsOpened(store);
+            return store;
+        }
+
+        private static X509Store EnsureStoreIsOpened(X509Store store)
+        {
+            try
+            {
+                // Try opening the store in read-only mode
+                store.Open(OpenFlags.ReadOnly);
+            }
+            catch { }
+
+            return store;
+        }
+
+        internal static string OSXCustomKeychainFilePath
+        {
+            get
+            {
+                return Path.Combine(Environment.CurrentDirectory, "wcfLocal.keychain");
+            }
+        }
+
+        internal static string OSXCustomKeychainPassword
+        {
+            get
+            {
+                return "WCFKeychainFilePassword";
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static X509Store GetMacOSX509Store(string storeFilePath = null)
+        {
+            if (storeFilePath == null)
+            {
+                storeFilePath = OSXCustomKeychainFilePath;
+            }
+
+            SafeKeychainHandle keychain;
+            if (!File.Exists(storeFilePath))
+            {
+                keychain = SafeKeychainHandle.Create(storeFilePath, OSXCustomKeychainPassword);
+            }
+            else
+            {
+                keychain = SafeKeychainHandle.Open(storeFilePath, OSXCustomKeychainPassword);
+            }
+
+            if (keychain.IsInvalid)
+                throw new Exception("Unable to open MacOS Keychain");
+
+            X509Store store = new X509Store(keychain.DangerousGetHandle());
+            return store;
+        }
+    }
+}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CertificateHelper/SafeKeychainHandle.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CertificateHelper/SafeKeychainHandle.cs
new file mode 100644
index 00000000000..bb3b8d4146d
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CertificateHelper/SafeKeychainHandle.cs
@@ -0,0 +1,112 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+namespace Infrastructure.Common
+{
+    // This class facilitates using a private keychain on OSX
+    public class SafeKeychainHandle : SafeHandle
+    {
+        private const string CoreFoundation = "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation";
+        private const string SecurityFramework = "/System/Library/Frameworks/Security.framework/Security";
+
+        [DllImport(SecurityFramework)]
+        private static extern int SecKeychainUnlock(SafeKeychainHandle handle, int passphraseLength, byte[] passphraseUtf8, bool usePassword);
+
+        [DllImport(SecurityFramework)]
+        private static extern int SecKeychainOpen(string path, out SafeKeychainHandle keychain);
+
+        [DllImport(SecurityFramework)]
+        private static extern int SecKeychainCreate(string pathName, int passphraseLength, byte[] passphraseUtf8, bool promptUser, IntPtr initialAccessNull, out SafeKeychainHandle keychain);
+
+        [DllImport(SecurityFramework)]
+        private static extern int SecKeychainDelete(SafeKeychainHandle handle);
+
+        [DllImport(CoreFoundation)]
+        private static extern void CFRelease(IntPtr ptr);
+
+        internal SafeKeychainHandle()
+            : base(IntPtr.Zero, ownsHandle: true)
+        {
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        protected override bool ReleaseHandle()
+        {
+            CFRelease(handle);
+            SetHandle(IntPtr.Zero);
+            return true;
+        }
+
+        public override bool IsInvalid
+        {
+            get
+            {
+                return handle == IntPtr.Zero;
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static SafeKeychainHandle Create(string pathName, string passphrase)
+        {
+            byte[] utf8Passphrase = Encoding.UTF8.GetBytes(passphrase);
+            SafeKeychainHandle keychain;
+            int osStatus = SecKeychainCreate(pathName, utf8Passphrase.Length, utf8Passphrase, false, IntPtr.Zero, out keychain);
+
+            if (osStatus != 0)
+            {
+                keychain.Dispose();
+                throw new InvalidOperationException(string.Format("OSStatus={0}", osStatus));
+            }
+
+            return keychain;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static SafeKeychainHandle Open(string pathName, string passphrase)
+        {
+            SafeKeychainHandle keychain;
+            int osStatus = SecKeychainOpen(pathName, out keychain);
+
+            if (osStatus != 0)
+            {
+                keychain.Dispose();
+                throw new InvalidOperationException(string.Format("OSStatus={0}", osStatus));
+            }
+
+            if(!string.IsNullOrEmpty(passphrase))
+            {
+                byte[] utf8Passphrase = Encoding.UTF8.GetBytes(passphrase);
+                osStatus = SecKeychainUnlock(keychain, utf8Passphrase.Length, utf8Passphrase, true);
+
+                if (osStatus != 0)
+                {
+                    keychain.Dispose();
+                    throw new InvalidOperationException(string.Format("OSStatus={0}", osStatus));
+                }
+            }
+
+            return keychain;
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        public static void Delete(SafeKeychainHandle handle)
+        {
+            if (handle.IsInvalid)
+                return;
+
+            int osStatus = SecKeychainDelete(handle);
+            handle.Dispose();
+
+            if (osStatus != 0)
+            {
+                throw new InvalidOperationException(string.Format("OSStatus={0}", osStatus));
+            }
+        }
+    }
+}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ChainedAsyncResult.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ChainedAsyncResult.cs
deleted file mode 100644
index 2883667fc5c..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ChainedAsyncResult.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    internal delegate IAsyncResult ChainedBeginHandler(TimeSpan timeout, AsyncCallback asyncCallback, object state);
-    internal delegate void ChainedEndHandler(IAsyncResult result);
-
-    internal class ChainedAsyncResult : AsyncResult
-    {
-        private ChainedBeginHandler _begin2;
-        private ChainedEndHandler _end1;
-        private ChainedEndHandler _end2;
-        private TimeoutHelper _timeoutHelper;
-        private static AsyncCallback s_begin1Callback = new AsyncCallback(Begin1Callback);
-        private static AsyncCallback s_begin2Callback = new AsyncCallback(Begin2Callback);
-
-        protected ChainedAsyncResult(TimeSpan timeout, AsyncCallback callback, object state)
-            : base(callback, state)
-        {
-            _timeoutHelper = new TimeoutHelper(timeout);
-        }
-
-        public ChainedAsyncResult(TimeSpan timeout, AsyncCallback callback, object state, ChainedBeginHandler begin1, ChainedEndHandler end1, ChainedBeginHandler begin2, ChainedEndHandler end2)
-            : base(callback, state)
-        {
-            _timeoutHelper = new TimeoutHelper(timeout);
-            Begin(begin1, end1, begin2, end2);
-        }
-
-        protected void Begin(ChainedBeginHandler begin1, ChainedEndHandler end1, ChainedBeginHandler begin2, ChainedEndHandler end2)
-        {
-            _end1 = end1;
-            _begin2 = begin2;
-            _end2 = end2;
-
-            IAsyncResult result = begin1(_timeoutHelper.RemainingTime(), s_begin1Callback, this);
-            if (!result.CompletedSynchronously)
-                return;
-
-            if (Begin1Completed(result))
-            {
-                this.Complete(true);
-            }
-        }
-
-        private static void Begin1Callback(IAsyncResult result)
-        {
-            if (result.CompletedSynchronously)
-                return;
-
-            ChainedAsyncResult thisPtr = (ChainedAsyncResult)result.AsyncState;
-
-            bool completeSelf = false;
-            Exception completeException = null;
-
-            try
-            {
-                completeSelf = thisPtr.Begin1Completed(result);
-            }
-            catch (Exception exception)
-            {
-                completeSelf = true;
-                completeException = exception;
-            }
-
-            if (completeSelf)
-            {
-                thisPtr.Complete(false, completeException);
-            }
-        }
-
-        private bool Begin1Completed(IAsyncResult result)
-        {
-            _end1(result);
-
-            result = _begin2(_timeoutHelper.RemainingTime(), s_begin2Callback, this);
-            if (!result.CompletedSynchronously)
-            {
-                return false;
-            }
-
-            _end2(result);
-            return true;
-        }
-
-        private static void Begin2Callback(IAsyncResult result)
-        {
-            if (result.CompletedSynchronously)
-                return;
-
-            ChainedAsyncResult thisPtr = (ChainedAsyncResult)result.AsyncState;
-
-            Exception completeException = null;
-
-            try
-            {
-                thisPtr._end2(result);
-            }
-            catch (Exception exception)
-            {
-                completeException = exception;
-            }
-
-            thisPtr.Complete(false, completeException);
-        }
-
-        public static void End(IAsyncResult result)
-        {
-            AsyncResult.End<ChainedAsyncResult>(result);
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ChannelMessageInterceptor.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ChannelMessageInterceptor.cs
deleted file mode 100644
index d50cf5a1386..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ChannelMessageInterceptor.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.ServiceModel.Channels;
-using System.ServiceModel.Description;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    public abstract class ChannelMessageInterceptor
-    {
-        public virtual void OnSend(ref Message message) { }
-        public virtual void OnReceive(ref Message message) { }
-
-        public virtual void OnExportPolicy(MetadataExporter exporter, PolicyConversionContext context) { }
-
-        public virtual void OnImportPolicy(MetadataImporter importer, PolicyConversionContext context) { }
-
-        public abstract ChannelMessageInterceptor Clone();
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ComplexCompositeType.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ComplexCompositeType.cs
index 65fa76b62ba..c3b4a03aa13 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ComplexCompositeType.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ComplexCompositeType.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
 using System.Runtime.Serialization;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CompositeType.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CompositeType.cs
index 9e3d94bf661..bd78357f326 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CompositeType.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CompositeType.cs
@@ -2,9 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.Runtime.Serialization;
 using System.ServiceModel;
+#endif
 using System.Xml;
 using System.Xml.Serialization;
 
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/BasicHttpsBinding.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/BasicHttpsBinding.cs
new file mode 100644
index 00000000000..9863095aa04
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/BasicHttpsBinding.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+
+namespace WcfService
+{
+    //public enum BasicHttpsSecurityMode
+    //{
+    //    //
+    //    // Summary:
+    //    //     The Transport security mode.
+    //    Transport,
+    //    //
+    //    // Summary:
+    //    //     The TransportWithMessageCredential security mode.
+    //    TransportWithMessageCredential
+    //}
+
+    // Cast BasicHttpsSecurityMode (WCF) to BasicHttpSecurityMode (CoreWCF)
+    internal enum BasicHttpsSecurityMode
+    {
+        None,
+        Transport,
+        Message,
+        TransportWithMessageCredential,
+        TransportCredentialOnly
+    }
+
+    internal class BasicHttpsBinding : BasicHttpBinding
+    {
+        public BasicHttpsBinding() : base((BasicHttpSecurityMode)BasicHttpsSecurityMode.Transport)
+        {
+        }
+
+        public BasicHttpsBinding(BasicHttpsSecurityMode securityMode) : base((BasicHttpSecurityMode)securityMode)
+        {
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthentication.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthentication.cs
new file mode 100644
index 00000000000..840f3371bc0
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthentication.cs
@@ -0,0 +1,142 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using System.Security.Cryptography;
+using System.Text;
+
+namespace WcfService
+{
+    public class DigestAuthenticationState
+    {
+        private const string DigestAuthenticationMechanism = "Digest";
+        private const int DigestAuthenticationMechanismLength = 7; // DigestAuthenticationMechanism.Length;
+        private const string UriAuthenticationParameter = "uri";
+        private const string UsernameAuthenticationParameter = "username";
+        private const string NonceAuthenticationParameter = "nonce";
+        private const string ResponseAuthenticationParameter = "response";
+        private readonly string _authorizationHeader;
+        private readonly Dictionary<string, string> _authorizationParameters;
+        private readonly string _method;
+        private readonly string _realm;
+        private readonly bool _useStrictUsername;
+        private string _nonceString;
+        private string _password;
+        private bool _authorized;
+
+        public DigestAuthenticationState(string authorizationHeader, string realm)
+        {
+            _useStrictUsername = true;
+            _method = "POST";// Request.Method;
+            _realm = realm;
+            _password = null;
+            _authorized = new bool();
+            _authorizationHeader = authorizationHeader;
+            if (!_authorizationHeader.StartsWith(DigestAuthenticationMechanism))
+            {
+                _authorized = false;
+                _nonceString = string.Empty;
+                _authorizationParameters = new Dictionary<string, string>();
+                return;
+            }
+
+            string[] digestElements = _authorizationHeader.Substring(DigestAuthenticationMechanismLength).Split(',');
+            _authorizationParameters = new Dictionary<string, string>(digestElements.Length);
+            foreach (string element in digestElements)
+            {
+                string[] keyValue = element.Split(new[] { '=' }, 2);
+                string key = keyValue[0].Trim(' ', '\"');
+                string value = keyValue[1].Trim(' ', '\"');
+                _authorizationParameters.Add(key, value);
+            }
+
+            _nonceString = _authorizationParameters[NonceAuthenticationParameter];
+        }
+
+        public string Nonce { get { return _nonceString; } }
+
+        public Dictionary<string, string> Parameters { get { return _authorizationParameters; } }
+
+        public string Password { set { _password = value; } }
+
+        public string Uri { get { return Parameters[UriAuthenticationParameter]; } }
+
+        public string Username
+        {
+            get
+            {
+                var username = Parameters[UsernameAuthenticationParameter];
+
+                if (!_useStrictUsername)
+                {
+                    // On some platforms, the username is sent as realm\\username or realm\username. This should only happen when
+                    // the user account is in a different realm/domain than the server but some implementations of HttpClient
+                    // always send the username prefixed with the realm.
+
+                    username = username.Replace(@"\\", @"\");
+                    var realmPrefix = _realm + @"\";
+                    if (username.StartsWith(realmPrefix))
+                    {
+                        username = username.Substring(realmPrefix.Length);
+                    }
+                }
+
+                return username;
+            }
+        }
+
+        private string RawUsername { get { return Parameters[UsernameAuthenticationParameter]; } }
+
+        private string CalculateHash(string plaintext)
+        {
+            Encoding enc = Encoding.ASCII;
+            MD5 md5 = MD5.Create();
+            byte[] hashbytes = md5.ComputeHash(enc.GetBytes(plaintext));
+            var hashStringBuilder = new StringBuilder();
+            for (int i = 0; i < 16; i++)
+            {
+                hashStringBuilder.AppendFormat("{0:x02}", hashbytes[i]);
+            }
+
+            return hashStringBuilder.ToString();
+        }
+
+        public bool IsValid()
+        {
+            if (_realm == null || RawUsername == null || _password == null || _method == null)
+            {
+                throw new InvalidOperationException("Insufficient information to determine authorization");
+            }
+
+            // If username is realm\\username, convert the double slash to a single slash
+            var username = RawUsername.Replace(@"\\", @"\");
+
+            string SA1 = string.Concat(username, ":", _realm, ":", _password);
+            string HA1 = CalculateHash(SA1);
+            string SA2 = string.Concat(_method, ":", Uri);
+            string HA2 = CalculateHash(SA2);
+
+            string responseString;
+            if (Parameters["qop"] != null)
+            {
+                responseString = string.Concat(
+                    HA1, ":",
+                    Nonce, ":",
+                    Parameters["nc"], ":",
+                    Parameters["cnonce"], ":",
+                    Parameters["qop"], ":",
+                    HA2);
+            }
+            else
+            {
+                responseString = string.Concat(HA1, ":", Nonce, ":", HA2);
+            }
+
+            string responseDigest = CalculateHash(responseString);
+            _authorized = (Parameters[ResponseAuthenticationParameter] == responseDigest);
+            return _authorized;
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationDefaults.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationDefaults.cs
new file mode 100644
index 00000000000..0ac4ad090da
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationDefaults.cs
@@ -0,0 +1,12 @@
+#if NET
+namespace WcfService
+{
+    public static class DigestAuthenticationDefaults
+    {
+        /// <summary>
+        /// The default value used for DigestAuthenticationOptions.AuthenticationScheme
+        /// </summary>
+        public const string AuthenticationScheme = "Digest";
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationExtensions.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationExtensions.cs
new file mode 100644
index 00000000000..3b7e68a2c30
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationExtensions.cs
@@ -0,0 +1,31 @@
+#if NET
+using Microsoft.AspNetCore.Authentication;
+
+namespace WcfService
+{
+    public static class DigestAuthenticationAppBuilderExtensions
+    {
+        public static AuthenticationBuilder AddDigest(this AuthenticationBuilder builder)
+            => builder.AddDigest(DigestAuthenticationDefaults.AuthenticationScheme);
+
+        public static AuthenticationBuilder AddDigest(this AuthenticationBuilder builder, string authenticationScheme)
+            => builder.AddDigest(authenticationScheme, configureOptions: null);
+
+        public static AuthenticationBuilder AddDigest(this AuthenticationBuilder builder, Action<DigestAuthenticationOptions> configureOptions)
+            => builder.AddDigest(DigestAuthenticationDefaults.AuthenticationScheme, configureOptions);
+
+        public static AuthenticationBuilder AddDigest(
+            this AuthenticationBuilder builder,
+            string authenticationScheme,
+            Action<DigestAuthenticationOptions> configureOptions)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder.AddScheme<DigestAuthenticationOptions, DigestAuthenticationHandler>(authenticationScheme, configureOptions);
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationHandler.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationHandler.cs
new file mode 100644
index 00000000000..592dbe20b01
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationHandler.cs
@@ -0,0 +1,85 @@
+#if NET
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.Extensions.Options;
+using System.Text.Encodings.Web;
+
+namespace WcfService
+{
+    public class DigestAuthenticationHandler : AuthenticationHandler<DigestAuthenticationOptions>
+    {
+        public DigestAuthenticationHandler(IOptionsMonitor<DigestAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder)
+            : base(options, logger, encoder) { }
+
+        private const string DigestUsernameHeaderName = "DigestUsername";
+        private const string DigestPasswordHeaderName = "DigestPassword";
+        private const string DigestRealmHeaderName = "DigestRealm";
+        private const string DigestAuthenticationMechanism = "Digest";
+        private const string AuthenticationChallengeHeaderName = "WWW-Authenticate";
+        private const string AuthorizationHeaderName = "Authorization";
+
+        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            var authorizationHeader = Request.Headers[AuthorizationHeaderName].ToString();
+
+            if (string.IsNullOrEmpty(authorizationHeader) || !authorizationHeader.StartsWith(DigestAuthenticationMechanism, StringComparison.OrdinalIgnoreCase))
+            {
+                return Task.FromResult(AuthenticateResult.NoResult());
+            }
+
+            var digestState = new DigestAuthenticationState(authorizationHeader, GetRealm());
+            string password;
+
+            if (!GetPassword(digestState.Username, out password))
+            {
+                return Task.FromResult(AuthenticateResult.Fail("Invalid Username or Password"));
+            }
+            digestState.Password = password;
+
+            if (!digestState.IsValid())
+            {
+                return Task.FromResult(AuthenticateResult.Fail("Invalid Username or Password"));
+            }
+
+            var claimsPrincipal = new System.Security.Claims.ClaimsPrincipal(
+                new System.Security.Claims.ClaimsIdentity(new[] { new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, digestState.Username) }, DigestAuthenticationDefaults.AuthenticationScheme));
+
+            Context.User = claimsPrincipal;
+
+            var ticket = new AuthenticationTicket(claimsPrincipal, DigestAuthenticationDefaults.AuthenticationScheme);
+
+            return Task.FromResult(AuthenticateResult.Success(ticket));
+        }
+
+        protected override Task HandleChallengeAsync(AuthenticationProperties properties)
+        {
+            var nonce = Guid.NewGuid().ToString("N");
+            var realm = GetRealm();
+
+            var challenge = $"Digest realm=\"{realm}\", nonce=\"{nonce}\", opaque=\"0000000000000000\", stale=false, algorithm=MD5, qop=\"auth\"";
+
+            Response.Headers[AuthenticationChallengeHeaderName] = challenge;
+            Response.StatusCode = 401;
+
+            return Task.CompletedTask;
+        }
+
+        public bool GetPassword(string username, out string password)
+        {
+            string sentUsername = Request.Headers[DigestUsernameHeaderName];
+            if (username.Equals(sentUsername))
+            {
+                password = Request.Headers[DigestPasswordHeaderName];
+                return true;
+            }
+
+            password = null;
+            return false;
+        }
+
+        public string GetRealm()
+        {
+            return Request.Headers[DigestRealmHeaderName];
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationOptions.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationOptions.cs
new file mode 100644
index 00000000000..45bed006609
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/DigestAuth/DigestAuthenticationOptions.cs
@@ -0,0 +1,11 @@
+#if NET
+using Microsoft.AspNetCore.Authentication;
+
+namespace WcfService
+{
+    public class DigestAuthenticationOptions : AuthenticationSchemeOptions
+    {
+        public string Realm { get; set; } = "realm";
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/NetHttpsBinding.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/NetHttpsBinding.cs
new file mode 100644
index 00000000000..a4b26e52469
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/NetHttpsBinding.cs
@@ -0,0 +1,44 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+
+namespace WcfService
+{
+    //public enum BasicHttpsSecurityMode
+    //{
+    //    //
+    //    // Summary:
+    //    //     The Transport security mode.
+    //    Transport,
+    //    //
+    //    // Summary:
+    //    //     The TransportWithMessageCredential security mode.
+    //    TransportWithMessageCredential
+    //}
+
+    // Cast BasicHttpsSecurityMode (WCF) to BasicHttpSecurityMode (CoreWCF)
+    //internal enum BasicHttpsSecurityMode
+    //{
+    //    None,
+    //    Transport,
+    //    Message,
+    //    TransportWithMessageCredential,
+    //    TransportCredentialOnly
+    //}
+
+    internal class NetHttpsBinding : NetHttpBinding
+    {
+        public NetHttpsBinding() : base((BasicHttpSecurityMode)BasicHttpsSecurityMode.Transport)
+        {
+        }
+
+        public NetHttpsBinding(BasicHttpsSecurityMode securityMode) : base((BasicHttpSecurityMode)securityMode)
+        {
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/ServiceHostHelper.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/ServiceHostHelper.cs
new file mode 100644
index 00000000000..628632bc8d1
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/ServiceHostHelper.cs
@@ -0,0 +1,122 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using System.Diagnostics;
+
+namespace WcfService
+{
+    public class ServiceHostHelper
+    {
+        public static async Task<bool> PingAsync(string url)
+        {
+            Console.WriteLine("Ping service host...");
+            using HttpClient httpClient = new HttpClient();
+
+            for (int i = 0; i < 10; i++)
+            {
+                try
+                {
+                    using HttpResponseMessage response = await httpClient.GetAsync(url);
+                    if (response.IsSuccessStatusCode)
+                    {
+                        Console.WriteLine("Ping succeed...");
+                        httpClient.Dispose();
+                        return true;
+                    }
+                    else
+                    {
+                        Console.WriteLine($"Ping failed... retrying after 10 seconds. {response.ReasonPhrase}");
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine($"Ping failed... retrying after 10 seconds. {ex.Message}");
+                }
+                await Task.Delay(10000);
+            }
+
+            Console.WriteLine("Ping failed... Exiting..");
+            httpClient.Dispose();
+            return false;
+        }
+
+        public static async Task<bool> ShutdownServiceAsync(string url)
+        {
+            Console.WriteLine("Shutdown service host...");
+            using HttpClient httpClient = new HttpClient();
+
+            try
+            {
+                using HttpResponseMessage response = await httpClient.GetAsync(url);
+                if (response.IsSuccessStatusCode)
+                {
+                    Console.WriteLine("Service Shutdown succeed...");
+                    httpClient.Dispose();
+                    return true;
+                }
+                else
+                {
+                    Console.WriteLine($"Service Shutdown failed... Service likely was not running");
+                }
+            }
+            catch (Exception)
+            {
+                Console.WriteLine($"Service Shutdown failed... Service likely was not running");
+            }
+
+            httpClient.Dispose();
+            return false;
+        }
+
+        public static async Task ServiceBootstrap()
+        {
+            _ = await ShutdownServiceAsync("http://localhost:8081/TestHost.svc/shutdown");
+
+            string processArgs = "";
+            if (Process.GetCurrentProcess().ProcessName == "dotnet")
+            {
+                processArgs = "exec --roll-forward Major " + String.Join(" ", Environment.GetCommandLineArgs().SkipLast(1));
+            }
+
+            var process = new Process()
+            {
+                StartInfo = {
+                    FileName = Environment.ProcessPath,
+                    Arguments = processArgs,
+                    WindowStyle = ProcessWindowStyle.Normal,
+                    WorkingDirectory = Environment.CurrentDirectory,
+                    RedirectStandardOutput = false,
+                    RedirectStandardInput = false,
+                    UseShellExecute = false
+                },
+                EnableRaisingEvents = false
+            };
+
+            process.Start();
+
+            Console.WriteLine($"Starting process in the background: {Path.GetFileName(process.ProcessName)}, ID: {process.Id}.");
+
+            // Ping to make sure the service is started
+            bool result = await PingAsync("http://localhost:8081/TestHost.svc/Ping");
+            if (result)
+            {
+                Environment.Exit(0);
+            }
+            Environment.Exit(1);
+        }
+
+        public static ServiceSchema ToServiceSchema(string CoreWcfScheme, bool usesWebsockets) => CoreWcfScheme switch
+        {
+            "http" => usesWebsockets ? ServiceSchema.WS : ServiceSchema.HTTP,
+            "https" => usesWebsockets ? ServiceSchema.WSS : ServiceSchema.HTTPS,
+            "net.tcp" => ServiceSchema.NETTCP,
+            "net.pipe" => ServiceSchema.NETPIPE,
+            "ws" => ServiceSchema.WS,
+            "wss" => ServiceSchema.WSS,
+            _ => throw new ArgumentOutOfRangeException(nameof(CoreWcfScheme), $"Not expected CoreWcfScheme value: {CoreWcfScheme}"),
+        };
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/TestHostServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/TestHostServiceHost.cs
new file mode 100644
index 00000000000..9638b67aea4
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/TestHostServiceHost.cs
@@ -0,0 +1,34 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+
+namespace WcfService
+{
+    //Start the crlUrl service as the client use it to ensure all services have been started
+    [TestServiceDefinition(BasePath = "", Schema = ServiceSchema.HTTP)]
+    public class TestHostServiceHost : TestServiceHostBase<ITestHost>
+    {
+        protected override string Address { get { return "TestHost.svc"; } }
+
+        protected override Binding GetBinding()
+        {
+            return GetWebHttpBinding();
+        }
+
+        private Binding GetWebHttpBinding()
+        {
+            var binding = new WebHttpBinding();
+            return binding;
+        }
+
+        public TestHostServiceHost(params Uri[] baseAddresses)
+            : base(typeof(TestHost), baseAddresses)
+        {
+        }
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/WcfServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/WcfServiceHost.cs
new file mode 100644
index 00000000000..3df37d57284
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/CoreWCF/WcfServiceHost.cs
@@ -0,0 +1,58 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Description;
+
+namespace WcfService
+{
+    public class ServiceHost
+    {
+        private ServiceHostBase _serviceHostBase = null;
+        private readonly Type _serviceType;
+        private readonly List<Endpoint> _endpoints = new List<Endpoint>();
+
+        public ServiceHost(Type serviceType, params Uri[] baseAddresses)
+        {
+            _serviceType = serviceType ?? throw new ArgumentNullException(nameof(serviceType));
+        }
+
+        public void AddServiceEndpoint(Type implementedContract, Binding binding, string address)
+        {
+            _endpoints.Add(new Endpoint
+            {
+                ContractType = implementedContract,
+                Binding = binding,
+                Address = address
+            });
+        }
+
+        protected virtual void ApplyConfiguration() { }
+
+        public void ApplyConfig(ServiceHostBase serviceHostBase)
+        {
+            _serviceHostBase = serviceHostBase;
+            ApplyConfiguration();
+            _serviceHostBase = null;
+        }
+
+        public List<Endpoint> Endpoints => _endpoints;
+
+        public class Endpoint
+        {
+            public Type ContractType { get; set; }
+            public Binding Binding { get; set; }
+            public string Address { get; set; }
+        }
+
+        public Type ServiceType => _serviceHostBase != null ? _serviceHostBase.Description.ServiceType : _serviceType;
+
+        public ServiceCredentials Credentials => _serviceHostBase != null ? _serviceHostBase.Credentials : new ServiceCredentials();
+
+        public ServiceDescription Description => _serviceHostBase != null ? _serviceHostBase.Description : new ServiceDescription();
+    }
+}
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DataContractResolverService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DataContractResolverService.cs
index 85242d03ecb..000a149cf29 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DataContractResolverService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DataContractResolverService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.Collections.Generic;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DigestServiceAuthorizationManager.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DigestServiceAuthorizationManager.cs
index c0fa086bf0a..a73bdb2ee98 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DigestServiceAuthorizationManager.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/DigestServiceAuthorizationManager.cs
@@ -2,16 +2,23 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Description;
+using CoreWCF.Dispatcher;
+#else
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Net;
-using System.Security.Cryptography;
-using System.Security.Principal;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
+#endif
+using System.Collections.ObjectModel;
+using System.Net;
+using System.Security.Cryptography;
+using System.Security.Principal;
 using System.Text;
 
 namespace WcfService
@@ -47,6 +54,7 @@ private bool Authorized(DigestAuthenticationState digestState, OperationContext
             return true;
         }
 
+        [Obsolete]
         public override bool CheckAccess(OperationContext operationContext, ref Message message)
         {
            var contractName = operationContext.EndpointDispatcher.ContractName; 
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail.cs
index 09572e5fb0d..0e20623fe1d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System.Runtime.Serialization;
+#endif
 using System.Xml.Serialization;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail2.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail2.cs
index 8281b56faa3..f8b72348bcc 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail2.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FaultDetail2.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if !NET
 using System.Runtime.Serialization;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FlowControlledStream.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FlowControlledStream.cs
index 583563e1c6b..8fa7db80c96 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FlowControlledStream.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/FlowControlledStream.cs
@@ -2,9 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
 using System.IO;
 using System.Threading;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IDataResolverService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IDataResolverService.cs
index 198942d2413..55de91f097d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IDataResolverService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IDataResolverService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.Collections.Generic;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IPushCallback.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IPushCallback.cs
index 2951c10d2b8..4ed7c9486b0 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IPushCallback.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IPushCallback.cs
@@ -2,9 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.Collections.Generic;
 using System.IO;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IService1.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IService1.cs
index dde286f74c0..dbfb6394708 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IService1.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IService1.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ISessionTests.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ISessionTests.cs
index 32069afc997..1e3bd0611b2 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ISessionTests.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ISessionTests.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.Runtime.Serialization;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
@@ -73,4 +77,4 @@ public interface ISessionTestsDuplexCallback
     // note IsTerminating = false while the client callback has IsTerminating = true
     [OperationContract(IsInitiating = true, IsTerminating = false)]
     int ClientSideOnlyTerminatingClientCallback(int callsToNonTerminatingMethodToMake, int callsToTerminatingMethodToMake);
-}
\ No newline at end of file
+}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IUnderstoodHeaders.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IUnderstoodHeaders.cs
index eea9f29a6a4..fe8523c33b4 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IUnderstoodHeaders.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IUnderstoodHeaders.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IVerifyWebSockets.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IVerifyWebSockets.cs
index b0751f9d3a3..f69bab95dec 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IVerifyWebSockets.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IVerifyWebSockets.cs
@@ -2,8 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSDuplexService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSDuplexService.cs
index 9fa7f8c4856..d34b29c1b8d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSDuplexService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSDuplexService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.IO;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSRequestReplyService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSRequestReplyService.cs
index 1ee51d941af..12c9952d42d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSRequestReplyService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWSRequestReplyService.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfChannelExtensibilityService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfChannelExtensibilityService.cs
index 5ee68858478..927e2b28333 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfChannelExtensibilityService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfChannelExtensibilityService.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfCustomUserNameService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfCustomUserNameService.cs
index 921f21d2c13..b836da6b84a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfCustomUserNameService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfCustomUserNameService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDecompService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDecompService.cs
index fd94a459de0..05f10ec43db 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDecompService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDecompService.cs
@@ -2,11 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDuplexService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDuplexService.cs
index 8452d76116b..dffa70c474c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDuplexService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfDuplexService.cs
@@ -2,9 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
 using System.Threading.Tasks;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfReliableService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfReliableService.cs
index 0f9537bec52..1b5e29358e8 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfReliableService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfReliableService.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfRestartService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfRestartService.cs
index d8537c209ba..6c60338b759 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfRestartService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfRestartService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.4.4.0.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.4.4.0.cs
index a825ac85d64..0c998dd7ed7 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.4.4.0.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.cs
index ccb45318c61..46e2f048f92 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfService.cs
@@ -2,11 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
@@ -117,7 +122,7 @@ public interface IWcfService
         Stream EchoStream(Stream stream);
 
         [OperationContract(Action = "http://tempuri.org/IWcfService/EchoMessageParameter")]
-        [return: System.ServiceModel.MessageParameterAttribute(Name = "result")]
+        [return: MessageParameterAttribute(Name = "result")]
         string EchoMessageParameter(string name);
 
         [OperationContract(Action = "http://tempuri.org/IWcfService/EchoItems")]
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfSoapService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfSoapService.cs
index 2af379bfe81..3eb87a46e38 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfSoapService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IWcfSoapService.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSFAttribute.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSFAttribute.cs
index 2ea80e137d2..7b0d002c4c2 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSFAttribute.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSFAttribute.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSerFormatAttrServices.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSerFormatAttrServices.cs
index a2e5542179b..27d483b1d2d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSerFormatAttrServices.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/IXmlSerFormatAttrServices.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingBindingElement.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingBindingElement.cs
deleted file mode 100644
index ddb5822682a..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingBindingElement.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ServiceModel.Channels;
-using System.ServiceModel.Description;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    public class InterceptingBindingElement
-                 : BindingElement
-                 , IPolicyExportExtension
-    {
-        private ChannelMessageInterceptor _interceptor;
-
-        public InterceptingBindingElement(ChannelMessageInterceptor interceptor)
-        {
-            _interceptor = interceptor;
-        }
-
-        protected InterceptingBindingElement(InterceptingBindingElement other)
-            : base(other)
-        {
-            _interceptor = other.Interceptor;
-        }
-
-        public ChannelMessageInterceptor Interceptor
-        {
-            get
-            {
-                if (_interceptor != null)
-                {
-                    return _interceptor.Clone();
-                }
-                else
-                {
-                    return new NullMessageInterceptor();
-                }
-            }
-        }
-
-        public override BindingElement Clone()
-        {
-            return new InterceptingBindingElement(this);
-        }
-
-        public override bool CanBuildChannelFactory<TChannel>(BindingContext context)
-        {
-            return context.CanBuildInnerChannelFactory<TChannel>();
-        }
-
-        public override bool CanBuildChannelListener<TChannel>(BindingContext context)
-        {
-            return context.CanBuildInnerChannelListener<TChannel>();
-        }
-
-        public override IChannelFactory<TChannel> BuildChannelFactory<TChannel>(BindingContext context)
-        {
-            return new InterceptingChannelFactory<TChannel>(this.Interceptor, context);
-        }
-
-        public override IChannelListener<TChannel> BuildChannelListener<TChannel>(BindingContext context)
-        {
-            return new InterceptingChannelListener<TChannel>(this.Interceptor, context);
-        }
-
-        public override T GetProperty<T>(BindingContext context)
-        {
-            if (typeof(T) == typeof(ChannelMessageInterceptor))
-            {
-                return (T)(object)this.Interceptor;
-            }
-
-            return context.GetInnerProperty<T>();
-        }
-
-        void IPolicyExportExtension.ExportPolicy(MetadataExporter exporter, PolicyConversionContext context)
-        {
-            if (context == null)
-            {
-                throw new ArgumentNullException("context");
-            }
-
-            _interceptor.OnExportPolicy(exporter, context);
-        }
-
-
-        private class NullMessageInterceptor : ChannelMessageInterceptor
-        {
-            public override ChannelMessageInterceptor Clone()
-            {
-                return new NullMessageInterceptor();
-            }
-        }
-    }
-}
-
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingBindingElementImporter.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingBindingElementImporter.cs
deleted file mode 100644
index de73d54ab9f..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingBindingElementImporter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System.ServiceModel.Description;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    public abstract class InterceptingBindingElementImporter : IPolicyImportExtension
-    {
-        void IPolicyImportExtension.ImportPolicy(MetadataImporter importer, PolicyConversionContext context)
-        {
-            ChannelMessageInterceptor messageInterceptor = CreateMessageInterceptor();
-            messageInterceptor.OnImportPolicy(importer, context);
-        }
-
-        protected abstract ChannelMessageInterceptor CreateMessageInterceptor();
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelBase.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelBase.cs
deleted file mode 100644
index c20dc3fec53..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelBase.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ServiceModel.Channels;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    /// <summary>
-    /// Base channel class that uses an ChannelMessageInterceptor
-    /// </summary>
-    internal class InterceptingChannelBase<TChannel> : ChannelBase
-        where TChannel : class, IChannel
-    {
-        private ChannelMessageInterceptor _interceptor;
-        private TChannel _innerChannel;
-
-        protected InterceptingChannelBase(
-            ChannelManagerBase manager, ChannelMessageInterceptor interceptor, TChannel innerChannel)
-            : base(manager)
-        {
-            if (innerChannel == null)
-            {
-                throw new ArgumentException("InterceptingChannelBase requires a non-null inner channel.", "innerChannel");
-            }
-
-            _interceptor = interceptor;
-            _innerChannel = innerChannel;
-        }
-
-        protected TChannel InnerChannel
-        {
-            get
-            {
-                return _innerChannel;
-            }
-        }
-
-        public override T GetProperty<T>()
-        {
-            T baseProperty = base.GetProperty<T>();
-            if (baseProperty != null)
-            {
-                return baseProperty;
-            }
-
-            return this.InnerChannel.GetProperty<T>();
-        }
-
-        protected override void OnAbort()
-        {
-            _innerChannel.Abort();
-        }
-
-        protected override IAsyncResult OnBeginClose(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannel.BeginClose(timeout, callback, state);
-        }
-
-        protected override IAsyncResult OnBeginOpen(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannel.BeginOpen(timeout, callback, state);
-        }
-
-        protected override void OnClose(TimeSpan timeout)
-        {
-            _innerChannel.Close(timeout);
-        }
-
-        protected override void OnEndClose(IAsyncResult result)
-        {
-            _innerChannel.EndClose(result);
-        }
-
-        protected override void OnEndOpen(IAsyncResult result)
-        {
-            _innerChannel.EndOpen(result);
-        }
-
-        protected override void OnOpen(TimeSpan timeout)
-        {
-            _innerChannel.Open(timeout);
-        }
-
-        protected void OnReceive(ref Message message)
-        {
-            _interceptor.OnReceive(ref message);
-        }
-
-        protected void OnSend(ref Message message)
-        {
-            _interceptor.OnSend(ref message);
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelFactory.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelFactory.cs
deleted file mode 100644
index 036a3468534..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelFactory.cs
+++ /dev/null
@@ -1,392 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    /// <summary>
-    /// ChannelFactory that performs message Interception
-    /// </summary>
-    internal class InterceptingChannelFactory<TChannel>
-        : ChannelFactoryBase<TChannel>
-    {
-        private ChannelMessageInterceptor _interceptor;
-        private IChannelFactory<TChannel> _innerChannelFactory;
-
-        public InterceptingChannelFactory(ChannelMessageInterceptor interceptor, BindingContext context)
-        {
-            _interceptor = interceptor;
-            _innerChannelFactory = context.BuildInnerChannelFactory<TChannel>();
-            if (_innerChannelFactory == null)
-            {
-                throw new InvalidOperationException("InterceptingChannelFactory requires an inner IChannelFactory.");
-            }
-        }
-
-        public ChannelMessageInterceptor Interceptor
-        {
-            get { return _interceptor; }
-        }
-
-        public override T GetProperty<T>()
-        {
-            T baseProperty = base.GetProperty<T>();
-            if (baseProperty != null)
-            {
-                return baseProperty;
-            }
-
-            return _innerChannelFactory.GetProperty<T>();
-        }
-
-        protected override void OnOpen(TimeSpan timeout)
-        {
-            _innerChannelFactory.Open(timeout);
-        }
-
-        protected override IAsyncResult OnBeginOpen(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannelFactory.BeginOpen(timeout, callback, state);
-        }
-
-        protected override void OnEndOpen(IAsyncResult result)
-        {
-            _innerChannelFactory.EndOpen(result);
-        }
-
-        protected override void OnAbort()
-        {
-            base.OnAbort();
-            _innerChannelFactory.Abort();
-        }
-
-        protected override void OnClose(TimeSpan timeout)
-        {
-            TimeoutHelper timeoutHelper = new TimeoutHelper(timeout);
-            base.OnClose(timeoutHelper.RemainingTime());
-            _innerChannelFactory.Close(timeoutHelper.RemainingTime());
-        }
-
-        protected override IAsyncResult OnBeginClose(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return new ChainedAsyncResult(timeout, callback, state, base.OnBeginClose, base.OnEndClose, _innerChannelFactory.BeginClose, _innerChannelFactory.EndClose);
-        }
-
-        protected override void OnEndClose(IAsyncResult result)
-        {
-            ChainedAsyncResult.End(result);
-        }
-
-        protected override TChannel OnCreateChannel(EndpointAddress to, Uri via)
-        {
-            TChannel innerChannel = _innerChannelFactory.CreateChannel(to, via);
-            if (typeof(TChannel) == typeof(IOutputChannel))
-            {
-                return (TChannel)(object)new InterceptingOutputChannel(this, (IOutputChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IRequestChannel))
-            {
-                return (TChannel)(object)new InterceptingRequestChannel(this, (IRequestChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IDuplexChannel))
-            {
-                return (TChannel)(object)new InterceptingDuplexChannel(this, Interceptor, (IDuplexChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IOutputSessionChannel))
-            {
-                return (TChannel)(object)new InterceptingOutputSessionChannel(this, (IOutputSessionChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IRequestSessionChannel))
-            {
-                return (TChannel)(object)new InterceptingRequestSessionChannel(this,
-                    (IRequestSessionChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IDuplexSessionChannel))
-            {
-                return (TChannel)(object)new InterceptingDuplexSessionChannel(this, Interceptor, (IDuplexSessionChannel)innerChannel);
-            }
-
-            throw new InvalidOperationException();
-        }
-
-        private class InterceptingOutputChannel
-            : InterceptingChannelBase<IOutputChannel>, IOutputChannel
-        {
-            public InterceptingOutputChannel(InterceptingChannelFactory<TChannel> factory, IOutputChannel innerChannel)
-                : base(factory, factory.Interceptor, innerChannel)
-            {
-                // empty
-            }
-
-            public EndpointAddress RemoteAddress
-            {
-                get
-                {
-                    return this.InnerChannel.RemoteAddress;
-                }
-            }
-
-            public Uri Via
-            {
-                get
-                {
-                    return this.InnerChannel.Via;
-                }
-            }
-
-            public IAsyncResult BeginSend(Message message, AsyncCallback callback, object state)
-            {
-                return BeginSend(message, DefaultSendTimeout, callback, state);
-            }
-
-            public IAsyncResult BeginSend(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-            {
-                this.OnSend(ref message);
-                return new SendAsyncResult(this, message, timeout, callback, state);
-            }
-
-            public void EndSend(IAsyncResult result)
-            {
-                SendAsyncResult.End(result);
-            }
-
-            public void Send(Message message)
-            {
-                Send(message, DefaultSendTimeout);
-            }
-
-            public void Send(Message message, TimeSpan timeout)
-            {
-                base.OnSend(ref message);
-
-                if (message != null)
-                {
-                    this.InnerChannel.Send(message, timeout);
-                }
-            }
-
-            private class SendAsyncResult : AsyncResult
-            {
-                private IOutputChannel _channel;
-                private AsyncCallback _sendCallback = new AsyncCallback(OnSend);
-
-                public SendAsyncResult(IOutputChannel channel, Message message, TimeSpan timeout, AsyncCallback callback, object state)
-                    : base(callback, state)
-                {
-                    if (message != null)
-                    {
-                        _channel = channel;
-
-                        IAsyncResult sendResult = channel.BeginSend(message, timeout, _sendCallback, this);
-                        if (!sendResult.CompletedSynchronously)
-                        {
-                            return;
-                        }
-
-                        CompleteSend(sendResult);
-                    }
-
-                    base.Complete(true);
-                }
-
-                private void CompleteSend(IAsyncResult result)
-                {
-                    _channel.EndSend(result);
-                }
-
-                private static void OnSend(IAsyncResult result)
-                {
-                    if (result.CompletedSynchronously)
-                    {
-                        return;
-                    }
-
-                    SendAsyncResult thisPtr = (SendAsyncResult)result.AsyncState;
-                    Exception completionException = null;
-
-                    try
-                    {
-                        thisPtr.CompleteSend(result);
-                    }
-                    catch (Exception e)
-                    {
-                        completionException = e;
-                    }
-
-                    thisPtr.Complete(false, completionException);
-                }
-
-                public static void End(IAsyncResult result)
-                {
-                    AsyncResult.End<SendAsyncResult>(result);
-                }
-            }
-        }
-
-        private class InterceptingRequestChannel
-            : InterceptingChannelBase<IRequestChannel>, IRequestChannel
-        {
-            public InterceptingRequestChannel(
-                InterceptingChannelFactory<TChannel> factory, IRequestChannel innerChannel)
-                : base(factory, factory.Interceptor, innerChannel)
-            {
-                // empty
-            }
-
-            public EndpointAddress RemoteAddress
-            {
-                get
-                {
-                    return this.InnerChannel.RemoteAddress;
-                }
-            }
-
-            public Uri Via
-            {
-                get
-                {
-                    return this.InnerChannel.Via;
-                }
-            }
-
-            public IAsyncResult BeginRequest(Message message, AsyncCallback callback, object state)
-            {
-                return BeginRequest(message, this.DefaultSendTimeout, callback, state);
-            }
-
-            public IAsyncResult BeginRequest(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-            {
-                base.OnSend(ref message);
-                return new RequestAsyncResult(this, message, timeout, callback, state);
-            }
-
-            public Message EndRequest(IAsyncResult result)
-            {
-                Message reply = RequestAsyncResult.End(result);
-                this.OnReceive(ref reply);
-                return reply;
-            }
-
-            public Message Request(Message message)
-            {
-                return Request(message, this.DefaultSendTimeout);
-            }
-
-            public Message Request(Message message, TimeSpan timeout)
-            {
-                this.OnSend(ref message);
-                Message reply = null;
-                if (message != null)
-                {
-                    reply = this.InnerChannel.Request(message);
-                }
-
-                this.OnReceive(ref reply);
-                return reply;
-            }
-
-            private class RequestAsyncResult : AsyncResult
-            {
-                private Message _replyMessage;
-                private InterceptingRequestChannel _channel;
-                private AsyncCallback _requestCallback = new AsyncCallback(OnRequest);
-
-                public RequestAsyncResult(InterceptingRequestChannel channel, Message message, TimeSpan timeout, AsyncCallback callback, object state)
-                    : base(callback, state)
-                {
-                    if (message != null)
-                    {
-                        _channel = channel;
-
-                        IAsyncResult requestResult = channel.InnerChannel.BeginRequest(message, timeout, _requestCallback, this);
-                        if (!requestResult.CompletedSynchronously)
-                        {
-                            return;
-                        }
-
-                        CompleteRequest(requestResult);
-                    }
-
-                    base.Complete(true);
-                }
-
-                private void CompleteRequest(IAsyncResult result)
-                {
-                    _replyMessage = _channel.InnerChannel.EndRequest(result);
-                }
-
-                private static void OnRequest(IAsyncResult result)
-                {
-                    if (result.CompletedSynchronously)
-                    {
-                        return;
-                    }
-
-                    RequestAsyncResult thisPtr = (RequestAsyncResult)result.AsyncState;
-                    Exception completionException = null;
-
-                    try
-                    {
-                        thisPtr.CompleteRequest(result);
-                    }
-                    catch (Exception e)
-                    {
-                        completionException = e;
-                    }
-
-                    thisPtr.Complete(false, completionException);
-                }
-
-                public static Message End(IAsyncResult result)
-                {
-                    RequestAsyncResult thisPtr = AsyncResult.End<RequestAsyncResult>(result);
-                    return thisPtr._replyMessage;
-                }
-            }
-        }
-
-        private class InterceptingOutputSessionChannel : InterceptingOutputChannel, IOutputSessionChannel
-        {
-            private IOutputSessionChannel _innerSessionChannel;
-
-            public InterceptingOutputSessionChannel(
-                InterceptingChannelFactory<TChannel> factory, IOutputSessionChannel innerChannel)
-                : base(factory, innerChannel)
-            {
-                _innerSessionChannel = innerChannel;
-            }
-
-            public IOutputSession Session
-            {
-                get
-                {
-                    return _innerSessionChannel.Session;
-                }
-            }
-        }
-
-        private class InterceptingRequestSessionChannel : InterceptingRequestChannel, IRequestSessionChannel
-        {
-            private IRequestSessionChannel _innerSessionChannel;
-
-            public InterceptingRequestSessionChannel(
-                InterceptingChannelFactory<TChannel> factory, IRequestSessionChannel innerChannel)
-                : base(factory, innerChannel)
-            {
-                _innerSessionChannel = innerChannel;
-            }
-
-            public IOutputSession Session
-            {
-                get
-                {
-                    return _innerSessionChannel.Session;
-                }
-            }
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelListener.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelListener.cs
deleted file mode 100644
index b95c12592fc..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingChannelListener.cs
+++ /dev/null
@@ -1,546 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    internal class InterceptingChannelListener<TChannel>
-        : ChannelListenerBase<TChannel>
-        where TChannel : class, IChannel
-    {
-        private ChannelMessageInterceptor _interceptor;
-        private IChannelListener<TChannel> _innerChannelListener;
-
-        public InterceptingChannelListener(ChannelMessageInterceptor interceptor, BindingContext context)
-        {
-            _interceptor = interceptor;
-            _innerChannelListener = context.BuildInnerChannelListener<TChannel>();
-            if (_innerChannelListener == null)
-            {
-                throw new InvalidOperationException(
-                    "InterceptingChannelListener requires an inner IChannelListener.");
-            }
-        }
-
-        public ChannelMessageInterceptor Interceptor
-        {
-            get { return _interceptor; }
-        }
-
-        public override Uri Uri
-        {
-            get
-            {
-                return _innerChannelListener.Uri;
-            }
-        }
-
-        public override T GetProperty<T>()
-        {
-            T baseProperty = base.GetProperty<T>();
-            if (baseProperty != null)
-            {
-                return baseProperty;
-            }
-
-            return _innerChannelListener.GetProperty<T>();
-        }
-
-        protected override void OnOpen(TimeSpan timeout)
-        {
-            _innerChannelListener.Open(timeout);
-        }
-
-        protected override IAsyncResult OnBeginOpen(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannelListener.BeginOpen(timeout, callback, state);
-        }
-
-        protected override void OnEndOpen(IAsyncResult result)
-        {
-            _innerChannelListener.EndOpen(result);
-        }
-
-        protected override void OnClose(TimeSpan timeout)
-        {
-            _innerChannelListener.Close(timeout);
-        }
-
-        protected override IAsyncResult OnBeginClose(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannelListener.BeginClose(timeout, callback, state);
-        }
-
-        protected override void OnEndClose(IAsyncResult result)
-        {
-            _innerChannelListener.EndClose(result);
-        }
-
-        protected override void OnAbort()
-        {
-            _innerChannelListener.Abort();
-        }
-
-        protected override TChannel OnAcceptChannel(TimeSpan timeout)
-        {
-            TChannel innerChannel = _innerChannelListener.AcceptChannel(timeout);
-            return WrapChannel(innerChannel);
-        }
-
-        protected override IAsyncResult OnBeginAcceptChannel(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannelListener.BeginAcceptChannel(timeout, callback, state);
-        }
-
-        protected override TChannel OnEndAcceptChannel(IAsyncResult result)
-        {
-            TChannel innerChannel = _innerChannelListener.EndAcceptChannel(result);
-            return WrapChannel(innerChannel);
-        }
-
-        protected override bool OnWaitForChannel(TimeSpan timeout)
-        {
-            return _innerChannelListener.WaitForChannel(timeout);
-        }
-
-        protected override IAsyncResult OnBeginWaitForChannel(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return _innerChannelListener.BeginWaitForChannel(timeout, callback, state);
-        }
-
-        protected override bool OnEndWaitForChannel(IAsyncResult result)
-        {
-            return _innerChannelListener.EndWaitForChannel(result);
-        }
-
-        private TChannel WrapChannel(TChannel innerChannel)
-        {
-            if (innerChannel == null)
-            {
-                return null;
-            }
-
-            if (typeof(TChannel) == typeof(IInputChannel))
-            {
-                return (TChannel)(object)new InterceptingInputChannel<IInputChannel>(this, this.Interceptor, (IInputChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IReplyChannel))
-            {
-                return (TChannel)(object)new InterceptingReplyChannel(this, (IReplyChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IDuplexChannel))
-            {
-                return (TChannel)(object)new InterceptingDuplexChannel(this, Interceptor, (IDuplexChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IInputSessionChannel))
-            {
-                return (TChannel)(object)new InterceptingInputSessionChannel(this,
-                    (IInputSessionChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IReplySessionChannel))
-            {
-                return (TChannel)(object)new InterceptingReplySessionChannel(this,
-                    (IReplySessionChannel)innerChannel);
-            }
-            else if (typeof(TChannel) == typeof(IDuplexSessionChannel))
-            {
-                return (TChannel)(object)new InterceptingDuplexSessionChannel(this, Interceptor,
-                    (IDuplexSessionChannel)innerChannel);
-            }
-
-            // Cannot wrap this channel.
-            return innerChannel;
-        }
-
-        private class InterceptingReplyChannel : InterceptingChannelBase<IReplyChannel>, IReplyChannel
-        {
-            public InterceptingReplyChannel(
-                InterceptingChannelListener<TChannel> listener, IReplyChannel innerChannel)
-                : base(listener, listener.Interceptor, innerChannel)
-            {
-                // empty
-            }
-
-            public EndpointAddress LocalAddress
-            {
-                get
-                {
-                    return this.InnerChannel.LocalAddress;
-                }
-            }
-
-            public RequestContext ReceiveRequest()
-            {
-                return ReceiveRequest(DefaultReceiveTimeout);
-            }
-
-            public RequestContext ReceiveRequest(TimeSpan timeout)
-            {
-                RequestContext requestContext;
-                while (true)
-                {
-                    requestContext = this.InnerChannel.ReceiveRequest(timeout);
-                    if (ProcessRequestContext(ref requestContext))
-                    {
-                        break;
-                    }
-                }
-
-                return requestContext;
-            }
-
-            public IAsyncResult BeginReceiveRequest(AsyncCallback callback, object state)
-            {
-                return BeginReceiveRequest(DefaultReceiveTimeout, callback, state);
-            }
-
-            public IAsyncResult BeginReceiveRequest(TimeSpan timeout, AsyncCallback callback, object state)
-            {
-                ReceiveRequestAsyncResult result = new ReceiveRequestAsyncResult(this, timeout, callback, state);
-                result.Begin();
-                return result;
-            }
-
-            public RequestContext EndReceiveRequest(IAsyncResult result)
-            {
-                return ReceiveRequestAsyncResult.End(result);
-            }
-
-            public bool TryReceiveRequest(TimeSpan timeout, out RequestContext requestContext)
-            {
-                bool result;
-
-                while (true)
-                {
-                    result = this.InnerChannel.TryReceiveRequest(timeout, out requestContext);
-                    if (!result || ProcessRequestContext(ref requestContext))
-                    {
-                        break;
-                    }
-                }
-
-                return result;
-            }
-
-            public IAsyncResult BeginTryReceiveRequest(TimeSpan timeout, AsyncCallback callback, object state)
-            {
-                TryReceiveRequestAsyncResult result = new TryReceiveRequestAsyncResult(this, timeout, callback, state);
-                result.Begin();
-                return result;
-            }
-
-            public bool EndTryReceiveRequest(IAsyncResult result, out RequestContext requestContext)
-            {
-                return TryReceiveRequestAsyncResult.End(result, out requestContext);
-            }
-
-            public bool WaitForRequest(TimeSpan timeout)
-            {
-                return this.InnerChannel.WaitForRequest(timeout);
-            }
-
-            public IAsyncResult BeginWaitForRequest(TimeSpan timeout, AsyncCallback callback, object state)
-            {
-                return this.InnerChannel.BeginWaitForRequest(timeout, callback, state);
-            }
-
-            public bool EndWaitForRequest(IAsyncResult result)
-            {
-                return this.InnerChannel.EndWaitForRequest(result);
-            }
-
-            private bool ProcessRequestContext(ref RequestContext requestContext)
-            {
-                if (requestContext == null)
-                {
-                    return true;
-                }
-
-                Message m = requestContext.RequestMessage;
-                Message originalMessage = m;
-
-                this.OnReceive(ref m);
-                if (m != null || originalMessage == null)
-                {
-                    requestContext = new InterceptingRequestContext(this, requestContext);
-                }
-                else
-                {
-                    requestContext.Close();
-                    requestContext = null;
-                }
-
-                return requestContext != null;
-            }
-
-            private abstract class ReceiveRequestAsyncResultBase : AsyncResult
-            {
-                private RequestContext _requestContext;
-                private InterceptingReplyChannel _channel;
-                private AsyncCallback _onReceive;
-
-                protected ReceiveRequestAsyncResultBase(InterceptingReplyChannel channel,
-                    AsyncCallback callback, object state)
-                    : base(callback, state)
-                {
-                    _channel = channel;
-                    _onReceive = new AsyncCallback(OnReceive);
-                }
-
-                protected RequestContext RequestContext
-                {
-                    get { return _requestContext; }
-                }
-
-                public void Begin()
-                {
-                    IAsyncResult result = BeginReceiveRequest(_onReceive, null);
-                    if (result.CompletedSynchronously)
-                    {
-                        if (HandleReceiveComplete(result))
-                        {
-                            base.Complete(true);
-                        }
-                    }
-                }
-
-                protected abstract IAsyncResult BeginReceiveRequest(AsyncCallback callback, object state);
-                protected abstract RequestContext EndReceiveRequest(IAsyncResult result);
-
-                private bool HandleReceiveComplete(IAsyncResult result)
-                {
-                    while (true)
-                    {
-                        _requestContext = EndReceiveRequest(result);
-                        if (_channel.ProcessRequestContext(ref _requestContext))
-                        {
-                            return true;
-                        }
-
-                        // try again
-                        result = BeginReceiveRequest(_onReceive, null);
-                        if (!result.CompletedSynchronously)
-                        {
-                            return false;
-                        }
-                    }
-                }
-
-                private void OnReceive(IAsyncResult result)
-                {
-                    if (result.CompletedSynchronously)
-                    {
-                        return;
-                    }
-
-                    bool completeSelf = false;
-                    Exception completeException = null;
-                    try
-                    {
-                        completeSelf = HandleReceiveComplete(result);
-                    }
-                    catch (Exception e)
-                    {
-                        completeException = e;
-                        completeSelf = true;
-                    }
-
-                    if (completeSelf)
-                    {
-                        base.Complete(false, completeException);
-                    }
-                }
-            }
-
-            private class TryReceiveRequestAsyncResult : ReceiveRequestAsyncResultBase
-            {
-                private IReplyChannel _innerChannel;
-                private TimeSpan _timeout;
-                private bool _returnValue;
-
-                public TryReceiveRequestAsyncResult(InterceptingReplyChannel channel, TimeSpan timeout,
-                    AsyncCallback callback, object state)
-                    : base(channel, callback, state)
-                {
-                    _innerChannel = channel.InnerChannel;
-                    _timeout = timeout;
-                }
-
-                protected override IAsyncResult BeginReceiveRequest(AsyncCallback callback, object state)
-                {
-                    return _innerChannel.BeginTryReceiveRequest(_timeout, callback, state);
-                }
-
-                protected override RequestContext EndReceiveRequest(IAsyncResult result)
-                {
-                    RequestContext requestContext;
-                    _returnValue = _innerChannel.EndTryReceiveRequest(result, out requestContext);
-                    return requestContext;
-                }
-
-                public static bool End(IAsyncResult result, out RequestContext requestContext)
-                {
-                    TryReceiveRequestAsyncResult thisPtr = AsyncResult.End<TryReceiveRequestAsyncResult>(result);
-                    requestContext = thisPtr.RequestContext;
-                    return thisPtr._returnValue;
-                }
-            }
-
-            private class ReceiveRequestAsyncResult : ReceiveRequestAsyncResultBase
-            {
-                private IReplyChannel _innerChannel;
-                private TimeSpan _timeout;
-
-                public ReceiveRequestAsyncResult(InterceptingReplyChannel channel, TimeSpan timeout, AsyncCallback callback, object state)
-                    : base(channel, callback, state)
-                {
-                    _innerChannel = channel.InnerChannel;
-                    _timeout = timeout;
-                }
-
-                protected override IAsyncResult BeginReceiveRequest(AsyncCallback callback, object state)
-                {
-                    return _innerChannel.BeginReceiveRequest(_timeout, callback, state);
-                }
-
-                protected override RequestContext EndReceiveRequest(IAsyncResult result)
-                {
-                    return _innerChannel.EndReceiveRequest(result);
-                }
-
-                public static RequestContext End(IAsyncResult result)
-                {
-                    ReceiveRequestAsyncResult thisPtr = AsyncResult.End<ReceiveRequestAsyncResult>(result);
-                    return thisPtr.RequestContext;
-                }
-            }
-
-
-            private class InterceptingRequestContext : RequestContext
-            {
-                private InterceptingReplyChannel _channel;
-                private RequestContext _innerContext;
-
-                public InterceptingRequestContext(InterceptingReplyChannel channel, RequestContext innerContext)
-                {
-                    _channel = channel;
-                    _innerContext = innerContext;
-                }
-
-                public override Message RequestMessage
-                {
-                    get
-                    {
-                        return _innerContext.RequestMessage;
-                    }
-                }
-
-                public override void Abort()
-                {
-                    _innerContext.Abort();
-                }
-
-                public override IAsyncResult BeginReply(Message message, AsyncCallback callback, object state)
-                {
-                    return BeginReply(message, _channel.DefaultSendTimeout, callback, state);
-                }
-
-                public override IAsyncResult BeginReply(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-                {
-                    Message m = message;
-                    this.OnSend(ref m);
-                    return _innerContext.BeginReply(m, timeout, callback, state);
-                }
-
-                public override void Close()
-                {
-                    _innerContext.Close();
-                }
-
-                public override void Close(TimeSpan timeout)
-                {
-                    _innerContext.Close(timeout);
-                }
-
-                protected override void Dispose(bool disposing)
-                {
-                    try
-                    {
-                        if (disposing)
-                            ((IDisposable)_innerContext).Dispose();
-                    }
-                    finally
-                    {
-                        base.Dispose(disposing);
-                    }
-                }
-
-                public override void EndReply(IAsyncResult result)
-                {
-                    _innerContext.EndReply(result);
-                }
-
-                private void OnSend(ref Message message)
-                {
-                    _channel.OnSend(ref message);
-                }
-
-                public override void Reply(Message message)
-                {
-                    Reply(message, _channel.DefaultSendTimeout);
-                }
-
-                public override void Reply(Message message, TimeSpan timeout)
-                {
-                    Message m = message;
-                    this.OnSend(ref m);
-                    _innerContext.Reply(m, timeout);
-                }
-            }
-        }
-
-        private class InterceptingInputSessionChannel : InterceptingInputChannel<IInputSessionChannel>, IInputSessionChannel
-        {
-            private IInputSessionChannel _innerSessionChannel;
-
-            public InterceptingInputSessionChannel(
-                InterceptingChannelListener<TChannel> listener, IInputSessionChannel innerChannel)
-                : base(listener, listener.Interceptor, innerChannel)
-            {
-                _innerSessionChannel = innerChannel;
-            }
-
-            public IInputSession Session
-            {
-                get
-                {
-                    return _innerSessionChannel.Session;
-                }
-            }
-        }
-
-        private class InterceptingReplySessionChannel : InterceptingReplyChannel, IReplySessionChannel
-        {
-            private IReplySessionChannel _innerSessionChannel;
-
-            public InterceptingReplySessionChannel(
-                InterceptingChannelListener<TChannel> listener, IReplySessionChannel innerChannel)
-                : base(listener, innerChannel)
-            {
-                _innerSessionChannel = innerChannel;
-            }
-
-            public IInputSession Session
-            {
-                get
-                {
-                    return _innerSessionChannel.Session;
-                }
-            }
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingDuplexChannel.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingDuplexChannel.cs
deleted file mode 100644
index 946f2a82585..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/InterceptingDuplexChannel.cs
+++ /dev/null
@@ -1,337 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    internal class InterceptingInputChannel<TChannel>
-        : InterceptingChannelBase<TChannel>, IInputChannel
-        where TChannel : class, IInputChannel
-    {
-        public InterceptingInputChannel(
-            ChannelManagerBase manager, ChannelMessageInterceptor interceptor, TChannel innerChannel)
-            : base(manager, interceptor, innerChannel)
-        {
-            // empty
-        }
-
-        public EndpointAddress LocalAddress
-        {
-            get
-            {
-                return this.InnerChannel.LocalAddress;
-            }
-        }
-
-        private bool ProcessReceivedMessage(ref Message message)
-        {
-            Message originalMessage = message;
-            this.OnReceive(ref message);
-            return (message != null || originalMessage == null);
-        }
-
-        public Message Receive()
-        {
-            return Receive(DefaultReceiveTimeout);
-        }
-
-        public Message Receive(TimeSpan timeout)
-        {
-            Message message;
-            while (true)
-            {
-                message = this.InnerChannel.Receive(timeout);
-                if (ProcessReceivedMessage(ref message))
-                {
-                    break;
-                }
-            }
-
-            return message;
-        }
-
-        public IAsyncResult BeginReceive(AsyncCallback callback, object state)
-        {
-            return BeginReceive(DefaultReceiveTimeout, callback, state);
-        }
-
-        public IAsyncResult BeginReceive(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            ReceiveAsyncResult<TChannel> result = new ReceiveAsyncResult<TChannel>(this, timeout, callback, state);
-            result.Begin();
-            return result;
-        }
-
-        public Message EndReceive(IAsyncResult result)
-        {
-            return ReceiveAsyncResult<TChannel>.End(result);
-        }
-
-        public bool TryReceive(TimeSpan timeout, out Message message)
-        {
-            bool result;
-            while (true)
-            {
-                result = this.InnerChannel.TryReceive(timeout, out message);
-                if (ProcessReceivedMessage(ref message))
-                {
-                    break;
-                }
-            }
-
-            return result;
-        }
-
-        public IAsyncResult BeginTryReceive(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            TryReceiveAsyncResult<TChannel> result = new TryReceiveAsyncResult<TChannel>(this, timeout, callback, state);
-            result.Begin();
-            return result;
-        }
-
-        public bool EndTryReceive(IAsyncResult result, out Message message)
-        {
-            return TryReceiveAsyncResult<TChannel>.End(result, out message);
-        }
-
-        public bool WaitForMessage(TimeSpan timeout)
-        {
-            return this.InnerChannel.WaitForMessage(timeout);
-        }
-
-        public IAsyncResult BeginWaitForMessage(TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            return this.InnerChannel.BeginWaitForMessage(timeout, callback, state);
-        }
-
-        public bool EndWaitForMessage(IAsyncResult result)
-        {
-            return this.InnerChannel.EndWaitForMessage(result);
-        }
-
-        private abstract class ReceiveAsyncResultBase<TInputChannel> : AsyncResult
-            where TInputChannel : class, IInputChannel
-        {
-            private Message _message;
-            private InterceptingInputChannel<TInputChannel> _channel;
-            private AsyncCallback _onReceive;
-
-            protected ReceiveAsyncResultBase(InterceptingInputChannel<TInputChannel> channel,
-                AsyncCallback callback, object state)
-                : base(callback, state)
-            {
-                _channel = channel;
-                _onReceive = new AsyncCallback(OnReceive);
-            }
-
-            protected Message Message
-            {
-                get { return _message; }
-            }
-
-            public void Begin()
-            {
-                IAsyncResult result = BeginReceive(_onReceive, null);
-                if (result.CompletedSynchronously)
-                {
-                    if (HandleReceiveComplete(result))
-                    {
-                        base.Complete(true);
-                    }
-                }
-            }
-
-            protected abstract IAsyncResult BeginReceive(AsyncCallback callback, object state);
-            protected abstract Message EndReceive(IAsyncResult result);
-
-            private bool HandleReceiveComplete(IAsyncResult result)
-            {
-                while (true)
-                {
-                    _message = EndReceive(result);
-                    if (_channel.ProcessReceivedMessage(ref _message))
-                    {
-                        return true;
-                    }
-
-                    // try again
-                    result = BeginReceive(_onReceive, null);
-                    if (!result.CompletedSynchronously)
-                    {
-                        return false;
-                    }
-                }
-            }
-
-            private void OnReceive(IAsyncResult result)
-            {
-                if (result.CompletedSynchronously)
-                {
-                    return;
-                }
-
-                bool completeSelf = false;
-                Exception completeException = null;
-                try
-                {
-                    completeSelf = HandleReceiveComplete(result);
-                }
-                catch (Exception e)
-                {
-                    completeException = e;
-                    completeSelf = true;
-                }
-
-                if (completeSelf)
-                {
-                    base.Complete(false, completeException);
-                }
-            }
-        }
-
-        private class TryReceiveAsyncResult<TInputChannel> : ReceiveAsyncResultBase<TInputChannel>
-            where TInputChannel : class, IInputChannel
-        {
-            private TInputChannel _innerChannel;
-            private TimeSpan _timeout;
-            private bool _returnValue;
-
-            public TryReceiveAsyncResult(InterceptingInputChannel<TInputChannel> channel, TimeSpan timeout,
-                AsyncCallback callback, object state)
-                : base(channel, callback, state)
-            {
-                _innerChannel = channel.InnerChannel;
-                _timeout = timeout;
-            }
-
-            protected override IAsyncResult BeginReceive(AsyncCallback callback, object state)
-            {
-                return _innerChannel.BeginTryReceive(_timeout, callback, state);
-            }
-
-            protected override Message EndReceive(IAsyncResult result)
-            {
-                Message message;
-                _returnValue = _innerChannel.EndTryReceive(result, out message);
-                return message;
-            }
-
-            public static bool End(IAsyncResult result, out Message message)
-            {
-                TryReceiveAsyncResult<TInputChannel> thisPtr = AsyncResult.End<TryReceiveAsyncResult<TInputChannel>>(result);
-                message = thisPtr.Message;
-                return thisPtr._returnValue;
-            }
-        }
-
-        private class ReceiveAsyncResult<TInputChannel> : ReceiveAsyncResultBase<TInputChannel>
-           where TInputChannel : class, IInputChannel
-        {
-            private TInputChannel _innerChannel;
-            private TimeSpan _timeout;
-
-            public ReceiveAsyncResult(InterceptingInputChannel<TInputChannel> channel, TimeSpan timeout,
-                AsyncCallback callback, object state)
-                : base(channel, callback, state)
-            {
-                _innerChannel = channel.InnerChannel;
-                _timeout = timeout;
-            }
-
-            protected override IAsyncResult BeginReceive(AsyncCallback callback, object state)
-            {
-                return _innerChannel.BeginReceive(_timeout, callback, state);
-            }
-
-            protected override Message EndReceive(IAsyncResult result)
-            {
-                return _innerChannel.EndReceive(result);
-            }
-
-            public static Message End(IAsyncResult result)
-            {
-                ReceiveAsyncResult<TInputChannel> thisPtr = AsyncResult.End<ReceiveAsyncResult<TInputChannel>>(result);
-                return thisPtr.Message;
-            }
-        }
-    }
-
-    internal class InterceptingDuplexChannel
-        : InterceptingInputChannel<IDuplexChannel>, IDuplexChannel
-    {
-        public InterceptingDuplexChannel(
-            ChannelManagerBase manager, ChannelMessageInterceptor interceptor, IDuplexChannel innerChannel)
-            : base(manager, interceptor, innerChannel)
-        {
-            // empty
-        }
-
-        public EndpointAddress RemoteAddress
-        {
-            get
-            {
-                return this.InnerChannel.RemoteAddress;
-            }
-        }
-
-        public Uri Via
-        {
-            get
-            {
-                return this.InnerChannel.Via;
-            }
-        }
-
-        public void Send(Message message)
-        {
-            Send(message, DefaultSendTimeout);
-        }
-
-        public void Send(Message message, TimeSpan timeout)
-        {
-            this.OnSend(ref message);
-            this.InnerChannel.Send(message, timeout);
-        }
-
-        public IAsyncResult BeginSend(Message message, AsyncCallback callback, object state)
-        {
-            return BeginSend(message, DefaultSendTimeout, callback, state);
-        }
-
-        public IAsyncResult BeginSend(Message message, TimeSpan timeout, AsyncCallback callback, object state)
-        {
-            this.OnSend(ref message);
-            return this.InnerChannel.BeginSend(message, timeout, callback, state);
-        }
-
-        public void EndSend(IAsyncResult result)
-        {
-            this.InnerChannel.EndSend(result);
-        }
-    }
-
-
-    internal class InterceptingDuplexSessionChannel : InterceptingDuplexChannel, IDuplexSessionChannel
-    {
-        private IDuplexSessionChannel _innerSessionChannel;
-
-        public InterceptingDuplexSessionChannel(
-            ChannelManagerBase manager, ChannelMessageInterceptor interceptor, IDuplexSessionChannel innerChannel)
-            : base(manager, interceptor, innerChannel)
-        {
-            _innerSessionChannel = innerChannel;
-        }
-
-        public IDuplexSession Session
-        {
-            get
-            {
-                return _innerSessionChannel.Session;
-            }
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Interceptingelement.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Interceptingelement.cs
deleted file mode 100644
index efe88263a31..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Interceptingelement.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.ServiceModel.Channels;
-using System.ServiceModel.Configuration;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    /// <summary>
-    /// Configuration class for InterceptingBindingElement. To make your InterceptingBindingElement
-    /// configurable, derive from InterceptingElementInterceptingElement and override CreateMessageInterceptor()
-    /// </summary>
-    public abstract class InterceptingElement : BindingElementExtensionElement
-    {
-        protected InterceptingElement()
-            : base()
-        {
-        }
-
-        public override Type BindingElementType
-        {
-            get
-            {
-                return typeof(InterceptingBindingElement);
-            }
-        }
-
-        protected abstract ChannelMessageInterceptor CreateMessageInterceptor();
-
-        protected override BindingElement CreateBindingElement()
-        {
-            return new InterceptingBindingElement(CreateMessageInterceptor());
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/KnownTypeA.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/KnownTypeA.cs
index b71eb76a1cb..8a36a43b3d8 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/KnownTypeA.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/KnownTypeA.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if !NET
 using System.Runtime.Serialization;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/MyX509CertificateValidator.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/MyX509CertificateValidator.cs
index a8dc0537d94..aafb5020d8c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/MyX509CertificateValidator.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/MyX509CertificateValidator.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.IdentityModel.Selectors;
+using CoreWCF.IdentityModel.Tokens;
+#else
 using System;
 using System.IdentityModel.Selectors;
 using System.IdentityModel.Tokens;
+#endif
 using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.4.4.0.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.4.4.0.cs
index 55584e436db..09ed48b8188 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.4.4.0.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.cs
index 5feaf87ce03..35ece5b9af3 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingData.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingDataNotWrapped.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingDataNotWrapped.cs
index 1145dd95dcf..05fcfdf7b58 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingDataNotWrapped.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ReplyBankingDataNotWrapped.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.4.4.0.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.4.4.0.cs
index 464502bc760..91e06161d6a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.4.4.0.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.cs
index 39988112052..cc4de9f6f0c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/RequestBankingData.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Service1.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Service1.cs
index 7608f8ae933..7044c744dbc 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Service1.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/Service1.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceActivationsBuilder.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceActivationsBuilder.cs
index 50cffd1aa85..30296d09f70 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceActivationsBuilder.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceActivationsBuilder.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System.Configuration;
 using System.ServiceModel.Configuration;
 
@@ -34,3 +35,4 @@ private void UpdateServiceActivations(ServiceHostingEnvironmentSection serviceHo
     }
 
 }
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncInterfaces.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncInterfaces.cs
index 8f52beae18b..e8efca608bc 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncInterfaces.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncInterfaces.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncServices.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncServices.cs
index 625e10a0ac4..139491ccd2e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncServices.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/ServiceContractAsyncServices.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System.Linq;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/SessionTestsService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/SessionTestsService.cs
index e5c2bc29f52..73758c0f76f 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/SessionTestsService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/SessionTestsService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
 using System.Threading;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestDefinitionHelper.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestDefinitionHelper.cs
index a3156afbcd9..394b46d96cb 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestDefinitionHelper.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestDefinitionHelper.cs
@@ -2,10 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using System.Diagnostics;
+using System.Net;
+using System.Security.Claims;
+using System.Security.Cryptography.X509Certificates;
+using CoreWCF.Channels;
+using CoreWCF.Configuration;
+using CoreWCF.Description;
+using idunno.Authentication.Basic;
+#else
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
@@ -14,11 +25,11 @@ internal class TestDefinitionHelper
         private static IDictionary<ServiceSchema, string> s_baseAddresses = null;
         private const int DefaultHttpPort = 8081;
         private const int DefaultHttpsPort = 44285;
-        private const int DefaultTcpPort = 809;
+        private const int DefaultTcpPort = 8808;
         private const int DefaultWebSocketPort = 8083;
         private const int DefaultWebSocketSPort = 8084;
 
-        private static IDictionary<ServiceSchema, string> BaseAddresses
+        internal static IDictionary<ServiceSchema, string> BaseAddresses
         {
             get
             {
@@ -28,17 +39,18 @@ private static IDictionary<ServiceSchema, string> BaseAddresses
                     var httpPort = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("httpPort")) ? DefaultHttpPort : int.Parse(Environment.GetEnvironmentVariable("httpPort"));
                     dict[ServiceSchema.HTTP] = string.Format(@"http://localhost:{0}", httpPort);
                     var httpsPort = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("httpsPort")) ? DefaultHttpsPort : int.Parse(Environment.GetEnvironmentVariable("httpsPort"));
-                    dict[ServiceSchema.HTTPS]= string.Format(@"https://localhost:{0}", httpsPort);
+                    dict[ServiceSchema.HTTPS] = string.Format(@"https://localhost:{0}", httpsPort);
                     var tcpPort = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("tcpPort")) ? DefaultTcpPort : int.Parse(Environment.GetEnvironmentVariable("tcpPort"));
                     dict[ServiceSchema.NETTCP] = string.Format(@"net.tcp://localhost:{0}", tcpPort);
                     var websocketPort = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("websocketPort")) ? DefaultWebSocketPort : int.Parse(Environment.GetEnvironmentVariable("websocketPort"));
                     dict[ServiceSchema.WS] = string.Format(@"http://localhost:{0}", websocketPort);
                     var websocketsPort = string.IsNullOrEmpty(Environment.GetEnvironmentVariable("websocketsPort")) ? DefaultWebSocketSPort : int.Parse(Environment.GetEnvironmentVariable("websocketsPort"));
                     dict[ServiceSchema.WSS] = string.Format(@"https://localhost:{0}", websocketsPort);
+
                     s_baseAddresses = dict;
                     dict[ServiceSchema.NETPIPE] = @"net.pipe://localhost";
                     Console.WriteLine("Using base addresses:");
-                    foreach(var ba in dict.Values)
+                    foreach (var ba in dict.Values)
                     {
                         Console.WriteLine("\t" + ba);
                     }
@@ -48,7 +60,236 @@ private static IDictionary<ServiceSchema, string> BaseAddresses
             }
         }
 
-        internal static void StartHosts()
+#if NET
+        internal class ServiceTestHostOptions
+        {
+            public List<Uri> serviceBaseAddresses = new List<Uri>();
+            public Dictionary<Enum, string> endpointBasePath = new Dictionary<Enum, string>();
+        }
+
+        internal static async Task<IWebHost> StartHosts(bool useWebSocket)
+        {
+            bool success = true;
+            var serviceTestHostOptionsDict = new Dictionary<string, ServiceTestHostOptions>();
+
+            var webHostBuilder = new WebHostBuilder()
+                .ConfigureLogging((ILoggingBuilder logging) =>
+                {
+                    logging.ClearProviders();
+                    logging.AddConsole();
+                    logging.AddFilter("Default", LogLevel.Debug);
+                    logging.AddFilter("Microsoft", LogLevel.Debug);
+                    logging.SetMinimumLevel(LogLevel.Debug);
+                })
+                .UseKestrel(options =>
+                {
+                    options.AllowSynchronousIO = true;
+
+                    if (useWebSocket)
+                    {
+                        options.Listen(IPAddress.IPv6Any, new Uri(BaseAddresses[ServiceSchema.WS]).Port);
+                        options.Listen(IPAddress.IPv6Any, new Uri(BaseAddresses[ServiceSchema.WSS]).Port, listenOptions =>
+                        {
+                            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+                            listenOptions.UseHttps(cert);
+
+                            if (Debugger.IsAttached)
+                            {
+                                listenOptions.UseConnectionLogging();
+                            }
+                        });
+                    }
+                    else
+                    {
+                        options.Listen(IPAddress.IPv6Any, new Uri(BaseAddresses[ServiceSchema.HTTP]).Port);
+                        options.Listen(IPAddress.IPv6Any, new Uri(BaseAddresses[ServiceSchema.HTTPS]).Port, listenOptions =>
+                        {
+                            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+                            Debug.Assert(cert != null, "couldn't find the server certificate");
+
+                            listenOptions.UseHttps(cert);
+
+                            if (Debugger.IsAttached)
+                            {
+                                listenOptions.UseConnectionLogging();
+                            }
+                        });
+                    }
+
+                });
+
+            if (!useWebSocket)
+            {
+                webHostBuilder.UseNetTcp(IPAddress.IPv6Any, new Uri(BaseAddresses[ServiceSchema.NETTCP]).Port);
+            }
+
+            webHostBuilder.ConfigureServices(services =>
+            {
+                services.AddAuthentication()
+                .AddDigest()
+                .AddBasic(options =>
+                    {
+                        options.Realm = "Basic Authentication";
+                        options.Events = new BasicAuthenticationEvents
+                        {
+                            OnValidateCredentials = context =>
+                            {
+                                if (context.Username == context.Password)
+                                {
+                                    var claims = new[]
+                                        {
+                                            new Claim(ClaimTypes.NameIdentifier, context.Username, ClaimValueTypes.String, context.Options.ClaimsIssuer),
+                                            new Claim(ClaimTypes.Name, context.Username, ClaimValueTypes.String, context.Options.ClaimsIssuer)
+                                        };
+
+                                    context.Principal = new ClaimsPrincipal(new ClaimsIdentity(claims, context.Scheme.Name));
+                                    context.Success();
+                                }
+
+                                return Task.CompletedTask;
+                            }
+                        };
+                    });
+                services.AddServiceModelServices();
+                if (!useWebSocket)
+                {
+                    services.AddServiceModelMetadata();
+                }
+                services.AddServiceModelWebServices()
+                .AddRouting()
+                .AddAuthorization();
+            })
+            .Configure(app =>
+            {
+                app.UseAuthentication();
+                app.UseAuthorization();
+                app.UseServiceModel(serviceBuilder =>
+                {
+                    foreach (var serviceTestHost in GetAttributedServiceHostTypes())
+                    {
+                        var serviceTestHostOptions = new ServiceTestHostOptions();
+                        foreach (TestServiceDefinitionAttribute attr in serviceTestHost.GetCustomAttributes(typeof(TestServiceDefinitionAttribute), false))
+                        {
+                            Uri serviceBaseAddress = null;
+                            try
+                            {
+                                foreach (Enum schema in Enum.GetValues(typeof(ServiceSchema)))
+                                {
+                                    if (useWebSocket && !((ServiceSchema)schema == ServiceSchema.WS || (ServiceSchema)schema == ServiceSchema.WSS)) continue;
+                                    if (!useWebSocket && ((ServiceSchema)schema == ServiceSchema.WS || (ServiceSchema)schema == ServiceSchema.WSS)) continue;
+
+                                    if (attr.Schema.HasFlag(schema))
+                                    {
+                                        serviceTestHostOptions.endpointBasePath.Add(schema, attr.BasePath);
+                                        serviceBaseAddress = new Uri(BaseAddresses[(ServiceSchema)schema]);
+                                        serviceTestHostOptions.serviceBaseAddresses.Add(serviceBaseAddress);
+                                    }
+                                }
+                            }
+                            catch (Exception e)
+                            {
+                                ConsoleColor bg = Console.BackgroundColor;
+                                ConsoleColor fg = Console.ForegroundColor;
+                                Console.BackgroundColor = ConsoleColor.Black;
+                                Console.ForegroundColor = ConsoleColor.Red;
+                                Console.WriteLine("Problem creating base address for servicehost type " + serviceTestHost.Name + " with schema " + attr.Schema + " and address " + serviceBaseAddress == null ? string.Empty : serviceBaseAddress.ToString());
+                                Console.WriteLine(e);
+                                Console.BackgroundColor = bg;
+                                Console.ForegroundColor = fg;
+                                success = false;
+                                break;
+                            }
+                        }
+
+                        serviceTestHostOptionsDict.Add(serviceTestHost.Name, serviceTestHostOptions);
+                        try
+                        {
+                            if (success)
+                            {
+                                string serviceHostTypeName = serviceTestHost.Name;
+                                if (serviceTestHostOptionsDict[serviceHostTypeName].serviceBaseAddresses.Count == 0)
+                                    continue;
+
+                                var serviceHost = (ServiceHost)Activator.CreateInstance(serviceTestHost, serviceTestHostOptionsDict[serviceHostTypeName].serviceBaseAddresses.ToArray());
+                                serviceBuilder.AddService(serviceHost.ServiceType, options =>
+                                {
+                                    options.BaseAddresses.Clear();
+                                    options.DebugBehavior.IncludeExceptionDetailInFaults = true;
+
+                                    foreach (var baseAddress in BaseAddresses)
+                                    {
+                                        if (useWebSocket && !(baseAddress.Key == ServiceSchema.WS || baseAddress.Key == ServiceSchema.WSS)) continue;
+                                        if (!useWebSocket && (baseAddress.Key == ServiceSchema.WS || baseAddress.Key == ServiceSchema.WSS)) continue;
+
+                                        options.BaseAddresses.Add(new Uri(baseAddress.Value));
+                                    }
+                                });
+
+                                foreach (var endpoint in serviceHost.Endpoints)
+                                {
+                                    var customBinding = new CustomBinding(endpoint.Binding);
+                                    var htbe = customBinding.Elements.Find<HttpTransportBindingElement>();
+                                    bool isWebsockets = htbe != null && htbe.WebSocketSettings.TransportUsage == WebSocketTransportUsage.Always;
+
+                                    if (!useWebSocket && isWebsockets) continue;
+
+                                    ServiceSchema schema = ServiceHostHelper.ToServiceSchema(endpoint.Binding.Scheme, useWebSocket);
+
+                                    if (useWebSocket && !(schema == ServiceSchema.WS || schema == ServiceSchema.WSS)) continue;
+                                    if (!useWebSocket && (schema == ServiceSchema.WS || schema == ServiceSchema.WSS)) continue;
+
+                                    string basePath = serviceTestHostOptionsDict[serviceHostTypeName].endpointBasePath[schema];
+                                    string endpointAddress = string.Format("{0}/{1}", basePath, endpoint.Address);
+                                    serviceBuilder.AddServiceEndpoint(serviceHost.ServiceType, endpoint.ContractType, endpoint.Binding, new Uri(endpointAddress, UriKind.RelativeOrAbsolute), null);
+                                }
+
+                                serviceBuilder.ConfigureServiceHostBase(serviceHost.ServiceType, serviceHostBase =>
+                                {
+                                    if (!useWebSocket)
+                                    {
+                                        var localHostTypeName = serviceHostTypeName;
+                                        var smb = serviceHostBase.Description.Behaviors.Find<ServiceMetadataBehavior>();
+                                        if (serviceTestHostOptionsDict[localHostTypeName].serviceBaseAddresses.Where(uri => uri.Scheme == Uri.UriSchemeHttps).Any())
+                                        {
+                                            smb.HttpsGetEnabled = true;
+                                        }
+
+                                        smb.HttpGetEnabled = true;
+                                    }
+                                    
+                                    serviceHost.ApplyConfig(serviceHostBase);
+                                });
+                            }
+                        }
+                        catch (Exception e)
+                        {
+                            ConsoleColor bg = Console.BackgroundColor;
+                            ConsoleColor fg = Console.ForegroundColor;
+                            Console.BackgroundColor = ConsoleColor.Black;
+                            Console.ForegroundColor = ConsoleColor.Red;
+                            Console.WriteLine("Problem starting servicehost type " + serviceTestHost.Name);
+                            Console.WriteLine(e);
+                            Console.BackgroundColor = bg;
+                            Console.ForegroundColor = fg;
+                        }
+                    }
+
+                });
+            });
+
+            var webHost = webHostBuilder.Build();
+            await webHost.StartAsync();
+            return webHost;
+        }
+
+        internal static IEnumerable<Type> GetAttributedServiceHostTypes()
+        {
+            var allTypes = typeof(TestDefinitionHelper).Assembly.GetTypes();
+            var serviceHostTypes = from t in allTypes where (typeof(ServiceHost).IsAssignableFrom(t)) select t;
+            return from sht in serviceHostTypes where (sht.GetCustomAttributes(typeof(TestServiceDefinitionAttribute), false).Length > 0) select sht;
+        }
+#else
+internal static void StartHosts()
         {
             foreach (var sht in GetAttributedServiceHostTypes())
             {
@@ -125,5 +366,7 @@ internal static IEnumerable<Type> GetAttributedServiceHostTypes()
             var serviceHostTypes = from t in allTypes where (typeof(ServiceHostBase).IsAssignableFrom(t)) select t;
             return from sht in serviceHostTypes where (sht.GetCustomAttributes(typeof(TestServiceDefinitionAttribute), false).Length > 0) select sht;
         }
+#endif
+
     }
 }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs
index cc592f44cb7..61571a31203 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHost.cs
@@ -2,16 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Web;
+#else
 using System;
 using System.IO;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Web;
+#endif
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using WcfTestCommon;
 using X509Certificate2 = System.Security.Cryptography.X509Certificates.X509Certificate2;
 
-
 namespace WcfService
 {
     [ServiceContract]
@@ -48,6 +53,12 @@ public interface ITestHost
         [OperationContract]
         [WebGet(UriTemplate = "State", BodyStyle = WebMessageBodyStyle.Bare)]
         Stream State();
+
+#if NET
+        [OperationContract]
+        [WebGet(UriTemplate = "Shutdown", BodyStyle = WebMessageBodyStyle.Bare)]
+        void Shutdown();
+#endif
     }
 
     public class TestHost : ITestHost
@@ -55,14 +66,14 @@ public class TestHost : ITestHost
         public Stream ClientCert(bool asPem)
         {
             X509Certificate2 clientCert = CertificateFromSubject(StoreName.My, StoreLocation.LocalMachine, "WCF Client Certificate");
-            byte[] response; 
+            byte[] response;
 
             if (clientCert == null)
             {
                 WebOperationContext.Current.OutgoingResponse.StatusCode = HttpStatusCode.InternalServerError;
                 response = Encoding.UTF8.GetBytes("Client certificate not found on system");
             }
-            else 
+            else
             {
                 if (asPem)
                 {
@@ -95,7 +106,7 @@ public Stream Crl()
         public Stream RootCert(bool asPem)
         {
             X509Certificate2 rootCert = CertificateFromSubject(StoreName.Root, StoreLocation.LocalMachine, "DO_NOT_TRUST_WcfBridgeRootCA");
-            byte[] response; 
+            byte[] response;
 
             if (rootCert == null)
             {
@@ -202,8 +213,8 @@ public static X509Certificate2 CertificateFromSubject(StoreName name, StoreLocat
 
             try
             {
-                store = new X509Store(name, location);
-                store.Open(OpenFlags.ReadOnly);
+                store = CertificateHelper.GetX509Store(name, location);
+
                 X509Certificate2Collection foundCertificates = store.Certificates.Find(X509FindType.FindBySubjectName, subjectName, validOnly: true);
                 return foundCertificates.Count == 0 ? null : foundCertificates[0];
             }
@@ -222,13 +233,18 @@ public static X509Certificate2 CertificateFromFriendlyName(StoreName name, Store
 
             try
             {
-                store = new X509Store(name, location);
-                store.Open(OpenFlags.ReadOnly);
+                store = CertificateHelper.GetX509Store(name, location);
 
                 X509Certificate2Collection foundCertificates = store.Certificates.Find(X509FindType.FindByIssuerName, "DO_NOT_TRUST_WcfBridgeRootCA", false);
+
+                string friendlyNameHash = string.Empty;
+#if NET
+                friendlyNameHash = CertificateGenerator.HashFriendlyNameToString(friendlyName);
+#endif
                 foreach (X509Certificate2 cert in foundCertificates)
                 {
-                    if (cert.FriendlyName == friendlyName)
+                    // Search by serial number in Linux/MacOS
+                    if (cert.FriendlyName == friendlyName || cert.SerialNumber == friendlyNameHash)
                     {
                         return cert;
                     }
@@ -271,5 +287,10 @@ public static string GetCertificateAsPem(X509Certificate2 certificate)
 
             return builder.ToString();
         }
+
+        public void Shutdown()
+        {
+            Environment.Exit(0);
+        }
     }
 }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHttpRequestMessageProperty.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHttpRequestMessageProperty.cs
index e8aa0331549..a8dd15384a3 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHttpRequestMessageProperty.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestHttpRequestMessageProperty.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System.Collections.Generic;
 using System.Runtime.Serialization;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestServiceDefinitionAttribute.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestServiceDefinitionAttribute.cs
index 79c1d4b9749..ae22093981a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestServiceDefinitionAttribute.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TestServiceDefinitionAttribute.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TimeoutHelper.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TimeoutHelper.cs
deleted file mode 100644
index 4b11d8fa0a9..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/TimeoutHelper.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Threading;
-
-namespace Microsoft.Samples.MessageInterceptor
-{
-    public struct TimeoutHelper
-    {
-        public static TimeSpan DefaultTimeout { get { return TimeSpan.FromMinutes(2); } }
-        public static TimeSpan DefaultShortTimeout { get { return TimeSpan.FromSeconds(4); } }
-        public static TimeSpan Infinite { get { return TimeSpan.MaxValue; } }
-        private DateTime _deadline;
-        private TimeSpan _originalTimeout;
-
-        public TimeoutHelper(TimeSpan timeout)
-        {
-            if (timeout < TimeSpan.Zero)
-            {
-                throw new ArgumentOutOfRangeException("timeout");
-            }
-
-            _originalTimeout = timeout;
-            if (timeout == TimeSpan.MaxValue)
-            {
-                _deadline = DateTime.MaxValue;
-            }
-            else
-            {
-                _deadline = DateTime.UtcNow + timeout;
-            }
-        }
-
-        public TimeSpan OriginalTimeout
-        {
-            get { return _originalTimeout; }
-        }
-
-        public TimeSpan RemainingTime()
-        {
-            if (_deadline == DateTime.MaxValue)
-            {
-                return TimeSpan.MaxValue;
-            }
-            else
-            {
-                TimeSpan remaining = _deadline - DateTime.UtcNow;
-                if (remaining <= TimeSpan.Zero)
-                {
-                    return TimeSpan.Zero;
-                }
-                else
-                {
-                    return remaining;
-                }
-            }
-        }
-        public void SetTimer(TimerCallback callback, Object state)
-        {
-            Timer timer = new Timer(callback, state, TimeoutHelper.ToMilliseconds(this.RemainingTime()), Timeout.Infinite);
-        }
-
-        public static TimeSpan FromMilliseconds(int milliseconds)
-        {
-            if (milliseconds == Timeout.Infinite)
-            {
-                return TimeSpan.MaxValue;
-            }
-            else
-            {
-                return TimeSpan.FromMilliseconds(milliseconds);
-            }
-        }
-
-        public static int ToMilliseconds(TimeSpan timeout)
-        {
-            if (timeout == TimeSpan.MaxValue)
-            {
-                return Timeout.Infinite;
-            }
-            else
-            {
-                long ticks = Ticks.FromTimeSpan(timeout);
-                if (ticks / TimeSpan.TicksPerMillisecond > int.MaxValue)
-                {
-                    return int.MaxValue;
-                }
-                return Ticks.ToMilliseconds(ticks);
-            }
-        }
-
-        public static TimeSpan Add(TimeSpan timeout1, TimeSpan timeout2)
-        {
-            return Ticks.ToTimeSpan(Ticks.Add(Ticks.FromTimeSpan(timeout1), Ticks.FromTimeSpan(timeout2)));
-        }
-
-        public static DateTime Add(DateTime time, TimeSpan timeout)
-        {
-            if (timeout >= TimeSpan.Zero && DateTime.MaxValue - time <= timeout)
-            {
-                return DateTime.MaxValue;
-            }
-            if (timeout <= TimeSpan.Zero && DateTime.MinValue - time >= timeout)
-            {
-                return DateTime.MinValue;
-            }
-            return time + timeout;
-        }
-
-        public static DateTime Subtract(DateTime time, TimeSpan timeout)
-        {
-            return Add(time, TimeSpan.Zero - timeout);
-        }
-
-        public static TimeSpan Divide(TimeSpan timeout, int factor)
-        {
-            if (timeout == TimeSpan.MaxValue)
-            {
-                return TimeSpan.MaxValue;
-            }
-
-            return Ticks.ToTimeSpan((Ticks.FromTimeSpan(timeout) / factor) + 1);
-        }
-
-        public static bool WaitOne(WaitHandle waitHandle, TimeSpan timeout, bool exitSync)
-        {
-            if (timeout == TimeSpan.MaxValue)
-            {
-                waitHandle.WaitOne();
-                return true;
-            }
-            else
-            {
-                TimeSpan maxWait = TimeSpan.FromMilliseconds(Int32.MaxValue);
-
-                while (timeout > maxWait)
-                {
-                    bool signaled = waitHandle.WaitOne(maxWait, exitSync);
-
-                    if (signaled)
-                    {
-                        return true;
-                    }
-
-                    timeout -= maxWait;
-                }
-
-                return waitHandle.WaitOne(timeout, exitSync);
-            }
-        }
-
-        private static class Ticks
-        {
-            public static long FromMilliseconds(int milliseconds)
-            {
-                return (long)milliseconds * TimeSpan.TicksPerMillisecond;
-            }
-
-            public static int ToMilliseconds(long ticks)
-            {
-                return checked((int)(ticks / TimeSpan.TicksPerMillisecond));
-            }
-
-            public static long FromTimeSpan(TimeSpan duration)
-            {
-                return duration.Ticks;
-            }
-
-            public static TimeSpan ToTimeSpan(long ticks)
-            {
-                return new TimeSpan(ticks);
-            }
-
-            public static long Add(long firstTicks, long secondTicks)
-            {
-                if (firstTicks == long.MaxValue || firstTicks == long.MinValue)
-                {
-                    return firstTicks;
-                }
-                if (secondTicks == long.MaxValue || secondTicks == long.MinValue)
-                {
-                    return secondTicks;
-                }
-                if (firstTicks >= 0 && long.MaxValue - firstTicks <= secondTicks)
-                {
-                    return long.MaxValue - 1;
-                }
-                if (firstTicks <= 0 && long.MinValue - firstTicks >= secondTicks)
-                {
-                    return long.MinValue + 1;
-                }
-                return checked(firstTicks + secondTicks);
-            }
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UnderstoodHeaders.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UnderstoodHeaders.cs
index 33fc245d89b..7b0fa6a0c4d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UnderstoodHeaders.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UnderstoodHeaders.cs
@@ -2,8 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UniqueType.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UniqueType.cs
index 78a6777b69b..e7d98b0965b 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UniqueType.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/UniqueType.cs
@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 
-
-
 public class UniqueType
 {
     public string stringValue;
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/VerifyWebSockets.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/VerifyWebSockets.cs
index 77a4c525770..5129509b6f1 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/VerifyWebSockets.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/VerifyWebSockets.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSDuplexService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSDuplexService.cs
index 52a4ad97b40..1128a3b463e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSDuplexService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSDuplexService.cs
@@ -2,12 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.ServiceModel;
 using System.Threading;
 using System.Threading.Tasks;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSRequestReplyService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSRequestReplyService.cs
index 0b233eb94a2..066d83ce069 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSRequestReplyService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WSRequestReplyService.cs
@@ -2,13 +2,18 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net.NetworkInformation;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.Threading;
+#endif
+using System.Net.NetworkInformation;
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfChannelExtensibilityService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfChannelExtensibilityService.cs
deleted file mode 100644
index 3d74a9b9eab..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfChannelExtensibilityService.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Samples.MessageInterceptor;
-using System.ServiceModel;
-using System.ServiceModel.Channels;
-
-namespace WcfService
-{
-    [ServiceBehavior(AddressFilterMode = AddressFilterMode.Any)]
-    public class WcfChannelExtensiblityService : IWcfChannelExtensibilityContract
-    {
-        public void ReportWindSpeed(int speed)
-        {
-            // All the real work for this test is done in DroppingServerInterceptor.OnReceive
-        }
-    }
-
-    internal class DroppingServerElement : InterceptingElement
-    {
-        protected override ChannelMessageInterceptor CreateMessageInterceptor()
-        {
-            return new DroppingServerInterceptor();
-        }
-    }
-
-    public class DroppingServerInterceptor : ChannelMessageInterceptor
-    {
-        public DroppingServerInterceptor() { }
-
-        public override void OnReceive(ref Message msg)
-        {
-            // Verify the additional Header inserted by the ChannelMessageInterceptor exists
-            if (msg.Headers.FindHeader("ByPass", "urn:InterceptorNamespace") > 0)
-            {
-                return;
-            }
-            // Drop incoming Message if the Message does not have the special header
-            msg = null;
-        }
-
-        public override ChannelMessageInterceptor Clone()
-        {
-            return new DroppingServerInterceptor();
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDecompService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDecompService.cs
index 3e0963f74e5..cef3f1966bf 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDecompService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDecompService.cs
@@ -2,14 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Web;
 using System.Text;
+#endif
+using System.Net;
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDuplexService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDuplexService.cs
index 514c34c55e0..34258a29ecb 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDuplexService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfDuplexService.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.IO;
 using System.ServiceModel;
 using System.Threading.Tasks;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfReliableService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfReliableService.cs
index 8dff3d234eb..ea8a7f274d6 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfReliableService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfReliableService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
 using System.Threading;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfRestartService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfRestartService.cs
index 586c7bf8cb2..0bf99d5f3ad 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfRestartService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfRestartService.cs
@@ -2,14 +2,47 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
     public class WcfRestartService : IWcfRestartService
     {
+#if NET
+        public static Dictionary<Guid, IWebHost> webHostDictionary = new Dictionary<Guid, IWebHost>();
+
+        public string RestartService(Guid uniqueIdentifier)
+        {
+            IWebHost host;
+
+            if (!webHostDictionary.TryGetValue(uniqueIdentifier, out host))
+            {
+                throw new FaultException(String.Format("Failed to get the ServiceHost from the Dictionary.\nThe provided Guid did not match any key in the Dictionary.\nThe provided Guid was: {0}", uniqueIdentifier.ToString()));
+            }
+
+            host.StopAsync().Wait();
+            // cleanup dictionary
+            webHostDictionary.Remove(uniqueIdentifier);
+            return "This should never get back to the client.";
+        }
+
+        public string NonRestartService(Guid uniqueIdentifier)
+        {
+            IWebHost host;
+
+            if (!webHostDictionary.TryGetValue(uniqueIdentifier, out host))
+            {
+                throw new FaultException(String.Format("Failed to get the ServiceHost from the Dictionary.\nThe provided Guid did not match any key in the Dictionary.\nThe provided Guid was: {0}", uniqueIdentifier.ToString()));
+            }
+            return "Success!";
+        }
+#else
         public static Dictionary<Guid, ServiceHost> serviceHostDictionary = new Dictionary<Guid, ServiceHost>();
 
         public string RestartService(Guid uniqueIdentifier)
@@ -36,5 +69,6 @@ public string NonRestartService(Guid uniqueIdentifier)
             }
             return "Success!";
         }
+#endif
     }
 }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.4.4.0.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.4.4.0.cs
index 5ae0e7ba680..dbfd23b4abb 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.4.4.0.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.cs
index dc233de69ac..ab479bb46c3 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfService.cs
@@ -2,15 +2,24 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Configuration;
+using CoreWCF.Web;
+using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+#else
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
-using System.Security.Principal;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Web;
+#endif
+using System.Net;
+using System.Security.Principal;
 using System.Text;
 
 namespace WcfService
@@ -238,6 +247,44 @@ public TestHttpRequestMessageProperty EchoHttpRequestMessageProperty()
             return null;
         }
 
+#if NET
+        public string GetRestartServiceEndpoint()
+        {
+            Guid guid = Guid.NewGuid();
+            string localHost = "http://localhost:0";
+            string path = "WindowsCommunicationFoundationTest";
+            string endpointAddress = $"/{path}/{guid}";
+
+            IWebHost host = WebHost.CreateDefaultBuilder().UseKestrel(options =>
+            {
+                options.Listen(IPAddress.Loopback, 0);
+            }).ConfigureServices(services =>
+            {
+                services.AddServiceModelServices();
+
+            }).Configure(app =>
+            {
+                string serviceEndpointAddress = $"{localHost}/{path}/{guid}";
+                app.UseServiceModel(builder =>
+                {
+                    builder.AddService<WcfRestartService>()
+                    .AddServiceEndpoint<WcfRestartService, IWcfRestartService>(new BasicHttpBinding(BasicHttpSecurityMode.None), serviceEndpointAddress);
+                });
+            }).Build();
+
+            host.Start();
+
+            // Add the WebHost instance to a static dictionary so that it can be used by restart service operation to close the WebHost
+            WcfRestartService.webHostDictionary.Add(guid, host);
+
+            var address = host.ServerFeatures.Get<IServerAddressesFeature>().Addresses.FirstOrDefault();
+            var port = new Uri(address).Port;
+
+            // Return the unique endpoint for this WebHost instance of the WcfRestartService
+            return "http://[HOST]:" + port + endpointAddress;
+        }
+
+#else
         public string GetRestartServiceEndpoint()
         {
             BasicHttpBinding binding = new BasicHttpBinding();
@@ -256,6 +303,7 @@ public string GetRestartServiceEndpoint()
             // Return the unique endpoint for this ServiceHost instance of the WcfRestartService
             return "http://[HOST]" + path;
         }
+#endif
 
         public string GetRequestCustomHeader(string customHeaderName, string customHeaderNamespace)
         {
@@ -473,7 +521,7 @@ public System.Threading.Tasks.Task EchoReturnTask()
         {
             return System.Threading.Tasks.Task.Run(() =>
             {
-                System.Threading.Tasks.Task.Delay(1).Wait();                
+                System.Threading.Tasks.Task.Delay(1).Wait();
             });
         }
     }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfSoapService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfSoapService.cs
index e560d247647..a86d8133a6a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfSoapService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfSoapService.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
+#endif
 using System.Xml.Serialization;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfWebSocketService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfWebSocketService.cs
index 2f8cbcd14d7..ac49d315c65 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfWebSocketService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/WcfWebSocketService.cs
@@ -2,14 +2,20 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
 using System.Threading.Tasks;
+#endif
 
 namespace WcfService
 {
+#if !NET
     [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
+#endif
     public class WcfWebSocketService : IWcfDuplexService
     {
         public static IWcfDuplexServiceCallback callback;
@@ -21,7 +27,9 @@ public void Ping(Guid guid)
         }
     }
 
+#if !NET
     [AspNetCompatibilityRequirements(RequirementsMode = AspNetCompatibilityRequirementsMode.Allowed)]
+#endif
     public class WcfWebSocketTransportUsageAlwaysService : IWcfDuplexService
     {
         public static IWcfDuplexServiceCallback callback;
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlElementMessageHeader.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlElementMessageHeader.cs
index 4ab100d13e7..da56f44eae3 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlElementMessageHeader.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlElementMessageHeader.cs
@@ -2,8 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 using System.Xml.Serialization;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerFormatAttrServices.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerFormatAttrServices.cs
index c1b8a5c1058..c84f61ead11 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerFormatAttrServices.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerFormatAttrServices.cs
@@ -2,11 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Collections.Concurrent;
 using System.IO;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Collections.Concurrent;
 using System.Xml;
 using System.Xml.Serialization;
 
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerializerFormatAttribute.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerializerFormatAttribute.cs
index 1df3ae1c99a..4ee2f227080 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerializerFormatAttribute.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/XmlSerializerFormatAttribute.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System.ServiceModel;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/mahjong.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/mahjong.cs
index b077823c6a9..906587a515a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/mahjong.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/mahjong.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System.Runtime.Serialization;
+#endif
 
 namespace WcfService
 {
@@ -80,4 +82,4 @@ public enum ErrorCode
             UserNotAuthenticated = 0x191
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/AuthenticationResourceHelper.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/AuthenticationResourceHelper.cs
index 8e55fd085a2..c0f149e3137 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/AuthenticationResourceHelper.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/AuthenticationResourceHelper.cs
@@ -2,12 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+using CoreWCF.IdentityModel.Selectors;
+using CoreWCF.IdentityModel.Tokens;
+using CoreWCF.Security;
+#else
 using System;
 using System.IdentityModel.Selectors;
 using System.IdentityModel.Tokens;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
 
 namespace WcfService
 {
@@ -101,6 +108,7 @@ public override string GetRealm(ref Message message)
 
         private class SideChannelHeaderUserNamePasswordValidator : UserNamePasswordValidator
         {
+            [Obsolete]
             public override void Validate(string userName, string password)
             {
                 char[] usernameArr = userName.ToCharArray();
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicAuthTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicAuthTestServiceHost.cs
index 7d7d5f01b6e..ba3b0b13211 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicAuthTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicAuthTestServiceHost.cs
@@ -2,9 +2,13 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpService1Host.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpService1Host.cs
index 182f7d5b8b9..50a696f20c7 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpService1Host.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpService1Host.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpSoapTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpSoapTestServiceHost.cs
index a616f682ba8..ce754b333a4 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpSoapTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpSoapTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.4.4.0.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.4.4.0.cs
index d1661221a90..314a7791178 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.4.4.0.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.4.4.0.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.cs
index 4e5384e60d1..31d8b603519 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpXmlSerFormatAttrServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpXmlSerFormatAttrServiceHost.cs
index 0a8a497b6c3..3a73678a6ab 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpXmlSerFormatAttrServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpXmlSerFormatAttrServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsBindingTransportWithMessageCredentialsCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsBindingTransportWithMessageCredentialsCertTestServiceHost.cs
index 80564cec68d..a1b0d675394 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsBindingTransportWithMessageCredentialsCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsBindingTransportWithMessageCredentialsCertTestServiceHost.cs
@@ -2,10 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTestServiceHost.cs
index 5e83c6bb0d6..b071ed0a6f8 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs
index 6f64fb6dc9d..313c132c3b9 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs
@@ -2,10 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsUserNameTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsUserNameTestServiceHost.cs
index f367b965530..3efc412b4b3 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsUserNameTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/BasicHttpsTransportSecurityMessageCredentialsUserNameTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ChannelExtensibilityTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ChannelExtensibilityTestServiceHost.cs
deleted file mode 100644
index 683eb15627e..00000000000
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ChannelExtensibilityTestServiceHost.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Samples.MessageInterceptor;
-using System;
-using System.ServiceModel.Channels;
-
-namespace WcfService
-{
-    [TestServiceDefinition(Schema = ServiceSchema.HTTP, BasePath = "ChannelExtensibility.svc")]
-    public class ChannelExtensibilityServiceHost : TestServiceHostBase<IWcfChannelExtensibilityContract>
-    {
-        protected override string Address { get { return "ChannelExtensibility"; } }
-
-        protected override Binding GetBinding()
-        {
-            return new CustomBinding(new InterceptingBindingElement(new DroppingServerInterceptor()), new HttpTransportBindingElement());
-        }
-
-        public ChannelExtensibilityServiceHost(params Uri[] baseAddresses)
-            : base(typeof(WcfChannelExtensiblityService), baseAddresses)
-        {
-        }
-    }
-}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderBufferedServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderBufferedServiceHost.cs
index 985318c166b..acc1691923e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderBufferedServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderBufferedServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderStreamedServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderStreamedServiceHost.cs
index 092643aaef6..b8b61db2562 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderStreamedServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextEncoderStreamedServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageBindingElement.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageBindingElement.cs
index e9f1a7793ac..d53bb7e67ad 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageBindingElement.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageBindingElement.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Xml;
 
 namespace WcfService
@@ -40,7 +44,7 @@ public CustomTextMessageBindingElement(string encoding, string mediaType, Messag
         }
 
         public CustomTextMessageBindingElement(string encoding, string mediaType)
-    : this(encoding, mediaType, System.ServiceModel.Channels.MessageVersion.Soap12WSAddressing10)
+    : this(encoding, mediaType, MessageVersion.Soap12WSAddressing10)
         {
         }
 
@@ -116,6 +120,7 @@ public override BindingElement Clone()
             return new CustomTextMessageBindingElement(this);
         }
 
+#if !NET
         public override IChannelFactory<TChannel> BuildChannelFactory<TChannel>(BindingContext context)
         {
             if (context == null)
@@ -150,6 +155,7 @@ public override bool CanBuildChannelListener<TChannel>(BindingContext context)
             context.BindingParameters.Add(this);
             return context.CanBuildInnerChannelListener<TChannel>();
         }
+#endif
 
         public override T GetProperty<T>(BindingContext context)
         {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoder.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoder.cs
index e4ee23c197e..f59021e4ce7 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoder.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoder.cs
@@ -2,15 +2,19 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.IO;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 using System.Xml;
 
 namespace WcfService
 {
-    internal class CustomTextMessageEncoder : System.ServiceModel.Channels.MessageEncoder
+    internal class CustomTextMessageEncoder : MessageEncoder
     {
         private CustomTextMessageEncoderFactory _factory;
         private XmlWriterSettings _writerSettings;
@@ -50,6 +54,63 @@ public override MessageVersion MessageVersion
             }
         }
 
+#if NET
+        public override Message ReadMessage(ArraySegment<byte> buffer, BufferManager bufferManager, string contentType)
+        {
+            XmlReader reader = XmlReader.Create(new MemoryStream(buffer.Array, buffer.Offset, buffer.Count));
+            Message message = Message.CreateMessage(reader, int.MaxValue, MessageVersion);
+            bufferManager.ReturnBuffer(buffer.Array);
+
+            return message;
+        }
+
+        public override async Task<Message> ReadMessageAsync(Stream stream, int maxSizeOfHeaders, string contentType)
+        {
+            XmlReaderSettings settings = new XmlReaderSettings
+            {
+                Async = true
+            };
+
+            XmlReader reader = XmlReader.Create(stream, settings);
+            Message message = Message.CreateMessage(reader, maxSizeOfHeaders, MessageVersion);
+            return await Task.FromResult(message);
+        }
+
+        public override ArraySegment<byte> WriteMessage(Message message, int maxMessageSize, BufferManager bufferManager, int messageOffset)
+        {
+            MemoryStream memoryStream = new MemoryStream();
+            XmlWriter xmlWriter = XmlWriter.Create(memoryStream, _writerSettings);
+
+            message.WriteMessage(xmlWriter);
+            xmlWriter.Flush();
+            xmlWriter.Dispose();
+
+            int messageLength = (int)memoryStream.Length;
+            int totalLength = messageLength + messageOffset;
+
+            byte[] totalBuffer = bufferManager.TakeBuffer(totalLength);
+
+            ArraySegment<byte> messageBytes = new ArraySegment<byte>(memoryStream.GetBuffer(), 0, messageLength);
+            Buffer.BlockCopy(messageBytes.Array, 0, totalBuffer, messageOffset, messageLength);
+
+            return new ArraySegment<byte>(totalBuffer, messageOffset, messageLength);
+        }
+
+        public override async Task WriteMessageAsync(Message message, Stream stream)
+        {
+            XmlWriterSettings settings = new XmlWriterSettings
+            {
+                Async = true,
+                CloseOutput = false
+            };
+
+            await using (XmlWriter xmlWriter = XmlWriter.Create(stream, settings))
+            {
+                message.WriteMessage(xmlWriter);
+                await xmlWriter.FlushAsync();
+            }
+        }
+#else
         public override Message ReadMessage(Stream stream, int maxSizeOfHeaders, string contentType)
         {
             XmlReader reader = XmlReader.Create(stream);
@@ -102,5 +163,6 @@ public override ArraySegment<byte> WriteMessage(Message message, int maxMessageS
             ArraySegment<byte> byteArray = new ArraySegment<byte>(totalBytes, messageOffset, messageLength);
             return byteArray;
         }
+#endif
     }
 }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoderFactory.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoderFactory.cs
index 942348613c2..631dc9c32ec 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoderFactory.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/CustomTextMessageEncoderFactory.cs
@@ -2,13 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
     internal class CustomTextMessageEncoderFactory : MessageEncoderFactory
     {
-        private System.ServiceModel.Channels.MessageEncoder _encoder;
+        private MessageEncoder _encoder;
         private MessageVersion _version;
         private string _mediaType;
         private string _charSet;
@@ -21,7 +25,7 @@ internal CustomTextMessageEncoderFactory(string mediaType, string charSet, Messa
             _encoder = new CustomTextMessageEncoder(this);
         }
 
-        public override System.ServiceModel.Channels.MessageEncoder Encoder
+        public override MessageEncoder Encoder
         {
             get
             {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DataContractResolverTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DataContractResolverTestServiceHost.cs
index d44199820da..f93f81517f4 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DataContractResolverTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DataContractResolverTestServiceHost.cs
@@ -1,8 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Description;
+#else
 using System;
 using System.Linq;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DefaultCustomHttpTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DefaultCustomHttpTestServiceHost.cs
index 1aff2807d75..aa866476050 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DefaultCustomHttpTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DefaultCustomHttpTestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DuplexTestServiceHosts.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DuplexTestServiceHosts.cs
index dc550edc729..26cdfcae321 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DuplexTestServiceHosts.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/DuplexTestServiceHosts.cs
@@ -2,11 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -17,7 +23,7 @@ public class DuplexTestServiceHost : TestServiceHostBase<IWcfDuplexService>
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexTestServiceHost(params Uri[] baseAddresses)
@@ -33,7 +39,7 @@ public class DuplexCallbackTestServiceHost : TestServiceHostBase<IDuplexChannelS
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexCallbackTestServiceHost(params Uri[] baseAddresses)
@@ -49,7 +55,7 @@ public class DuplexChannelCallbackReturnTestServiceHost : TestServiceHostBase<IW
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexChannelCallbackReturnTestServiceHost(params Uri[] baseAddresses)
@@ -65,7 +71,7 @@ public class DuplexCallbackDataContractComplexTypeTestServiceHost : TestServiceH
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexCallbackDataContractComplexTypeTestServiceHost(params Uri[] baseAddresses)
@@ -81,7 +87,7 @@ public class DuplexCallbackXmlComplexTypeTestServiceHost : TestServiceHostBase<I
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexCallbackXmlComplexTypeTestServiceHost(params Uri[] baseAddresses)
@@ -106,13 +112,10 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
             // Ensure the https certificate is installed before this endpoint resource is used
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
-
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+            
             this.Credentials.ClientCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                      StoreName.My,
-                                                      X509FindType.FindByThumbprint,
-                                                      thumbprint);
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public DuplexCallbackTcpCertificateCredentialTestServiceHost(params Uri[] baseAddresses)
@@ -128,7 +131,7 @@ public class DuplexCallbackConcurrencyModeServiceHost : TestServiceHostBase<IWcf
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexCallbackConcurrencyModeServiceHost(params Uri[] baseAddresses)
@@ -144,7 +147,7 @@ public class DuplexCallbackDebugBahaviorServiceHost : TestServiceHostBase<IWcfDu
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexCallbackDebugBahaviorServiceHost(params Uri[] baseAddresses)
@@ -160,7 +163,7 @@ public class DuplexCallbackErrorHandlerServiceHost : TestServiceHostBase<IWcfDup
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public DuplexCallbackErrorHandlerServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernamePasswordValidator.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernamePasswordValidator.cs
index b66ca9eed97..ea2734b4f50 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernamePasswordValidator.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernamePasswordValidator.cs
@@ -2,12 +2,18 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.IdentityModel.Selectors;
+#else
+using System;
 using System.IdentityModel.Selectors;
+#endif
 
 namespace WcfService
 {
     internal class AcceptAnyUsernamePasswordValidator : UserNamePasswordValidator
     {
+        [Obsolete]
         public override void Validate(string userName, string password)
         {
             // Do Nothing as we accept anything
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernameSecurityTokenHandler.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernameSecurityTokenHandler.cs
index 3bdd7945c92..de98d4d5999 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernameSecurityTokenHandler.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/AcceptAnyUsernameSecurityTokenHandler.cs
@@ -2,10 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.IdentityModel.Tokens;
+#else
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IdentityModel.Tokens;
+#endif
+using System.Collections.ObjectModel;
 using System.Security.Claims;
 using System.Security.Principal;
 using System.Xml;
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/BasicAuthenticationBindingElement.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/BasicAuthenticationBindingElement.cs
index 6fe0959ee7b..b26e343678c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/BasicAuthenticationBindingElement.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/BasicAuthenticationBindingElement.cs
@@ -2,21 +2,22 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
-using System.Collections.ObjectModel;
-using System.Globalization;
 using System.IdentityModel.Policy;
 using System.IdentityModel.Selectors;
 using System.IdentityModel.Tokens;
-using System.Net;
-using System.Reflection;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Security;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Net;
+using System.Reflection;
+using System.Text;
 
 namespace WcfService
 {
@@ -607,3 +608,4 @@ internal static Task<TResult> ToApm<TResult>(this Task<TResult> task, AsyncCallb
         }
     }
 }
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/FederationSTSServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/FederationSTSServiceHost.cs
index 357248f031e..3a8c049e75c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/FederationSTSServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/FederationSTSServiceHost.cs
@@ -2,15 +2,23 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.IdentityModel.Tokens;
+using CoreWCF.Security;
+using Microsoft.Extensions.Hosting.Internal;
+#else
 using System;
 using System.Collections.Generic;
 using System.IdentityModel.Configuration;
 using System.IdentityModel.Tokens;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
 using System.Web.Hosting;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs
index ce609e3f9df..1d4fe1e31e2 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs
@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.IdentityModel.Tokens;
+#else
 using System.IdentityModel.Tokens;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/SelfHostSecurityTokenService.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/SelfHostSecurityTokenService.cs
index 80ca93c1073..c314d7d3631 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/SelfHostSecurityTokenService.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Federation/SelfHostSecurityTokenService.cs
@@ -2,12 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+#else
 using System;
 using System.IdentityModel;
 using System.IdentityModel.Configuration;
 using System.IdentityModel.Protocols.WSTrust;
-using System.Security.Claims;
 using System.ServiceModel;
+#endif
+using System.Security.Claims;
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpBinaryTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpBinaryTestServiceHost.cs
index 9db13ee3029..1beff8574cf 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpBinaryTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpBinaryTestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpDigestNoDomainTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpDigestNoDomainTestServiceHost.cs
index aab80d3e2d4..bc763f227c1 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpDigestNoDomainTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpDigestNoDomainTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
@@ -17,13 +22,19 @@ protected override Binding GetBinding()
         {
             var binding = new BasicHttpBinding(BasicHttpSecurityMode.None);
             binding.Security.Transport.ClientCredentialType = HttpClientCredentialType.None;
+#if NET
+            binding.Security.Mode = BasicHttpSecurityMode.TransportCredentialOnly;
+            binding.Security.Transport.ClientCredentialType = HttpClientCredentialType.Digest;
+#endif
             return binding;
         }
 
         protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
+#if !NET
             AuthenticationResourceHelper.ConfigureServiceHostUseDigestAuth(this);
+#endif
         }
 
         public HttpDigestNoDomainTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11TestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11TestServiceHost.cs
index 08f52f5d5dd..72f034a7ee5 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11TestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11TestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA10TestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA10TestServiceHost.cs
index ba805d25464..7d1d853c304 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA10TestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA10TestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA2004ServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA2004ServiceHost.cs
index 48256abb521..f741980957b 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA2004ServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap11WSA2004ServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12TestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12TestServiceHost.cs
index 5ff43cb74b1..6bac8ec4b53 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12TestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12TestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSA2004ServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSA2004ServiceHost.cs
index 113d2a443d2..c1781d7a630 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSA2004ServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSA2004ServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSANoneTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSANoneTestServiceHost.cs
index 181e14e7ebd..f2f23f31dce 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSANoneTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpSoap12WSANoneTestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpWindowsTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpWindowsTestServiceHost.cs
index 38b534005e0..6c7b7199c73 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpWindowsTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpWindowsTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationChainTrustTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationChainTrustTestServiceHost.cs
index 813bb02b0d1..20a8dc14768 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationChainTrustTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationChainTrustTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -26,12 +31,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                                StoreName.My,
-                                                                X509FindType.FindByThumbprint,
-                                                                certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public HttpsCertificateValidationChainTrustTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationPeerTrustTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationPeerTrustTestServiceHost.cs
index fa72da7554a..c04c8d75dda 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationPeerTrustTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsCertificateValidationPeerTrustTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -26,12 +31,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.TrustedPeople, StoreLocation.LocalMachine, "WCF Bridge - UserPeerTrustCertificateResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.TrustedPeople,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.TrustedPeople, StoreLocation.LocalMachine, "WCF Bridge - UserPeerTrustCertificateResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public HttpsCertificateValidationPeerTrustTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsClientCertificateTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsClientCertificateTestServiceHost.cs
index 3f5889e11b9..bfcb84eff7e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsClientCertificateTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsClientCertificateTestServiceHost.cs
@@ -2,15 +2,24 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
 
 namespace WcfService
 {
     [TestServiceDefinition(Schema = ServiceSchema.HTTPS, BasePath = "ClientCertificateAccepted/HttpsClientCertificate.svc")]
+#if NET
+    [TestServiceDefinition(Schema = ServiceSchema.WSS, BasePath = "ClientCertificateAccepted/HttpsClientCertificate.svc")]
+#endif
     public class HttpsClientCertificateTestServiceHost : TestServiceHostBase<IWcfService>
     {
         protected override IList<Binding> GetBindings()
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsDigestTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsDigestTestServiceHost.cs
index 472968658f7..fe36593532a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsDigestTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsDigestTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsNtlmTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsNtlmTestServiceHost.cs
index e4eea6ebfcf..0d6a7b0b80e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsNtlmTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsNtlmTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap11TestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap11TestServiceHost.cs
index ab1bd33e236..a10b1da2926 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap11TestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap11TestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap12TestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap12TestServiceHost.cs
index dcc2a947904..64c9f849966 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap12TestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsSoap12TestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs
index 000ab1a0e5e..621ac899b0d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs
@@ -2,11 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs
index 4e33eb0e070..1dd0b392b54 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsWindowsTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsWindowsTestServiceHost.cs
index 8606aac0149..d5eb20c8c84 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsWindowsTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/HttpsWindowsTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpTestServiceHost.cs
index 2569c367bcb..7465833fa89 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpsTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpsTestServiceHost.cs
index e72615a819c..3c65e550606 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpsTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/NetHttpsTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionDuplexTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionDuplexTestServiceHost.cs
index 213164e1b9d..04170580ff0 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionDuplexTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionDuplexTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionOneWayTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionOneWayTestServiceHost.cs
index c95b7861fae..4507d468a22 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionOneWayTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionOneWayTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionTestServiceHost.cs
index 8d1dc58590a..089ef617d75 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ReliableSessionTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/RequestLoggingServiceBehavior.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/RequestLoggingServiceBehavior.cs
index ae5dc51e38e..a71215546d3 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/RequestLoggingServiceBehavior.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/RequestLoggingServiceBehavior.cs
@@ -4,12 +4,19 @@
 
 // 
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Description;
+using CoreWCF.Dispatcher;
+#else
 using System;
-using System.Collections.ObjectModel;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
 using System.ServiceModel.Dispatcher;
+#endif
+using System.Collections.ObjectModel;
 using System.Text;
 
 namespace WcfService
@@ -115,6 +122,7 @@ public RequestLoggingAuthenticationWrapper(RequestLoggingServiceBehavior request
                 _parent = parent;
             }
 
+            [Obsolete]
             public override bool CheckAccess(OperationContext operationContext, ref Message message)
             {
                 bool success = false;
@@ -137,4 +145,4 @@ public override bool CheckAccess(OperationContext operationContext, ref Message
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Saml2IssuedTokenTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Saml2IssuedTokenTestServiceHost.cs
index ff095efafd0..ab82ea5734b 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Saml2IssuedTokenTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/Saml2IssuedTokenTestServiceHost.cs
@@ -2,14 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.IdentityModel.Tokens;
+using CoreWCF.Security;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
 using System.IdentityModel.Tokens;
 using System.Collections.Generic;
 using System.Diagnostics;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ServiceContractAsyncTestServiceHosts.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ServiceContractAsyncTestServiceHosts.cs
index 37b0fcf87fc..35ab3b531a7 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ServiceContractAsyncTestServiceHosts.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/ServiceContractAsyncTestServiceHosts.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateValidationPeerTrustTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateValidationPeerTrustTestServiceHost.cs
index 728f53f4ee3..95d3360c17f 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateValidationPeerTrustTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateValidationPeerTrustTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpCertificateValidationPeerTrustTestServiceHost : TestServiceHostB
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.TrustedPeople, StoreLocation.LocalMachine, "WCF Bridge - UserPeerTrustCertificateResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.TrustedPeople,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.TrustedPeople, StoreLocation.LocalMachine, "WCF Bridge - UserPeerTrustCertificateResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpCertificateValidationPeerTrustTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithServerAltNameTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithServerAltNameTestServiceHost.cs
index 7a3d9a8ac18..9610db22bed 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithServerAltNameTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithServerAltNameTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpCertificateWithServerAltNameTestServiceHost : TestServiceHostBas
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithServerAltNameResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithServerAltNameResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpCertificateWithServerAltNameTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameDomainNameTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameDomainNameTestServiceHost.cs
index 06e54f3edd2..acc659e309f 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameDomainNameTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameDomainNameTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpCertificateWithSubjectCanonicalNameDomainNameTestServiceHost : T
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithSubjectCanonicalNameDomainNameResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithSubjectCanonicalNameDomainNameResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpCertificateWithSubjectCanonicalNameDomainNameTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameFqdnTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameFqdnTestServiceHost.cs
index 156b6482110..36febed16cf 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameFqdnTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameFqdnTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -17,7 +22,7 @@ public class TcpCertificateWithSubjectCanonicalNameFqdnTestServiceHost : TestSer
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -28,14 +33,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            {
-                string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithSubjectCanonicalNameFqdnResource").Thumbprint;
-
-                this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
-            }
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithSubjectCanonicalNameFqdnResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpCertificateWithSubjectCanonicalNameFqdnTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameLocalhostTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameLocalhostTestServiceHost.cs
index e67da3576bf..6cbdb902cbc 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameLocalhostTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpCertificateWithSubjectCanonicalNameLocalhostTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpCertificateWithSubjectCanonicalNameLocalhostTestServiceHost : Te
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithSubjectCanonicalNameLocalhostResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpCertificateWithSubjectCanonicalNameLocalhostResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpCertificateWithSubjectCanonicalNameLocalhostTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs
index b84f4a42a34..4584407bfe7 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpDefaultResourceTestServiceHost.cs
@@ -2,11 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.Web.Hosting;
+#endif
 
 namespace WcfService
 {
@@ -17,23 +22,27 @@ protected override IList<Binding> GetBindings()
         {
             var bindings = new List<Binding>();
             bindings.Add(GetNetTcpBinding());
+
+#if !NET
             if (!HostingEnvironment.IsHosted)
             {
                 bindings.Add(GetNetNamedPipeBinding());
             }
-
+#endif
             return bindings;
         }
 
         private Binding GetNetTcpBinding()
         {
-            return new NetTcpBinding() { PortSharingEnabled = false, Name = "tcp-default" };
+            return new NetTcpBinding() { Name = "tcp-default" };
         }
 
+#if !NET
         private Binding GetNetNamedPipeBinding()
         {
             return new NetNamedPipeBinding() { Name = "namedpipe-default" };
         }
+#endif
 
         public TcpDefaultResourceTestServiceHost(params Uri[] baseAddresses)
             : base(typeof(WcfService), baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpExpiredServerCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpExpiredServerCertTestServiceHost.cs
index 63b3c0a4acb..806cbc6a73a 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpExpiredServerCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpExpiredServerCertTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpExpiredServerCertTestServiceHost : TestServiceHostBase<IWcfServi
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpExpiredServerCertResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpExpiredServerCertResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpExpiredServerCertTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpInvalidEkuServerCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpInvalidEkuServerCertTestServiceHost.cs
index 2aa6fcc1a62..c4868252a6b 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpInvalidEkuServerCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpInvalidEkuServerCertTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpInvalidEkuServerCertTestServiceHost : TestServiceHostBase<IWcfSe
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpInvalidEkuServerCert").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        thumbprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpInvalidEkuServerCert");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpInvalidEkuServerCertTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs
index 6ba1a69e33d..c6e2efaeb20 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTestServiceHost.cs
@@ -2,11 +2,16 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.Web.Hosting;
+#endif
 
 namespace WcfService
 {
@@ -17,23 +22,27 @@ protected override IList<Binding> GetBindings()
         {
             var bindings = new List<Binding>();
             bindings.Add(GetNetTcpBinding());
+
+#if !NET
             if (!HostingEnvironment.IsHosted)
             {
                 bindings.Add(GetNetNamedPipeBinding());
             }
-
+#endif
             return bindings;
         }
 
         private Binding GetNetTcpBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false , Name = "tcp-nosecurity" };
+            return new NetTcpBinding(SecurityMode.None) { Name = "tcp-nosecurity" };
         }
 
+#if !NET
         private Binding GetNetNamedPipeBinding()
         {
             return new NetNamedPipeBinding(NetNamedPipeSecurityMode.None) { Name = "namedpipe-nosecurity" };
         }
+#endif
 
         public TcpNoSecurityTestServiceHost(params Uri[] baseAddresses)
             : base(typeof(WcfService), baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTextTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTextTestServiceHost.cs
index 7cc94f70f38..f58c399300b 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTextTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpNoSecurityTextTestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
@@ -14,7 +18,7 @@ public class TcpNoSecurityTextTestServiceHost : TestServiceHostBase<IWcfService>
 
         protected override Binding GetBinding()
         {
-            return new CustomBinding(new TextMessageEncodingBindingElement(), new TcpTransportBindingElement() { PortSharingEnabled = false });
+            return new CustomBinding(new TextMessageEncodingBindingElement(), new TcpTransportBindingElement());
         }
 
         public TcpNoSecurityTextTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpRevokedServerCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpRevokedServerCertTestServiceHost.cs
index 9c4c29368bd..a813cbcb54e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpRevokedServerCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpRevokedServerCertTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpRevokedServerCertTestServiceHost : TestServiceHostBase<IWcfServi
 
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpRevokedServerCertResource").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        thumbprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - TcpRevokedServerCertResource");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpRevokedServerCertTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSessionTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSessionTestServiceHost.cs
index 5e4c9514ec8..1ee3f5822a9 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSessionTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSessionTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
@@ -16,7 +21,7 @@ public class TcpSessionTestServiceHost : TestServiceHostBase<ISessionTestsDefaul
 
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false };
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public TcpSessionTestServiceHost(params Uri[] baseAddresses)
@@ -31,7 +36,7 @@ public class TcpSessionShortTimeoutTestServiceHost : TestServiceHostBase<ISessio
         protected override string Address { get { return ""; } }
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false, ReceiveTimeout = TimeSpan.FromSeconds(5)};
+            return new NetTcpBinding(SecurityMode.None) { ReceiveTimeout = TimeSpan.FromSeconds(5) };
         }
 
         public TcpSessionShortTimeoutTestServiceHost(params Uri[] baseAddresses)
@@ -46,7 +51,7 @@ public class TcpSessionDuplexTestServiceHost : TestServiceHostBase<ISessionTests
         protected override string Address { get { return ""; } }
         protected override Binding GetBinding()
         {
-            return new NetTcpBinding(SecurityMode.None) { PortSharingEnabled = false};
+            return new NetTcpBinding(SecurityMode.None);
         }
 
         public TcpSessionDuplexTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap11WSA10TestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap11WSA10TestServiceHost.cs
index be82f34a095..965b1dda19c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap11WSA10TestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpSoap11WSA10TestServiceHost.cs
@@ -2,8 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel.Channels;
+#endif
 using System.Text;
 
 namespace WcfService
@@ -15,7 +19,7 @@ public class TcpSoap11WSA10TestServiceHost : TestServiceHostBase<IWcfService>
 
         protected override Binding GetBinding()
         {
-            return new CustomBinding(new TextMessageEncodingBindingElement(MessageVersion.Soap11WSAddressing10, Encoding.UTF8), new TcpTransportBindingElement() { PortSharingEnabled = false });
+            return new CustomBinding(new TextMessageEncodingBindingElement(MessageVersion.Soap11WSAddressing10, Encoding.UTF8), new TcpTransportBindingElement());
         }
 
         public TcpSoap11WSA10TestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpStreamedNoSecurityTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpStreamedNoSecurityTestServiceHost.cs
index 7fc2719b087..a8e79f255d5 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpStreamedNoSecurityTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpStreamedNoSecurityTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
@@ -17,7 +22,6 @@ protected override Binding GetBinding()
         {
             return new NetTcpBinding(SecurityMode.None)
             {
-                PortSharingEnabled = false,
                 TransferMode = TransferMode.Streamed
             };
         }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsCertTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsCertTestServiceHost.cs
index 5bcfe1d53c4..a08ec4e4e74 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsCertTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsCertTestServiceHost.cs
@@ -2,11 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -30,11 +36,8 @@ protected override void ApplyConfiguration()
             this.Credentials.ClientCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.Custom;
             this.Credentials.ClientCertificate.Authentication.CustomCertificateValidator = new MyX509CertificateValidator("DO_NOT_TRUST_WcfBridgeRootCA");
 
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                      StoreName.My,
-                                                      X509FindType.FindByThumbprint,
-                                                      thumbprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpTransportSecurityMessageCredentialsCertTestServiceHost(params Uri[] baseAddresses) : base(typeof(WcfService), baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsUsernameTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsUsernameTestServiceHost.cs
index 5f94e22d613..a03aafb07d8 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsUsernameTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityMessageCredentialsUsernameTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -28,11 +33,8 @@ protected override void ApplyConfiguration()
             base.ApplyConfiguration();
             AuthenticationResourceHelper.ConfigureServiceHostUserNameAuth(this);
 
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                      StoreName.My,
-                                                      X509FindType.FindByThumbprint,
-                                                      thumbprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpTransportSecurityMessageCredentialsUserNameTestServiceHost(params Uri[] baseAddresses) : base(typeof(WcfService), baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslClientCredentialTypeCertificate.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslClientCredentialTypeCertificate.cs
index 5304c2d0048..25ddc69b924 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslClientCredentialTypeCertificate.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslClientCredentialTypeCertificate.cs
@@ -2,11 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -26,13 +32,10 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
             // Ensure the https certificate is installed before this endpoint resource is used
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
 
             this.Credentials.ClientCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                      StoreName.My,
-                                                      X509FindType.FindByThumbprint,
-                                                      thumbprint);
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpTransportSecuritySslClientCredentialTypeCertificateTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslCustomCertValidationTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslCustomCertValidationTestServiceHost.cs
index b313748e71d..57ea4655afd 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslCustomCertValidationTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecuritySslCustomCertValidationTestServiceHost.cs
@@ -2,11 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -26,14 +32,11 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
 
             this.Credentials.ClientCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.Custom;
             this.Credentials.ClientCertificate.Authentication.CustomCertificateValidator = new MyX509CertificateValidator("DO_NOT_TRUST_WcfBridgeRootCA");
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                      StoreName.My,
-                                                      X509FindType.FindByThumbprint,
-                                                      thumbprint);
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpTransportSecuritySslCustomCertValidationTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityStreamedTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityStreamedTestServiceHost.cs
index 3f9ef5cb757..f6513f34c1c 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityStreamedTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityStreamedTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
@@ -17,7 +22,6 @@ protected override Binding GetBinding()
         {
             return new NetTcpBinding(SecurityMode.Transport)
             {
-                PortSharingEnabled = false,
                 TransferMode = TransferMode.Streamed
             };
         }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityWithSslTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityWithSslTestServiceHost.cs
index 913f7b6ffa2..5f83a1d87e9 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityWithSslTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpTransportSecurityWithSslTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+using CoreWCF.Security;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Security;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -27,12 +32,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
             {
-                string thumbprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
-
-                this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                          StoreName.My,
-                                                          X509FindType.FindByThumbprint,
-                                                          thumbprint);
+                X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+                this.Credentials.ServiceCertificate.Certificate = cert;
 
                 this.Credentials.ClientCertificate.Authentication.CertificateValidationMode = X509CertificateValidationMode.None;
             }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpVerifyDNSTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpVerifyDNSTestServiceHost.cs
index 107eb8b83fc..009011299e9 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpVerifyDNSTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TcpVerifyDNSTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
-using System.Security.Cryptography.X509Certificates;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
+using System.Security.Cryptography.X509Certificates;
 
 namespace WcfService
 {
@@ -15,7 +20,7 @@ public class TcpVerifyDNSTestServiceHost : TestServiceHostBase<IWcfService>
         protected override string Address { get { return "tcp-VerifyDNS"; } }
         protected override Binding GetBinding()
         {
-            NetTcpBinding binding = new NetTcpBinding() { PortSharingEnabled = false };
+            NetTcpBinding binding = new NetTcpBinding();
             binding.Security.Mode = SecurityMode.Transport;
             binding.Security.Transport.ClientCredentialType = TcpClientCredentialType.None;
 
@@ -26,12 +31,8 @@ protected override void ApplyConfiguration()
         {
             base.ApplyConfiguration();
 
-            string certThumprint = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager").Thumbprint;
-
-            this.Credentials.ServiceCertificate.SetCertificate(StoreLocation.LocalMachine,
-                                                        StoreName.My,
-                                                        X509FindType.FindByThumbprint,
-                                                        certThumprint);
+            X509Certificate2 cert = TestHost.CertificateFromFriendlyName(StoreName.My, StoreLocation.LocalMachine, "WCF Bridge - Machine certificate generated by the CertificateManager");
+            this.Credentials.ServiceCertificate.Certificate = cert;
         }
 
         public TcpVerifyDNSTestServiceHost(params Uri[] baseAddresses)
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs
index c1f58bcdb3a..d4144a710e9 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestHostWebServiceHost.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if !NET
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
@@ -27,3 +28,4 @@ public TestHostWebServiceHost(Type serviceType, params Uri[] baseAddresses)
         }
     }
 }
+#endif
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestServiceHostBase.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestServiceHostBase.cs
index e4921609dd6..ab1f131f483 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestServiceHostBase.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/TestServiceHostBase.cs
@@ -2,12 +2,17 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF.Channels;
+using CoreWCF.Description;
+#else
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.ServiceModel.Description;
+#endif
 
 namespace WcfService
 {
@@ -30,12 +35,13 @@ protected virtual IList<Binding> GetBindings()
         public TestServiceHostBase(Type serviceType, params Uri[] baseAddresses)
             : base(serviceType, baseAddresses)
         {
-            foreach(var binding in GetBindings())
+            foreach (var binding in GetBindings())
             {
                 AddServiceEndpoint(typeof(ContractType), binding, binding.Name == EmptyAddress ? "" : binding.Name);
             }
         }
 
+#if !NET
         //Overriding ApplyConfiguration() allows us to
         //alter the ServiceDescription prior to opening
         //the service host.
@@ -91,6 +97,7 @@ protected override void ApplyConfiguration()
                 }
             }
         }
+#endif
     }
 
     public abstract class TestServiceHostBase<ContractType1, ContractType2> : TestServiceHostBase<ContractType1>
@@ -98,7 +105,7 @@ public abstract class TestServiceHostBase<ContractType1, ContractType2> : TestSe
         public TestServiceHostBase(Type serviceType, params Uri[] baseAddresses)
             : base(serviceType, baseAddresses)
         {
-            ServiceEndpoint endpoint2 = this.AddServiceEndpoint(typeof(ContractType2), GetBinding(), Address);
+            AddServiceEndpoint(typeof(ContractType2), GetBinding(), Address);
         }
     }
 }
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/UnderstoodHeadersServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/UnderstoodHeadersServiceHost.cs
index d99a7a421a2..6b53eb8707e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/UnderstoodHeadersServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/UnderstoodHeadersServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WSHttpBindingTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WSHttpBindingTestServiceHost.cs
index f4ef56e8149..8a501fb9713 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WSHttpBindingTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WSHttpBindingTestServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WcfDecompServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WcfDecompServiceHost.cs
index 55a2b3afb96..7863d7d3ea7 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WcfDecompServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WcfDecompServiceHost.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WebSocketTestServiceHosts.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WebSocketTestServiceHosts.cs
index 968c4bf7ae0..9cf89ff9158 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WebSocketTestServiceHosts.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/WebSocketTestServiceHosts.cs
@@ -2,10 +2,15 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.Collections.Generic;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSFAttributeTestServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSFAttributeTestServiceHost.cs
index bae867fc51d..a42cb494b9e 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSFAttributeTestServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSFAttributeTestServiceHost.cs
@@ -2,9 +2,14 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSerializerRpcEncWithMessageHeadersServiceHost.cs b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSerializerRpcEncWithMessageHeadersServiceHost.cs
index 432aa7a9751..d78dcc71d5d 100644
--- a/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSerializerRpcEncWithMessageHeadersServiceHost.cs
+++ b/src/System.Private.ServiceModel/tools/IISHostedWcfService/App_code/testhosts/XmlSerializerRpcEncWithMessageHeadersServiceHost.cs
@@ -1,10 +1,19 @@
-using System;
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#if NET
+using CoreWCF;
+using CoreWCF.Channels;
+#else
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.ServiceModel;
 using System.ServiceModel.Channels;
 using System.Text;
 using System.Threading.Tasks;
+#endif
 
 namespace WcfService
 {
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs
new file mode 100644
index 00000000000..3d75c0b3350
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Program.cs
@@ -0,0 +1,93 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Runtime.InteropServices;
+using WcfService;
+
+namespace SelfHostedWCFService
+{
+    public class Parameters
+    {
+        public const string ServiceBootstrap = "bootstrap";
+    }
+
+    public class SelfHostedWCFService
+    {
+        private static bool s_serviceBootstrap = false;
+
+        public static async Task Main(string[] args)
+        {
+            ParseArgs(args);
+
+            if (s_serviceBootstrap)
+            {
+                await ServiceHostHelper.ServiceBootstrap();
+                Environment.Exit(1);
+            }
+
+            Console.WriteLine("Installing certificates...");
+            string testserverbase = string.Empty;
+            TimeSpan validatePeriod = TimeSpan.FromDays(1);
+            string crlFileLocation = "c:\\WCFTest\\test.crl";
+            int DefaultHttpPort = 8081;
+
+            CertificateGeneratorLibrary.SetupCerts(testserverbase, validatePeriod, crlFileLocation, DefaultHttpPort);
+
+            Console.WriteLine("Starting services...");
+            var webHost = await TestDefinitionHelper.StartHosts(false);
+            var webHostWebSocket = await TestDefinitionHelper.StartHosts(true);
+
+            Console.WriteLine("All services started.");
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                do
+                {
+                    Console.WriteLine("Type <Exit> to terminate the self service Host.");
+                    string input = Console.ReadLine();
+                    if (string.Compare(input, "exit", true) == 0)
+                    {
+                        return;
+                    }
+                } while (true);
+            }
+            else
+            {
+                //Linux and MacOS
+                Console.WriteLine("Use Shutdown endpoint to terminate the self service Host.");
+                Console.WriteLine("http://localhost:8081/TestHost.svc/shutdown");
+
+                Thread.Sleep(Timeout.Infinite);
+            }
+
+            GC.KeepAlive(webHost);
+            GC.KeepAlive(webHostWebSocket);
+        }
+
+        private static bool ParseArgs(string[] args)
+        {
+            foreach (string s in args)
+            {
+                string[] p = s.Split(new char[] { ':' }, count: 2);
+                if (p.Length != 2)
+                {
+                    continue;
+                }
+
+                switch (p[0].ToLower())
+                {
+                    case Parameters.ServiceBootstrap:
+                        bool.TryParse(p[1], out s_serviceBootstrap);
+                        break;
+                    default:
+                        Console.WriteLine("unknown argument: " + s);
+                        continue;
+                }
+            }
+
+            return true;
+        }
+
+    }
+}
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Properties/launchSettings.json b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Properties/launchSettings.json
new file mode 100644
index 00000000000..2c63c085104
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/Properties/launchSettings.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj
new file mode 100644
index 00000000000..47bf9444e3a
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.csproj
@@ -0,0 +1,58 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>true</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Using Include="System.Runtime.Serialization" />
+    <Using Include="Microsoft.Extensions.DependencyInjection.Extensions" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="CoreWCF.Http" Version="1.6" />
+    <PackageReference Include="CoreWCF.NetTcp" Version="1.6" />
+    <PackageReference Include="CoreWCF.Primitives" Version="1.6" />
+    <PackageReference Include="CoreWCF.WebHttp" Version="1.6" />
+    <PackageReference Include="idunno.Authentication.Basic" Version="2.4.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\IISHostedWcfService\**\*.cs">
+      <Visible>true</Visible>
+      <Link>IIS/%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+    <Compile Remove="..\IISHostedWcfService\App_code\CertificateHelper\*.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\FederationSTSServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Federation\SelfHostSecurityTokenService.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionDuplexTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionOneWayTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\ReliableSessionTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\Saml2IssuedTokenTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
+    <Compile Remove="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
+
+    <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\AcceptAnyUsernameSecurityTokenHandler.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\FederationSTSServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\ReturnX509SubjectNameOrRSAIssuerNameRegistry.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\Federation\SelfHostSecurityTokenService.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionDuplexTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionOneWayTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\ReliableSessionTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\Saml2IssuedTokenTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsCertTestServiceHost.cs" />
+    <None Include="..\IISHostedWcfService\App_code\testhosts\HttpsTransportSecurityMessageCredentialsUsernameTestServiceHost.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\IISHostedWcfService\Web.config">
+      <Link>Web.config</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CertificateGenerator\CertificateGeneratorLibrary\CertificateGeneratorLibrary.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.sln b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.sln
new file mode 100644
index 00000000000..cd95c275115
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/SelfHostedCoreWCFService.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.32916.344
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfHostedCoreWCFService", "SelfHostedCoreWCFService.csproj", "{19D41124-E785-44E4-9B7A-F75B6D21A7CD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CertificateGeneratorLibrary", "..\CertificateGenerator\CertificateGeneratorLibrary\CertificateGeneratorLibrary.csproj", "{314D8E66-225C-495E-AAB9-93966B825BEA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19D41124-E785-44E4-9B7A-F75B6D21A7CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19D41124-E785-44E4-9B7A-F75B6D21A7CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19D41124-E785-44E4-9B7A-F75B6D21A7CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19D41124-E785-44E4-9B7A-F75B6D21A7CD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{314D8E66-225C-495E-AAB9-93966B825BEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{314D8E66-225C-495E-AAB9-93966B825BEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{314D8E66-225C-495E-AAB9-93966B825BEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{314D8E66-225C-495E-AAB9-93966B825BEA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {38C67964-0504-4D3C-A5A0-2CD0C9A2E018}
+	EndGlobalSection
+EndGlobal
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/appsettings.Development.json b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/appsettings.Development.json
new file mode 100644
index 00000000000..0c208ae9181
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/appsettings.Development.json
@@ -0,0 +1,8 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  }
+}
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/appsettings.json b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/appsettings.json
new file mode 100644
index 00000000000..10f68b8c8b4
--- /dev/null
+++ b/src/System.Private.ServiceModel/tools/SelfHostedCoreWcfService/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "AllowedHosts": "*"
+}
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs
index 248c04b17e6..a4d9c7bb081 100644
--- a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs
+++ b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/Program.cs
@@ -14,7 +14,7 @@ public class SelfHostedWCFService
     {
         private static int s_httpPort = 8081;
         private static int s_httpsPort = 44285;
-        private static int s_tcpPort = 809;
+        private static int s_tcpPort = 8808;
         private static int s_websocketPort = 8083;
         private static int s_websocketsPort = 8084;
 
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.csproj b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.csproj
index 9c00c33199b..1f1926a4d06 100644
--- a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.csproj
+++ b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net471</TargetFramework>
diff --git a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.sln b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.sln
index 44236df8c0f..4e81361d6b3 100644
--- a/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.sln
+++ b/src/System.Private.ServiceModel/tools/SelfHostedWcfService/SelfHostedWCFService.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.202
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34707.107
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SelfHostedWCFService", "SelfHostedWCFService.csproj", "{4E7F9B04-79A4-43F5-BD3C-781AA57DDB52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfHostedWCFService", "SelfHostedWCFService.csproj", "{4E7F9B04-79A4-43F5-BD3C-781AA57DDB52}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/System.Private.ServiceModel/tools/scripts/OpenFirewallPorts.cmd b/src/System.Private.ServiceModel/tools/scripts/OpenFirewallPorts.cmd
index f3bbc4dbe60..f2c7789fdd8 100644
--- a/src/System.Private.ServiceModel/tools/scripts/OpenFirewallPorts.cmd
+++ b/src/System.Private.ServiceModel/tools/scripts/OpenFirewallPorts.cmd
@@ -33,7 +33,7 @@ if NOT [%__EXITCODE%]==[0] (
   goto :done
   )
 
-netsh advfirewall firewall add rule name="_WCF Test Server PortTcp"  dir=in action=allow profile=any localport=809 protocol=tcp
+netsh advfirewall firewall add rule name="_WCF Test Server PortTcp"  dir=in action=allow profile=any localport=8808 protocol=tcp
 set __EXITCODE=%ERRORLEVEL%
 if NOT [%__EXITCODE%]==[0] (
   echo Error: error adding rule name _WCF Test Server PortTcp
diff --git a/src/svcutilcore/src/dotnet-svcutil.xmlserializer.csproj b/src/svcutilcore/src/dotnet-svcutil.xmlserializer.csproj
index ebf40277b1a..b41f02af4f0 100644
--- a/src/svcutilcore/src/dotnet-svcutil.xmlserializer.csproj
+++ b/src/svcutilcore/src/dotnet-svcutil.xmlserializer.csproj
@@ -22,7 +22,6 @@
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <PreReleaseVersionLabel>preview1</PreReleaseVersionLabel>
-    <DisablePackageBaselineValidation>true</DisablePackageBaselineValidation>
     <PackageReleaseNotes>https://github.com/dotnet/wcf/blob/master/release-notes/dotnet-svcutil.xmlserializer-notes.md</PackageReleaseNotes>
     <!-- The partial facade assembly's public key token must exactly match the contract to be filled. -->
     <StrongNameKeyId>Open</StrongNameKeyId>