Update Appx discover extension to match changes in extensions

Author: Steve Lee (POWERSHELL HE/HIM) (from Dev Box)

dsc_lib/locales/en-us.toml

@@ -170,6 +170,7 @@ resourceManifestSchemaDescription = "Defines the JSON Schema the resource manife
 [extensions.dscextension]
 discoverNoResults = "No results returned for discovery extension '%{extension}'"
 discoverNotAbsolutePath = "Resource path from extension '%{extension}' is not an absolute path: %{path}"
+extensionReturned = "Extension '%{extension}' returned line: %{line}"
 
 [extensions.extension_manifest]
 extensionManifestSchemaTitle = "Extension manifest schema URI"

dsc_lib/src/discovery/command_discovery.rs

@@ -306,6 +306,11 @@ impl ResourceDiscovery for CommandDiscovery {
                     }
                 }
                 self.adapters = adapters;
+                // go through the resource and remove duplicates with same name and version
+                for (_resource_name, resource_vec) in &mut resources {
+                    let mut uniques: HashSet<String> = HashSet::new();
+                    resource_vec.retain(|e| uniques.insert(e.version.clone()));
+                }
                 self.resources = resources;
             },
             DiscoveryKind::Extension => {

dsc_lib/src/extensions/dscextension.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use schemars::JsonSchema;
 use std::{fmt::Display, path::Path};
-use tracing::info;
+use tracing::{info, trace};
 
 use crate::{discovery::command_discovery::{load_manifest, ImportedManifest}, dscerror::DscError, dscresources::{command_resource::{invoke_command, process_args}, dscresource::DscResource}};
 
@@ -99,6 +99,7 @@ impl DscExtension {
                 info!("{}", t!("extensions.dscextension.discoverNoResults", extension = self.type_name));
             } else {
                 for line in stdout.lines() {
+                    trace!("{}", t!("extensions.dscextension.extensionReturned", extension = self.type_name, line = line));
                     let discover_result: DiscoverResult = match serde_json::from_str(line) {
                         Ok(result) => result,
                         Err(err) => {

extensions/appx/appx-discover.ps1

@@ -1,5 +1,7 @@
-Get-AppxPackage | ForEach-Object {
-    Get-ChildItem -LiteralPath $_.InstallLocation -File -Include '*.dsc.resource.json','*.dsc.resource.yaml','*.dsc.resource.yml' | ForEach-Object {
-        @{ resourceManifestPath = $_.FullName } | ConvertTo-Json -Compress
+$packages = Get-AppxPackage
+foreach ($package in $packages) {
+    $manifests = Get-ChildItem -Path "$($package.InstallLocation)\*" -File -Include '*.dsc.resource.json','*.dsc.resource.yaml','*.dsc.resource.yml' -ErrorAction Ignore
+    foreach ($manifest in $manifests) {
+        @{ manifestPath = $manifest.FullName } | ConvertTo-Json -Compress
     }
 }

extensions/appx/appx.dsc.extension.json

@@ -1,9 +1,8 @@
 {
     "$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
-    "type": "Microsoft.Windows.AppX/Discover",
+    "type": "Microsoft.Windows.Appx/Discover",
     "version": "0.1.0",
-    "description": "Discovers DSC resources packaged as AppX packages.",
-    "author": "Microsoft Corporation",
+    "description": "Discovers DSC resources packaged as Appx packages.",
     "discover": {
         "executable": "powershell",
         "args": [