Merge branch 'allow-module-without-version' of https://github.com/Gij…

…sreyn/operation-methods into allow-module-without-version
PowerShell · Dec 9, 2024 · 9fc330a · 9fc330a
2 parents dd460eb + 58b9d3d
commit 9fc330a
Show file tree

Hide file tree

Showing 7 changed files with 469 additions and 92 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -30,11 +30,15 @@ if ($GetPackageVersion) {
 
 $filesForWindowsPackage = @(
     'dsc.exe',
+    'dsc_default.settings.json',
+    'dsc.settings.json',
     'dscecho.exe',
     'echo.dsc.resource.json',
     'assertion.dsc.resource.json',
     'group.dsc.resource.json',
     'NOTICE.txt',
+    'osinfo.exe',
+    'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
     'reboot_pending.dsc.resource.json',
@@ -48,42 +52,44 @@ $filesForWindowsPackage = @(
     'wmi.resource.ps1',
     'windows_baseline.dsc.yaml',
     'windows_inventory.dsc.yaml'
-    'dsc_default.settings.json',
-    'dsc.settings.json'
 )
 
 $filesForLinuxPackage = @(
     'dsc',
+    'dsc_default.settings.json',
+    'dsc.settings.json'
     'dscecho',
     'echo.dsc.resource.json',
     'assertion.dsc.resource.json',
     'apt.dsc.resource.json',
     'apt.dsc.resource.sh',
     'group.dsc.resource.json',
     'NOTICE.txt',
+    'osinfo',
+    'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
     'RunCommandOnSet.dsc.resource.json',
-    'runcommandonset',
-    'dsc_default.settings.json',
-    'dsc.settings.json'
+    'runcommandonset'
 )
 
 $filesForMacPackage = @(
     'dsc',
+    'dsc_default.settings.json',
+    'dsc.settings.json'
     'dscecho',
     'echo.dsc.resource.json',
     'assertion.dsc.resource.json',
     'brew.dsc.resource.json',
     'brew.dsc.resource.sh',
     'group.dsc.resource.json',
     'NOTICE.txt',
+    'osinfo',
+    'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
     'psDscAdapter/',
     'RunCommandOnSet.dsc.resource.json',
-    'runcommandonset',
-    'dsc_default.settings.json',
-    'dsc.settings.json'
+    'runcommandonset'
 )
 
 # the list of files other than the binaries which need to be executable

diff --git a/dsc/parallel.dsc.resource.json b/dsc/parallel.dsc.resource.json
diff --git a/dsc/tests/dsc_resource_list.tests.ps1 b/dsc/tests/dsc_resource_list.tests.ps1
@@ -9,7 +9,6 @@ Describe 'Tests for listing resources' {
         $resources.Count | Should -BeGreaterThan 0
         $resources.type | Should -Contain 'Microsoft.DSC/Assertion'
         $resources.type | Should -Contain 'Microsoft.DSC/Group'
-        $resources.type | Should -Contain 'Microsoft.DSC/Parallel'
         $resources.type | Should -Contain 'Microsoft/OSInfo'
         ($resources | Where-Object { $_.type -eq 'Microsoft.DSC/Group' }).Kind | Should -BeExactly 'Group'
         ($resources | Where-Object { $_.type -eq 'Microsoft/OSInfo' }).Kind | Should -BeExactly 'Resource'