Skip to content

Use SettingsLoadingContext in NuGetSdkResolver #4506

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
jeffkl merged 1 commit into from
Mar 17, 2022
Merged

Use SettingsLoadingContext in NuGetSdkResolver #4506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/NuGet.Core/Microsoft.Build.NuGetSdkResolver/NuGetSdkResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ public sealed class NuGetSdkResolver : SdkResolver
{
private static readonly Lazy<bool> DisableNuGetSdkResolver = new Lazy<bool>(() => Environment.GetEnvironmentVariable("MSBUILDDISABLENUGETSDKRESOLVER") == "1");

private static readonly Lazy<object> SettingsLoadContext = new Lazy<object>(() => new SettingsLoadingContext());

private static readonly Lazy<object> MachineWideSettings = new Lazy<object>(() => new XPlatMachineWideSetting());

private readonly IGlobalJsonReader _globalJsonReader;

/// <summary>
Expand Down Expand Up @@ -127,7 +131,7 @@ public static SdkResult GetSdkResult(SdkReference sdk, object nuGetVersion, SdkR
var parsedSdkVersion = (NuGetVersion)nuGetVersion;

// Load NuGet settings and a path resolver
ISettings settings = Settings.LoadDefaultSettings(context.ProjectFilePath);
ISettings settings = Settings.LoadDefaultSettings(context.ProjectFilePath, configFileName: null, MachineWideSettings.Value as IMachineWideSettings, SettingsLoadContext.Value as SettingsLoadingContext);

var fallbackPackagePathResolver = new FallbackPackagePathResolver(NuGetPathContext.Create(settings));

Expand Down