Revert "Merge pull request #12885 from heejaechang/dev15preview4setup"

This reverts commit 90f48150, reversing
changes made to 720f5c5e.

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

@@ -50,14 +50,6 @@ Public Module BuildDevDivInsertionFiles
             "codeAnalysisService.servicehub.service.json",
             "remoteHostService.servicehub.service.json",
             "serviceHubSnapshotService.servicehub.service.json",
-            "Microsoft.Build.Conversion.Core.dll",
-            "Microsoft.Build.dll",
-            "Microsoft.Build.Engine.dll",
-            "Microsoft.Build.Framework.dll",
-            "Microsoft.Build.Tasks.Core.dll",
-            "Microsoft.Build.Utilities.Core.dll",
-            "Microsoft.VisualStudio.Threading.dll",
-            "Microsoft.VisualStudio.Validation.dll",
             "System.Composition.AttributedModel.dll",
             "System.Composition.Runtime.dll",
             "System.Composition.Convention.resources.dll",

src/Tools/SignRoslyn/BinaryData.json

@@ -125,14 +125,6 @@
         "System.Composition.Convention.dll",
         "System.Composition.Hosting.dll",
         "System.Composition.TypedParts.dll",
-        "System.Composition.Runtime.dll",
-        "Microsoft.Build.Conversion.Core.dll",
-        "Microsoft.Build.dll",
-        "Microsoft.Build.Engine.dll",
-        "Microsoft.Build.Framework.dll",
-        "Microsoft.Build.Tasks.Core.dll",
-        "Microsoft.Build.Utilities.Core.dll",
-        "Microsoft.VisualStudio.Threading.dll",
-        "Microsoft.VisualStudio.Validation.dll"
+        "System.Composition.Runtime.dll"
     ]
 }

src/VisualStudio/Setup.Next/VisualStudioSetup.Next.csproj

@@ -104,9 +104,6 @@
   <ItemGroup>
     <NuGetPackageToIncludeInVsix Include="StreamJsonRpc" />
     <NuGetPackageToIncludeInVsix Include="Newtonsoft.Json" />
-    <NuGetPackageToIncludeInVsix Include="Microsoft.VisualStudio.Threading" />
-    <NuGetPackageToIncludeInVsix Include="Microsoft.VisualStudio.Validation" />
-    <NuGetPackageToIncludeInVsix Include="RoslynDependencies.Microsoft.Build.Desktop" />
     <!-- Visual Studio ships with some, but not all, of the assemblies in Microsoft.Composition, but we need them all -->
     <NuGetPackageToIncludeInVsix Include="Microsoft.Composition" />
     <NuGetPackageToIncludeInVsix Include="System.Reflection.Metadata" />

src/VisualStudio/Setup.Next/project.json

 {
   "dependencies": {
     "StreamJsonRpc": "0.14.3-alpha",
-    "Newtonsoft.Json": "6.0.6",
-    "Microsoft.VisualStudio.Threading": "14.1.131",
-    "Microsoft.VisualStudio.Validation": "14.1.111",
-    "RoslynDependencies.Microsoft.Build.Desktop": "14.3.25407"
+    "Newtonsoft.Json": "6.0.6"
   },
   "frameworks": {
     "net46": { }