Skip to content

Commit 9c15c79

Browse files
committed
Adapt to MSBuildProcessService API change
MSBuildProcessService.StartProcessHandler method was renamed to StartTrackedProcessHandler and now all arguments are passed via a ProcessStartArgs class.
1 parent 6f4f1af commit 9c15c79

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

src/MonoDevelop.ProjectSystem.Tools/MonoDevelop.ProjectSystem.Tools/MSBuildProcessServiceMonitor.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,27 +37,27 @@ namespace MonoDevelop.ProjectSystem.Tools
3737
{
3838
class MSBuildProcessServiceMonitor : IDisposable
3939
{
40-
readonly MSBuildProcessService.StartProcessCallback originalHandler;
40+
readonly MSBuildProcessService.StartTrackedProcessCallback originalHandler;
4141
readonly Dictionary<int, MSBuildTarget> buildTargets = new Dictionary<int, MSBuildTarget> ();
4242

4343
static int sessionId;
4444

4545
public MSBuildProcessServiceMonitor ()
4646
{
47-
originalHandler = MSBuildProcessService.StartProcessHandler;
48-
MSBuildProcessService.StartProcessHandler = StartProcess;
47+
originalHandler = MSBuildProcessService.StartTrackedProcessHandler;
48+
MSBuildProcessService.StartTrackedProcessHandler = StartProcess;
4949
}
5050

5151
public void Dispose ()
5252
{
53-
MSBuildProcessService.StartProcessHandler = originalHandler;
53+
MSBuildProcessService.StartTrackedProcessHandler = originalHandler;
5454
}
5555

56-
ProcessWrapper StartProcess (string command, string arguments, string workingDirectory, TextWriter outWriter, TextWriter errorWriter, EventHandler exited)
56+
ProcessWrapper StartProcess (ProcessStartArgs args)
5757
{
5858
int currentSessionId = Interlocked.Increment (ref sessionId);
5959

60-
var msbuildProcessArguments = new MSBuildProcessArguments (arguments);
60+
var msbuildProcessArguments = new MSBuildProcessArguments (args.Arguments);
6161

6262
var buildTarget = new MSBuildTarget {
6363
ProjectName = GettextCatalog.GetString ("Solution"),
@@ -69,24 +69,24 @@ ProcessWrapper StartProcess (string command, string arguments, string workingDir
6969

7070
buildTarget.Start ();
7171

72-
arguments = MSBuildProcessArguments.AddVerbosity (arguments, Runtime.Preferences.MSBuildVerbosity.Value);
73-
arguments = MSBuildProcessArguments.AddBinLogFileName (arguments, buildTarget.BinLogFileName);
72+
args.Arguments = MSBuildProcessArguments.AddVerbosity (args.Arguments, Runtime.Preferences.MSBuildVerbosity.Value);
73+
args.Arguments = MSBuildProcessArguments.AddBinLogFileName (args.Arguments, buildTarget.BinLogFileName);
7474

7575
lock (buildTargets) {
7676
buildTargets [currentSessionId] = buildTarget;
7777
}
7878

7979
ProjectSystemService.OnTargetStarted (buildTarget);
8080

81-
var monitor = new MSBuildProcessProgressMonitor (outWriter, errorWriter, buildTarget.LogFileName);
81+
var monitor = new MSBuildProcessProgressMonitor (args.OutWriter, args.ErrorWriter, buildTarget.LogFileName);
8282

8383
ProcessWrapper process = Runtime.ProcessService.StartProcess (
84-
command,
85-
arguments,
86-
workingDirectory,
84+
args.Command,
85+
args.Arguments,
86+
args.WorkingDirectory,
8787
monitor.Log,
8888
monitor.ErrorLog,
89-
exited);
89+
args.Exited);
9090

9191
monitor.Process = process;
9292

0 commit comments

Comments
 (0)