Create a NETCore-targeted Csc package

Creates a new package, Microsoft.NETCore.Csc, which contains a Csc
binary compiled against the netcoreapp1.1 shared framework. This can be
installed as a NuGet package and built using the dotnet SDK, as long as
the netcoreapp1.1 framework is installed.

This change also downgrades a few packages, like
System.Diagnostics.FileVersionInfo, that were higher than the
version available in netcoreapp1.1.

# Conflicts:
#	src/Compilers/VisualBasic/VbcCore/project.json
#	src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json
#	src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json

.gitattributes

@@ -12,6 +12,7 @@
 # files must be hard-coded to be cloned with LF
 src/Compilers/CSharp/CscCore/csc text eol=lf
 src/Compilers/VisualBasic/VbcCore/vbc text eol=lf
+build/NuGetAdditionalFiles/RunCsc text eol=lf
 
 ###############################################################################
 # Set default behavior for command prompt diff.

build/NuGetAdditionalFiles/Microsoft.NETCore.Csc.props

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Always use the local build task, even if we just shell out to an exe in case there are
+       new properties in the local build task. -->
+  <UsingTask TaskName="Microsoft.CodeAnalysis.BuildTasks.Csc"
+             AssemblyFile="$(MSBuildThisFileDirectory)..\tools\Microsoft.Build.Tasks.CodeAnalysis.dll" />
+  <PropertyGroup>
+    <CSharpCoreTargetsPath>$(MSBuildThisFileDirectory)..\tools\Microsoft.CSharp.Core.targets</CSharpCoreTargetsPath>
+  </PropertyGroup>
+
+  <!-- If we're not using the compiler server, set ToolPath/Exe to direct to
+       the exes in this package -->
+  <PropertyGroup Condition="'$(UseSharedCompilation)' != 'true'">
+    <CscToolPath>$(MSBuildThisFileDirectory)..\tools</CscToolPath>
+    <CscToolExe>RunCsc</CscToolExe>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

build/NuGetAdditionalFiles/RunCsc

+#!/bin/sh
+
+THISDIR=$(dirname $0)
+
+dotnet $THISDIR/csc.exe "$@"
\ No newline at end of file

build/NuGetAdditionalFiles/RunCsc.cmd

+echo off
+dotnet %~dp0\csc.exe %*
\ No newline at end of file

build/Targets/Dependencies.props

@@ -42,7 +42,7 @@
     <SystemConsoleVersion>4.3.0</SystemConsoleVersion>
     <SystemDiagnosticsContractsVersion>4.3.0</SystemDiagnosticsContractsVersion>
     <SystemDiagnosticsDebugVersion>4.3.0</SystemDiagnosticsDebugVersion>
-    <SystemDiagnosticsFileVersionInfoVersion>4.3.0</SystemDiagnosticsFileVersionInfoVersion>
+    <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
     <SystemDiagnosticsProcessVersion>4.3.0</SystemDiagnosticsProcessVersion>
     <SystemDiagnosticsStackTraceVersion>4.3.0</SystemDiagnosticsStackTraceVersion>
     <SystemDiagnosticsToolsVersion>4.3.0</SystemDiagnosticsToolsVersion>
@@ -79,7 +79,7 @@
     <SystemRuntimeInteropServicesRuntimeInformationVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
     <SystemRuntimeLoaderVersion>4.3.0</SystemRuntimeLoaderVersion>
     <SystemRuntimeNumericsVersion>4.3.0</SystemRuntimeNumericsVersion>
-    <SystemRuntimeSerializationJsonVersion>4.3.0</SystemRuntimeSerializationJsonVersion>
+    <SystemRuntimeSerializationJsonVersion>4.0.3</SystemRuntimeSerializationJsonVersion>
     <SystemRuntimeSerializationPrimitivesVersion>4.3.0</SystemRuntimeSerializationPrimitivesVersion>
     <SystemSecurityAccessControlVersion>4.3.0</SystemSecurityAccessControlVersion>
     <SystemSecurityCryptographyAlgorithmsVersion>4.3.0</SystemSecurityCryptographyAlgorithmsVersion>
