From 23d1a1283878040adbd1f852fbb627a58153fca2 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Wed, 7 Jun 2023 02:46:31 -0700 Subject: [PATCH] Fix nuget localization issue (#15329) * Fix nuget localization issue --- .../FSharp.DependencyManager.Utilities.fs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs index 31a9e003457b..b083202fa728 100644 --- a/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs +++ b/src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Utilities.fs @@ -171,7 +171,7 @@ module internal Utilities = result |> List.ofSeq |> List.map (fun option -> split option) - let executeTool pathToExe arguments workingDir timeout = + let executeTool pathToExe arguments workingDir environment timeout = match pathToExe with | Some path -> let errorsList = ResizeArray() @@ -195,6 +195,10 @@ module internal Utilities = psi.Arguments <- arguments psi.CreateNoWindow <- true psi.EnvironmentVariables.Remove("MSBuildSDKsPath") // Host can sometimes add this, and it can break things + + for varname, value in environment do + psi.EnvironmentVariables.Add(varname, value) + psi.UseShellExecute <- false use p = new Process() @@ -240,7 +244,7 @@ module internal Utilities = let workingDir = Path.GetDirectoryName projectPath let dotnetHostPath = getDotnetHostPath () let args = arguments "msbuild -v:quiet" - let success, stdOut, stdErr = executeTool dotnetHostPath args workingDir timeout + let success, stdOut, stdErr = executeTool dotnetHostPath args workingDir [] timeout #if DEBUG let diagnostics = @@ -289,7 +293,7 @@ module internal Utilities = let args = "nuget list source --format detailed" let success, stdOut, stdErr = - executeTool dotnetHostPath args scriptDirectory timeout + executeTool dotnetHostPath args scriptDirectory [ "DOTNET_CLI_UI_LANGUAGE", "en-us" ] timeout #if DEBUG let diagnostics = [|