提交 63872019 编写于 作者: A Andy Gocke 提交者: GitHub

Rationalize references for Microsoft.Net.Compilers.netcore (#14536)

This package now only supports the TFM. This is because the purpose of the package
to layout a .NET Core executable, which requires the netcoreapp references, including CoreCLR itself.

There are also numerous references that are now provided by inheritance from the compiler itself, so
those references have been removed from the Microsoft.Net.Compilers.netcore nuspec.

Fixes #12674
上级 fe82d0db
......@@ -31,24 +31,20 @@
<SystemIOFileSystemVersion>4.0.1</SystemIOFileSystemVersion>
<SystemIOFileSystemDriveInfoVersion>4.0.0</SystemIOFileSystemDriveInfoVersion>
<SystemIOFileSystemPrimitivesVersion>4.0.1</SystemIOFileSystemPrimitivesVersion>
<SystemIOFileSystemWatcherVersion>4.0.0</SystemIOFileSystemWatcherVersion>
<SystemIOPipesVersion>4.0.0</SystemIOPipesVersion>
<SystemLinqVersion>4.1.0</SystemLinqVersion>
<SystemLinqExpressionsVersion>4.1.0</SystemLinqExpressionsVersion>
<SystemLinqParallelVersion>4.0.1</SystemLinqParallelVersion>
<SystemNetNameResolutionVersion>4.0.0</SystemNetNameResolutionVersion>
<SystemNetSecurityVersion>4.0.0</SystemNetSecurityVersion>
<SystemNetSocketsVersion>4.1.0</SystemNetSocketsVersion>
<SystemObjectModelVersion>4.0.10</SystemObjectModelVersion>
<SystemReflectionVersion>4.1.0</SystemReflectionVersion>
<SystemReflectionExtensionsVersion>4.0.1</SystemReflectionExtensionsVersion>
<SystemReflectionMetadataVersion>1.4.1-beta-24430-01</SystemReflectionMetadataVersion>
<SystemReflectionPrimitivesVersion>4.0.1</SystemReflectionPrimitivesVersion>
<SystemReflectionTypeExtensionsVersion>4.1.0</SystemReflectionTypeExtensionsVersion>
<SystemResourcesResourceManagerVersion>4.0.1</SystemResourcesResourceManagerVersion>
<SystemRuntimeVersion>4.1.0</SystemRuntimeVersion>
<SystemRuntimeExtensionsVersion>4.1.0</SystemRuntimeExtensionsVersion>
<SystemRuntimeHandlesVersion>4.0.1</SystemRuntimeHandlesVersion>
<SystemRuntimeInteropServicesVersion>4.1.0</SystemRuntimeInteropServicesVersion>
<SystemRuntimeInteropServicesRuntimeInformationVersion>4.0.0</SystemRuntimeInteropServicesRuntimeInformationVersion>
<SystemRuntimeLoaderVersion>4.0.0</SystemRuntimeLoaderVersion>
......
{
"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": { },
"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", "dotnet" ]
},
"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": { }
}
}
{
"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"
}
},
"runtimes": {
"win7-x64": { },
"ubuntu.14.04-x64": { },
"osx.10.10-x64": { }
}
"dependencies": {
"System.AppContext": "4.1.0",
"System.Collections": "4.0.11",
"System.Collections.Immutable": "1.2.0",
"System.Console": "4.0.0",
"System.Diagnostics.Process": "4.1.0",
"System.IO.FileSystem": "4.0.1",
"System.IO.Pipes": "4.0.0",
"System.Linq": "4.1.0",
"System.Net.Sockets": "4.1.0",
"System.Runtime.Extensions": "4.1.0",
"System.Runtime.InteropServices": "4.1.0",
"System.Runtime.Loader": "4.0.0",
"System.Threading.Thread": "4.0.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
"netstandard1.6": { },
"NETCoreApp1.0": { }
},
"runtimes": {
"win7-x64": { },
"ubuntu.14.04-x64": { },
"osx.10.10-x64": { }
}
}
{
"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": { },
"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", "dotnet" ]
},
"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": { }
}
}
......@@ -28,11 +28,9 @@
<dependency id="System.Linq.Expressions" version="$SystemLinqExpressionsVersion$"/>
<dependency id="System.Reflection" version="$SystemReflectionVersion$"/>
<dependency id="System.Reflection.Metadata" version="$SystemReflectionMetadataVersion$"/>
<dependency id="System.Reflection.Primitives" version="$SystemReflectionPrimitivesVersion$"/>
<dependency id="System.Resources.ResourceManager" version="$SystemResourcesResourceManagerVersion$"/>
<dependency id="System.Runtime" version="$SystemRuntimeVersion$"/>
<dependency id="System.Runtime.Extensions" version="$SystemRuntimeExtensionsVersion$"/>
<dependency id="System.Runtime.Handles" version="$SystemRuntimeHandlesVersion$"/>
<dependency id="System.Runtime.InteropServices" version="$SystemRuntimeInteropServicesVersion$"/>
<dependency id="System.Runtime.Numerics" version="$SystemRuntimeNumericsVersion$"/>
<dependency id="System.Security.Cryptography.Algorithms" version="$SystemSecurityCryptographyAlgorithmsVersion$"/>
......
......@@ -4,9 +4,6 @@
<id>Microsoft.Net.Compilers.netcore</id>
<description>
CoreCLR-compatible versions of the C# and VB compilers.
Supported Platforms:
- .NET Core (NETCoreApp1.0)
</description>
<language>en-US</language>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
......@@ -17,51 +14,20 @@
<tags>$tags$</tags>
<serviceable>true</serviceable>
<dependencies>
<group targetFramework="NETCoreApp1.0">
<group targetFramework="netcoreapp1.0">
<dependency id="Microsoft.CodeAnalysis.Compilers" version="[$version$]" />
<dependency id="System.AppContext" version="$SystemAppContextVersion$"/>
<dependency id="System.Collections" version="$SystemCollectionsVersion$"/>
<dependency id="System.Collections.Concurrent" version="$SystemCollectionsConcurrentVersion$"/>
<dependency id="System.Collections.Immutable" version="$SystemCollectionsImmutableVersion$"/>
<dependency id="System.Console" version="$SystemConsoleVersion$"/>
<dependency id="System.Diagnostics.Debug" version="$SystemDiagnosticsDebugVersion$"/>
<dependency id="System.Diagnostics.FileVersionInfo" version="$SystemDiagnosticsFileVersionInfoVersion$"/>
<dependency id="System.Diagnostics.StackTrace" version="$SystemDiagnosticsStackTraceVersion$"/>
<dependency id="System.Diagnostics.Tools" version="$SystemDiagnosticsToolsVersion$"/>
<dependency id="System.Dynamic.Runtime" version="$SystemDynamicRuntimeVersion$"/>
<dependency id="System.Globalization" version="$SystemGlobalizationVersion$"/>
<dependency id="System.IO.FileSystem" version="$SystemIOFileSystemVersion$"/>
<dependency id="System.IO.FileSystem.Primitives" version="$SystemIOFileSystemPrimitivesVersion$"/>
<dependency id="System.Linq" version="$SystemLinqVersion$"/>
<dependency id="System.Linq.Expressions" version="$SystemLinqExpressionsVersion$"/>
<dependency id="System.Reflection" version="$SystemReflectionVersion$"/>
<dependency id="System.Reflection.Primitives" version="$SystemReflectionPrimitivesVersion$"/>
<dependency id="System.Resources.ResourceManager" version="$SystemResourcesResourceManagerVersion$"/>
<dependency id="System.Runtime" version="$SystemRuntimeVersion$"/>
<dependency id="System.Runtime.Extensions" version="$SystemRuntimeExtensionsVersion$"/>
<dependency id="System.Runtime.Handles" version="$SystemRuntimeHandlesVersion$"/>
<dependency id="System.Runtime.InteropServices" version="$SystemRuntimeInteropServicesVersion$"/>
<dependency id="System.Runtime.Loader" version="$SystemRuntimeLoaderVersion$" />
<dependency id="System.Runtime.Numerics" version="$SystemRuntimeNumericsVersion$"/>
<dependency id="System.Security.Cryptography.Algorithms" version="$SystemSecurityCryptographyAlgorithmsVersion$"/>
<dependency id="System.Security.Cryptography.Encoding" version="$SystemSecurityCryptographyEncodingVersion$"/>
<dependency id="System.Security.Cryptography.X509Certificates" version="$SystemSecurityCryptographyX509CertificatesVersion$"/>
<dependency id="System.Text.Encoding" version="$SystemTextEncodingVersion$"/>
<dependency id="System.Text.Encoding.CodePages" version="$SystemTextEncodingCodePagesVersion$"/>
<dependency id="System.Text.Encoding.Extensions" version="$SystemTextEncodingExtensionsVersion$"/>
<dependency id="System.Threading" version="$SystemThreadingVersion$"/>
<dependency id="System.Threading.Tasks" version="$SystemThreadingTasksVersion$"/>
<dependency id="System.Threading.Tasks.Parallel" version="$SystemThreadingTasksParallelVersion$"/>
<dependency id="System.Threading.Thread" version="$SystemThreadingThreadVersion$"/>
<dependency id="System.Xml.ReaderWriter" version="$SystemXmlReaderWriterVersion$"/>
<dependency id="System.Xml.XDocument" version="$SystemXmlXDocumentVersion$"/>
<dependency id="System.Xml.XmlDocument" version="$SystemXmlXmlDocumentVersion$"/>
<dependency id="System.Xml.XPath.XDocument" version="$SystemXmlXPathXDocumentVersion$"/>
<dependency id="System.AppContext" version="$SystemAppContextVersion$" />
<dependency id="System.Diagnostics.Process" version="$SystemDiagnosticsProcessVersion$" />
<dependency id="System.Console" version="$SystemConsoleVersion$" />
<dependency id="System.IO" version="$SystemIOVersion$" />
<dependency id="System.IO.FileSystem" version="$SystemIOFileSystemVersion$" />
<dependency id="System.Net.Sockets" version="$SystemNetSocketsVersion$" />
<dependency id="System.Runtime.Loader" version="$SystemRuntimeLoaderVersion$" />
<dependency id="System.Threading.Thread" version="$SystemThreadingThreadVersion$" />
</group>
</dependencies>
</metadata>
<files>
<file src="$emptyDirPath$/_._" target="ref/dotnet" />
<file src="$emptyDirPath$/_._" target="ref/netcoreapp1.0" />
<file src="csccore/csc.exe" target="runtimes/any/native" />
<file src="vbccore/vbc.exe" target="runtimes/any/native" />
......
......@@ -5,49 +5,12 @@
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.3-rc4-24221-02",
"Microsoft.NETCore.TestHost": "1.0.0",
"System.AppContext": "4.1.0",
"System.Collections": "4.0.11",
"System.Collections.Concurrent": "4.0.12",
"System.Collections.Immutable": "1.2.0",
"System.Console": "4.0.0",
"System.Diagnostics.Debug": "4.0.11",
"System.Diagnostics.FileVersionInfo": "4.0.0",
"System.Diagnostics.Process": "4.1.0",
"System.Diagnostics.StackTrace": "4.0.1",
"System.Diagnostics.Tools": "4.0.1",
"System.Dynamic.Runtime": "4.0.11",
"System.Globalization": "4.0.11",
"System.IO.Compression": "4.1.0",
"System.IO.FileSystem": "4.0.1",
"System.IO.FileSystem.Primitives": "4.0.1",
"System.IO.FileSystem.Watcher": "4.0.0",
"System.IO.Pipes": "4.0.0",
"System.Linq": "4.1.0",
"System.Linq.Expressions": "4.1.0",
"System.Net.NameResolution": "4.0.0",
"System.Net.Sockets": "4.1.0",
"System.Reflection": "4.1.0",
"System.Reflection.Primitives": "4.0.1",
"System.Resources.ResourceManager": "4.0.1",
"System.Runtime": "4.1.0",
"System.Runtime.Extensions": "4.1.0",
"System.Runtime.Handles": "4.0.1",
"System.Runtime.InteropServices": "4.1.0",
"System.Runtime.Loader": "4.0.0",
"System.Runtime.Numerics": "4.0.1",
"System.Security.Cryptography.Algorithms": "4.2.0",
"System.Security.Cryptography.Encoding": "4.0.0",
"System.Security.Cryptography.X509Certificates": "4.1.0",
"System.Text.Encoding": "4.0.11",
"System.Text.Encoding.CodePages": "4.0.1",
"System.Text.Encoding.Extensions": "4.0.11",
"System.Threading": "4.0.11",
"System.Threading.Tasks": "4.0.11",
"System.Threading.Tasks.Parallel": "4.0.1",
"System.Threading.Thread": "4.0.0",
"System.Xml.ReaderWriter": "4.0.11",
"System.Xml.XDocument": "4.0.11",
"System.Xml.XmlDocument": "4.0.1",
"System.Xml.XPath.XDocument": "4.0.1"
"System.Threading.Thread": "4.0.0"
},
"frameworks": {
// We don't actually target netstandard1.6; this is to work around https://github.com/dotnet/roslyn/issues/12458
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册