Rename msbuild directory to .msbuild

In MSBuild 16, the current omnisharp standalone msbuild path gets detected as belonging to Visual Studio, resulting in incorrect build behavior.
OmniSharp · Apr 12, 2019 · abe7b34 · abe7b34
1 parent ea4c4da
commit abe7b34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.cake b/build.cake
@@ -683,7 +683,7 @@ void CopyMonoBuild(BuildEnvironment env, string sourceFolder, string outputFolde
 {
     DirectoryHelper.Copy(sourceFolder, outputFolder, copySubDirectories: false);
 
-    var msbuildFolder = CombinePaths(outputFolder, "msbuild");
+    var msbuildFolder = CombinePaths(outputFolder, ".msbuild");
 
     // Copy MSBuild runtime and libraries
     DirectoryHelper.Copy($"{env.Folders.MSBuild}", msbuildFolder);
@@ -830,7 +830,7 @@ string PublishWindowsBuild(string project, BuildEnvironment env, BuildPlan plan,
     }
 
     // Copy MSBuild to output
-    DirectoryHelper.Copy($"{env.Folders.MSBuild}", CombinePaths(outputFolder, "msbuild"));
+    DirectoryHelper.Copy($"{env.Folders.MSBuild}", CombinePaths(outputFolder, ".msbuild"));
 
     CopyExtraDependencies(env, outputFolder);
 

diff --git a/src/OmniSharp.Host/MSBuild/Discovery/MSBuildInstanceProvider.cs b/src/OmniSharp.Host/MSBuild/Discovery/MSBuildInstanceProvider.cs
@@ -63,8 +63,8 @@ bool TryGetToolsPath(string versionPath, string binPath, out string toolsPath)
 
         protected static string FindLocalMSBuildDirectory()
         {
-            // If OmniSharp is running normally, MSBuild is located in an 'msbuild' folder beneath OmniSharp.exe.
-            var msbuildDirectory = Path.Combine(AppContext.BaseDirectory, "msbuild");
+            // If OmniSharp is running normally, MSBuild is located in an '.msbuild' folder beneath OmniSharp.exe.
+            var msbuildDirectory = Path.Combine(AppContext.BaseDirectory, ".msbuild");
 
             if (!Directory.Exists(msbuildDirectory))
             {