@@ -88,7 +88,7 @@
     <SystemSecurityCryptographyX509CertificatesVersion>4.3.0</SystemSecurityCryptographyX509CertificatesVersion>
     <SystemSecurityPrincipalWindowsVersion>4.3.0</SystemSecurityPrincipalWindowsVersion>
     <SystemTextEncodingVersion>4.3.0</SystemTextEncodingVersion>
-    <SystemTextEncodingCodePagesVersion>4.3.0</SystemTextEncodingCodePagesVersion>
+    <SystemTextEncodingCodePagesVersion>4.0.1</SystemTextEncodingCodePagesVersion>
     <SystemTextEncodingExtensionsVersion>4.3.0</SystemTextEncodingExtensionsVersion>
     <SystemTextRegularExpressionsVersion>4.3.0</SystemTextRegularExpressionsVersion>
     <SystemThreadingVersion>4.3.0</SystemThreadingVersion>

src/Compilers/CSharp/CscCore/CscCore.csproj

@@ -59,6 +59,12 @@
     <None Include="csc">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="csc.deps.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="csc.runtimeconfig.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="project.json" />
   </ItemGroup>
   <Import Project="..\..\Core\CommandLine\CommandLine.projitems" Label="Shared" />

src/Compilers/CSharp/CscCore/csc.deps.json

+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v1.1",
+    "signature": "e5ea3817b6aac63ca2090d539fed7ef5d4d7342b"
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v1.1": {
+      "csc/1.0.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis": "1.0.0",
+          "Microsoft.CodeAnalysis.CSharp": "1.0.0"
+        },
+        "runtime": {
+          "csc.dll": {}
+        }
+      },
+      "system.collections.immutable/1.3.1": {
+        "runtime": {
+          "lib/netstandard1.0/System.Collections.Immutable.dll": {}
+        }
+      },
+      "system.reflection.metadata/1.4.2": {
+        "dependencies": {
+          "System.Collections.Immutable": "1.3.1"
+        },
+        "runtime": {
+          "lib/netstandard1.1/System.Reflection.Metadata.dll": {}
+        }
+      },
+      "system.valuetuple/4.3.0": {
+        "runtime": {
+          "lib/netstandard1.0/System.ValueTuple.dll": {}
+        }
+      },
+      "system.xml.xmldocument/4.3.0": {
+        "runtime": {
+          "lib/netstandard1.3/System.Xml.XmlDocument.dll": {}
+        }
+      },
+      "system.xml.xpath/4.3.0": {
+        "runtime": {
+          "lib/netstandard1.3/System.Xml.XPath.dll": {}
+        }
+      },
+      "system.xml.xpath.xdocument/4.3.0": {
+        "dependencies": {
+          "System.Xml.XPath": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.3/System.Xml.XPath.XDocument.dll": {}
+        }
+      },
+      "microsoft.codeanalysis/1.0.0": {
+        "dependencies": {
+          "System.Collections.Immutable": "1.3.1",
+          "System.Reflection.Metadata": "1.4.2",
+          "System.ValueTuple": "4.3.0",
+          "System.Xml.XPath.XDocument": "4.3.0",
+          "System.Xml.XmlDocument": "4.3.0"
+        },
+        "runtime": {
+          "Microsoft.CodeAnalysis.dll": {}
+        }
+      },
+      "microsoft.codeanalysis.csharp/1.0.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis": "1.0.0"
+        },
+        "runtime": {
+          "Microsoft.CodeAnalysis.CSharp.dll": {}
+        }
+      }
+    }
+  },
+  "libraries": {
+    "csc/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "system.collections.immutable/1.3.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-n+AGX7zmiZumW9aggOkXaHzUeAS3EfeTErnkKCusyONUozbTv+kMb8VE36m+ldV6kF9g57G2c641KCdgH9E0pg==",
+      "path": "system.collections.immutable/1.3.1",
+      "hashPath": "system.collections.immutable.1.3.1.nupkg.sha512"
+    },
+    "system.reflection.metadata/1.4.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-KYPNMDrLB2R+G5JJiJ2fjBpihtktKVIjsirmyyv+VDo5rQkIR9BWeCYM1wDSzbQatWNZ/NQfPsQyTB1Ui3qBfQ==",
+      "path": "system.reflection.metadata/1.4.2",
+      "hashPath": "system.reflection.metadata.1.4.2.nupkg.sha512"
+    },
+    "system.valuetuple/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-cNLEvBX3d6MMQRZe3SMFNukVbitDAEpVZO17qa0/2FHxZ7Y7PpFRpr6m2615XYM/tYYYf0B+WyHNujqIw8Luwg==",
+      "path": "system.valuetuple/4.3.0",
+      "hashPath": "system.valuetuple.4.3.0.nupkg.sha512"
+    },
+    "system.xml.xmldocument/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-lJ8AxvkX7GQxpC6GFCeBj8ThYVyQczx2+f/cWHJU8tjS7YfI6Cv6bon70jVEgs2CiFbmmM8b9j1oZVx0dSI2Ww==",
+      "path": "system.xml.xmldocument/4.3.0",
+      "hashPath": "system.xml.xmldocument.4.3.0.nupkg.sha512"
+    },
+    "system.xml.xpath/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-v1JQ5SETnQusqmS3RwStF7vwQ3L02imIzl++sewmt23VGygix04pEH+FCj1yWb+z4GDzKiljr1W7Wfvrx0YwgA==",
+      "path": "system.xml.xpath/4.3.0",
+      "hashPath": "system.xml.xpath.4.3.0.nupkg.sha512"
+    },
+    "system.xml.xpath.xdocument/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-jw9oHHEIVW53mHY9PgrQa98Xo2IZ0ZjrpdOTmtvk+Rvg4tq7dydmxdNqUvJ5YwjDqhn75mBXWttWjiKhWP53LQ==",
+      "path": "system.xml.xpath.xdocument/4.3.0",
+      "hashPath": "system.xml.xpath.xdocument.4.3.0.nupkg.sha512"
+    },
+    "microsoft.codeanalysis/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "microsoft.codeanalysis.csharp/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file

