From ff152a364b00831c88dff7e465c374c1e4aa338c Mon Sep 17 00:00:00 2001
From: Stephen Bonikowsky <stebon@microsoft.com>
Date: Mon, 7 Nov 2016 14:32:53 -0800
Subject: [PATCH] Combine all test dependencies into one common project.json

* This was done in CoreFx with PR #12345
* Although not as impactful as for CoreFx this will shorten the time it takes to sync.
* In addition, as a simplification improvement it makes a lot of sense.
---
 build.proj                                    | 45 ++++++++-
 dir.targets                                   | 19 +++-
 src/Common/test-runtime/project.json          | 94 ++++++++++++++++---
 .../Infrastructure.Common.csproj              |  1 -
 .../tests/Common/Infrastructure/project.json  | 30 ------
 .../Scenarios/ScenarioTests.Common.csproj     |  3 -
 .../tests/Common/Scenarios/project.json       | 27 ------
 .../tests/Common/Unit/UnitTests.Common.csproj |  3 -
 .../tests/Common/Unit/project.json            | 26 -----
 .../Custom/Binding.Custom.Tests.csproj        |  3 -
 .../Scenarios/Binding/Custom/project.json     | 28 ------
 .../Binding/Http/Binding.Http.Tests.csproj    |  3 -
 .../tests/Scenarios/Binding/Http/project.json | 28 ------
 .../Binding/Tcp/Binding.Tcp.Tests.csproj      |  3 -
 .../tests/Scenarios/Binding/Tcp/project.json  | 28 ------
 .../Client.ChannelLayer.Tests.csproj          |  3 -
 .../Client/ChannelLayer/project.json          | 28 ------
 .../ClientBase/Client.ClientBase.Tests.csproj |  3 -
 .../Scenarios/Client/ClientBase/project.json  | 28 ------
 .../Client.ExpectedExceptions.Tests.csproj    |  3 -
 .../Client/ExpectedExceptions/project.json    | 28 ------
 .../Client.TypedClient.Tests.csproj           |  3 -
 .../Scenarios/Client/TypedClient/project.json | 28 ------
 .../Contract/Data/Contract.Data.Tests.csproj  |  3 -
 .../Scenarios/Contract/Data/project.json      | 28 ------
 .../Fault/Contract.Fault.Tests.csproj         |  3 -
 .../Scenarios/Contract/Fault/project.json     | 28 ------
 .../Message/Contract.Message.Tests.csproj     |  3 -
 .../Scenarios/Contract/Message/project.json   | 28 ------
 .../Service/Contract.Service.Tests.csproj     |  3 -
 .../Scenarios/Contract/Service/project.json   | 28 ------
 .../Contract.XmlSerializer.Tests.csproj       |  3 -
 .../Contract/XmlSerializer/project.json       | 28 ------
 .../Encoders/Encoding.Encoders.Tests.csproj   |  3 -
 .../Scenarios/Encoding/Encoders/project.json  | 28 ------
 .../Encoding.MessageVersion.Tests.csproj      |  3 -
 .../Encoding/MessageVersion/project.json      | 28 ------
 .../Extensibility.MessageEncoder.Tests.csproj |  3 -
 .../Extensibility/MessageEncoder/project.json | 28 ------
 ...ensibility.MessageInterceptor.Tests.csproj |  3 -
 .../MessageInterceptor/project.json           | 28 ------
 .../Extensibility.WebSockets.Tests.csproj     |  3 -
 .../Extensibility/WebSockets/project.json     | 28 ------
 .../Infrastructure.Tests.csproj               |  3 -
 .../Scenarios/Infrastructure/project.json     | 28 ------
 .../Security.TransportSecurity.Tests.csproj   |  6 +-
 .../Security/TransportSecurity/project.json   | 28 ------
 .../System.ServiceModel.Duplex.Tests.csproj   |  3 -
 .../tests/project.json                        | 22 -----
 .../System.ServiceModel.Http.Tests.csproj     |  3 -
 .../tests/project.json                        | 24 -----
 .../System.ServiceModel.NetTcp.Tests.csproj   |  3 -
 .../tests/project.json                        | 25 -----
 ...ystem.ServiceModel.Primitives.Tests.csproj |  3 -
 .../tests/project.json                        | 26 -----
 .../System.ServiceModel.Security.Tests.csproj |  3 -
 .../tests/project.json                        | 22 -----
 57 files changed, 146 insertions(+), 828 deletions(-)
 delete mode 100644 src/System.Private.ServiceModel/tests/Common/Infrastructure/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Common/Scenarios/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Common/Unit/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/project.json
 delete mode 100644 src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/project.json
 delete mode 100644 src/System.ServiceModel.Duplex/tests/project.json
 delete mode 100644 src/System.ServiceModel.Http/tests/project.json
 delete mode 100644 src/System.ServiceModel.NetTcp/tests/project.json
 delete mode 100644 src/System.ServiceModel.Primitives/tests/project.json
 delete mode 100644 src/System.ServiceModel.Security/tests/project.json

