Skip to content

use SpecialFolder.UserProfile instead of USERPROFILE #15135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+2 −17
Open

use SpecialFolder.UserProfile instead of USERPROFILE #15135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa84339
use SpecialFolder.UserProfile instead of USERPROFILE
kasperk81 Oct 4, 2024
1cb445f
userprofile
kasperk81 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions ...ion/Microsoft.Extensions.DependencyModel/Resolution/PackageCompilationAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,13 @@ internal static string[] GetDefaultProbeDirectories(Platform osPlatform, IEnviro
return new string[] { packageDirectory };
}

string basePath;
if (osPlatform == Platform.Windows)
{
basePath = environment.GetEnvironmentVariable("USERPROFILE");
}
else
{
basePath = environment.GetEnvironmentVariable("HOME");
}

string basePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
if (string.IsNullOrEmpty(basePath))
{
return new string[] { string.Empty };
}

return new string[] { Path.Combine(basePath, ".nuget", "packages") };

}

public bool TryResolveAssemblyPaths(CompilationLibrary library, List<string> assemblies)
Expand Down
7 changes: 1 addition & 6 deletions ...nitConsoleRunner/src/common/AssemblyResolution/XunitPackageCompilationAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,7 @@ static List<string> GetDefaultProbeDirectories(Platform osPlatform, IMessageSink
results.Add(packageDirectory);
else
{
string basePath;
if (osPlatform == Platform.Windows)
basePath = Environment.GetEnvironmentVariable("USERPROFILE");
else
basePath = Environment.GetEnvironmentVariable("HOME");

string basePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
if (!string.IsNullOrEmpty(basePath))
results.Add(Path.Combine(basePath, ".nuget", "packages"));
}
Expand Down
Loading