src/Compilers/CSharp/CscCore/csc.runtimeconfig.json

+{
+  "runtimeOptions": {
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "1.1.0"
+    }
+  }
+}
\ No newline at end of file

src/Compilers/CSharp/CscCore/project.json

@@ -5,51 +5,12 @@
     "Microsoft.NETCore.Runtime.CoreCLR": "1.1.0",
     "Microsoft.NETCore.TestHost": "1.1.0",
     "System.AppContext": "4.3.0",
-    "System.Collections": "4.3.0",
-    "System.Collections.Concurrent": "4.3.0",
-    "System.Collections.Immutable": "1.3.1",
     "System.Console": "4.3.0",
-    "System.Diagnostics.Debug": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
     "System.Diagnostics.Process": "4.3.0",
-    "System.Diagnostics.StackTrace": "4.3.0",
-    "System.Diagnostics.Tools": "4.3.0",
-    "System.Dynamic.Runtime": "4.3.0",
-    "System.Globalization": "4.3.0",
-    "System.IO.Compression": "4.3.0",
-    "System.IO.FileSystem": "4.3.0",
-    "System.IO.FileSystem.Primitives": "4.3.0",
-    "System.IO.FileSystem.Watcher": "4.3.0",
-    "System.IO.Pipes": "4.3.0",
-    "System.Linq": "4.3.0",
-    "System.Linq.Expressions": "4.3.0",
     "System.Net.NameResolution": "4.3.0",
     "System.Net.Sockets": "4.3.0",
-    "System.Reflection": "4.3.0",
-    "System.Reflection.Primitives": "4.3.0",
-    "System.Resources.ResourceManager": "4.3.0",
-    "System.Runtime": "4.3.0",
-    "System.Runtime.Extensions": "4.3.0",
-    "System.Runtime.Handles": "4.3.0",
-    "System.Runtime.InteropServices": "4.3.0",
     "System.Runtime.Loader": "4.3.0",