diff --git a/build.proj b/build.proj
index bc3a38149ac..cb539527a50 100644
--- a/build.proj
+++ b/build.proj
@@ -68,10 +68,15 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(BuildTestsAgainstPackages)' == 'true'">
     <TraversalBuildDependsOn>
+      UpdateVersionsOnTestProjectJson;
       BatchGenerateTestProjectJsons;
       $(TraversalBuildDependsOn);
     </TraversalBuildDependsOn>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <TestProjectJsons Include="$(MSBuildThisFileDirectory)src/Common/test-runtime/project.json" />
+  </ItemGroup>
 
   <UsingTask TaskName="GatherDirectoriesToRestore" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" />
 
@@ -82,7 +87,7 @@
     <ProjectJsonFiles Condition="'$(BuildTestsAgainstPackages)' == 'true'" Include="$(GeneratedProjectJsonDir)/**/project.json" />
   </ItemGroup>
   
-  <Target Name="BatchRestorePackages" DependsOnTargets="VerifyDependencies">
+  <Target Name="BatchRestorePackages" DependsOnTargets="AddGeneratedProjectJsons;VerifyDependencies">
     <MakeDir Directories="$(PackagesDir)" Condition="!Exists('$(PackagesDir)')" /> 
 
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages..." />
@@ -91,6 +96,13 @@
       <Output TaskParameter="RestoreRequired" PropertyName="RestoreRequired" />
     </IsRestoreRequired>
     
+    <!-- This is to restore the test-runtime project.json up front which contains the latest packages to be tested to avoid download contention within nuget. -->
+    <Exec Command="$(DnuRestoreCommand) @(TestProjectJsons->'&quot;%(Identity)&quot;', ' ')"
+          Condition="'$(RestoreRequired)' == 'true'"
+          StandardOutputImportance="Low"
+          CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)"
+          ContinueOnError="ErrorAndContinue" />
+    
     <Exec Command="$(DnuRestoreCommand) @(DnuRestoreDir->'&quot;%(Identity)&quot;', ' ')"
           Condition="'$(RestoreRequired)' == 'true'"
           StandardOutputImportance="Low"
@@ -102,11 +114,40 @@
     
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." />
   </Target>
