Implement --config-file param in dotnet.exe

NuGet · Sep 26, 2022 · 4b2d8b6 · 4b2d8b6
1 parent 0c551dc
commit 4b2d8b6
Show file tree

Hide file tree

Showing 8 changed files with 543 additions and 83 deletions.
diff --git a/src/NuGet.Clients/NuGet.CommandLine/NuGetCommand.resx b/src/NuGet.Clients/NuGet.CommandLine/NuGetCommand.resx
@@ -921,4 +921,4 @@ nuget client-certs List</value>
   <data name="Option_Help" xml:space="preserve">
     <value>Show command help and usage information.</value>
   </data>
-</root>
+</root>
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PushCommand.cs b/src/NuGet.Core/NuGet.CommandLine.XPlat/Commands/PushCommand.cs
@@ -36,6 +36,11 @@ public static void Register(CommandLineApplication app, Func<ILogger> getLogger)
                     Strings.SymbolSource_Description,
                     CommandOptionType.SingleValue);
 
+                var configurationFile = push.Option(
+                    "--config-file <source>",
+                    Strings.Option_ConfigFile,
+                    CommandOptionType.SingleValue);
+
                 var timeout = push.Option(
                     "-t|--timeout <timeout>",
                     Strings.Push_Timeout_Description,
@@ -105,7 +110,9 @@ public static void Register(CommandLineApplication app, Func<ILogger> getLogger)
                     }
 
 #pragma warning disable CS0618 // Type or member is obsolete
-                    var sourceProvider = new PackageSourceProvider(XPlatUtility.GetSettingsForCurrentWorkingDirectory(), enablePackageSourcesChangedEvent: false);
+                    var sourceProvider = new PackageSourceProvider(
+                        XPlatUtility.ProcessConfigFile(configurationFile.Value()),
+                        enablePackageSourcesChangedEvent: false);
 #pragma warning restore CS0618 // Type or member is obsolete
 
                     try

diff --git a/src/NuGet.Core/NuGet.Commands/CommandRunners/PushRunner.cs b/src/NuGet.Core/NuGet.Commands/CommandRunners/PushRunner.cs
@@ -95,7 +95,8 @@ public static Task Run(
             bool skipDuplicate,
             ILogger logger)
         {
-            return Run(settings: settings,
+            return Run(
+                settings: settings,
                 sourceProvider: sourceProvider,
                 packagePaths: new[] { packagePath },
                 source: source,

diff --git a/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs b/src/NuGet.Core/NuGet.Protocol/HttpSource/HttpSourceAuthenticationHandler.cs
@@ -25,7 +25,9 @@ public class HttpSourceAuthenticationHandler : DelegatingHandler
         private readonly HttpClientHandler _clientHandler;
         private readonly ICredentialService _credentialService;
 
+#pragma warning disable CA2213
         private readonly SemaphoreSlim _httpClientLock = new SemaphoreSlim(1, 1);
+#pragma warning restore CA2213
         private Dictionary<string, AmbientAuthenticationState> _authStates = new Dictionary<string, AmbientAuthenticationState>();
         private HttpSourceCredentials _credentials;