-    "System.Runtime.Numerics": "4.3.0",
-    "System.Runtime.Serialization.Primitives": "4.3.0",
-    "System.Runtime.Serialization.Json": "4.3.0",
-    "System.Security.Cryptography.Algorithms": "4.3.0",
-    "System.Security.Cryptography.Encoding": "4.3.0",
-    "System.Security.Cryptography.X509Certificates": "4.3.0",
-    "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
-    "System.Text.Encoding.Extensions": "4.3.0",
-    "System.Threading": "4.3.0",
-    "System.Threading.Tasks": "4.3.0",
-    "System.Threading.Tasks.Parallel": "4.3.0",
-    "System.Threading.Thread": "4.3.0",
-    "System.Xml.ReaderWriter": "4.3.0",
-    "System.Xml.XDocument": "4.3.0",
-    "System.Xml.XmlDocument": "4.3.0",
-    "System.Xml.XPath.XDocument": "4.3.0"
+    "System.Threading.Thread": "4.3.0"
   },
   "frameworks": {
     // We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458

src/Compilers/Core/MSBuildTask/AssemblyResolution.cs

@@ -50,7 +50,6 @@ private static bool TryRedirect(AssemblyName name)
                     return TryRedirect(name, s_b77a5c561934e089, 4, 1, 2, 0);
 
                 case "System.Console":
-                case "System.Diagnostics.FileVersionInfo":
                 case "System.IO.Pipes":
                 case "System.Security.AccessControl":
                 case "System.Security.Cryptography.Primitives":

src/Compilers/Core/Portable/project.json

@@ -6,7 +6,7 @@
     "System.Collections": "4.3.0",
     "System.Collections.Concurrent": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.IO": "4.3.0",
     "System.IO.Compression": "4.3.0",
     "System.IO.FileSystem": "4.3.0",
@@ -17,7 +17,7 @@
     "System.Security.Cryptography.Encoding": "4.3.0",
     "System.Security.Cryptography.X509Certificates": "4.3.0",
     "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
+    "System.Text.Encoding.CodePages": "4.0.1",
     "System.Text.Encoding.Extensions": "4.3.0",
     "System.ValueTuple": "4.3.0",
     "System.Xml.ReaderWriter": "4.3.0",
@@ -28,4 +28,4 @@
   "frameworks": {
     "netstandard1.3": {}
   }
-}
+}
\ No newline at end of file

src/Compilers/Server/PortableServer/project.json

-{
-  "dependencies": { 
+{
+  "dependencies": {
     "System.AppContext": "4.3.0",
     "System.Console": "4.3.0",
     "System.Diagnostics.Debug": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.Diagnostics.Process": "4.3.0",
     "System.Diagnostics.StackTrace": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
@@ -30,9 +30,9 @@
     }
   },
   "runtimes": {
-    "win7-x64": { },
-    "ubuntu.14.04-x64": { },
-    "ubuntu.16.04-x64": { },
-    "osx.10.10-x64": { }
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "ubuntu.16.04-x64": {},
+    "osx.10.10-x64": {}
   }
-}
+}
\ No newline at end of file

src/Compilers/VisualBasic/VbcCore/project.json

-{
+{
   "dependencies": {
     "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
     "Microsoft.NETCore.Platforms": "1.1.0",
@@ -10,7 +10,7 @@
     "System.Collections.Immutable": "1.3.1",
     "System.Console": "4.3.0",
     "System.Diagnostics.Debug": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.Diagnostics.Process": "4.3.0",
     "System.Diagnostics.StackTrace": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
@@ -35,12 +35,12 @@
     "System.Runtime.Loader": "4.3.0",
     "System.Runtime.Numerics": "4.3.0",
     "System.Runtime.Serialization.Primitives": "4.3.0",
-    "System.Runtime.Serialization.Json": "4.3.0",
+    "System.Runtime.Serialization.Json": "4.0.3",
     "System.Security.Cryptography.Algorithms": "4.3.0",
     "System.Security.Cryptography.Encoding": "4.3.0",
     "System.Security.Cryptography.X509Certificates": "4.3.0",
     "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
+    "System.Text.Encoding.CodePages": "4.0.1",
     "System.Text.Encoding.Extensions": "4.3.0",
     "System.Threading": "4.3.0",
     "System.Threading.Tasks": "4.3.0",
@@ -66,4 +66,4 @@
     "ubuntu.16.04-x64": { },
     "osx.10.10-x64": { }
   }
-}
+}
\ No newline at end of file

