From 16945df57797bc7f0485e238c603de5210dbeaab Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 19 Apr 2017 16:20:35 -0700 Subject: [PATCH] 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 | 1 + .../Microsoft.NETCore.Csc.props | 18 +++ build/NuGetAdditionalFiles/RunCsc | 5 + build/NuGetAdditionalFiles/RunCsc.cmd | 2 + build/Targets/Dependencies.props | 6 +- src/Compilers/CSharp/CscCore/CscCore.csproj | 6 + src/Compilers/CSharp/CscCore/csc.deps.json | 135 ++++++++++++++++++ .../CSharp/CscCore/csc.runtimeconfig.json | 8 ++ src/Compilers/CSharp/CscCore/project.json | 41 +----- .../Core/MSBuildTask/AssemblyResolution.cs | 1 - src/Compilers/Core/Portable/project.json | 6 +- .../Server/PortableServer/project.json | 16 +-- .../VisualBasic/VbcCore/project.json | 10 +- src/Interactive/CsiCore/project.json | 9 +- src/Interactive/VbiCore/project.json | 9 +- src/NuGet/BuildNuGets.csx | 8 ++ src/NuGet/Microsoft.NETCore.Csc.nuspec | 38 +++++ src/Setup/DevDivPackages/Roslyn/project.json | 8 +- .../PortableFacades/PortableFacades.swr | 2 +- src/Test/Utilities/CoreClr/project.json | 2 +- src/Test/Utilities/Portable/project.json | 2 +- .../Source/BoundTreeGenerator/project.json | 2 +- .../Source/CSharpSyntaxGenerator/project.json | 2 +- .../Setup.Dependencies/project.json | 4 +- 24 files changed, 260 insertions(+), 81 deletions(-) create mode 100644 build/NuGetAdditionalFiles/Microsoft.NETCore.Csc.props create mode 100755 build/NuGetAdditionalFiles/RunCsc create mode 100644 build/NuGetAdditionalFiles/RunCsc.cmd create mode 100644 src/Compilers/CSharp/CscCore/csc.deps.json create mode 100644 src/Compilers/CSharp/CscCore/csc.runtimeconfig.json create mode 100644 src/NuGet/Microsoft.NETCore.Csc.nuspec diff --git a/.gitattributes b/.gitattributes index 70a51e2ddde..4a6b8baee91 100644 --- a/.gitattributes +++ b/.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. diff --git a/build/NuGetAdditionalFiles/Microsoft.NETCore.Csc.props b/build/NuGetAdditionalFiles/Microsoft.NETCore.Csc.props new file mode 100644 index 00000000000..850c90064a9 --- /dev/null +++ b/build/NuGetAdditionalFiles/Microsoft.NETCore.Csc.props @@ -0,0 +1,18 @@ + + + + + + + $(MSBuildThisFileDirectory)..\tools\Microsoft.CSharp.Core.targets + + + + + $(MSBuildThisFileDirectory)..\tools + RunCsc + + \ No newline at end of file diff --git a/build/NuGetAdditionalFiles/RunCsc b/build/NuGetAdditionalFiles/RunCsc new file mode 100755 index 00000000000..263441da05c --- /dev/null +++ b/build/NuGetAdditionalFiles/RunCsc @@ -0,0 +1,5 @@ +#!/bin/sh + +THISDIR=$(dirname $0) + +dotnet $THISDIR/csc.exe "$@" \ No newline at end of file diff --git a/build/NuGetAdditionalFiles/RunCsc.cmd b/build/NuGetAdditionalFiles/RunCsc.cmd new file mode 100644 index 00000000000..c3e8c655419 --- /dev/null +++ b/build/NuGetAdditionalFiles/RunCsc.cmd @@ -0,0 +1,2 @@ +echo off +dotnet %~dp0\csc.exe %* \ No newline at end of file diff --git a/build/Targets/Dependencies.props b/build/Targets/Dependencies.props index 3f44488c190..6f10afc3042 100644 --- a/build/Targets/Dependencies.props +++ b/build/Targets/Dependencies.props @@ -42,7 +42,7 @@ 4.3.0 4.3.0 4.3.0 - 4.3.0 + 4.0.0 4.3.0 4.3.0 4.3.0 @@ -79,7 +79,7 @@ 4.3.0 4.3.0 4.3.0 - 4.3.0 + 4.0.3 4.3.0 4.3.0 4.3.0 @@ -88,7 +88,7 @@ 4.3.0 4.3.0 4.3.0 - 4.3.0 + 4.0.1 4.3.0 4.3.0 4.3.0 diff --git a/src/Compilers/CSharp/CscCore/CscCore.csproj b/src/Compilers/CSharp/CscCore/CscCore.csproj index 74eb2987dcc..28c5f56eca1 100644 --- a/src/Compilers/CSharp/CscCore/CscCore.csproj +++ b/src/Compilers/CSharp/CscCore/CscCore.csproj @@ -59,6 +59,12 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + diff --git a/src/Compilers/CSharp/CscCore/csc.deps.json b/src/Compilers/CSharp/CscCore/csc.deps.json new file mode 100644 index 00000000000..de3ea6d91a2 --- /dev/null +++ b/src/Compilers/CSharp/CscCore/csc.deps.json @@ -0,0 +1,135 @@ +{ + "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 diff --git a/src/Compilers/CSharp/CscCore/csc.runtimeconfig.json b/src/Compilers/CSharp/CscCore/csc.runtimeconfig.json new file mode 100644 index 00000000000..de15fa66c62 --- /dev/null +++ b/src/Compilers/CSharp/CscCore/csc.runtimeconfig.json @@ -0,0 +1,8 @@ +{ + "runtimeOptions": { + "framework": { + "name": "Microsoft.NETCore.App", + "version": "1.1.0" + } + } +} \ No newline at end of file diff --git a/src/Compilers/CSharp/CscCore/project.json b/src/Compilers/CSharp/CscCore/project.json index 72c1ab09f13..aae2d9eece8 100644 --- a/src/Compilers/CSharp/CscCore/project.json +++ b/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 diff --git a/src/Compilers/Core/MSBuildTask/AssemblyResolution.cs b/src/Compilers/Core/MSBuildTask/AssemblyResolution.cs index a1dc2457bb2..fc7bfc512c8 100644 --- a/src/Compilers/Core/MSBuildTask/AssemblyResolution.cs +++ b/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": diff --git a/src/Compilers/Core/Portable/project.json b/src/Compilers/Core/Portable/project.json index 5e2cd7f27f0..9c0149274a1 100644 --- a/src/Compilers/Core/Portable/project.json +++ b/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 diff --git a/src/Compilers/Server/PortableServer/project.json b/src/Compilers/Server/PortableServer/project.json index ba8ceca4823..fbb2983eaf8 100644 --- a/src/Compilers/Server/PortableServer/project.json +++ b/src/Compilers/Server/PortableServer/project.json @@ -1,9 +1,9 @@ -{ - "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 diff --git a/src/Compilers/VisualBasic/VbcCore/project.json b/src/Compilers/VisualBasic/VbcCore/project.json index 72c1ab09f13..9673707dd0d 100644 --- a/src/Compilers/VisualBasic/VbcCore/project.json +++ b/src/Compilers/VisualBasic/VbcCore/project.json @@ -1,4 +1,4 @@ -{ +{ "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 diff --git a/src/Interactive/CsiCore/project.json b/src/Interactive/CsiCore/project.json index baf0725dfaf..ffb6be79df0 100644 --- a/src/Interactive/CsiCore/project.json +++ b/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 diff --git a/src/Interactive/VbiCore/project.json b/src/Interactive/VbiCore/project.json index fba5b3c8243..f322855cefa 100644 --- a/src/Interactive/VbiCore/project.json +++ b/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 diff --git a/src/NuGet/BuildNuGets.csx b/src/NuGet/BuildNuGets.csx index ae455f4a67e..60bb78092a8 100644 --- a/src/NuGet/BuildNuGets.csx +++ b/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 "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) diff --git a/src/NuGet/Microsoft.NETCore.Csc.nuspec b/src/NuGet/Microsoft.NETCore.Csc.nuspec new file mode 100644 index 00000000000..07a7d1956ef --- /dev/null +++ b/src/NuGet/Microsoft.NETCore.Csc.nuspec @@ -0,0 +1,38 @@ + + + + Microsoft.NETCore.Csc + + CoreCLR-compatible version of the C# compiler for use in MSBuild. + + en-US + true + $version$ + $authors$ + $licenseUrl$ + $projectUrl$ + $tags$ + true + true + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Setup/DevDivPackages/Roslyn/project.json b/src/Setup/DevDivPackages/Roslyn/project.json index af8c16a0b19..7c6f4ebcd49 100644 --- a/src/Setup/DevDivPackages/Roslyn/project.json +++ b/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 diff --git a/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr b/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr index cc4ac553186..f8b724ccda6 100644 --- a/src/Setup/DevDivVsix/PortableFacades/PortableFacades.swr +++ b/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 diff --git a/src/Test/Utilities/CoreClr/project.json b/src/Test/Utilities/CoreClr/project.json index 99809cf7f65..7270833524f 100644 --- a/src/Test/Utilities/CoreClr/project.json +++ b/src/Test/Utilities/CoreClr/project.json @@ -24,4 +24,4 @@ "imports": "portable-net452" } } -} +} \ No newline at end of file diff --git a/src/Test/Utilities/Portable/project.json b/src/Test/Utilities/Portable/project.json index 09f10a9485f..4fc960496d7 100644 --- a/src/Test/Utilities/Portable/project.json +++ b/src/Test/Utilities/Portable/project.json @@ -27,4 +27,4 @@ "imports": "portable-net452" } } -} +} \ No newline at end of file diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json index e52b45b96fd..f793a38b5cd 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/project.json +++ b/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 diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json index e52b45b96fd..f793a38b5cd 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/project.json +++ b/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 diff --git a/src/VisualStudio/Setup.Dependencies/project.json b/src/VisualStudio/Setup.Dependencies/project.json index 0d36d8bea7e..29ed312e0d9 100644 --- a/src/VisualStudio/Setup.Dependencies/project.json +++ b/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", -- GitLab