Support overriding of MSBuild SDKs path via environment variable.

#5
tintoy · Apr 24, 2018 · 87a371f · 87a371f
1 parent 7937c76
commit 87a371f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.2.36.{build}
+version: 0.2.37.{build}
 image: Visual Studio 2017
 build_script:
 - ps: >-

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## v0.2.37
+
+* Support overriding of MSBuild SDKs path via environment variable (tintoy/msbuild-project-tools-server#5).
+
 ## v0.2.36
 
 * Bug-fix: ArgumentException (parameter name: itemType) when requesting completions on root `Project` element (tintoy/msbuild-project-tools-server#5).

diff --git a/src/LanguageServer.Common/Utilities/MSBuildHelper.cs b/src/LanguageServer.Common/Utilities/MSBuildHelper.cs
@@ -111,14 +111,19 @@ public static Dictionary<string, string> CreateGlobalMSBuildProperties(DotNetRun
             if (solutionDirectory.Length > 0 && solutionDirectory[solutionDirectory.Length - 1] != Path.DirectorySeparatorChar)
                 solutionDirectory += Path.DirectorySeparatorChar;
 
+            // Support overriding of SDKs path.
+            string sdksPath = Environment.GetEnvironmentVariable("MSBuildSDKsPath");
+            if (String.IsNullOrWhiteSpace(sdksPath))
+                sdksPath = Path.Combine(runtimeInfo.BaseDirectory, "Sdks");
+
             return new Dictionary<string, string>
             {
                 [WellKnownPropertyNames.DesignTimeBuild] = "true",
                 [WellKnownPropertyNames.BuildProjectReferences] = "false",
                 [WellKnownPropertyNames.ResolveReferenceDependencies] = "true",
                 [WellKnownPropertyNames.SolutionDir] = solutionDirectory,
                 [WellKnownPropertyNames.MSBuildExtensionsPath] = runtimeInfo.BaseDirectory,
-                [WellKnownPropertyNames.MSBuildSDKsPath] = Path.Combine(runtimeInfo.BaseDirectory, "Sdks"),
+                [WellKnownPropertyNames.MSBuildSDKsPath] = sdksPath,
                 [WellKnownPropertyNames.RoslynTargetsPath] = Path.Combine(runtimeInfo.BaseDirectory, "Roslyn")
             };
         }