src/Interactive/CsiCore/project.json

@@ -11,7 +11,7 @@
     "System.Collections.Immutable": "1.3.1",
     "System.Console": "4.3.0",
     "System.Diagnostics.Debug": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.Diagnostics.Process": "4.3.0",
     "System.Diagnostics.StackTrace": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
@@ -36,12 +36,12 @@
     "System.Runtime.Loader": "4.3.0",
     "System.Runtime.Numerics": "4.3.0",
     "System.Runtime.Serialization.Primitives": "4.3.0",
-    "System.Runtime.Serialization.Json": "4.3.0",
+    "System.Runtime.Serialization.Json": "4.0.3",
     "System.Security.Cryptography.Algorithms": "4.3.0",
     "System.Security.Cryptography.Encoding": "4.3.0",
     "System.Security.Cryptography.X509Certificates": "4.3.0",
     "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
+    "System.Text.Encoding.CodePages": "4.0.1",
     "System.Text.Encoding.Extensions": "4.3.0",
     "System.Threading": "4.3.0",
     "System.Threading.Tasks": "4.3.0",
@@ -54,7 +54,6 @@
     "System.Xml.XPath.XDocument": "4.3.0"
   },
   "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"
     },
@@ -68,4 +67,4 @@
     "ubuntu.16.04-x64": {},
     "osx.10.10-x64": {}
   }
-}
+}
\ No newline at end of file

src/Interactive/VbiCore/project.json

@@ -11,7 +11,7 @@
     "System.Collections.Immutable": "1.3.1",
     "System.Console": "4.3.0",
     "System.Diagnostics.Debug": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.Diagnostics.Process": "4.3.0",
     "System.Diagnostics.StackTrace": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
@@ -36,12 +36,12 @@
     "System.Runtime.Loader": "4.3.0",
     "System.Runtime.Numerics": "4.3.0",
     "System.Runtime.Serialization.Primitives": "4.3.0",
-    "System.Runtime.Serialization.Json": "4.3.0",
+    "System.Runtime.Serialization.Json": "4.0.3",
     "System.Security.Cryptography.Algorithms": "4.3.0",
     "System.Security.Cryptography.Encoding": "4.3.0",
     "System.Security.Cryptography.X509Certificates": "4.3.0",
     "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
+    "System.Text.Encoding.CodePages": "4.0.1",
     "System.Text.Encoding.Extensions": "4.3.0",
     "System.Threading": "4.3.0",
     "System.Threading.Tasks": "4.3.0",
@@ -54,7 +54,6 @@
     "System.Xml.XPath.XDocument": "4.3.0"
   },
   "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"
     },
@@ -68,4 +67,4 @@
     "ubuntu.16.04-x64": {},
     "osx.10.10-x64": {}
   }
-}
+}
\ No newline at end of file

src/NuGet/BuildNuGets.csx

@@ -77,6 +77,9 @@ var IsCoreBuild = File.Exists(Path.Combine(ToolsetPath, "corerun"));
 var NuGetAdditionalFilesPath = Path.Combine(SolutionRoot, "build/NuGetAdditionalFiles");
 var ThirdPartyNoticesPath = Path.Combine(NuGetAdditionalFilesPath, "ThirdPartyNotices.rtf");
 var NetCompilersPropsPath = Path.Combine(NuGetAdditionalFilesPath, "Microsoft.Net.Compilers.props");
