From 3af96ea687d6e02863ac2e065ce9bb833f8a6fe1 Mon Sep 17 00:00:00 2001 From: Ran Sagy Date: Tue, 11 Feb 2020 19:47:18 +0200 Subject: [PATCH] Initialize NuGet's Credential Service (#868) * Initialize NuGet's Credential Service * Init credentials (#3) * Initialize NuGet's Credential Service * Rebased and switched to the expected Logger (#2) * :package: Automatic update of NUnit3TestAdapter to 3.15.1 (#869) * :package: Automatic update of SimpleInjector to 4.7.1 (#870) * :package: Automatic update of LibGit2Sharp to 0.26.1 (#874) * Automatic update of NuGet.CommandLine to 5.2.0 (#875) * :package: Automatic update of NuGet.CommandLine to 5.2.0 * Bump the packaged NuGet version * :package: Automatic update of Octokit to 0.34.0 (#880) * FxCopAnalyzers already pulls in other analyzers (#883) * Automatic update of Microsoft.NET.Test.Sdk to 16.3.0 (#884) * :package: Automatic update of Microsoft.NET.Test.Sdk to 16.3.0 * Fix mismatched test project target framework * Automatic update of coverlet.msbuild to 2.7.0 (#885) * :package: Automatic update of coverlet.msbuild to 2.7.0 * Remove duplicate coverlet privateassets node * :package: Automatic update of NuGet.Protocol to 5.3.0 (#886) * :package: Automatic update of System.Text.Encoding.CodePages to 4.6.0 (#887) * :package: Automatic update of McMaster.Extensions.CommandLineUtils to 2.4.2 (#888) * :package: Automatic update of Octokit to 0.36.0 (#890) * Initialize NuGet's Credential Service * Switch to nuget logger --- NuKeeper.Tests/Local/LocalEngineTests.cs | 6 ++++-- NuKeeper/Local/LocalEngine.cs | 9 ++++++++- NuKeeper/NuKeeper.csproj | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/NuKeeper.Tests/Local/LocalEngineTests.cs b/NuKeeper.Tests/Local/LocalEngineTests.cs index 3a171a8ec..78a2fa4b4 100644 --- a/NuKeeper.Tests/Local/LocalEngineTests.cs +++ b/NuKeeper.Tests/Local/LocalEngineTests.cs @@ -90,10 +90,12 @@ private static LocalEngine MakeLocalEngine(IUpdateFinder finder, ILocalUpdater u var logger = Substitute.For(); - var reporter = Substitute.For(); + var nugetLogger = Substitute.For(); + var reporter = Substitute.For(); + var engine = new LocalEngine(reader, finder, sorter, updater, - reporter, logger); + reporter, logger, nugetLogger); Assert.That(engine, Is.Not.Null); return engine; } diff --git a/NuKeeper/Local/LocalEngine.cs b/NuKeeper/Local/LocalEngine.cs index 623c29ba9..989fbff12 100644 --- a/NuKeeper/Local/LocalEngine.cs +++ b/NuKeeper/Local/LocalEngine.cs @@ -3,6 +3,8 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; +using NuGet.Common; +using NuGet.Credentials; using NuKeeper.Abstractions.Configuration; using NuKeeper.Abstractions.Inspections.Files; using NuKeeper.Abstractions.Logging; @@ -24,6 +26,7 @@ public class LocalEngine : ILocalEngine private readonly ILocalUpdater _updater; private readonly IReporter _reporter; private readonly INuKeeperLogger _logger; + private readonly ILogger _nugetLogger; public LocalEngine( INuGetSourcesReader nuGetSourcesReader, @@ -31,7 +34,8 @@ public class LocalEngine : ILocalEngine IPackageUpdateSetSort sorter, ILocalUpdater updater, IReporter reporter, - INuKeeperLogger logger) + INuKeeperLogger logger, + ILogger nugetLogger) { _nuGetSourcesReader = nuGetSourcesReader; _updateFinder = updateFinder; @@ -39,10 +43,13 @@ public class LocalEngine : ILocalEngine _updater = updater; _reporter = reporter; _logger = logger; + _nugetLogger = nugetLogger; } public async Task Run(SettingsContainer settings, bool write) { + DefaultCredentialServiceUtility.SetupDefaultCredentialService(_nugetLogger, true); + var folder = TargetFolder(settings.UserSettings); var sources = _nuGetSourcesReader.Read(folder, settings.UserSettings.NuGetSources); diff --git a/NuKeeper/NuKeeper.csproj b/NuKeeper/NuKeeper.csproj index 6cfc6cf8a..c0a548e39 100644 --- a/NuKeeper/NuKeeper.csproj +++ b/NuKeeper/NuKeeper.csproj @@ -16,6 +16,7 @@ runtime; build; native; contentfiles; analyzers all +