commit 0703b6beece5ed85e1dc18b5e1761215233f5078 parent f31f411c780b3e95893cae3cb0ec3ed58d6d4989 Author: yao-msft <50888816+yao-msft@users.noreply.github.com> Date: Thu, 9 May 2024 19:42:33 -0700 Make proxy feature stable (#4466) Diffstat:
8 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/doc/Settings.md b/doc/Settings.md @@ -302,16 +302,6 @@ You can enable the feature as shown below. }, ``` -### proxy - -This feature enables the use of web proxies. -You can enable the feature as shown below. - -```json - "experimentalFeatures": { - "proxy": true - }, -``` ### sideBySide This feature enables experimental improvements for supporting multiple instances of a package being installed on a system. diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json @@ -271,11 +271,6 @@ "type": "boolean", "default": false }, - "proxy": { - "description": "Enable support for proxies", - "type": "boolean", - "default": false - }, "sideBySide": { "description": "Enable support for improved side-by-side handling", "type": "boolean", diff --git a/src/AppInstallerCLICore/Argument.cpp b/src/AppInstallerCLICore/Argument.cpp @@ -419,9 +419,9 @@ namespace AppInstaller::CLI case Args::Type::TargetVersion: return Argument{ type, Resource::String::TargetVersionArgumentDescription, ArgumentType::Standard }; case Args::Type::Proxy: - return Argument{ type, Resource::String::ProxyArgumentDescription, ArgumentType::Standard, ExperimentalFeature::Feature::Proxy, TogglePolicy::Policy::ProxyCommandLineOptions, BoolAdminSetting::ProxyCommandLineOptions }; + return Argument{ type, Resource::String::ProxyArgumentDescription, ArgumentType::Standard, TogglePolicy::Policy::ProxyCommandLineOptions, BoolAdminSetting::ProxyCommandLineOptions }; case Args::Type::NoProxy: - return Argument{ type, Resource::String::NoProxyArgumentDescription, ArgumentType::Flag, ExperimentalFeature::Feature::Proxy, TogglePolicy::Policy::ProxyCommandLineOptions, BoolAdminSetting::ProxyCommandLineOptions }; + return Argument{ type, Resource::String::NoProxyArgumentDescription, ArgumentType::Flag, TogglePolicy::Policy::ProxyCommandLineOptions, BoolAdminSetting::ProxyCommandLineOptions }; default: THROW_HR(E_UNEXPECTED); } diff --git a/src/AppInstallerCLICore/Workflows/DownloadFlow.cpp b/src/AppInstallerCLICore/Workflows/DownloadFlow.cpp @@ -149,11 +149,10 @@ namespace AppInstaller::CLI::Workflow // It is assumed that the parent of the installer path will always be a directory // If it isn't, then something went severely wrong. However, we will check that - // it is a directory here just to be safe. If it is an empty directory, remove it + // it is a directory here just to be safe. If it is an empty directory, remove it. if (std::filesystem::is_directory(path.parent_path()) && - std::filesystem::is_empty(path.parent_path()) - ) + std::filesystem::is_empty(path.parent_path())) { std::filesystem::remove(path.parent_path()); } diff --git a/src/AppInstallerCommonCore/ExperimentalFeature.cpp b/src/AppInstallerCommonCore/ExperimentalFeature.cpp @@ -46,8 +46,6 @@ namespace AppInstaller::Settings return userSettings.Get<Setting::EFConfiguration03>(); case ExperimentalFeature::Feature::SideBySide: return userSettings.Get<Setting::EFSideBySide>(); - case ExperimentalFeature::Feature::Proxy: - return userSettings.Get<Setting::EFProxy>(); case ExperimentalFeature::Feature::ConfigureSelfElevation: return userSettings.Get<Setting::EFConfigureSelfElevation>(); case ExperimentalFeature::Feature::StoreDownload: @@ -89,8 +87,6 @@ namespace AppInstaller::Settings return ExperimentalFeature{ "Configuration Schema 0.3", "configuration03", "https://aka.ms/winget-settings", Feature::Configuration03 }; case Feature::SideBySide: return ExperimentalFeature{ "Side-by-side improvements", "sideBySide", "https://aka.ms/winget-settings", Feature::SideBySide }; - case Feature::Proxy: - return ExperimentalFeature{ "Proxy", "proxy", "https://aka.ms/winget-settings", Feature::Proxy }; case Feature::ConfigureSelfElevation: return ExperimentalFeature{ "Configure Self Elevation", "configureSelfElevate", "https://aka.ms/winget-settings", Feature::ConfigureSelfElevation }; case Feature::StoreDownload: diff --git a/src/AppInstallerCommonCore/Public/winget/ExperimentalFeature.h b/src/AppInstallerCommonCore/Public/winget/ExperimentalFeature.h @@ -25,11 +25,10 @@ namespace AppInstaller::Settings DirectMSI = 0x1, Resume = 0x2, Configuration03 = 0x4, - Proxy = 0x8, - SideBySide = 0x10, - ConfigureSelfElevation = 0x20, - StoreDownload = 0x40, - ConfigureExport = 0x80, + SideBySide = 0x8, + ConfigureSelfElevation = 0x10, + StoreDownload = 0x20, + ConfigureExport = 0x40, Max, // This MUST always be after all experimental features // Features listed after Max will not be shown with the features command diff --git a/src/AppInstallerCommonCore/Public/winget/UserSettings.h b/src/AppInstallerCommonCore/Public/winget/UserSettings.h @@ -73,7 +73,6 @@ namespace AppInstaller::Settings EFResume, EFConfiguration03, EFSideBySide, - EFProxy, EFConfigureSelfElevation, EFStoreDownload, EFConfigureExport, @@ -157,7 +156,6 @@ namespace AppInstaller::Settings SETTINGMAPPING_SPECIALIZATION(Setting::EFResume, bool, bool, false, ".experimentalFeatures.resume"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFConfiguration03, bool, bool, false, ".experimentalFeatures.configuration03"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFSideBySide, bool, bool, false, ".experimentalFeatures.sideBySide"sv); - SETTINGMAPPING_SPECIALIZATION(Setting::EFProxy, bool, bool, false, ".experimentalFeatures.proxy"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFConfigureSelfElevation, bool, bool, false, ".experimentalFeatures.configureSelfElevate"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFStoreDownload, bool, bool, false, ".experimentalFeatures.storeDownload"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFConfigureExport, bool, bool, false, ".experimentalFeatures.configureExport"sv); diff --git a/src/AppInstallerCommonCore/UserSettings.cpp b/src/AppInstallerCommonCore/UserSettings.cpp @@ -262,7 +262,6 @@ namespace AppInstaller::Settings WINGET_VALIDATE_PASS_THROUGH(EFResume) WINGET_VALIDATE_PASS_THROUGH(EFConfiguration03) WINGET_VALIDATE_PASS_THROUGH(EFSideBySide) - WINGET_VALIDATE_PASS_THROUGH(EFProxy) WINGET_VALIDATE_PASS_THROUGH(EFConfigureSelfElevation) WINGET_VALIDATE_PASS_THROUGH(EFStoreDownload) WINGET_VALIDATE_PASS_THROUGH(EFConfigureExport)