address copilot feedback

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

dsc/tests/dsc_resource_list.tests.ps1

@@ -38,6 +38,7 @@ Describe 'Tests for listing resources' {
     ) {
         param($tags, $description, $expectedCount, $expectedType)
 
+        $oldPath = $env:DSC_RESOURCE_PATH
         try {
             # Need to restrict the search as more resources are being added like from PS7
             $env:DSC_RESOURCE_PATH = Split-Path (Get-Command dsc).Source -Parent
@@ -58,7 +59,7 @@ Describe 'Tests for listing resources' {
                 $resources.type | Should -BeExactly $expectedType
             }
         } finally {
-            $env:DSC_RESOURCE_PATH = $null
+            $env:DSC_RESOURCE_PATH = $oldPath
         }
     }
 
@@ -142,8 +143,8 @@ Describe 'Tests for listing resources' {
     }
 }
 '@
-        $manifestPath = Join-Path $TestDrive "echoDupeManifest.json"
-        $manifestDupePath = Join-Path $TestDrive "echoDupeManifestDuplicate.json"
+        $manifestPath = Join-Path $TestDrive "echoDupeManifest.dsc.resource.json"
+        $manifestDupePath = Join-Path $TestDrive "echoDupeManifestDuplicate.dsc.resource.json"
         Set-Content -Path $manifestPath -Value $resource_manifest
         Set-Content -Path $manifestDupePath -Value $resource_manifest
 

extensions/appx/appx.dsc.extension.json

@@ -3,7 +3,6 @@
     "type": "Microsoft.Windows.Appx/Discover",
     "version": "0.1.0",
     "description": "Discovers DSC resources packaged as Appx packages.",
-    "condition": "[not(equals(tryWhich('pwsh'), null()))]",
     "discover": {
         "executable": "powershell",
         "args": [

lib/dsc-lib/src/discovery/mod.rs

@@ -81,25 +81,16 @@ impl Discovery {
             };
 
             for (_resource_name, found_resources) in discovered_resources {
-                'manifests: for manifest in found_resources {
-                    match manifest {
-                        ImportedManifest::Resource(ref resource) => {
-                            let key = format!("{}@{}", resource.type_name, resource.version);
-                            if resources.contains_key(&key) {
-                                continue 'manifests; // if we already have this resource, we can skip it
-                            } else {
-                                resources.insert(key, manifest.clone());
-                            }
+                for manifest in found_resources {
+                    let key = match &manifest {
+                        ImportedManifest::Resource(resource) => {
+                            format!("{}@{}", resource.type_name.to_lowercase(), resource.version)
                         },
-                        ImportedManifest::Extension(ref extension) => {
-                            let key = format!("{}@{}", extension.type_name, extension.version);
-                            if resources.contains_key(&key) {
-                                continue 'manifests; // if we already have this extension, we can skip it
-                            } else {
-                                resources.insert(key, manifest.clone());
-                            }
+                        ImportedManifest::Extension(extension) => {
+                            format!("{}@{}", extension.type_name.to_lowercase(), extension.version)
                         }
-                    }
+                    };
+                    resources.insert(key, manifest);
                 }
             };