+  
+  <!-- Generated project.json's may not exist when the "ProjectJsonFiles"" item group is defined (in dir.props), This target
+       ensures those files are added to the itemgroup. -->
+  <Target Name="AddGeneratedProjectJsons">
+    <ItemGroup>
+      <ProjectJsonFiles Condition="'$(BuildTestsAgainstPackages)' == 'true'" Include="$(GeneratedProjectJsonDir)/**/project.json" />
+    </ItemGroup>
+  </Target>
+  
+  <UsingTask TaskName="AddDependenciesToProjectJson" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
+  <Target Name="UpdateVersionsOnTestProjectJson" >
+  
+  <!-- Duplicate properties to be removed in future -->
+    <PropertyGroup>
+        <PackageNameRegex Condition="'$(PackageNameRegex)' == ''">(?%3Cname%3E.*)\.(?%3Cversion%3E\d+\.\d+\.\d+)(-(?%3Cprerelease%3E.*)?)?</PackageNameRegex>
+    </PropertyGroup>
+    <ItemGroup>
+      <_PackagesDropsForCommonProjectJson Include="$(PackagesDrops)" />
+    </ItemGroup>
+  
+    <AddDependenciesToProjectJson AdditionalDependencies="@(ExternalDependencies)"
+                                  PackagesDrops="@(_PackagesDropsForCommonProjectJson)"
+                                  PackageNameRegex="$(PackageNameRegex)"
+                                  VersionsFiles="@(_VersionsFiles)"
+                                  ProjectJson="$(CommonTestProjectJson)"
+                                  OutputProjectJson="$(CommonOutputTestProjectJson)"
+                                  UseNewestAvailablePackages="$(UseNewestAvailablePackages)"
+                                   />
+  </Target>
 
   <!-- Evaluate our test projects (in src\tests.builds) -->
   <Target Name="BatchGenerateTestProjectJsons"
           Condition="'$(BuildTestsAgainstPackages)' == 'true'" 
-          DependsOnTargets="FilterProjects"
+          DependsOnTargets="FilterProjects;UpdateVersionsOnTestProjectJson"
           BeforeTargets="RestorePackages">
       <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Generating Test project.json's..." />
       <MSBuild Targets="GenerateAllTestProjectJsons"
diff --git a/dir.targets b/dir.targets
index e51ab5fa259..019096697ac 100644
--- a/dir.targets
+++ b/dir.targets
@@ -12,7 +12,7 @@
   <Target Name="BuildAndTest" DependsOnTargets="Build;Test" />
   <Target Name="RebuildAndTest" DependsOnTargets="Rebuild;Test" />
   <Target Name="Test" />
-
+  
   <!-- Targets will be overridden if buildagainstpackages.targets is imported. -->
   <Target Name="GenerateTestProjectJson" />
   <Target Name="GenerateAllTestProjectJsons" />
@@ -28,6 +28,23 @@
       </ProjectReference>
     </ItemGroup>
   </Target>
+  
+  <PropertyGroup>
+    <CommonTestProjectJson>$(MSBuildThisFileDirectory)src/Common/test-runtime/project.json</CommonTestProjectJson>
+    <CommonTestProjectLockJson>$(MSBuildThisFileDirectory)src/Common/test-runtime/project.lock.json</CommonTestProjectLockJson>
+    <CommonOutputTestProjectJson>$(GeneratedProjectJsonDir)/project.json</CommonOutputTestProjectJson>
+    <CommonOutputTestProjectLockJson>$(GeneratedProjectJsonDir)/project.lock.json</CommonOutputTestProjectLockJson>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition="'$(IsTestProject)' == 'true'">
+    <CommonTestProjectJson Condition="'$(BuildTestsAgainstPackages)'=='true'">$(CommonOutputTestProjectJson)</CommonTestProjectJson>
+    <CommonTestProjectLockJson Condition="'$(BuildTestsAgainstPackages)'=='true'">$(CommonOutputTestProjectLockJson)</CommonTestProjectLockJson>
+    <ProjectJson Condition="'$(ProjectJson)'=='' and Exists('$(MSBuildProjectDirectory)/project.json')">$(MSBuildProjectDirectory)/project.json</ProjectJson>
+    <!-- If project specific project.json exists then don't skip generating test project.json files -->
+    <SkipGenerateTestProjectJson Condition="'$(ProjectJson)'==''" >true</SkipGenerateTestProjectJson>
+    <ProjectJson Condition="'$(ProjectJson)'==''">$(CommonTestProjectJson)</ProjectJson>
+    <ProjectLockJson Condition="'$(ProjectJson)'=='$(CommonTestProjectJson)'">$(CommonTestProjectLockJson)</ProjectLockJson>
+  </PropertyGroup>
 
   <Import Project="$(ToolsDir)/Build.Common.targets" Condition="Exists('$(ToolsDir)/Build.Common.targets')" />
 
diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json
index 3f654b18ea9..9b64404a9aa 100644
--- a/src/Common/test-runtime/project.json
+++ b/src/Common/test-runtime/project.json
@@ -1,25 +1,38 @@
 {
   "dependencies": {
-    "NETStandard.Library": "1.6.2-beta-24605-03",
-    "Microsoft.NETCore.TestHost": "1.2.0-beta-24603-03",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24603-03",
-    "System.Diagnostics.Contracts": "4.4.0-beta-24605-03",
-    "System.Linq.Parallel": "4.4.0-beta-24605-03",
     "coveralls.io": "1.4",
     "OpenCover": "4.6.519",
     "ReportGenerator": "2.4.3",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
+    "Microsoft.NETCore.TestHost": "1.2.0-beta-24603-03",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24603-03",
     "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01",
     "xunit.console.netcore": "1.0.3-prerelease-00925-01",
     "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "System.Net.Security": "4.4.0-beta-24605-03",
-    "System.Net.WebSockets.Client": "4.4.0-beta-24605-03"
+    "System.Collections.Concurrent": "4.4.0-beta-24605-03",
+    "System.Console": "4.4.0-beta-24605-03",
+    "System.Diagnostics.Contracts": "4.4.0-beta-24605-03",
+    "System.Diagnostics.Tracing": "4.4.0-beta-24605-03",
+    "System.Linq": "4.4.0-beta-24605-03",
+    "System.Linq.Parallel": "4.4.0-beta-24605-03",
+    "System.Linq.Queryable": "4.4.0-beta-24605-03",
+    "System.Net.Http": "4.4.0-beta-24605-03",
+    "System.Net.WebHeaderCollection": "4.4.0-beta-24605-03",
+    "System.Net.WebSockets.Client": "4.4.0-beta-24605-03",
+    "System.Reflection.DispatchProxy": "4.4.0-beta-24605-03",
+    "System.Reflection.Extensions": "4.4.0-beta-24605-03",
+    "System.Runtime.Extensions": "4.4.0-beta-24605-03",
+    "System.Runtime.Serialization.Primitives": "4.4.0-beta-24605-03",
+    "System.Runtime.Serialization.Xml": "4.4.0-beta-24605-03",
+    "System.Threading.Timer": "4.4.0-beta-24605-03",
+    "System.Xml.XmlSerializer": "4.4.0-beta-24605-03"
   },
   "frameworks": {
-    "netstandard1.3": {},
+    "netstandard1.3": {
+      "System.Net.Security": "4.4.0-beta-24605-03"
+    },
+    "netcoreapp1.1": {
+      "System.Net.Security": "4.4.0-beta-24605-03"
+    },
     "uap10.0": {
       "dependencies": {
         "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
@@ -31,5 +44,62 @@
         }
       }
     }
+  },
+  "supports": {
+    "coreFx.Test.net46": {
+      "net46": [
+        "",
+        "win-x86",
+        "win-x64"
+      ]
+    },
+    "coreFx.Test.net461": {
+      "net461": [
+        "",
+        "win-x86",
+        "win-x64"
+      ]
+    },
+    "coreFx.Test.net462": {
+      "net462": [
+        "",
+        "win-x86",
+        "win-x64"
+      ]
+    },
+    "coreFx.Test.net463": {
+      "net463": [
+        "",
+        "win-x86",
+        "win-x64"
+      ]
+    },
+    "coreFx.Test.netcore50": {
+      "uap10.0": [
+        "win10-x86",
+        "win10-x86-aot",
+        "win10-x64",
+        "win10-x64-aot"
+      ]
+    },
+    "coreFx.Test.netcoreapp1.1": {
+      "netcoreapp1.1": [
+        "win7-x86",
+        "win7-x64",
+        "win10-arm64",
+        "osx.10.10-x64",
+        "centos.7-x64",
+        "debian.8-x64",
+        "rhel.7-x64",
+        "ubuntu.14.04-x64",
+        "ubuntu.16.04-x64",
+        "ubuntu.16.10-x64",
+        "fedora.23-x64",
+        "fedora.24-x64",
+        "linux-x64",
+        "opensuse.13.2-x64",
+        "opensuse.42.1-x64"
+      ]
+    }
   }
 }
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj b/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj
index c74199d5df4..92f62b539f9 100644
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj
+++ b/src/System.Private.ServiceModel/tests/Common/Infrastructure/Infrastructure.Common.csproj
@@ -24,7 +24,6 @@
     <ProjectReference Include="$(WcfPrimitivesPkgProj)" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="project.json" />
     <None Include="testproperties.props" />
     <None Include="testproperties.targets" />
   </ItemGroup>
