Merge pull request dotnet-script#233 from filipw/bug/issue230

filipw · web-flow · commit 664f3204ff21 · 2018-03-06T13:00:36.000-08:00
Clear MSBuild related env variables before dotnet restore
diff --git a/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs b/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs
@@ -18,8 +18,8 @@ public DotnetRestorer(CommandRunner commandRunner, LogFactory logFactory)
 
         public void Restore(string pathToProjectFile)
         {
-            _logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli.");
             var runtimeIdentifier = RuntimeHelper.GetRuntimeIdentifier();
+            _logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier}");            
             var exitcode = _commandRunner.Execute("dotnet", $"restore \"{pathToProjectFile}\" -r {runtimeIdentifier}");
             if (exitcode != 0)
             {
diff --git a/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj b/src/Dotnet.Script.DependencyModel/Dotnet.Script.DependencyModel.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/filipw/dotnet-script.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>script;csx;csharp;roslyn;omnisharp</PackageTags>
-    <Version>0.4.0</Version>    
+    <Version>0.5.0</Version>    
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Dotnet.Script.DependencyModel/Process/CommandRunner.cs b/src/Dotnet.Script.DependencyModel/Process/CommandRunner.cs
@@ -1,4 +1,5 @@
-﻿using System.Diagnostics;
+﻿using System.Collections.Generic;
+using System.Diagnostics;
 using Dotnet.Script.DependencyModel.Logging;
 
 namespace Dotnet.Script.DependencyModel.Process
@@ -27,11 +28,20 @@ private static ProcessStartInfo CreateProcessStartInfo(string commandPath, strin
                 CreateNoWindow = true,
                 Arguments = arguments ?? "",
                 RedirectStandardOutput = true,
-                RedirectStandardError = true,
+                RedirectStandardError = true,                
                 UseShellExecute = false
             };
+            RemoveMsBuildEnvironmentVariables(startInformation.Environment);
             return startInformation;
         }
+        private static void RemoveMsBuildEnvironmentVariables(IDictionary<string, string> environment)
+        {
+            // Remove various MSBuild environment variables set by OmniSharp to ensure that
+            // the .NET CLI is not launched with the wrong values.
+            environment.Remove("MSBUILD_EXE_PATH");
+            environment.Remove("MSBuildExtensionsPath");
+        }
+
 
         private static void RunAndWait(System.Diagnostics.Process process)
         {

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public DotnetRestorer(CommandRunner commandRunner, LogFactory logFactory)`
`18`	`18`
`19`	`19`	`public void Restore(string pathToProjectFile)`
`20`	`20`	`{`
`21`		`- _logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli.");`
`22`	`21`	`var runtimeIdentifier = RuntimeHelper.GetRuntimeIdentifier();`
	`22`	`+ _logger.Debug($"Restoring {pathToProjectFile} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier}");`
`23`	`23`	`var exitcode = _commandRunner.Execute("dotnet", $"restore \"{pathToProjectFile}\" -r {runtimeIdentifier}");`
`24`	`24`	`if (exitcode != 0)`
`25`	`25`	`{`