Skip to content
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

Update NuGetSourceRepositoryProvider.cs #4284

Merged
merged 3 commits into from
Oct 3, 2024
Merged

Update NuGetSourceRepositoryProvider.cs #4284

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e26e2ae
Update NuGetSourceRepositoryProvider.cs
WeihanLi Dec 29, 2023
cc062fe
Update NuGetSourceRepositoryProvider.cs
WeihanLi Dec 29, 2023
a9cb965
Update NuGetSourceRepositoryProvider.cs
WeihanLi Jan 3, 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
18 changes: 7 additions & 11 deletions src/Cake.NuGet/Client/NuGetSourceRepositoryProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public NuGetSourceRepositoryProvider(ISettings settings, ICakeConfiguration conf
_localRepositories.Add(CreateRepository(SettingsUtility.GetGlobalPackagesFolder(settings)));
_localRepositories.AddRange(SettingsUtility.GetFallbackPackageFolders(settings).Select(CreateRepository));

var packageSources = new PackageSourceProvider(settings).LoadPackageSources().ToList();
var packageSources = SettingsUtility.GetEnabledSources(settings).ToList();

if (package.Address != null)
{
Expand Down Expand Up @@ -85,24 +85,20 @@ public NuGetSourceRepositoryProvider(ISettings settings, ICakeConfiguration conf
// Only add sources added via NuGet.config if nuget_source configuration value is not specified.
foreach (var source in packageSources)
{
if (source.IsEnabled)
{
var repository = CreateRepository(source);
_repositories.Add(repository);
var repository = CreateRepository(source);
_repositories.Add(repository);

// If source is not specified in directive, add it as primary source.
if (package.Address == null)
{
_primaryRepositories.Add(repository);
}
// If source is not specified in directive, add it as primary source.
if (package.Address == null)
{
_primaryRepositories.Add(repository);
}
}
}

SourceRepository GetOrCreateRepository(string source)
{
var packageSource = packageSources
.Where(p => p.IsEnabled)
.FirstOrDefault(p => p.Source.Equals(source, StringComparison.OrdinalIgnoreCase));

return packageSource == null ?
Expand Down
Loading