提交 f8869903 编写于 作者: J Jared Parsons

Fix compiler server tests

It was still relying on the 'ref' directory. Changed it to use the
resource image.
上级 482f7528
......@@ -99,13 +99,13 @@ private static void CheckForBadShared(List<string> arguments)
}
}
private static void ReferenceNetstandardDllIfCoreClr(List<string> arguments)
private static void ReferenceNetstandardDllIfCoreClr(TempDirectory currentDirectory, List<string> arguments)
{
#if NETCOREAPP2_0
var filePath = Path.Combine(currentDirectory.Path, "netstandard.dll");
File.WriteAllBytes(filePath, TestResources.NetFX.netstandard20.netstandard);
arguments.Add("/nostdlib");
var selfDir = Path.GetDirectoryName(typeof(CompilerServerUnitTests).Assembly.Location);
var arg = "/r:" + Path.Combine(selfDir, "ref", "netstandard.dll");
arguments.Add(arg);
arguments.Add("/r:netstandard.dll");
#endif
}
......@@ -187,7 +187,7 @@ private static (T Result, string Output) UseTextWriter<T>(Encoding encoding, Fun
bool shouldRunOnServer = true)
{
var arguments = new List<string>(argumentsSingle.Split(' '));
ReferenceNetstandardDllIfCoreClr(arguments);
ReferenceNetstandardDllIfCoreClr(currentDirectory, arguments);
CheckForBadShared(arguments);
CreateFiles(currentDirectory, filesInDirectory);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册