Merge pull request #11558 from brettfo/compiler-path

brettfo · web-flow · commit 1b23bbeda88e · 2021-05-12T14:07:26.000-06:00
[release/dev16.10] ensure compiler and targets can be found in legacy projects
diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Utilities.cs b/vsintegration/src/FSharp.ProjectSystem.Base/Utilities.cs
@@ -740,7 +740,7 @@ public static Microsoft.Build.Evaluation.Project InitializeMsBuildProject(Micros
             {
                 var lclGlobalProperties = (null == globalProperties) ? new Dictionary<string, string>() : new Dictionary<string, string>(globalProperties)
                 {
-                    { "FSharpCompilerPath", Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) }
+                    { "FSharpCompilerPath", Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Tools") }
                 };
                 buildProject = buildEngine.LoadProject(fullProjectPath, lclGlobalProperties, null);
                 buildProject.IsBuildEnabled = true;

Original file line number	Diff line number	Diff line change
`@@ -740,7 +740,7 @@ public static Microsoft.Build.Evaluation.Project InitializeMsBuildProject(Micros`
`740`	`740`	`{`
`741`	`741`	`var lclGlobalProperties = (null == globalProperties) ? new Dictionary<string, string>() : new Dictionary<string, string>(globalProperties)`
`742`	`742`	`{`
`743`		`- { "FSharpCompilerPath", Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) }`
	`743`	`+ { "FSharpCompilerPath", Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "Tools") }`
`744`	`744`	`};`
`745`	`745`	`buildProject = buildEngine.LoadProject(fullProjectPath, lclGlobalProperties, null);`
`746`	`746`	`buildProject.IsBuildEnabled = true;`