Fix tests

Author: Gijsreyn

build.ps1

@@ -63,7 +63,7 @@ $filesForWindowsPackage = @(
     'osinfo.exe',
     'osinfo.dsc.resource.json',
     'powershell.dsc.resource.json',
-    'powershell.dsc.extension.json'
+    'windowspowershell.dsc.extension.json'
     'psDscAdapter/',
     'psscript.ps1',
     'psscript.dsc.resource.json',

extensions/powershell/convert-resource.ps1

@@ -7,7 +7,7 @@ param (
 begin {
     $lines = [System.Collections.Generic.List[string]]::new()
 
-    $scriptModule = Import-Module "$PSScriptRoot/convertDscResource.psd1" -Force -PassThru
+    $scriptModule = Import-Module "$PSScriptRoot/convertDscResource.psd1" -Force -PassThru -ErrorAction Ignore
 }
 
 process {
@@ -19,7 +19,7 @@ process {
 end {
     if ($lines.Count -ne 0) {
         $result = $scriptModule.invoke( { param($lines) Build-DscConfigDocument -Content $lines }, ($lines | Out-String) )
-        
+
         return ($result | ConvertTo-Json -Depth 10 -Compress)
     }
 }

extensions/powershell/convertDscResource.psd1

@@ -41,7 +41,7 @@ AliasesToExport = @()
 
 PrivateData = @{
     PSData = @{
-        ProjectUri   = 'https://github.com/PowerShell/dsc'
+        ProjectUri   = 'https://github.com/PowerShell/DSC'
     }
 }
 }

extensions/powershell/convertDscResource.psm1

@@ -1,14 +1,3 @@
-$Script:IsPowerShellCore = $PSVersionTable.PSEdition -eq 'Core'
-
-if ($Script:IsPowerShellCore)
-{
-    if ($IsWindows)
-    {
-        Import-Module -Name 'PSDesiredStateConfiguration' -RequiredVersion 1.1 -UseWindowsPowerShell -WarningAction SilentlyContinue
-    }
-    Import-Module -Name 'PSDesiredStateConfiguration' -MinimumVersion 2.0.7 -Prefix 'Pwsh'
-}
-
 function Write-DscTrace {
     param(
         [Parameter(Mandatory = $false)]
@@ -19,7 +8,7 @@ function Write-DscTrace {
     )
 
     $trace = @{$Operation.ToLower() = $Message } | ConvertTo-Json -Compress
-    $host.ui.WriteLine($trace)
+    $host.ui.WriteErrorLine($trace)
 }
 
 function Build-DscConfigDocument

extensions/powershell/copy_files.txt

@@ -1,4 +1,4 @@
-powershell.dsc.extension.json 
+windowspowershell.dsc.extension.json 
 convert-resource.ps1
 convertDscResource.psd1
 convertDscResource.psm1

extensions/powershell/win_powershell.tests.ps1

@@ -32,7 +32,7 @@ configuration InvalidConfiguration {
     }
 }
 "@
-        $out = dsc -l trace config get -f $psFile 2>$TestDrive/error.log | ConvertFrom-Json
+        dsc -l trace config get -f $psFile 2>$TestDrive/error.log 
         $LASTEXITCODE | Should -Be 2 -Because (Get-Content -Path $TestDrive/error.log -Raw | Out-String)
         $content = (Get-Content -Path $TestDrive/error.log -Raw)
         $content | Should -BeLike "*Importing file '$psFile' with extension 'Microsoft.DSC.Extension/PowerShell'*"

extensions/powershell/windowspowershell.dsc.extension.json

@@ -1,8 +1,8 @@
 {
     "$schema": "https://aka.ms/dsc/schemas/v3/bundled/resource/manifest.json",
-    "type": "Microsoft.DSC.Extension/PowerShell",
+    "type": "Microsoft.DSC.Extension/WindowsPowerShell",
     "version": "0.1.0",
-    "description": "Enable passing PowerShell v1 configuration document file directly to DSC. Works only on Windows.",
+    "description": "Enable passing Windows PowerShell v1 configuration document file directly to DSC. Works only on Windows.",
     "import": {
         "fileExtensions": ["ps1"],
         "executable": "powershell",