Make proxy arguments common

florelis · Feb 29, 2024 · 48872d5 · 48872d5
1 parent 2e065e6
commit 48872d5
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 20 deletions.
diff --git a/src/AppInstallerCLICore/Argument.cpp b/src/AppInstallerCLICore/Argument.cpp
@@ -407,6 +407,8 @@ namespace AppInstaller::CLI
         args.push_back(ForType(Args::Type::RetroStyle));
         args.push_back(ForType(Args::Type::VerboseLogs));
         args.emplace_back(Args::Type::DisableInteractivity, Resource::String::DisableInteractivityArgumentDescription, ArgumentType::Flag, false);
+        args.push_back(ForType(Args::Type::Proxy));
+        args.push_back(ForType(Args::Type::NoProxy));
     }
 
     std::string Argument::GetUsageString() const

diff --git a/src/AppInstallerCLICore/Commands/DownloadCommand.cpp b/src/AppInstallerCLICore/Commands/DownloadCommand.cpp
@@ -36,8 +36,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Args::Type::CustomHeader),
             Argument::ForType(Args::Type::AuthenticationMode),
             Argument::ForType(Args::Type::AuthenticationAccount),
-            Argument::ForType(Args::Type::Proxy),
-            Argument::ForType(Args::Type::NoProxy),
             Argument::ForType(Args::Type::AcceptPackageAgreements),
             Argument::ForType(Args::Type::AcceptSourceAgreements),
         };

diff --git a/src/AppInstallerCLICore/Commands/ImportCommand.cpp b/src/AppInstallerCLICore/Commands/ImportCommand.cpp
@@ -19,8 +19,6 @@ namespace AppInstaller::CLI
             Argument{ Execution::Args::Type::IgnoreUnavailable, Resource::String::ImportIgnoreUnavailableArgumentDescription, ArgumentType::Flag },
             Argument{ Execution::Args::Type::IgnoreVersions, Resource::String::ImportIgnorePackageVersionsArgumentDescription, ArgumentType::Flag },
             Argument::ForType(Execution::Args::Type::NoUpgrade),
-            Argument::ForType(Execution::Args::Type::Proxy),
-            Argument::ForType(Execution::Args::Type::NoProxy),
             Argument::ForType(Execution::Args::Type::AcceptPackageAgreements),
             Argument::ForType(Execution::Args::Type::AcceptSourceAgreements),
         };

diff --git a/src/AppInstallerCLICore/Commands/InstallCommand.cpp b/src/AppInstallerCLICore/Commands/InstallCommand.cpp
@@ -55,8 +55,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Args::Type::Rename),
             Argument::ForType(Args::Type::UninstallPrevious),
             Argument::ForType(Args::Type::Force),
-            Argument::ForType(Args::Type::Proxy),
-            Argument::ForType(Args::Type::NoProxy),
             Argument{ Args::Type::IncludeUnknown, Resource::String::IncludeUnknownArgumentDescription, ArgumentType::Flag, Argument::Visibility::Hidden},
         };
     }

diff --git a/src/AppInstallerCLICore/Commands/ListCommand.cpp b/src/AppInstallerCLICore/Commands/ListCommand.cpp
@@ -27,8 +27,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Execution::Args::Type::CustomHeader),
             Argument::ForType(Execution::Args::Type::AuthenticationMode),
             Argument::ForType(Execution::Args::Type::AuthenticationAccount),
-            Argument::ForType(Execution::Args::Type::Proxy),
-            Argument::ForType(Execution::Args::Type::NoProxy),
             Argument::ForType(Execution::Args::Type::AcceptSourceAgreements),
             Argument{ Execution::Args::Type::Upgrade, Resource::String::UpgradeArgumentDescription, ArgumentType::Flag, Argument::Visibility::Help },
             Argument{ Execution::Args::Type::IncludeUnknown, Resource::String::IncludeUnknownInListArgumentDescription, ArgumentType::Flag },

diff --git a/src/AppInstallerCLICore/Commands/SearchCommand.cpp b/src/AppInstallerCLICore/Commands/SearchCommand.cpp
@@ -27,8 +27,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Execution::Args::Type::CustomHeader),
             Argument::ForType(Execution::Args::Type::AuthenticationMode),
             Argument::ForType(Execution::Args::Type::AuthenticationAccount),
-            Argument::ForType(Execution::Args::Type::Proxy),
-            Argument::ForType(Execution::Args::Type::NoProxy),
             Argument::ForType(Execution::Args::Type::AcceptSourceAgreements),
             Argument::ForType(Execution::Args::Type::ListVersions),
         };

diff --git a/src/AppInstallerCLICore/Commands/ShowCommand.cpp b/src/AppInstallerCLICore/Commands/ShowCommand.cpp
@@ -33,8 +33,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Execution::Args::Type::CustomHeader),
             Argument::ForType(Execution::Args::Type::AuthenticationMode),
             Argument::ForType(Execution::Args::Type::AuthenticationAccount),
-            Argument::ForType(Execution::Args::Type::Proxy),
-            Argument::ForType(Execution::Args::Type::NoProxy),
             Argument::ForType(Execution::Args::Type::AcceptSourceAgreements),
         };
     }

diff --git a/src/AppInstallerCLICore/Commands/SourceCommand.cpp b/src/AppInstallerCLICore/Commands/SourceCommand.cpp
@@ -53,8 +53,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Args::Type::SourceArg),
             Argument::ForType(Args::Type::SourceType),
             Argument::ForType(Args::Type::CustomHeader),
-            Argument::ForType(Args::Type::Proxy),
-            Argument::ForType(Args::Type::NoProxy),
             Argument::ForType(Args::Type::AcceptSourceAgreements),
         };
     }
@@ -128,8 +126,6 @@ namespace AppInstaller::CLI
     {
         return {
             Argument::ForType(Args::Type::SourceName),
-            Argument::ForType(Execution::Args::Type::Proxy),
-            Argument::ForType(Execution::Args::Type::NoProxy),
         };
     }
 

diff --git a/src/AppInstallerCLICore/Commands/UninstallCommand.cpp b/src/AppInstallerCLICore/Commands/UninstallCommand.cpp
@@ -37,8 +37,6 @@ namespace AppInstaller::CLI
             Argument::ForType(Args::Type::CustomHeader),
             Argument::ForType(Args::Type::AuthenticationMode),
             Argument::ForType(Args::Type::AuthenticationAccount),
-            Argument::ForType(Args::Type::Proxy),
-            Argument::ForType(Args::Type::NoProxy),
             Argument::ForType(Args::Type::AcceptSourceAgreements),
         };
     }

diff --git a/src/AppInstallerCLICore/Commands/UpgradeCommand.cpp b/src/AppInstallerCLICore/Commands/UpgradeCommand.cpp
@@ -73,8 +73,6 @@ namespace AppInstaller::CLI
             Argument{ Args::Type::IncludePinned, Resource::String::IncludePinnedArgumentDescription, ArgumentType::Flag},
             Argument::ForType(Args::Type::UninstallPrevious),
             Argument::ForType(Args::Type::Force),
-            Argument::ForType(Args::Type::Proxy),
-            Argument::ForType(Args::Type::NoProxy),
         };
     }