+var NetcoreCscPropsPath = Path.Combine(NuGetAdditionalFilesPath, "Microsoft.NETCore.Csc.props");
+var RunCscShPath = Path.Combine(NuGetAdditionalFilesPath, "RunCsc");
+var RunCscCmdPath = Path.Combine(NuGetAdditionalFilesPath, "RunCsc.cmd");
 
 string[] RedistPackageNames = {
     "Microsoft.CodeAnalysis",
@@ -110,6 +113,7 @@ string[] NonRedistPackageNames = {
     "Microsoft.Net.Compilers",
     "Microsoft.Net.Compilers.netcore",
     "Microsoft.Net.CSharp.Interactive.netcore",
+    "Microsoft.NETCore.Csc",
     "Microsoft.VisualStudio.IntegrationTest.Utilities",
     "Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient",
 };
@@ -127,6 +131,7 @@ var PreReleaseOnlyPackages = new HashSet<string>
     "Microsoft.CodeAnalysis.VisualBasic.Scripting",
     "Microsoft.Net.Compilers.netcore",
     "Microsoft.Net.CSharp.Interactive.netcore",
+    "Microsoft.NETCore.Csc",
     "Microsoft.CodeAnalysis.Remote.Razor.ServiceHub",
     "Microsoft.CodeAnalysis.Remote.ServiceHub",
     "Microsoft.CodeAnalysis.Remote.Workspaces",
@@ -206,6 +211,9 @@ int PackFiles(string[] nuspecFiles, string licenseUrl)
         { "thirdPartyNoticesPath", ThirdPartyNoticesPath },
         { "netCompilersPropsPath", NetCompilersPropsPath },
         { "emptyDirPath", emptyDir },
+        { "netcoreCscPropsPath", NetcoreCscPropsPath },
+        { "runCscShPath", RunCscShPath },
+        { "runCscCmdPath", RunCscCmdPath },
     };
 
     foreach (var dependencyVersion in dependencyVersions)

src/NuGet/Microsoft.NETCore.Csc.nuspec

+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
+  <metadata>
+    <id>Microsoft.NETCore.Csc</id>
+    <description>
+      CoreCLR-compatible version of the C# compiler for use in MSBuild.
+    </description>
+    <language>en-US</language>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <licenseUrl>$licenseUrl$</licenseUrl>
+    <projectUrl>$projectUrl$</projectUrl>
+    <tags>$tags$</tags>
+    <serviceable>true</serviceable>
+    <developmentDependency>true</developmentDependency>
+  </metadata>
+  <files>
+    <file src="$netcoreCscPropsPath$" target="build/Microsoft.NETCore.Csc.props" />
+    <file src="Dlls/CodeAnalysis/Microsoft.CodeAnalysis.dll" target="tools" />
+    <file src="Dlls/CSharpCodeAnalysis/Microsoft.CodeAnalysis.CSharp.dll" target="tools" />
+    <file src="Exes/CscCore/csc.exe" target="tools" />
+    <file src="Exes/CscCore/csc.deps.json" target="tools" />
+    <file src="Exes/CscCore/csc.runtimeconfig.json" target="tools" />
+    <file src="$runCscShPath$" target="tools/RunCsc" />
+    <file src="$runCscCmdPath$" target="tools" />
+    <file src="Dlls/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.dll" target="tools" />
+    <file src="Dlls/MSbuildTask/Microsoft.CSharp.Core.targets" target="tools" />
+
+    <!-- References that are either not in the target framework or are a higher version -->
+    <file src="Exes/CscCore/System.Collections.Immutable.dll" target="tools" />
+    <file src="Exes/CscCore/System.Reflection.Metadata.dll" target="tools" />
+    <file src="Exes/CscCore/System.ValueTuple.dll" target="tools" />
+    <file src="Exes/CscCore/System.Xml.XmlDocument.dll" target="tools" />
+    <file src="Exes/CscCore/System.Xml.XPath.dll" target="tools" />
+    <file src="Exes/CscCore/System.Xml.XPath.XDocument.dll" target="tools" />
+  </files>
+</package>

src/Setup/DevDivPackages/Roslyn/project.json

@@ -12,7 +12,7 @@
     "System.Collections.Concurrent": "4.3.0",
     "System.Diagnostics.Process": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.Diagnostics.StackTrace": "4.3.0",
     "System.IO": "4.3.0",
     "System.IO.Compression": "4.3.0",
