Skip to content

[xabuild] print config file to console on error #971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2017
Merged

[xabuild] print config file to console on error #971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions tools/xabuild/XABuild.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ static int Main ()
}

//Create a custom xabuild.exe.config
CreateConfig (paths);
var xml = CreateConfig (paths);

//Create link to .NETFramework and .NETPortable directory
foreach (var dir in Directory.GetDirectories (paths.SystemProfiles)) {
Expand All @@ -28,7 +28,19 @@ static int Main ()
}
}

return MSBuildApp.Main ();
int exitCode = MSBuildApp.Main ();
if (exitCode != 0) {
Console.WriteLine ($"MSBuildApp.Main exited with {exitCode}, xabuild configuration is:");

var settings = new XmlWriterSettings {
Indent = true,
NewLineOnAttributes = true,
};
using (var writer = XmlTextWriter.Create (Console.Out, settings)) {
xml.WriteTo (writer);
}
}
return exitCode;
} finally {
//NOTE: these are temporary files
foreach (var file in new [] { paths.MSBuildExeTempPath, paths.XABuildConfig }) {
Expand All @@ -39,7 +51,7 @@ static int Main ()
}
}

static void CreateConfig (XABuildPaths paths)
static XmlDocument CreateConfig (XABuildPaths paths)
{
var xml = new XmlDocument ();
xml.Load (paths.MSBuildConfig);
Expand Down Expand Up @@ -90,6 +102,7 @@ static void CreateConfig (XABuildPaths paths)
xml.Save (paths.XABuildConfig);

Environment.SetEnvironmentVariable ("MSBUILD_EXE_PATH", paths.MSBuildExeTempPath, EnvironmentVariableTarget.Process);
return xml;
}

/// <summary>
Expand Down