Skip to content

Commit a53299a

Browse files
authored
Make dsc3 and export experimentals stable (#5487)
## Change Move the `dsc3` and `configureExport` features to stable.
1 parent 828354f commit a53299a

19 files changed

+5
-91
lines changed

doc/Settings.md

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -354,25 +354,3 @@ You can enable the feature as shown below.
354354
"resume": true
355355
},
356356
```
357-
358-
### dsc3
359-
360-
This feature enables support for DSC v3 integration.
361-
You can enable the feature as shown below.
362-
363-
```json
364-
"experimentalFeatures": {
365-
"dsc3": true
366-
},
367-
```
368-
369-
### configureExport
370-
371-
This feature enables exporting a configuration file.
372-
You can enable the feature as shown below.
373-
374-
```json
375-
"experimentalFeatures": {
376-
"configureExport": true
377-
},
378-
```

schemas/JSON/settings/settings.schema.0.2.json

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -294,21 +294,6 @@
294294
"type": "boolean",
295295
"default": false
296296
},
297-
"configuration03": {
298-
"description": "Enable support for configuration schema 0.3",
299-
"type": "boolean",
300-
"default": false
301-
},
302-
"configureSelfElevate": {
303-
"description": "Enable configure commands request elevation as needed",
304-
"type": "boolean",
305-
"default": false
306-
},
307-
"configureExport": {
308-
"description": "Enable support for the configure export command",
309-
"type": "boolean",
310-
"default": false
311-
},
312297
"fonts": {
313298
"description": "Enable support for managing fonts",
314299
"type": "boolean",

src/AppInstallerCLICore/Commands/DscCommandBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ namespace AppInstaller::CLI
165165
}
166166

167167
DscCommandBase::DscCommandBase(std::string_view parent, std::string_view resourceName, DscResourceKind kind, DscFunctions functions, DscFunctionModifiers modifiers) :
168-
Command(resourceName, parent, Settings::ExperimentalFeature::Feature::ConfigurationDSCv3, CommandOutputFlags::IgnoreSettingsWarnings), m_kind(kind), m_functions(functions), m_modifiers(modifiers)
168+
Command(resourceName, parent, CommandOutputFlags::IgnoreSettingsWarnings), m_kind(kind), m_functions(functions), m_modifiers(modifiers)
169169
{
170170
// Limits on current implementation
171171
THROW_HR_IF(E_NOTIMPL, kind != DscResourceKind::Resource);

src/AppInstallerCLICore/ConfigurationSetProcessorFactoryRemoting.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,6 @@ namespace AppInstaller::CLI::ConfigurationRemoting
325325

326326
IConfigurationSetProcessorFactory CreateOutOfProcessFactory(ProcessorEngine processorEngine, bool useRunAs, const std::string& properties, const std::string& restrictions)
327327
{
328-
THROW_HR_IF(APPINSTALLER_CLI_ERROR_EXPERIMENTAL_FEATURE_DISABLED, processorEngine == ProcessorEngine::DSCv3 && !Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ConfigurationDSCv3));
329-
330328
return winrt::make<RemoteFactory>(processorEngine, useRunAs, properties, restrictions);
331329
}
332330

src/AppInstallerCLICore/ConfigureExportCommand.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace AppInstaller::CLI
77
{
88
struct ConfigureExportCommand final : public Command
99
{
10-
ConfigureExportCommand(std::string_view parent) : Command("export", parent, Settings::ExperimentalFeature::Feature::ConfigureExport) {}
10+
ConfigureExportCommand(std::string_view parent) : Command("export", parent) {}
1111

1212
std::vector<Argument> GetArguments() const override;
1313

src/AppInstallerCLICore/Workflows/ConfigurationFlow.cpp

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,6 @@ namespace AppInstaller::CLI::Workflow
167167

168168
THROW_HR_IF(WINGET_CONFIG_ERROR_INVALID_FIELD_VALUE, processorEngine == ConfigurationRemoting::ProcessorEngine::Unknown);
169169

170-
if (processorEngine == ConfigurationRemoting::ProcessorEngine::DSCv3)
171-
{
172-
context << EnsureFeatureEnabled(Settings::ExperimentalFeature::Feature::ConfigurationDSCv3);
173-
if (context.IsTerminated())
174-
{
175-
THROW_HR(APPINSTALLER_CLI_ERROR_EXPERIMENTAL_FEATURE_DISABLED);
176-
}
177-
}
178-
179170
// Since downgrading is not currently supported, only use dynamic if running limited.
180171
if (Runtime::IsRunningWithLimitedToken())
181172
{
@@ -1872,11 +1863,7 @@ namespace AppInstaller::CLI::Workflow
18721863
{
18731864
ConfigurationSet set;
18741865
set.SchemaVersion(Utility::ConvertToUTF16(m_defaultSchemaVersion));
1875-
1876-
if (Settings::ExperimentalFeature::IsEnabled(Settings::ExperimentalFeature::Feature::ConfigurationDSCv3))
1877-
{
1878-
set.Environment().ProcessorIdentifier(ConfigurationRemoting::ToString(ConfigurationRemoting::ProcessorEngine::DSCv3));
1879-
}
1866+
set.Environment().ProcessorIdentifier(ConfigurationRemoting::ToString(ConfigurationRemoting::ProcessorEngine::DSCv3));
18801867

18811868
std::wstring argPathWide = Utility::ConvertToUTF16(argPath);
18821869
auto absolutePath = std::filesystem::weakly_canonical(std::filesystem::path{ argPathWide });

src/AppInstallerCLIE2ETests/ConfigureCommand.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ public static void EnsureTestResourcePresence()
3232
[OneTimeSetUp]
3333
public void OneTimeSetup()
3434
{
35-
WinGetSettingsHelper.ConfigureFeature("dsc3", true);
3635
this.DeleteResourceArtifacts();
3736
EnsureTestResourcePresence();
3837
TestCommon.SetupTestSource(false);
@@ -44,7 +43,6 @@ public void OneTimeSetup()
4443
[OneTimeTearDown]
4544
public void OneTimeTeardown()
4645
{
47-
WinGetSettingsHelper.ConfigureFeature("dsc3", false);
4846
this.DeleteResourceArtifacts();
4947
TestCommon.TearDownTestSource();
5048
}

src/AppInstallerCLIE2ETests/ConfigureExportCommand.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ public class ConfigureExportCommand
2828
public void BaseSetup()
2929
{
3030
TestCommon.SetupTestSource(false);
31-
WinGetSettingsHelper.ConfigureFeature("configureExport", true);
32-
WinGetSettingsHelper.ConfigureFeature("dsc3", true);
3331
var installDir = TestCommon.GetRandomTestDir();
3432
TestCommon.RunAICLICommand("install", $"AppInstallerTest.TestPackageExport -v 1.0.0.0 --silent -l {installDir}");
3533
this.previousPathValue = System.Environment.GetEnvironmentVariable("PATH");
@@ -45,8 +43,6 @@ public void BaseTeardown()
4543
{
4644
TestCommon.RunAICLICommand("uninstall", "AppInstallerTest.TestPackageExport");
4745
TestCommon.TearDownTestSource();
48-
WinGetSettingsHelper.ConfigureFeature("configureExport", false);
49-
WinGetSettingsHelper.ConfigureFeature("dsc3", false);
5046
if (!string.IsNullOrEmpty(this.previousPathValue))
5147
{
5248
System.Environment.SetEnvironmentVariable("PATH", this.previousPathValue);

src/AppInstallerCLIE2ETests/ConfigureShowCommand.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public class ConfigureShowCommand
2222
[OneTimeSetUp]
2323
public void OneTimeSetup()
2424
{
25-
WinGetSettingsHelper.ConfigureFeature("dsc3", true);
2625
this.DeleteResourceArtifacts();
2726
ConfigureCommand.EnsureTestResourcePresence();
2827
}
@@ -33,7 +32,6 @@ public void OneTimeSetup()
3332
[OneTimeTearDown]
3433
public void OneTimeTearDown()
3534
{
36-
WinGetSettingsHelper.ConfigureFeature("dsc3", false);
3735
this.DeleteResourceArtifacts();
3836
}
3937

src/AppInstallerCLIE2ETests/ConfigureTestCommand.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ public class ConfigureTestCommand
2424
[OneTimeSetUp]
2525
public void OneTimeSetup()
2626
{
27-
WinGetSettingsHelper.ConfigureFeature("dsc3", true);
2827
this.DeleteResourceArtifacts();
2928
ConfigureCommand.EnsureTestResourcePresence();
3029
}
@@ -35,7 +34,6 @@ public void OneTimeSetup()
3534
[OneTimeTearDown]
3635
public void OneTimeTeardown()
3736
{
38-
WinGetSettingsHelper.ConfigureFeature("dsc3", false);
3937
this.DeleteResourceArtifacts();
4038
}
4139

0 commit comments

Comments
 (0)