diff --git a/src/System.Private.ServiceModel/tests/Common/Infrastructure/project.json b/src/System.Private.ServiceModel/tests/Common/Infrastructure/project.json
deleted file mode 100644
index d3d26933614..00000000000
--- a/src/System.Private.ServiceModel/tests/Common/Infrastructure/project.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "dependencies": {
-    "System.Console": "4.0.0",
-    "System.Collections.Concurrent": "4.0.12",
-    "System.Diagnostics.Tracing": "4.1.0",
-    "System.Net.Http": "4.1.0",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/ScenarioTests.Common.csproj b/src/System.Private.ServiceModel/tests/Common/Scenarios/ScenarioTests.Common.csproj
index 444de684d60..c610f011b38 100644
--- a/src/System.Private.ServiceModel/tests/Common/Scenarios/ScenarioTests.Common.csproj
+++ b/src/System.Private.ServiceModel/tests/Common/Scenarios/ScenarioTests.Common.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfInfrastructureCommonProj)">
       <Project>{AFD69665-89A3-42AE-A32E-AB2CBBE6EE7E}</Project>
diff --git a/src/System.Private.ServiceModel/tests/Common/Scenarios/project.json b/src/System.Private.ServiceModel/tests/Common/Scenarios/project.json
deleted file mode 100644
index be98d86bf7c..00000000000
--- a/src/System.Private.ServiceModel/tests/Common/Scenarios/project.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "dependencies": {
-    "System.Collections.Concurrent": "4.0.12",
-    "System.Runtime.Extensions": "4.1.0",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Xml.XmlSerializer": "4.0.11",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Common/Unit/UnitTests.Common.csproj b/src/System.Private.ServiceModel/tests/Common/Unit/UnitTests.Common.csproj
index c0454ca1ac8..139b6dcc431 100644
--- a/src/System.Private.ServiceModel/tests/Common/Unit/UnitTests.Common.csproj
+++ b/src/System.Private.ServiceModel/tests/Common/Unit/UnitTests.Common.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfDuplexPkgProj)" />
     <ProjectReference Include="$(WcfHttpPkgProj)" />