@@ -26,7 +26,7 @@
     "System.Security.Cryptography.X509Certificates": "4.3.0",
     "System.Security.Principal.Windows": "4.3.0",
     "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
+    "System.Text.Encoding.CodePages": "4.0.1",
     "System.Text.Encoding.Extensions": "4.3.0",
     "System.Text.RegularExpressions": "4.3.0",
     "System.Threading.Thread": "4.3.0",
@@ -34,7 +34,7 @@
     "System.Xml.XDocument": "4.3.0",
     "System.Xml.XmlDocument": "4.3.0",
     "System.Xml.XPath.XDocument": "4.3.0",
-    "System.ValueTuple": "4.3.0",
+    "System.ValueTuple": "4.3.0"
   },
   "frameworks": {
     "net46": {}
@@ -42,4 +42,4 @@
   "runtimes": {
     "win": {}
   }
-}
+}
\ No newline at end of file

src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr

@@ -6,7 +6,7 @@ package name=PortableFacades
 folder InstallDir:\Common7\IDE\PrivateAssemblies
     file source="$(NuGetPackageRoot)\System.AppContext\4.3.0\lib\net46\System.AppContext.dll" vs.file.ngen=yes
     file source="$(NuGetPackageRoot)\System.Console\4.3.0\lib\net46\System.Console.dll" vs.file.ngen=yes
-    file source="$(NuGetPackageRoot)\System.Diagnostics.FileVersionInfo\4.3.0\runtimes\win\lib\net46\System.Diagnostics.FileVersionInfo.dll" vs.file.ngen=yes
+    file source="$(NuGetPackageRoot)\System.Diagnostics.FileVersionInfo\4.0.0\runtimes\win\lib\net46\System.Diagnostics.FileVersionInfo.dll" vs.file.ngen=yes
     file source="$(NuGetPackageRoot)\System.Diagnostics.Process\4.3.0\runtimes\win\lib\net46\System.Diagnostics.Process.dll" vs.file.ngen=yes
     file source="$(NuGetPackageRoot)\System.Diagnostics.StackTrace\4.3.0\lib\net46\System.Diagnostics.StackTrace.dll" vs.file.ngen=yes
     file source="$(NuGetPackageRoot)\System.IO.Compression\4.3.0\runtimes\win\lib\net46\System.IO.Compression.dll" vs.file.ngen=yes

src/Test/Utilities/CoreClr/project.json

@@ -24,4 +24,4 @@
       "imports": "portable-net452"
     }
   }
-}
+}
\ No newline at end of file

src/Test/Utilities/Portable/project.json

@@ -27,4 +27,4 @@
       "imports": "portable-net452"
     }
   }
-}
+}
\ No newline at end of file

src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json

@@ -16,4 +16,4 @@
     "ubuntu.16.04-x64": { },
     "osx.10.10-x64": { }
   }
-}
+}
\ No newline at end of file

src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json

@@ -16,4 +16,4 @@
     "ubuntu.16.04-x64": { },
     "osx.10.10-x64": { }
   }
-}
+}
\ No newline at end of file

src/VisualStudio/Setup.Dependencies/project.json

@@ -9,7 +9,7 @@
     "System.Collections.Concurrent": "4.3.0",
     "System.Diagnostics.Contracts": "4.3.0",
     "System.Diagnostics.Tools": "4.3.0",
-    "System.Diagnostics.FileVersionInfo": "4.3.0",
+    "System.Diagnostics.FileVersionInfo": "4.0.0",
     "System.IO": "4.3.0",
     "System.IO.Compression": "4.3.0",
     "System.IO.FileSystem": "4.3.0",
@@ -25,7 +25,7 @@
     "System.Security.Cryptography.Primitives": "4.3.0",
     "System.Security.Cryptography.X509Certificates": "4.3.0",
     "System.Text.Encoding": "4.3.0",
-    "System.Text.Encoding.CodePages": "4.3.0",
+    "System.Text.Encoding.CodePages": "4.0.1",
     "System.Text.Encoding.Extensions": "4.3.0",
     "System.Text.RegularExpressions": "4.3.0",
     "System.Threading.Tasks.Parallel": "4.3.0",