diff --git a/.gitattributes b/.gitattributes
index 70a51e2ddded02793ff69a6a3419ac9f155f9dc1..fedb564445757f3ef3875b46c18ca96872011f40 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,6 +12,8 @@
# 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
+build/NuGetAdditionalFiles/RunVbc text eol=lf
###############################################################################
# Set default behavior for command prompt diff.
diff --git a/build/NuGetAdditionalFiles/Microsoft.NETCore.Compilers.props b/build/NuGetAdditionalFiles/Microsoft.NETCore.Compilers.props
new file mode 100644
index 0000000000000000000000000000000000000000..f84aa16dcb1d2943df6859144f97e2f46f249ff5
--- /dev/null
+++ b/build/NuGetAdditionalFiles/Microsoft.NETCore.Compilers.props
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+ $(MSBuildThisFileDirectory)..\tools\Microsoft.CSharp.Core.targets
+ $(MSBuildThisFileDirectory)..\tools\Microsoft.VisualBasic.Core.targets
+
+
+
+
+
+ false
+ $(MSBuildThisFileDirectory)..\tools\bincore
+ RunCsc.cmd
+ RunCsc
+ $(MSBuildThisFileDirectory)..\tools\bincore
+ RunVbc.cmd
+ RunVbc
+
+
+
+
+
+
+
diff --git a/build/NuGetAdditionalFiles/RunCsc b/build/NuGetAdditionalFiles/RunCsc
new file mode 100644
index 0000000000000000000000000000000000000000..d5419ae66d17f5313bcf3b3f41e8b30f8dc3e528
--- /dev/null
+++ b/build/NuGetAdditionalFiles/RunCsc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+THISDIR=$(dirname $0)
+
+dotnet $THISDIR/csc.dll "$@"
diff --git a/build/NuGetAdditionalFiles/RunCsc.cmd b/build/NuGetAdditionalFiles/RunCsc.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..17ad8b6fb77dc625961227d3973b767ffd6cf89e
--- /dev/null
+++ b/build/NuGetAdditionalFiles/RunCsc.cmd
@@ -0,0 +1,2 @@
+echo off
+dotnet %~dp0\csc.dll %*
diff --git a/build/NuGetAdditionalFiles/RunVbc b/build/NuGetAdditionalFiles/RunVbc
new file mode 100644
index 0000000000000000000000000000000000000000..5babac90c52327e91534ae1a628b978b4e3d0ad8
--- /dev/null
+++ b/build/NuGetAdditionalFiles/RunVbc
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+THISDIR=$(dirname $0)
+
+dotnet $THISDIR/vbc.dll "$@"
diff --git a/build/NuGetAdditionalFiles/RunVbc.cmd b/build/NuGetAdditionalFiles/RunVbc.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e76259772fe4f0507c05f5803127d40a171ad03f
--- /dev/null
+++ b/build/NuGetAdditionalFiles/RunVbc.cmd
@@ -0,0 +1,2 @@
+echo off
+dotnet %~dp0\vbc.dll %*
diff --git a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
index 09d0536ac2f9ee20f78efcd7d3edccee5e839a50..70a2a276f57802bab7ae7c5c17bcb49cd4b73524 100644
--- a/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
+++ b/src/Compilers/VisualBasic/VbcCore/VbcCore.csproj
@@ -5,7 +5,6 @@
AnyCPU
AnyCPU
- x64
{8CE3A581-2969-4864-A803-013E9D977C3A}
Exe
Microsoft.CodeAnalysis.VisualBasic.CommandLine
diff --git a/src/NuGet/BuildNuGets.csx b/src/NuGet/BuildNuGets.csx
index a5bb49699f261f4247ebff303a486943a68e70a0..89a40a3350c0b20f8fdaace277f0998b82131542 100644
--- a/src/NuGet/BuildNuGets.csx
+++ b/src/NuGet/BuildNuGets.csx
@@ -76,8 +76,6 @@ var IsCoreBuild = File.Exists(Path.Combine(ToolsetPath, "corerun"));
#endregion
var NuGetAdditionalFilesPath = Path.Combine(SolutionRoot, "build/NuGetAdditionalFiles");
-var ThirdPartyNoticesPath = Path.Combine(NuGetAdditionalFilesPath, "ThirdPartyNotices.rtf");
-var NetCompilersPropsPath = Path.Combine(NuGetAdditionalFilesPath, "Microsoft.Net.Compilers.props");
string[] RedistPackageNames = {
"Microsoft.CodeAnalysis",
@@ -111,6 +109,7 @@ string[] NonRedistPackageNames = {
"Microsoft.Net.Compilers",
"Microsoft.Net.Compilers.netcore",
"Microsoft.Net.CSharp.Interactive.netcore",
+ "Microsoft.NETCore.Compilers",
"Microsoft.VisualStudio.IntegrationTest.Utilities",
"Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient",
};
@@ -128,6 +127,7 @@ var PreReleaseOnlyPackages = new HashSet
"Microsoft.CodeAnalysis.VisualBasic.Scripting",
"Microsoft.Net.Compilers.netcore",
"Microsoft.Net.CSharp.Interactive.netcore",
+ "Microsoft.NETCore.Compilers",
"Microsoft.CodeAnalysis.Remote.Razor.ServiceHub",
"Microsoft.CodeAnalysis.Remote.ServiceHub",
"Microsoft.CodeAnalysis.Remote.Workspaces",
@@ -204,9 +204,8 @@ int PackFiles(string[] nuspecFiles, string licenseUrl)
{ "authors", Authors },
{ "projectURL", ProjectURL },
{ "tags", Tags },
- { "thirdPartyNoticesPath", ThirdPartyNoticesPath },
- { "netCompilersPropsPath", NetCompilersPropsPath },
{ "emptyDirPath", emptyDir },
+ { "additionalFilesPath", NuGetAdditionalFilesPath }
};
foreach (var dependencyVersion in dependencyVersions)
diff --git a/src/NuGet/Microsoft.CodeAnalysis.nuspec b/src/NuGet/Microsoft.CodeAnalysis.nuspec
index 1c04c02ca4e90054725d1ea0e7431108c22c9870..ad9c455ad807b3ff373ac05be1e70cd578daacfb 100644
--- a/src/NuGet/Microsoft.CodeAnalysis.nuspec
+++ b/src/NuGet/Microsoft.CodeAnalysis.nuspec
@@ -28,6 +28,6 @@
$tags$
-
+
diff --git a/src/NuGet/Microsoft.NETCore.Compilers.nuspec b/src/NuGet/Microsoft.NETCore.Compilers.nuspec
new file mode 100644
index 0000000000000000000000000000000000000000..e1f9ca0c5759859fb5dae6a035aea7df71176ca5
--- /dev/null
+++ b/src/NuGet/Microsoft.NETCore.Compilers.nuspec
@@ -0,0 +1,45 @@
+
+
+
+ Microsoft.NETCore.Compilers
+
+ CoreCLR-compatible versions of the C# and VB compilers for use in MSBuild.
+
+ en-US
+ true
+ $version$
+ $authors$
+ $licenseUrl$
+ $projectUrl$
+ $tags$
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/NuGet/Microsoft.Net.Compilers.nuspec b/src/NuGet/Microsoft.Net.Compilers.nuspec
index 51952124a68b57863b10b6cd2e42f78e7c3427d2..c6b6d02a71fc9d9b30a39a57d3a84b79fb8ca252 100644
--- a/src/NuGet/Microsoft.Net.Compilers.nuspec
+++ b/src/NuGet/Microsoft.Net.Compilers.nuspec
@@ -18,8 +18,8 @@
true
-
-
+
+
diff --git a/src/NuGet/NuGet.proj b/src/NuGet/NuGet.proj
index 2cf66880af289e0e57d3b14b2702752dc1b4b307..65fa52082356adb14489d85c6d2d6722447caba5 100644
--- a/src/NuGet/NuGet.proj
+++ b/src/NuGet/NuGet.proj
@@ -4,6 +4,14 @@
+
+
+
+
diff --git a/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr b/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr
index cc4ac5531863947a74c28871f517f55c4891bb24..6c599270e010da76bbdb58d73e3ae399bfbfc35e 100644
--- a/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr
+++ b/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr
@@ -1,7 +1,7 @@
use vs
package name=PortableFacades
- version=1.3.0.0
+ version=1.4.0.0
folder InstallDir:\Common7\IDE\PrivateAssemblies
file source="$(NuGetPackageRoot)\System.AppContext\4.3.0\lib\net46\System.AppContext.dll" vs.file.ngen=yes