Merge pull request #16239 from jaredpar/fix

Fix builds on Dev15 only

build/Defaults/Desktop/app.config

@@ -45,6 +45,10 @@
         <assemblyIdentity name="System.Threading.Thread" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.5.24.0"/>
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.FileVersionInfo" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
@@ -65,6 +69,10 @@
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+</configuration>

build/Defaults/Portable/app.config

@@ -69,6 +69,10 @@
         <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

build/Targets/Dependencies.props

@@ -83,6 +83,7 @@
     <SystemTextRegularExpressionsVersion>4.3.0</SystemTextRegularExpressionsVersion>
     <SystemThreadingVersion>4.3.0</SystemThreadingVersion>
     <SystemThreadingTasksVersion>4.3.0</SystemThreadingTasksVersion>
+    <SystemThreadingTasksDataflowVersion>4.5.24</SystemThreadingTasksDataflowVersion>
     <SystemThreadingTasksParallelVersion>4.3.0</SystemThreadingTasksParallelVersion>
     <SystemThreadingThreadVersion>4.3.0</SystemThreadingThreadVersion>
     <SystemValueTupleVersion>4.3.0</SystemValueTupleVersion>

build/config/RepoUtilData.json

@@ -18,6 +18,9 @@
     "Microsoft.VisualStudio.Text.Logic": "14.3.25407", 
     "Microsoft.VisualStudio.Text.Data": "14.3.25407", 
     "Microsoft.VisualStudio.Text.UI": "14.3.25407",
+    "Microsoft.VisualStudio.Utilities": "14.3.25407",
+    "Microsoft.VisualStudio.Validation": "14.1.111",
+    "Microsoft.VisualStudio.Threading": "14.1.111",
     "Microsoft.Build": {
       "generateName": "Microsoft.Build.14",
       "version": "14.3.0"

src/EditorFeatures/Core/project.json

@@ -11,6 +11,9 @@
     "Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime": "14.3.25407",
     "Microsoft.VisualStudio.ImageCatalog": "14.3.25407",
     "Microsoft.VisualStudio.Text.UI.Wpf": "14.3.25407",
+    "Microsoft.VisualStudio.Utilities": "14.3.25407",
+    "Microsoft.VisualStudio.Validation": "14.1.111",
+    "Microsoft.VisualStudio.Threading": "14.1.111"
   },
   "frameworks": {
     "net46": { }

src/EditorFeatures/Next/project.json

@@ -12,7 +12,11 @@
     "Microsoft.VisualStudio.Text.UI.Wpf": "15.0.25726-Preview5",
     "Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
     "Microsoft.VisualStudio.Language.NavigateTo.Interfaces": "15.0.25726-Preview5",
+    "Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
+    "Microsoft.VisualStudio.Validation": "15.0.55-pre",
+    "Microsoft.VisualStudio.Threading": "15.0.109-pre",
     "System.Collections.Immutable": "1.3.1",
+    "System.Threading.Tasks.Dataflow": "4.5.24",
     "VS.ExternalAPIs.CodingConventions": "1.0.60704.2"
   },
   "frameworks": {

src/EditorFeatures/Test2/project.json

 {
   "dependencies": {
+    "System.Threading.Tasks.Dataflow": "4.5.24",
     "Microsoft.VisualStudio.Composition": "14.2.19-pre",
     "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
     "BasicUndo": "0.9.3",

src/VisualStudio/Core/Test.Next/project.json

 {
   "dependencies": {
+    "System.Threading.Tasks.Dataflow": "4.5.24",
     "Newtonsoft.Json": "8.0.3",
     "Moq": "4.2.1402.2112",
     "Microsoft.VisualStudio.Composition": "14.2.19-pre",
@@ -22,6 +23,9 @@
     "RoslynDependencies.Microsoft.VisualStudio.Platform.VSEditor": "14.3.25407",
     "Microsoft.VisualStudio.InteractiveWindow": "2.0.0-beta5-60820-04",
     "Microsoft.VisualStudio.Diagnostics.PerformanceProvider": "15.0.25802-alpha",
+    "Microsoft.VisualStudio.Utilities": "15.0.25726-Preview5",
+    "Microsoft.VisualStudio.Validation": "15.0.55-pre",
+    "Microsoft.VisualStudio.Threading": "15.0.109-pre",
     "RoslynDependencies.Microsoft.VisualStudio.GraphModel": {
         "version": "14.3.25407",
         "include": "none"