diff --git a/src/System.Private.ServiceModel/tests/Common/Unit/project.json b/src/System.Private.ServiceModel/tests/Common/Unit/project.json
deleted file mode 100644
index 57e3d7c5b64..00000000000
--- a/src/System.Private.ServiceModel/tests/Common/Unit/project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "dependencies": {
-    "System.Collections.Concurrent": "4.0.12",
-    "System.Linq": "4.1.0",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/Binding.Custom.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/Binding.Custom.Tests.csproj
index 37cc16f80d0..c3a7e169dcf 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/Binding.Custom.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/Binding.Custom.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Custom/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/Binding.Http.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/Binding.Http.Tests.csproj
index 5fff6359500..7300819b81d 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/Binding.Http.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/Binding.Http.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Http/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/Binding.Tcp.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/Binding.Tcp.Tests.csproj
index e3b93c8eee5..217293b55a5 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/Binding.Tcp.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/Binding.Tcp.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Binding/Tcp/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/Client.ChannelLayer.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/Client.ChannelLayer.Tests.csproj
index d5503fc5a41..d9c21de0b50 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/Client.ChannelLayer.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/Client.ChannelLayer.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ChannelLayer/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/Client.ClientBase.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/Client.ClientBase.Tests.csproj
index 95ca34334ca..36cb14bec4b 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/Client.ClientBase.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/Client.ClientBase.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ClientBase/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/Client.ExpectedExceptions.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/Client.ExpectedExceptions.Tests.csproj
index 78ebea355f0..1ef0bf807ab 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/Client.ExpectedExceptions.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/Client.ExpectedExceptions.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/ExpectedExceptions/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/Client.TypedClient.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/Client.TypedClient.Tests.csproj
index 827989c6c2d..4092be07500 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/Client.TypedClient.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/Client.TypedClient.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Client/TypedClient/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/Contract.Data.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/Contract.Data.Tests.csproj
index 8d17505d657..3c4189e34a9 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/Contract.Data.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/Contract.Data.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Data/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/Contract.Fault.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/Contract.Fault.Tests.csproj
index d6ca5466bea..41c61362f56 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/Contract.Fault.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/Contract.Fault.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Fault/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/Contract.Message.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/Contract.Message.Tests.csproj
index 0ce1a65bcd6..b29edab6fa6 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/Contract.Message.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/Contract.Message.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Message/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/Contract.Service.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/Contract.Service.Tests.csproj
index 4f239f050ab..fc99bb41587 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/Contract.Service.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/Contract.Service.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/Service/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/Contract.XmlSerializer.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/Contract.XmlSerializer.Tests.csproj
index 3cf32713ff2..6a29a63d8d5 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/Contract.XmlSerializer.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/Contract.XmlSerializer.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Contract/XmlSerializer/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/Encoding.Encoders.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/Encoding.Encoders.Tests.csproj
index 77f0e1144aa..ad634e06420 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/Encoding.Encoders.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/Encoding.Encoders.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/Encoders/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/Encoding.MessageVersion.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/Encoding.MessageVersion.Tests.csproj
index 986bb53d390..d7e908be3f2 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/Encoding.MessageVersion.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/Encoding.MessageVersion.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Encoding/MessageVersion/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/Extensibility.MessageEncoder.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/Extensibility.MessageEncoder.Tests.csproj
index 908ec42842c..b0aa177b42f 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/Extensibility.MessageEncoder.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/Extensibility.MessageEncoder.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageEncoder/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.Tests.csproj
index 7968694faee..bf5c4b654b0 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/Extensibility.MessageInterceptor.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/MessageInterceptor/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/Extensibility.WebSockets.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/Extensibility.WebSockets.Tests.csproj
index 1f93a80b05b..bd2c54776f9 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/Extensibility.WebSockets.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/Extensibility.WebSockets.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/Infrastructure.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/Infrastructure.Tests.csproj
index 21251383a03..0f1346d07b8 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/Infrastructure.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/Infrastructure.Tests.csproj
@@ -21,9 +21,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Infrastructure/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Security.TransportSecurity.Tests.csproj b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Security.TransportSecurity.Tests.csproj
index 3affb4c9bcd..9e740d08c2b 100644
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Security.TransportSecurity.Tests.csproj
+++ b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Security.TransportSecurity.Tests.csproj
@@ -21,13 +21,13 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
     </ProjectReference>
+    <ProjectReference Include='$(WcfDuplexPkgProj)'>
+      <Name>System.ServiceModel.Duplex</Name>
+    </ProjectReference>
     <ProjectReference Include='$(WcfHttpPkgProj)'>
       <Name>System.ServiceModel.Http</Name>
     </ProjectReference>
diff --git a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/project.json b/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/project.json
deleted file mode 100644
index 5bf36e02287..00000000000
--- a/src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/project.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "dependencies": {
-    "System.Net.Http": "4.4.0-beta-24605-03",
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "System.Threading.Timer": "4.4.0-beta-24605-03",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.ServiceModel.Duplex/tests/System.ServiceModel.Duplex.Tests.csproj b/src/System.ServiceModel.Duplex/tests/System.ServiceModel.Duplex.Tests.csproj
index 227096388d3..7515f8efb18 100644
--- a/src/System.ServiceModel.Duplex/tests/System.ServiceModel.Duplex.Tests.csproj
+++ b/src/System.ServiceModel.Duplex/tests/System.ServiceModel.Duplex.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.ServiceModel.Duplex/tests/project.json b/src/System.ServiceModel.Duplex/tests/project.json
deleted file mode 100644
index f9f806c302a..00000000000
--- a/src/System.ServiceModel.Duplex/tests/project.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "dependencies": {
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.ServiceModel.Http/tests/System.ServiceModel.Http.Tests.csproj b/src/System.ServiceModel.Http/tests/System.ServiceModel.Http.Tests.csproj
index 8a55c712597..25cae0ee768 100644
--- a/src/System.ServiceModel.Http/tests/System.ServiceModel.Http.Tests.csproj
+++ b/src/System.ServiceModel.Http/tests/System.ServiceModel.Http.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.ServiceModel.Http/tests/project.json b/src/System.ServiceModel.Http/tests/project.json
deleted file mode 100644
index a076d1d418a..00000000000
--- a/src/System.ServiceModel.Http/tests/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dependencies": {
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.ServiceModel.NetTcp/tests/System.ServiceModel.NetTcp.Tests.csproj b/src/System.ServiceModel.NetTcp/tests/System.ServiceModel.NetTcp.Tests.csproj
index 918d2df00c1..fa8b6ad0566 100644
--- a/src/System.ServiceModel.NetTcp/tests/System.ServiceModel.NetTcp.Tests.csproj
+++ b/src/System.ServiceModel.NetTcp/tests/System.ServiceModel.NetTcp.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.ServiceModel.NetTcp/tests/project.json b/src/System.ServiceModel.NetTcp/tests/project.json
deleted file mode 100644
index d4fbd81809a..00000000000
--- a/src/System.ServiceModel.NetTcp/tests/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "dependencies": {
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.ServiceModel.Primitives/tests/System.ServiceModel.Primitives.Tests.csproj b/src/System.ServiceModel.Primitives/tests/System.ServiceModel.Primitives.Tests.csproj
index d358d7fccc1..eeac54fa063 100644
--- a/src/System.ServiceModel.Primitives/tests/System.ServiceModel.Primitives.Tests.csproj
+++ b/src/System.ServiceModel.Primitives/tests/System.ServiceModel.Primitives.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.ServiceModel.Primitives/tests/project.json b/src/System.ServiceModel.Primitives/tests/project.json
deleted file mode 100644
index 52d9268288f..00000000000
--- a/src/System.ServiceModel.Primitives/tests/project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "dependencies": {
-    "System.ServiceModel.Duplex": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Http": "4.4.0-beta-24704-02",
-    "System.ServiceModel.NetTcp": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Primitives": "4.4.0-beta-24704-02",
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}
diff --git a/src/System.ServiceModel.Security/tests/System.ServiceModel.Security.Tests.csproj b/src/System.ServiceModel.Security/tests/System.ServiceModel.Security.Tests.csproj
index ae36bfdebbe..abe2fa00654 100644
--- a/src/System.ServiceModel.Security/tests/System.ServiceModel.Security.Tests.csproj
+++ b/src/System.ServiceModel.Security/tests/System.ServiceModel.Security.Tests.csproj
@@ -20,9 +20,6 @@
   <ItemGroup>
     <Compile Include="**\*.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(WcfSourcePkgProj)">
       <Name>System.Private.ServiceModel</Name>
diff --git a/src/System.ServiceModel.Security/tests/project.json b/src/System.ServiceModel.Security/tests/project.json
deleted file mode 100644
index b62bdb823b1..00000000000
--- a/src/System.ServiceModel.Security/tests/project.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "dependencies": {
-    "System.ServiceModel.Security": "4.4.0-beta-24704-02",
-    "test-runtime": {
-      "target": "project",
-      "exclude": "compile"
-    },
-    "Microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00925-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00925-01"
-  },
-  "frameworks": {
-    "netstandard1.3": {}
-  },
-  "supports": {
-    "coreFx.Test.netcore50": {},
-    "coreFx.Test.netcoreapp1.1": {},
-    "coreFx.Test.net46": {},
-    "coreFx.Test.net461": {},
-    "coreFx.Test.net462": {},
-    "coreFx.Test.net463": {}
-  }
-}