Imported Upstream version 5.10.0.47

Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-01-24 17:04:36 +00:00
parent 88ff76fe28
commit e46a49ecf1
5927 changed files with 226314 additions and 129848 deletions

View File

@ -72,6 +72,7 @@ namespace ILLink.Tests
psi.Environment.Remove("MSBuildSDKsPath");
psi.Environment.Remove("VbcToolExe");
psi.Environment.Remove("CscToolExe");
psi.Environment.Remove("MSBUILD_EXE_PATH");
StringBuilder processOutput = new StringBuilder();
DataReceivedEventHandler handler = (sender, e) => {
@ -85,6 +86,10 @@ namespace ILLink.Tests
};
process.OutputDataReceived += handler;
process.ErrorDataReceived += ehandler;
output.WriteLine("environment:");
foreach (var item in psi.Environment) {
output.WriteLine($"\t{item.Key}={item.Value}");
}
process.Start();
process.BeginOutputReadLine();
process.BeginErrorReadLine();
@ -124,10 +129,10 @@ namespace ILLink.Tests
publishArgs += $" /p:LinkerRootDescriptors={rootFilesStr}";
}
if (extraPublishArgs != null) {
foreach (var item in extraPublishArgs) {
publishArgs += $" /p:{item.Key}={item.Value}";
}
}
foreach (var item in extraPublishArgs) {
publishArgs += $" /p:{item.Key}={item.Value}";
}
}
int ret = Dotnet(publishArgs, demoRoot);
if (ret != 0) {