Merge branch 'master' of https://github.com/dotnet/roslyn

build/Targets/VSL.Settings.targets

@@ -77,7 +77,7 @@
     <!-- If we're on Visual Studio 2015 RTM and  we still have Roslyn installed, our VSIX-producing packages are not going to install, so let's not even try.
          Update 1 supports this, so we'll use csi.exe's existence as a simple proxy for whether we have Update 1 installed or not.
          OpenSourceDebug overrides this by simple virtue that it's property setting is after the include of this file. -->
-    <DeployExtension Condition="Exists('$(DevEnvDir)\CommonExtensions\Microsoft\Roslyn\Language Services\extension.vsixmanifest') and !Exists('$(MSBuildBinPath)\csi.exe')">false</DeployExtension>
+    <DeployExtension Condition="'$(DeployExtension)' == '' AND Exists('$(DevEnvDir)\CommonExtensions\Microsoft\Roslyn\Language Services\extension.vsixmanifest') AND !Exists('$(MSBuildBinPath)\csi.exe')">false</DeployExtension>
   </PropertyGroup>
 
   <Choose>

cibuild.cmd

@@ -11,7 +11,7 @@ set BuildRestore=false
 REM Because override the C#/VB toolset to build against our LKG package, it is important
 REM that we do not reuse MSBuild nodes from other jobs/builds on the machine. Otherwise, 
 REM we'll run into issues such as https://github.com/dotnet/roslyn/issues/6211.
-set MSBuildAdditionalCommandLineArgs=/nologo /v:m /m /nodeReuse:false
+set MSBuildAdditionalCommandLineArgs=/nologo /v:m /m /nodeReuse:false /p:DeployExtension=false
 
 :ParseArguments
 if "%1" == "" goto :DoneParsing

src/NuGet/Microsoft.Net.Interactive.netcore.nuspec

+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+    <metadata>
+        <id>Microsoft.Net.Interactive.netcore</id>
+        <description>
+            CoreCLR-compatible version of csi.exe.
+
+            Supported Platforms:
+            - .NET Core (dnxcore50)
+        </description>
+        <language>en-US</language>
+        <requireLicenseAcceptance>true</requireLicenseAcceptance>
+        <version>$version$</version>
+        <authors>$authors$</authors>
+        <licenseUrl>$licenseUrl$</licenseUrl>
+        <projectUrl>$projectUrl$</projectUrl>
+        <tags>$tags$</tags>
+        <dependencies>
+            <group targetFramework="dnxcore50">
+                <dependency id="Microsoft.CodeAnalysis.Compilers" version="$version$" />
+                <dependency id="Microsoft.CodeAnalysis.Scripting" version="$version$" />
+                <dependency id="System.AppContext" version="4.0.1-beta-23428" />
+                <dependency id="System.Collections" version="4.0.11-beta-23428" />
+                <dependency id="System.Collections.Immutable" version="1.1.37" />
+                <dependency id="System.Diagnostics.Debug" version="4.0.11-beta-23428" />
+                <dependency id="System.Diagnostics.StackTrace" version="4.0.1-beta-23428" />
+                <dependency id="System.Diagnostics.Tools" version="4.0.1-beta-23428" />
+                <dependency id="System.Globalization" version="4.0.11-beta-23428" />
+                <dependency id="System.IO" version="4.0.11-beta-23428" />
+                <dependency id="System.IO.FileSystem" version="4.0.1-beta-23428" />
+                <dependency id="System.IO.FileSystem.Primitives" version="4.0.1-beta-23428" />
+                <dependency id="System.Linq" version="4.0.1-beta-23428" />
+                <dependency id="System.Linq.Expressions" version="4.0.11-beta-23428" />
+                <dependency id="System.Reflection" version="4.1.0-beta-23428" />
+                <dependency id="System.Reflection.Metadata" version="1.1.0-beta-23428" />
+                <dependency id="System.Reflection.Primitives" version="4.0.1-beta-23428" />
+                <dependency id="System.Resources.ResourceManager" version="4.0.1-beta-23428" />
+                <dependency id="System.Runtime" version="4.0.21-beta-23428" />
+                <dependency id="System.Runtime.Extensions" version="4.0.11-beta-23428" />
+                <dependency id="System.Runtime.Handles" version="4.0.1-beta-23428" />
+                <dependency id="System.Runtime.InteropServices" version="4.0.21-beta-23428" />
+                <dependency id="System.Text.Encoding" version="4.0.11-beta-23428" />
+                <dependency id="System.Text.Encoding.Extensions" version="4.0.11-beta-23428" />
+                <dependency id="System.Threading" version="4.0.11-beta-23428" />
+                <dependency id="System.Threading.Tasks" version="4.0.11-beta-23428" />
+            </group>
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="csi.exe" target="runtimes/any/native" />
+    </files>
+</package>