Refactor PowerShell adapter tests to use Microsoft.Windows/WindowsPowerShell instead of Microsoft.DSC/WindowsPowerShell

Author: mgreenegit

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

@@ -25,7 +25,7 @@ Describe 'PowerShell adapter resource tests' {
 
     It 'Windows PowerShell adapter supports File resource' -Skip:(!$IsWindows){
 
-        $r = dsc resource list --adapter Microsoft.DSC/WindowsPowerShell
+        $r = dsc resource list --adapter Microsoft.Windows/WindowsPowerShell
         $LASTEXITCODE | Should -Be 0
         $resources = $r | ConvertFrom-Json
         ($resources | ? {$_.Type -eq 'PSDesiredStateConfiguration/File'}).Count | Should -Be 1

powershell-adapter/Tests/winps_reference_resource.dsc.yaml

@@ -4,7 +4,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
 resources:
 - name: Copy contents from one file to another
-  type: Microsoft.DSC/WindowsPowerShell
+  type: Microsoft.Windows/WindowsPowerShell
   properties:
     resources:
     - name: From

powershell-adapter/Tests/winps_resource.dsc.yaml

@@ -4,7 +4,7 @@
 $schema: https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/10/config/document.json
 resources:
 - name: Get info from classic DSC resources
-  type: Microsoft.DSC/WindowsPowerShell
+  type: Microsoft.Windows/WindowsPowerShell
   properties:
     resources:
     - name: File

powershell-adapter/powershell.resource.ps1

@@ -57,7 +57,7 @@ switch ($Operation) {
 
             # match adapter to version of powershell
             if ($PSVersionTable.PSVersion.Major -le 5) {
-                $requireAdapter = 'Microsoft.DSC/WindowsPowerShell'
+                $requireAdapter = 'Microsoft.Windows/WindowsPowerShell'
             }
             else {
                 $requireAdapter = 'Microsoft.DSC/PowerShell'

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -151,7 +151,7 @@ function Get-DscResourceObject {
 
     # match adapter to version of powershell
     if ($PSVersionTable.PSVersion.Major -le 5) {
-        $adapterName = 'Microsoft.DSC/WindowsPowerShell'
+        $adapterName = 'Microsoft.Windows/WindowsPowerShell'
     }
     else {
         $adapterName = 'Microsoft.DSC/PowerShell'
@@ -287,7 +287,7 @@ function Get-ActualState {
             }
             'Binary' {
                 if ($PSVersionTable.PSVersion.Major -gt 5) {
-                    $trace = @{'Debug' = 'To use a binary resource such as File, Log, or SignatureValidation, use the Microsoft.DSC/WindowsPowerShell adapter.' } | ConvertTo-Json -Compress
+                    $trace = @{'Debug' = 'To use a binary resource such as File, Log, or SignatureValidation, use the Microsoft.Windows/WindowsPowerShell adapter.' } | ConvertTo-Json -Compress
                     $host.ui.WriteErrorLine($trace)
                     exit 1
                 }

powershell-adapter/windowspowershell.dsc.resource.json

@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/PowerShell/DSC/main/schemas/2023/08/bundled/resource/manifest.json",
-    "type": "Microsoft.DSC/WindowsPowerShell",
+    "type": "Microsoft.Windows/WindowsPowerShell",
     "version": "0.1.0",
     "kind": "Adapter",
     "description": "Resource adapter to classic DSC Powershell resources in Windows PowerShell.",