Move content under dism_dsc

Author: Gijsreyn

Cargo.toml

@@ -21,7 +21,6 @@ members = [
     "resources/sshdconfig",
     "resources/WindowsUpdate",
     "resources/windows_service",
-    "resources/windows_feature",
     "resources/windows_firewall",
     "tools/dsctest",
     "tools/test_group_resource",
@@ -52,7 +51,6 @@ default-members = [
     "resources/sshdconfig",
     "resources/WindowsUpdate",
     "resources/windows_service",
-    "resources/windows_feature",
     "resources/windows_firewall",
     "tools/dsctest",
     "tools/test_group_resource",
@@ -85,7 +83,6 @@ Windows = [
     "resources/sshdconfig",
     "resources/WindowsUpdate",
     "resources/windows_service",
-    "resources/windows_feature",
     "resources/windows_firewall",
     "tools/dsctest",
     "tools/test_group_resource",

data.build.json

@@ -109,7 +109,6 @@
       "windows_firewall.exe",
       "windows_service.exe",
       "windows_service.dsc.resource.json",
-      "windows_feature.exe",
       "windows_feature.dsc.resource.json",
       "wmi.dsc.resource.json",
       "wmi.resource.ps1",
@@ -182,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"]
         }
     },
     {
@@ -480,21 +479,6 @@
         ]
       }
     },
-    {
-      "Name": "windows_feature",
-      "Kind": "Resource",
-      "RelativePath": "resources/windows_feature",
-      "SupportedPlatformOS": "Windows",
-      "IsRust": true,
-      "Binaries": [
-        "windows_feature"
-      ],
-      "CopyFiles": {
-        "Windows": [
-          "windows_feature.dsc.resource.json"
-        ]
-      }
-    },
     {
       "Name": "dsctest",
       "Kind": "Resource",

resources/dism_dsc/.project.data.json

@@ -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"]
     }
 }

resources/dism_dsc/locales/en-us.toml

@@ -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]
@@ -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)"