Merge branch 'master' into add-xRDCertificate-resource

dsccommunity · Mar 25, 2020 · 4473528 · 4473528
2 parents e746158 + ececb38
commit 4473528
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Changed resouce key from Server alone to Role + Server.
     This allows the resource to be used multiple times for different roles on
     the same server. (Issue #62)
+- Changes to xRemoteApp
+  - Fix xRDRemoteApp Test-TargetResource to not test PowerShell common parameters
 
 ## 1.9.0.0
 

diff --git a/source/DSCResources/MSFT_xRDRemoteApp/MSFT_xRDRemoteApp.psm1 b/source/DSCResources/MSFT_xRDRemoteApp/MSFT_xRDRemoteApp.psm1
@@ -207,6 +207,10 @@ function Test-TargetResource
     $testTargetResourceResult = $true
 
     $getTargetResourceResult = Get-TargetResource @PSBoundParameters
+    [System.Management.Automation.PSCmdlet]::CommonParameters | Foreach-Object -Process {
+        $null = $PSBoundParameters.Remove($_)
+    }
+
     $PSBoundParameters.Keys | ForEach-Object -Process {
         if ($PSBoundParameters[$_] -ne $getTargetResourceResult[$_])
         {

diff --git a/source/DSCResources/MSFT_xRDSessionDeployment/MSFT_xRDSessionDeployment.psm1 b/source/DSCResources/MSFT_xRDSessionDeployment/MSFT_xRDSessionDeployment.psm1
@@ -1,5 +1,8 @@
 Import-Module -Name "$PSScriptRoot\..\..\Modules\xRemoteDesktopSessionHostCommon.psm1"
-if (!(Test-xRemoteDesktopSessionHostOsRequirement)) { throw "The minimum OS requirement was not met."}
+if (!(Test-xRemoteDesktopSessionHostOsRequirement))
+{
+    throw "The minimum OS requirement was not met."
+}
 Import-Module RemoteDesktop
 
 #######################################################################