Skip to content

use SpecialFolder.UserProfile instead of USERPROFILE #108559

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

Merged
merged 7 commits into from
Nov 11, 2024
Merged

use SpecialFolder.UserProfile instead of USERPROFILE #108559

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
983e413
use SpecialFolder.UserProfile instead of USERPROFILE
kasperk81 Oct 4, 2024
ab88b5b
Merge branch 'main' into patch-1
ViktorHofer Nov 8, 2024
38d5b55
Update PackageResolverTest.cs
kasperk81 Nov 8, 2024
a4719a3
Update PackageResolverTest.cs
kasperk81 Nov 8, 2024
69eea0c
Update src/libraries/Microsoft.Extensions.DependencyModel/tests/Packa…
kasperk81 Nov 8, 2024
0559891
Update PackageResolverTest.cs
kasperk81 Nov 8, 2024
96261a1
Merge branch 'main' into patch-1
kasperk81 Nov 8, 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
22 changes: 7 additions & 15 deletions ...Microsoft.Extensions.DependencyModel/src/Resolution/PackageCompilationAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PackageCompilationAssemblyResolver()
}

public PackageCompilationAssemblyResolver(string nugetPackageDirectory)
: this(FileSystemWrapper.Default, new string[] { nugetPackageDirectory })
: this(FileSystemWrapper.Default, [nugetPackageDirectory])
{
}

Expand All @@ -46,32 +46,24 @@ internal static string[] GetDefaultProbeDirectories(IEnvironment environment)

if (!string.IsNullOrEmpty(listOfDirectories))
{
return listOfDirectories.Split(new char[] { Path.PathSeparator }, StringSplitOptions.RemoveEmptyEntries);
return listOfDirectories.Split([Path.PathSeparator], StringSplitOptions.RemoveEmptyEntries);
}

string? packageDirectory = environment.GetEnvironmentVariable("NUGET_PACKAGES");

if (!string.IsNullOrEmpty(packageDirectory))
{
return new string[] { packageDirectory };
return [packageDirectory];
}

string? basePath;
if (environment.IsWindows())
{
basePath = environment.GetEnvironmentVariable("USERPROFILE");
}
else
{
basePath = environment.GetEnvironmentVariable("HOME");
}
string basePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ViktorHofer this is matching sdk and nuget streamlined behavior NuGet/NuGet.Client@310f5d4 dotnet/sdk@456aa42 using standard .net api to get profile directory cross platform instead of manually checking the environment variables.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really have much context here but the changes LGTM


if (string.IsNullOrEmpty(basePath))
{
return new string[] { string.Empty };
return [string.Empty];
}

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

public bool TryResolveAssemblyPaths(CompilationLibrary library, List<string>? assemblies)
Expand Down Expand Up @@ -102,7 +94,7 @@ public bool TryResolveAssemblyPaths(CompilationLibrary library, List<string>? as

private static bool TryResolveFromPackagePath(IFileSystem fileSystem, CompilationLibrary library, string basePath, [MaybeNullWhen(false)] out IEnumerable<string> results)
{
var paths = new List<string>();
List<string> paths = [];

foreach (string assembly in library.Assemblies)
{
Expand Down
20 changes: 3 additions & 17 deletions src/libraries/Microsoft.Extensions.DependencyModel/tests/PackageResolverTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System;
using System.Collections.Generic;
using System.IO;
using FluentAssertions;
Expand Down Expand Up @@ -28,29 +29,14 @@ public void ShouldUseEnvironmentVariableToGetDefaultLocation()


[Fact]
public void ShouldUseNugetUnderUserProfileOnWindows()
public void ShouldUseNugetUnderUserProfile()
{
var environment = EnvironmentMockBuilder.Create()
.SetIsWindows(true)
.AddVariable("USERPROFILE", "User Profile")
.AddAppContextData("PROBING_DIRECTORIES", string.Empty)
.Build();

var result = PackageCompilationAssemblyResolver.GetDefaultProbeDirectories(environment);
result.Should().Contain(Path.Combine("User Profile", ".nuget", "packages"));
}

[Fact]
public void ShouldUseNugetUnderHomeOnNonWindows()
{
var environment = EnvironmentMockBuilder.Create()
.SetIsWindows(false)
.AddVariable("HOME", "User Home")
.AddAppContextData("PROBING_DIRECTORIES", string.Empty)
.Build();

var result = PackageCompilationAssemblyResolver.GetDefaultProbeDirectories(environment);
result.Should().Contain(Path.Combine("User Home", ".nuget", "packages"));
result.Should().Contain(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".nuget", "packages"));
}

[Fact]
Expand Down
Loading