Skip to content

Add new Microsoft.Windows/WindowsFeatureList resource #1541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveL-MSFT merged 13 commits into from
Jun 11, 2026
Merged

Add new Microsoft.Windows/WindowsFeatureList resource #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e3d40b
Initial setup of Microsoft.Windows/WindowsFeatureList
Gijsreyn May 22, 2026
806b564
Add whatIf support
Gijsreyn May 22, 2026
2d016de
Fix build
Gijsreyn May 22, 2026
7c22222
Remove unused strings
Gijsreyn May 22, 2026
06e58c9
Fix pointer
Gijsreyn May 23, 2026
9cec952
Initial setup of Microsoft.Windows/WindowsFeatureList
Gijsreyn May 22, 2026
d252d13
Add whatIf support
Gijsreyn May 22, 2026
6c85039
Fix build
Gijsreyn May 22, 2026
ac5aceb
Remove unused strings
Gijsreyn May 22, 2026
e78ffd9
Fix pointer
Gijsreyn May 23, 2026
ef7acc3
Merge branch 'gh-1540/main/add-windowsfeaturelist-resource' of https:…
Gijsreyn Jun 11, 2026
15ccd6f
Move content under dism_dsc
Gijsreyn Jun 11, 2026
5f10118
Revert registry file
Gijsreyn Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ default-members = [
"lib/dsc-lib-registry",
"resources/runcommandonset",
"lib/dsc-lib-security_context",
"resources/dism_dsc",
"resources/sshdconfig",
"resources/WindowsUpdate",
"resources/windows_service",
Expand All @@ -58,7 +57,8 @@ default-members = [
"grammars/tree-sitter-dscexpression",
"grammars/tree-sitter-ssh-server-config",
"y2j",
"xtask"
"xtask",
"resources/dism_dsc"
]

[workspace.metadata.groups]
Expand Down
3 changes: 2 additions & 1 deletion data.build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
"windows_firewall.exe",
"windows_service.exe",
"windows_service.dsc.resource.json",
"windows_feature.dsc.resource.json",
"wmi.dsc.resource.json",
"wmi.resource.ps1",
"wmiAdapter.psd1",
Expand Down Expand Up @@ -180,7 +181,7 @@
"SupportedPlatformOS": "Windows",
"Binaries": ["dism_dsc"],
"CopyFiles": {
"Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json"]
"Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json", "windows_feature.dsc.resource.json"]
}
},
{
Expand Down
4 changes: 2 additions & 2 deletions lib/dsc-lib-registry/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ pub struct Registry {
}

#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, JsonSchema)]
#[serde(deny_unknown_fields)]
#[serde(deny_unknown_fields, rename_all = "camelCase")]
pub struct Metadata {
#[serde(rename = "whatIf", skip_serializing_if = "Option::is_none")]
#[serde(skip_serializing_if = "Option::is_none")]
pub what_if: Option<Vec<String>>
}
2 changes: 1 addition & 1 deletion resources/dism_dsc/.project.data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"SupportedPlatformOS": "Windows",
"Binaries": ["dism_dsc"],
"CopyFiles": {
"Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json"]
"Windows": ["optionalfeature.dsc.resource.json", "featureondemand.dsc.resource.json", "windows_feature.dsc.resource.json"]
}
}
9 changes: 7 additions & 2 deletions resources/dism_dsc/locales/en-us.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ _version = 1

[main]
missingArguments = "Missing operation and resource type arguments"
usage = "Usage: dism_dsc <get|set|export> <optional-feature|feature-on-demand>"
usage = "Usage: dism_dsc <get|set|export> <optional-feature|feature-on-demand|windows-feature>"
windowsOnly = "This resource is only supported on Windows"
unknownOperation = "Unknown operation '%{operation}'"
unknownResourceType = "Unknown resource type '%{resource_type}'. Expected 'optional-feature' or 'feature-on-demand'"
unknownResourceType = "Unknown resource type '%{resource_type}'. Expected 'optional-feature', 'feature-on-demand', or 'windows-feature'"
errorReadingInput = "Error reading input: %{err}"

[get]
Expand Down Expand Up @@ -60,3 +60,8 @@ getCapabilitiesFailed = "DismGetCapabilities failed: HRESULT %{hr}"
getCapabilityInfoFailed = "DismGetCapabilityInfo failed for '%{name}': HRESULT %{hr}"
addCapabilityFailed = "DismAddCapability failed for '%{name}': HRESULT %{hr}"
removeCapabilityFailed = "DismRemoveCapability failed for '%{name}': HRESULT %{hr}"

[windows_feature_helper]
whatIfEnable = "Would enable feature '%{name}'"
whatIfDisable = "Would disable feature '%{name}' (remove payload: false)"
whatIfRemove = "Would remove feature '%{name}' (remove payload: true)"
Loading
Loading