mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove empty PATH in path resolver (#8943)

Browse source
This commit is contained in:
William Lee 2018-03-30 16:05:41 -07:00 committed by GitHub
parent 5983fa1a2c
commit a67d1c6e06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs
View file

@ -47,6 +47,7 @@ namespace Microsoft.DotNet.Cli.Utils
.GetEnvironmentVariable("PATH") .GetEnvironmentVariable("PATH")
.Split(s_pathSeparator) .Split(s_pathSeparator)
.Select(p => p.Trim(s_quote)) .Select(p => p.Trim(s_quote))
.Where(p => !string.IsNullOrWhiteSpace(p))
.Select(p => ExpandTildeSlash(p))); .Select(p => ExpandTildeSlash(p)));
_searchPaths = searchPaths; _searchPaths = searchPaths;

5
src/dotnet/ShellShim/WindowsEnvironmentPath.cs
View file

@ -33,6 +33,11 @@ namespace Microsoft.DotNet.ShellShim
var existingUserEnvPath = Environment.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User); var existingUserEnvPath = Environment.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User);
if (existingUserEnvPath.EndsWith(';'))
{
existingUserEnvPath = existingUserEnvPath.Substring(0, (existingUserEnvPath.Length - 1));
}
Environment.SetEnvironmentVariable( Environment.SetEnvironmentVariable(
PathName, PathName,
$"{existingUserEnvPath};{_packageExecutablePath}", $"{existingUserEnvPath};{_packageExecutablePath}",