Merge branch 'Redth-msbuild-macosx' into develop

cake-build · Mar 8, 2017 · a06f66c · a06f66c
2 parents fc1a34e + 3046320
commit a06f66c
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/Cake.Common/Tools/MSBuild/MSBuildResolver.cs b/src/Cake.Common/Tools/MSBuild/MSBuildResolver.cs
@@ -12,6 +12,18 @@ internal static class MSBuildResolver
     {
         public static FilePath GetMSBuildPath(IFileSystem fileSystem, ICakeEnvironment environment, MSBuildToolVersion version, MSBuildPlatform buildPlatform)
         {
+            if (environment.Platform.Family == PlatformFamily.OSX)
+            {
+                var macMSBuildPath = new FilePath("/Library/Frameworks/Mono.framework/Versions/Current/Commands/msbuild");
+
+                if (fileSystem.Exist(macMSBuildPath))
+                {
+                    return macMSBuildPath;
+                }
+
+                throw new CakeException("Could not resolve MSBuild.");
+            }
+
             var binPath = version == MSBuildToolVersion.Default
                 ? GetHighestAvailableMSBuildVersion(fileSystem, environment, buildPlatform)
                 : GetMSBuildPath(fileSystem, environment, (MSBuildVersion)version, buildPlatform);