commit d9cdbc824531ae61f1bdde2c18a9221a1eb13c75 parent 2bfaa918bfef3a67fefb070aeee1a61fb188a7e3 Author: KEINOS <github+fork-qiita-news@keinos.com> Date: Wed, 28 May 2025 18:36:46 +0000 Merge remote-tracking branch 'upstream/master' Diffstat:
19 files changed, 5 insertions(+), 91 deletions(-)
diff --git a/doc/Settings.md b/doc/Settings.md @@ -354,25 +354,3 @@ You can enable the feature as shown below. "resume": true }, ``` - -### dsc3 - -This feature enables support for DSC v3 integration. -You can enable the feature as shown below. - -```json - "experimentalFeatures": { - "dsc3": true - }, -``` - -### configureExport - -This feature enables exporting a configuration file. -You can enable the feature as shown below. - -```json - "experimentalFeatures": { - "configureExport": true - }, -``` diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json @@ -294,21 +294,6 @@ "type": "boolean", "default": false }, - "configuration03": { - "description": "Enable support for configuration schema 0.3", - "type": "boolean", - "default": false - }, - "configureSelfElevate": { - "description": "Enable configure commands request elevation as needed", - "type": "boolean", - "default": false - }, - "configureExport": { - "description": "Enable support for the configure export command", - "type": "boolean", - "default": false - }, "fonts": { "description": "Enable support for managing fonts", "type": "boolean", diff --git a/src/AppInstallerCLICore/Commands/DscCommandBase.cpp b/src/AppInstallerCLICore/Commands/DscCommandBase.cpp @@ -165,7 +165,7 @@ namespace AppInstaller::CLI } DscCommandBase::DscCommandBase(std::string_view parent, std::string_view resourceName, DscResourceKind kind, DscFunctions functions, DscFunctionModifiers modifiers) : - Command(resourceName, parent, Settings::ExperimentalFeature::Feature::ConfigurationDSCv3, CommandOutputFlags::IgnoreSettingsWarnings), m_kind(kind), m_functions(functions), m_modifiers(modifiers) + Command(resourceName, parent, CommandOutputFlags::IgnoreSettingsWarnings), m_kind(kind), m_functions(functions), m_modifiers(modifiers) { // Limits on current implementation THROW_HR_IF(E_NOTIMPL, kind != DscResourceKind::Resource); diff --git a/src/AppInstallerCLICore/ConfigurationSetProcessorFactoryRemoting.cpp b/src/AppInstallerCLICore/ConfigurationSetProcessorFactoryRemoting.cpp @@ -325,8 +325,6 @@ namespace AppInstaller::CLI::ConfigurationRemoting IConfigurationSetProcessorFactory CreateOutOfProcessFactory(ProcessorEngine processorEngine, bool useRunAs, const std::string& properties, const std::string& restrictions) { - THROW_HR_IF(APPINSTALLER_CLI_ERROR_EXPERIMENTAL_FEATURE_DISABLED, processorEngine == ProcessorEngine::DSCv3 && !Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ConfigurationDSCv3)); - return winrt::make<RemoteFactory>(processorEngine, useRunAs, properties, restrictions); } diff --git a/src/AppInstallerCLICore/ConfigureExportCommand.h b/src/AppInstallerCLICore/ConfigureExportCommand.h @@ -7,7 +7,7 @@ namespace AppInstaller::CLI { struct ConfigureExportCommand final : public Command { - ConfigureExportCommand(std::string_view parent) : Command("export", parent, Settings::ExperimentalFeature::Feature::ConfigureExport) {} + ConfigureExportCommand(std::string_view parent) : Command("export", parent) {} std::vector<Argument> GetArguments() const override; diff --git a/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp b/src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp @@ -167,15 +167,6 @@ namespace AppInstaller::CLI::Workflow THROW_HR_IF(WINGET_CONFIG_ERROR_INVALID_FIELD_VALUE, processorEngine == ConfigurationRemoting::ProcessorEngine::Unknown); - if (processorEngine == ConfigurationRemoting::ProcessorEngine::DSCv3) - { - context << EnsureFeatureEnabled(Settings::ExperimentalFeature::Feature::ConfigurationDSCv3); - if (context.IsTerminated()) - { - THROW_HR(APPINSTALLER_CLI_ERROR_EXPERIMENTAL_FEATURE_DISABLED); - } - } - // Since downgrading is not currently supported, only use dynamic if running limited. if (Runtime::IsRunningWithLimitedToken()) { @@ -1872,11 +1863,7 @@ namespace AppInstaller::CLI::Workflow { ConfigurationSet set; set.SchemaVersion(Utility::ConvertToUTF16(m_defaultSchemaVersion)); - - if (Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ConfigurationDSCv3)) - { - set.Environment().ProcessorIdentifier(ConfigurationRemoting::ToString(ConfigurationRemoting::ProcessorEngine::DSCv3)); - } + set.Environment().ProcessorIdentifier(ConfigurationRemoting::ToString(ConfigurationRemoting::ProcessorEngine::DSCv3)); std::wstring argPathWide = Utility::ConvertToUTF16(argPath); auto absolutePath = std::filesystem::weakly_canonical(std::filesystem::path{ argPathWide }); diff --git a/src/AppInstallerCLIE2ETests/ConfigureCommand.cs b/src/AppInstallerCLIE2ETests/ConfigureCommand.cs @@ -32,7 +32,6 @@ namespace AppInstallerCLIE2ETests [OneTimeSetUp] public void OneTimeSetup() { - WinGetSettingsHelper.ConfigureFeature("dsc3", true); this.DeleteResourceArtifacts(); EnsureTestResourcePresence(); TestCommon.SetupTestSource(false); @@ -44,7 +43,6 @@ namespace AppInstallerCLIE2ETests [OneTimeTearDown] public void OneTimeTeardown() { - WinGetSettingsHelper.ConfigureFeature("dsc3", false); this.DeleteResourceArtifacts(); TestCommon.TearDownTestSource(); } diff --git a/src/AppInstallerCLIE2ETests/ConfigureExportCommand.cs b/src/AppInstallerCLIE2ETests/ConfigureExportCommand.cs @@ -28,8 +28,6 @@ namespace AppInstallerCLIE2ETests public void BaseSetup() { TestCommon.SetupTestSource(false); - WinGetSettingsHelper.ConfigureFeature("configureExport", true); - WinGetSettingsHelper.ConfigureFeature("dsc3", true); var installDir = TestCommon.GetRandomTestDir(); TestCommon.RunAICLICommand("install", $"AppInstallerTest.TestPackageExport -v 1.0.0.0 --silent -l {installDir}"); this.previousPathValue = System.Environment.GetEnvironmentVariable("PATH"); @@ -45,8 +43,6 @@ namespace AppInstallerCLIE2ETests { TestCommon.RunAICLICommand("uninstall", "AppInstallerTest.TestPackageExport"); TestCommon.TearDownTestSource(); - WinGetSettingsHelper.ConfigureFeature("configureExport", false); - WinGetSettingsHelper.ConfigureFeature("dsc3", false); if (!string.IsNullOrEmpty(this.previousPathValue)) { System.Environment.SetEnvironmentVariable("PATH", this.previousPathValue); diff --git a/src/AppInstallerCLIE2ETests/ConfigureShowCommand.cs b/src/AppInstallerCLIE2ETests/ConfigureShowCommand.cs @@ -22,7 +22,6 @@ namespace AppInstallerCLIE2ETests [OneTimeSetUp] public void OneTimeSetup() { - WinGetSettingsHelper.ConfigureFeature("dsc3", true); this.DeleteResourceArtifacts(); ConfigureCommand.EnsureTestResourcePresence(); } @@ -33,7 +32,6 @@ namespace AppInstallerCLIE2ETests [OneTimeTearDown] public void OneTimeTearDown() { - WinGetSettingsHelper.ConfigureFeature("dsc3", false); this.DeleteResourceArtifacts(); } diff --git a/src/AppInstallerCLIE2ETests/ConfigureTestCommand.cs b/src/AppInstallerCLIE2ETests/ConfigureTestCommand.cs @@ -24,7 +24,6 @@ namespace AppInstallerCLIE2ETests [OneTimeSetUp] public void OneTimeSetup() { - WinGetSettingsHelper.ConfigureFeature("dsc3", true); this.DeleteResourceArtifacts(); ConfigureCommand.EnsureTestResourcePresence(); } @@ -35,7 +34,6 @@ namespace AppInstallerCLIE2ETests [OneTimeTearDown] public void OneTimeTeardown() { - WinGetSettingsHelper.ConfigureFeature("dsc3", false); this.DeleteResourceArtifacts(); } diff --git a/src/AppInstallerCLIE2ETests/DSCv3AdminSettingsResourceCommand.cs b/src/AppInstallerCLIE2ETests/DSCv3AdminSettingsResourceCommand.cs @@ -42,7 +42,6 @@ namespace AppInstallerCLIE2ETests [OneTimeSetUp] public void OneTimeSetup() { - WinGetSettingsHelper.ConfigureFeature("dsc3", true); EnsureTestResourcePresence(); } @@ -52,7 +51,6 @@ namespace AppInstallerCLIE2ETests [OneTimeTearDown] public void OneTimeTeardown() { - WinGetSettingsHelper.ConfigureFeature("dsc3", false); ResetAllSettings(); GroupPolicyHelper.DeleteExistingPolicies(); } diff --git a/src/AppInstallerCLIE2ETests/DSCv3PackageResourceCommand.cs b/src/AppInstallerCLIE2ETests/DSCv3PackageResourceCommand.cs @@ -33,7 +33,6 @@ namespace AppInstallerCLIE2ETests public void OneTimeSetup() { TestCommon.SetupTestSource(); - WinGetSettingsHelper.ConfigureFeature("dsc3", true); WinGetSettingsHelper.ConfigureLoggingLevel("verbose"); EnsureTestResourcePresence(); } @@ -46,7 +45,6 @@ namespace AppInstallerCLIE2ETests { RemoveTestPackage(); WinGetSettingsHelper.ConfigureLoggingLevel(null); - WinGetSettingsHelper.ConfigureFeature("dsc3", false); TestCommon.TearDownTestSource(); } diff --git a/src/AppInstallerCLIE2ETests/DSCv3SourceResourceCommand.cs b/src/AppInstallerCLIE2ETests/DSCv3SourceResourceCommand.cs @@ -56,7 +56,6 @@ namespace AppInstallerCLIE2ETests public void OneTimeSetup() { TestCommon.SetupTestSource(); - WinGetSettingsHelper.ConfigureFeature("dsc3", true); EnsureTestResourcePresence(); } @@ -67,7 +66,6 @@ namespace AppInstallerCLIE2ETests public void OneTimeTeardown() { RemoveTestSource(); - WinGetSettingsHelper.ConfigureFeature("dsc3", false); TestCommon.TearDownTestSource(); } diff --git a/src/AppInstallerCLIE2ETests/DSCv3UserSettingsFileResourceCommand.cs b/src/AppInstallerCLIE2ETests/DSCv3UserSettingsFileResourceCommand.cs @@ -35,7 +35,6 @@ public class DSCv3UserSettingsFileResourceCommand : DSCv3ResourceTestBase public void OneTimeSetup() { TestCommon.SetupTestSource(); - WinGetSettingsHelper.ConfigureFeature("dsc3", true); EnsureTestResourcePresence(); } @@ -46,7 +45,6 @@ public class DSCv3UserSettingsFileResourceCommand : DSCv3ResourceTestBase public void OneTimeTeardown() { WinGetSettingsHelper.InitializeWingetSettings(); - WinGetSettingsHelper.ConfigureFeature("dsc3", false); } /// <summary> diff --git a/src/AppInstallerCommonCore/ExperimentalFeature.cpp b/src/AppInstallerCommonCore/ExperimentalFeature.cpp @@ -42,10 +42,6 @@ namespace AppInstaller::Settings return userSettings.Get<Setting::EFDirectMSI>(); case ExperimentalFeature::Feature::Resume: return userSettings.Get<Setting::EFResume>(); - case ExperimentalFeature::Feature::ConfigurationDSCv3: - return userSettings.Get<Setting::EFConfigurationDSCv3>(); - case ExperimentalFeature::Feature::ConfigureExport: - return userSettings.Get<Setting::EFConfigureExport>(); case ExperimentalFeature::Feature::Font: return userSettings.Get<Setting::EFFonts>(); default: @@ -79,10 +75,6 @@ namespace AppInstaller::Settings return ExperimentalFeature{ "Direct MSI Installation", "directMSI", "https://aka.ms/winget-settings", Feature::DirectMSI }; case Feature::Resume: return ExperimentalFeature{ "Resume", "resume", "https://aka.ms/winget-settings", Feature::Resume }; - case Feature::ConfigurationDSCv3: - return ExperimentalFeature{ "Support for DSC v3", "dsc3", "https://aka.ms/winget-settings", Feature::ConfigurationDSCv3 }; - case Feature::ConfigureExport: - return ExperimentalFeature{ "Configure Export", "configureExport", "https://aka.ms/winget-settings", Feature::ConfigureExport }; case Feature::Font: return ExperimentalFeature{ "Font", "Font", "https://aka.ms/winget-settings", Feature::Font }; diff --git a/src/AppInstallerCommonCore/Public/winget/ExperimentalFeature.h b/src/AppInstallerCommonCore/Public/winget/ExperimentalFeature.h @@ -24,9 +24,7 @@ namespace AppInstaller::Settings // Before making DirectMSI non-experimental, it should be part of manifest validation. DirectMSI = 0x1, Resume = 0x2, - ConfigurationDSCv3 = 0x4, - ConfigureExport = 0x8, - Font = 0x10, + Font = 0x4, 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 @@ -75,8 +75,6 @@ namespace AppInstaller::Settings EFExperimentalArg, EFDirectMSI, EFResume, - EFConfigurationDSCv3, - EFConfigureExport, EFFonts, // Telemetry TelemetryDisable, @@ -160,8 +158,6 @@ namespace AppInstaller::Settings SETTINGMAPPING_SPECIALIZATION(Setting::EFExperimentalArg, bool, bool, false, ".experimentalFeatures.experimentalArg"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFDirectMSI, bool, bool, false, ".experimentalFeatures.directMSI"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFResume, bool, bool, false, ".experimentalFeatures.resume"sv); - SETTINGMAPPING_SPECIALIZATION(Setting::EFConfigurationDSCv3, bool, bool, false, ".experimentalFeatures.dsc3"sv); - SETTINGMAPPING_SPECIALIZATION(Setting::EFConfigureExport, bool, bool, false, ".experimentalFeatures.configureExport"sv); SETTINGMAPPING_SPECIALIZATION(Setting::EFFonts, bool, bool, false, ".experimentalFeatures.fonts"sv); // Telemetry SETTINGMAPPING_SPECIALIZATION(Setting::TelemetryDisable, bool, bool, false, ".telemetry.disable"sv); diff --git a/src/AppInstallerCommonCore/UserSettings.cpp b/src/AppInstallerCommonCore/UserSettings.cpp @@ -266,8 +266,6 @@ namespace AppInstaller::Settings WINGET_VALIDATE_PASS_THROUGH(EFExperimentalArg) WINGET_VALIDATE_PASS_THROUGH(EFDirectMSI) WINGET_VALIDATE_PASS_THROUGH(EFResume) - WINGET_VALIDATE_PASS_THROUGH(EFConfigurationDSCv3) - WINGET_VALIDATE_PASS_THROUGH(EFConfigureExport) WINGET_VALIDATE_PASS_THROUGH(EFFonts) WINGET_VALIDATE_PASS_THROUGH(AnonymizePathForDisplay) WINGET_VALIDATE_PASS_THROUGH(TelemetryDisable) diff --git a/src/PowerShell/tests/RunTests.ps1 b/src/PowerShell/tests/RunTests.ps1 @@ -47,7 +47,7 @@ if (-not [System.String]::IsNullOrEmpty($packageLayoutPath)) $local:settingsExport = ConvertFrom-Json (& $local:wingetExeName settings export) $local:settingsFilePath = $local:settingsExport.userSettingsFile - $local:settingsFileContent = ConvertTo-Json @{ debugging= @{ enableSelfInitiatedMinidump=$true ; keepAllLogFiles=$true }; experimentalFeatures= @{ dsc3=$true } } + $local:settingsFileContent = ConvertTo-Json @{ debugging= @{ enableSelfInitiatedMinidump=$true ; keepAllLogFiles=$true } } Set-Content -Path $local:settingsFilePath -Value $local:settingsFileContent }