From 697b14cecefb3d91824e11ce6a43ff7a4cb2dc4a Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Tue, 11 Jul 2017 18:26:32 -0700 Subject: [PATCH] Fixed issue #775 with CalcMSBuildPath --- .../Build/Editor/BuildDeployTools.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Assets/HoloToolkit/Build/Editor/BuildDeployTools.cs b/Assets/HoloToolkit/Build/Editor/BuildDeployTools.cs index c11f56f9cf0..0a0fe3064f8 100644 --- a/Assets/HoloToolkit/Build/Editor/BuildDeployTools.cs +++ b/Assets/HoloToolkit/Build/Editor/BuildDeployTools.cs @@ -109,9 +109,20 @@ public static string CalcMSBuildPath(string msBuildVersion) vswhereP.Dispose(); } - output = output + @"\MSBuild\" + msBuildVersion + @"\Bin\MSBuild.exe"; - output = output.Replace(Environment.NewLine, ""); - return output; + string externalScriptingEditorPath = EditorPrefs.GetString("kScriptsDefaultApp"); + string[] paths = output.Split(new[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries); + + for (int i = 0; i < paths.Length; i++) + { + paths[i] = paths[i].Replace(Environment.NewLine, ""); + if (externalScriptingEditorPath.Contains(paths[i])) + { + return paths[i] + @"\MSBuild\" + msBuildVersion + @"\Bin\MSBuild.exe"; + } + } + + Debug.LogError("Unable to find a valid path to Visual Studio Instance!"); + return string.Empty; } public static bool RestoreNugetPackages(string nugetPath, string storePath)