Moved files to psDscAdapter subfolder

Author: Andrew

powershell-adapter/Tests/powershellgroup.config.tests.ps1

@@ -5,7 +5,7 @@ Describe 'PowerShell adapter resource tests' {
 
     BeforeAll {
         if ($isWindows) {
-          #winrm quickconfig -quiet -force
+          winrm quickconfig -quiet -force
         }  
         $OldPSModulePath  = $env:PSModulePath
         $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot
@@ -26,16 +26,15 @@ Describe 'PowerShell adapter resource tests' {
         $res.results[0].result.actualState.result[1].properties.EnumProp | Should -BeExactly 'Expected'
     }
 
-    <#It 'Get works on config with File resource for WinPS' -Skip:(!$IsWindows){
+    It 'Get works on config with File resource for WinPS' -Skip:(!$IsWindows){
 
       $testFile = "$testdrive\test.txt"
       'test' | Set-Content -Path $testFile -Force
       $r = (Get-Content -Raw $winpsConfigPath).Replace('c:\test.txt',"$testFile") | dsc config get
       $LASTEXITCODE | Should -Be 0
       $res = $r | ConvertFrom-Json
       $res.results[0].result.actualState.result[0].properties.DestinationPath | Should -Be "$testFile"
-  }#>
-
+    }
 
     It 'Test works on config with class-based and script-based resources' -Skip:(!$IsWindows){
 

powershell-adapter/Tests/powershellgroup.resource.tests.ps1

@@ -5,7 +5,7 @@ Describe 'PowerShell adapter resource tests' {
 
     BeforeAll {
         if ($isWindows) {
-            #winrm quickconfig -quiet -force
+            winrm quickconfig -quiet -force
         }    
         $OldPSModulePath  = $env:PSModulePath
         $env:PSModulePath += [System.IO.Path]::PathSeparator + $PSScriptRoot

powershell-adapter/copy_files.txt

@@ -1,3 +1,3 @@
-powershell.resource.ps1
+./psDscAdapter/powershell.resource.ps1
 ./psDscAdapter/psDscAdapter.psd1
 ./psDscAdapter/psDscAdapter.psm1

powershell-adapter/powershell.dsc.resource.json

@@ -15,7 +15,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "./powershell.resource.ps1 List"
+          "./psDscAdapter/powershell.resource.ps1 List"
         ]
         },
       "config": "full"
@@ -27,7 +27,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Get"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Get"
       ],
       "input": "stdin"
       },
@@ -38,7 +38,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Set"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Set"
       ],
       "input": "stdin",
       "implementsPretest": true,
@@ -51,7 +51,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Test"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Test"
       ],
       "input": "stdin",
       "return": "state"
@@ -63,7 +63,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Export"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Export"
       ],
       "input": "stdin",
       "return": "state"
@@ -75,7 +75,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "$Input | ./powershell.resource.ps1 Validate"
+          "$Input | ./psDscAdapter/powershell.resource.ps1 Validate"
           ],
         "input": "stdin"
       },

powershell-adapter/powershell.resource.ps1 renamed to powershell-adapter/psDscAdapter/powershell.resource.ps1

@@ -15,7 +15,7 @@ if ('Validate' -ne $Operation) {
     $host.ui.WriteErrorLine($trace)
 
     # load private functions of psDscAdapter stub module
-    $psDscAdapter = Import-Module "$PSScriptRoot/psDscAdapter/psDscAdapter.psd1" -Force -PassThru
+    $psDscAdapter = Import-Module "$PSScriptRoot/psDscAdapter.psd1" -Force -PassThru
 
     # initialize OUTPUT as array
     $result = [System.Collections.Generic.List[Object]]::new()

powershell-adapter/windowspowershell.dsc.resource.json

@@ -15,7 +15,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "./powershell.resource.ps1 List"
+          "./psDscAdapter/powershell.resource.ps1 List"
         ]
         },
       "config": "full"
@@ -27,7 +27,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Get"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Get"
       ],
       "input": "stdin"
       },
@@ -38,7 +38,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Set"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Set"
       ],
       "input": "stdin",
       "preTest": true,
@@ -51,7 +51,7 @@
         "-NonInteractive",
         "-NoProfile",
         "-Command",
-        "$Input | ./powershell.resource.ps1 Test"
+        "$Input | ./psDscAdapter/powershell.resource.ps1 Test"
       ],
       "input": "stdin",
       "return": "state"
@@ -63,7 +63,7 @@
           "-NonInteractive",
           "-NoProfile",
           "-Command",
-          "$Input | ./powershell.resource.ps1 Validate"
+          "$Input | ./psDscAdapter/powershell.resource.ps1 Validate"
           ]
       },
     "exitCodes": {