提交 69445039 编写于 作者: T Tomas Matousek

PR feedback

上级 42fe0347
......@@ -262,7 +262,8 @@ private void ProcessStarting(bool initialize)
private static MetadataReferenceResolver CreateMetadataReferenceResolver(IMetadataService metadataService, ImmutableArray<string> searchPaths, string baseDirectory)
{
// TODO: We need to do reference resolution in the remote process (InteractiveHost.exe), in order to support other platforms than Desktop FX
// TODO: To support CoreCLR we need to query the remote process for TPA list and pass it to the resolver.
// https://github.com/dotnet/roslyn/issues/4788
return new RuntimeMetadataReferenceResolver(
new RelativePathResolver(searchPaths, baseDirectory),
packageResolver: null,
......
{
"dependencies": {
"System.AppContext": "4.3.0",
"System.ValueTuple": "4.3.0"
},
"frameworks": {
......
......@@ -185,23 +185,16 @@ private PortableExecutableReference ResolveTrustedPlatformAssemblyCore(string na
{
foreach (var path in paths.Split(Path.PathSeparator))
{
try
if (PathUtilities.GetExtension(path) == ".dll")
{
if (Path.GetExtension(path) == ".dll")
string fileName = PathUtilities.GetFileName(path, includeExtension: false);
if (fileName.EndsWith(".ni", StringComparison.OrdinalIgnoreCase))
{
string fileName = Path.GetFileNameWithoutExtension(path);
if (fileName.EndsWith(".ni", StringComparison.OrdinalIgnoreCase))
{
fileName = fileName.Substring(0, fileName.Length - ".ni".Length);
}
// last one wins:
set[fileName] = path;
fileName = fileName.Substring(0, fileName.Length - ".ni".Length);
}
}
catch (Exception)
{
// skip invalid paths
// last one wins:
set[fileName] = path;
}
}
}
......
{
"dependencies": {
"Microsoft.NETCore.Portable.Compatibility": "1.0.1",
"System.AppContext": "4.3.0",
"System.Collections": "4.3.0",
"System.Diagnostics.Debug": "4.3.0",
"System.Diagnostics.StackTrace": "4.3.0",
......
{
"dependencies": {
"System.AppContext": "4.3.0"
},
"frameworks": {
"netstandard1.3": {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册