Bundle System.ValueTuple with csi.exe

src/Interactive/CsiCore/csi.rsp

@@ -23,6 +23,7 @@
 /r:System.Threading.Tasks.dll
 /r:System.Threading.Tasks.Parallel.dll
 /r:System.Threading.Thread.dll
+/r:System.ValueTuple.dll
 # imports
 /u:System
 /u:System.IO

src/Interactive/CsiCore/project.json

 {
-    "dependencies": { },
-    "frameworks": {
-        // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
-        "netstandard1.6": {
-            "imports": "portable-net452"
-        },
-        "NETCoreApp1.0": {
-            "imports": "portable-net452"
-        }
+  "dependencies": {
+    "System.ValueTuple": "4.3.0-preview1-24530-04"
+  },
+  "frameworks": {
+    // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
+    "netstandard1.6": {
+      "imports": "portable-net452"
     },
-    "runtimes": {
-        "win7-x64": { },
-        "ubuntu.14.04-x64": { },
-        "osx.10.10-x64": { }
+    "NETCoreApp1.0": {
+      "imports": "portable-net452"
     }
+  },
+  "runtimes": {
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "osx.10.10-x64": {}
+  }
 }

src/Interactive/VbiCore/project.json

 {
-    "dependencies": { },
-    "frameworks": {
-        // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
-        "netstandard1.6": {
-            "imports": "portable-net452"
-        },
-        "NETCoreApp1.0": {
-            "imports": "portable-net452"
-        }
+  "dependencies": {
+    "System.ValueTuple": "4.3.0-preview1-24530-04"
+  },
+  "frameworks": {
+    // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
+    "netstandard1.6": {
+      "imports": "portable-net452"
     },
-    "runtimes": {
-        "win7-x64": { },
-        "ubuntu.14.04-x64": { },
-        "osx.10.10-x64": { }
+    "NETCoreApp1.0": {
+      "imports": "portable-net452"
     }
+  },
+  "runtimes": {
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "osx.10.10-x64": {}
+  }
 }

src/Interactive/VbiCore/vbi.rsp

@@ -22,6 +22,7 @@
 /r:System.Threading.Tasks.dll
 /r:System.Threading.Tasks.Parallel.dll
 /r:System.Threading.Thread.dll
+/r:System.ValueTuple.dll
 # imports
 /Imports:System
 /Imports:System.IO

src/Interactive/csi/csi.rsp

 /r:System
 /r:System.Core
 /r:Microsoft.CSharp
+/r:System.ValueTuple.dll
 /u:System
 /u:System.IO
 /u:System.Collections.Generic

src/Interactive/csi/project.json

 {
-    "dependencies": { },
-    "frameworks": {
-        "net46": { }
-    },
-    "runtimes": {
-        "win7": { }
-    }
+  "dependencies": {
+    "System.ValueTuple": "4.3.0-preview1-24530-04"
+  },
+  "frameworks": {
+    "net46": {}
+  },
+  "runtimes": {
+    "win7": {}
+  }
 }

src/Interactive/vbi/project.json

 {
-    "dependencies": { },
-    "frameworks": {
-        "net46": { }
-    },
-    "runtimes": {
-        "win7": { }
-    }
+  "dependencies": {
+    "System.ValueTuple": "4.3.0-preview1-24530-04"
+  },
+  "frameworks": {
+    "net46": {}
+  },
+  "runtimes": {
+    "win7": {}
+  }
 }

src/Interactive/vbi/vbi.rsp

 /r:System
 /r:System.Core
+/r:System.ValueTuple.dll
 /Imports:System
 /Imports:System.IO
 /Imports:System.Collections.Generic

src/Scripting/CSharpTest/CommandLineRunnerTests.cs

@@ -26,7 +26,7 @@ public class CommandLineRunnerTests : TestBase
         // default csi.rsp
         private static readonly string[] s_defaultArgs = new[]
         {
-            "/r:System;System.Core;Microsoft.CSharp",
+            "/r:System;System.Core;Microsoft.CSharp;System.ValueTuple.dll",
             "/u:System;System.IO;System.Collections.Generic;System.Diagnostics;System.Dynamic;System.Linq;System.Linq.Expressions;System.Text;System.Threading.Tasks",
         };
 
@@ -166,6 +166,22 @@ > Print(2)
 > ", runner.Console.Out.ToString());
         }
 
+        [Fact]
+        public void Tuples()
+        {
+            var runner = CreateRunner(input: "(1,2)");
+            runner.RunInteractive();
+
+            AssertEx.AssertEqualToleratingWhitespaceDifferences(
+$@"Microsoft (R) Visual C# Interactive Compiler version {s_compilerVersion}
+Copyright (C) Microsoft Corporation. All rights reserved.
+
+Type ""#help"" for more information.
+> (1,2)
+[(1, 2)]
+> ", runner.Console.Out.ToString());
+        }
+
         [Fact]
         public void Exception()
         {

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

@@ -122,6 +122,7 @@ Public Class BuildDevDivInsertionFiles
         "System.Security.Principal.Windows.dll",
         "System.Text.Encoding.CodePages.dll",
         "System.Threading.Thread.dll",
+        "System.ValueTuple.dll",
         "System.Xml.XmlDocument.dll",
         "System.Xml.XPath.dll",
         "System.Xml.XPath.XDocument.dll",

src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr

@@ -28,6 +28,7 @@ folder InstallDir:\MSBuild\15.0\Bin
     file source=$(OutputPath)\Microsoft.CodeAnalysis.dll vs.file.ngen=yes
     file source=$(OutputPath)\System.Collections.Immutable.dll vs.file.ngen=yes
     file source=$(OutputPath)\System.Reflection.Metadata.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.ValueTuple.dll vs.file.ngen=yes
 
     file source=$(OutputPath)\Microsoft.DiaSymReader.Native.amd64.dll
     file source=$(OutputPath)\Microsoft.DiaSymReader.Native.x86.dll
@@ -81,6 +82,7 @@ folder InstallDir:\MSBuild\15.0\Bin\amd64
     file source=$(OutputPath)\Microsoft.CodeAnalysis.dll vs.file.ngen=yes
     file source=$(OutputPath)\System.Collections.Immutable.dll vs.file.ngen=yes
     file source=$(OutputPath)\System.Reflection.Metadata.dll vs.file.ngen=yes
+    file source=$(OutputPath)\System.ValueTuple.dll vs.file.ngen=yes
 
     file source=$(OutputPath)\Microsoft.DiaSymReader.Native.amd64.dll
     file source=$(OutputPath)\Microsoft.DiaSymReader.Native.x86.dll