diff options
| author | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2016-07-22 20:33:39 +0300 |
|---|---|---|
| committer | Mikayla Hutchinson <m.j.hutchinson@gmail.com> | 2016-07-22 20:33:57 +0300 |
| commit | 526f87d4ee79d1d0332d6398f9810e31c3ccdaf3 (patch) | |
| tree | 9c48c7cd8afcc2610541705d88b304e6e4a39896 /main/src/core/MonoDevelop.Core | |
| parent | cf0a3720c80b6320d7dea9163ffc11096a01020b (diff) | |
[MSBuild] Add xbuild12 and xbuild14 builders
Diffstat (limited to 'main/src/core/MonoDevelop.Core')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs index c30fcc1b37..b724b6dc5e 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects.MSBuild/MSBuildProjectService.cs @@ -962,11 +962,7 @@ namespace MonoDevelop.Projects.MSBuild }; p.BeginErrorReadLine (); - // first line: path for locating the msbuild (oss) assemblies - if (Runtime.Preferences.BuildWithMSBuild) - p.StandardInput.WriteLine (binDir); - else - p.StandardInput.WriteLine (); + p.StandardInput.WriteLine (binDir); p.StandardInput.WriteLine (Process.GetCurrentProcess ().Id.ToString ()); if (await Task.WhenAny (processStartedSignal.Task, Task.Delay (5000)) != processStartedSignal.Task) @@ -1043,9 +1039,6 @@ namespace MonoDevelop.Projects.MSBuild if (useMicrosoftBuild) { toolsVersion = "dotnet." + toolsVersion; - } else { - // We only have a 4.0 builder on non-windows systems - toolsVersion = "4.0"; } var exe = builderDir.Combine (toolsVersion, "MonoDevelop.Projects.Formats.MSBuild.exe"); |