From e26ea33bbb4b156acd75eafb8a6000c31aeea054 Mon Sep 17 00:00:00 2001
From: Daniel Hughes <2237515+dan-hughes@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:08:51 +0000
Subject: [PATCH 1/5] Update Changelog

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6f709f..913de05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Replaced `xWindowsFeatureSet` composite resource with individual
     `WindowsFeature` resources, each specifying the `Source` path for SxS
     feature installation and an explicit `DependsOn` on `NetFx35`.
+- `xRemoteDesktopSessionHost`
+  - Rename to `RemoteDesktopServicesDsc`.
+  - Update to version 4.1.0.
+  - Updated doc references.
+- Tests
+  - Re-enabled tests for:
+    - 'PowerShellRepositories'
+    - 'RemoteDesktopCollections'
+    - 'RemoteDesktopDeployment'
+- Module GUIDs:
+  - Regenerated unique GUIDs for:
+    - PowerShellRepositories
+    - RemoteDesktopCertificates
+    - RemoteDesktopCollections
+    - RemoteDesktopDeployment
+    - RemoteDesktopHAMode
+    - RemoteDesktopLicensing
+    - RenameNetworkAdapters
+    - RestartSystem
 
 ### Fixed
 
@@ -21,6 +40,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     configuring DFS namespace settings. `DFSNamespaceServerConfiguration` now
     depends on the service resource to prevent configuration failures when the
     DFS service has not started yet.
+- README
+  - Fixed PSGallery PreRelease badge.
 
 ## [0.12.0] - 2026-02-24
 

From d54f3affcd03283e78686139c5e9d921592f01af Mon Sep 17 00:00:00 2001
From: Daniel Hughes <2237515+dan-hughes@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:09:06 +0000
Subject: [PATCH 2/5] Fix preview PSGallery badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2145a01..6c79189 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # CommonTasks
 Build | Status | Last Commit | Latest Release | Lastest Preview Release
 --- | --- | --- | --- | ---
-Main | [![Build status](https://dev.azure.com/dsccommunity/CommonTasks/_apis/build/status/dsccommunity.CommonTasks?branchName=main)](https://dev.azure.com/dsccommunity/CommonTasks/_build) | [![GitHub last commit](https://img.shields.io/github/last-commit/dsccommunity/commontasks/main.svg)](https://github.com/dsccommunity/commontasks/tree/master/) | [![PowerShell Gallery](https://img.shields.io/powershellgallery/v/commontasks.svg)](https://www.powershellgallery.com/packages/CommonTasks/) | [![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/vpre/CommonTasks?label=CommonTasks%20Preview)](https://www.powershellgallery.com/packages/CommonTasks/)
+Main | [![Build status](https://dev.azure.com/dsccommunity/CommonTasks/_apis/build/status/dsccommunity.CommonTasks?branchName=main)](https://dev.azure.com/dsccommunity/CommonTasks/_build) | [![GitHub last commit](https://img.shields.io/github/last-commit/dsccommunity/commontasks/main.svg)](https://github.com/dsccommunity/commontasks/tree/master/) | [![PowerShell Gallery](https://img.shields.io/powershellgallery/v/commontasks.svg)](https://www.powershellgallery.com/packages/CommonTasks/) | [![PowerShell Gallery (with prereleases)](https://img.shields.io/powershellgallery/v/CommonTasks?label=CommonTasks%20Preview&include_prereleases)](https://www.powershellgallery.com/packages/CommonTasks/)
 
 [![GitHub issues](https://img.shields.io/github/issues/dsccommunity/commontasks.svg)](https://github.com/dsccommunity/commontasks/issues)
 [![PowerShell Gallery](https://img.shields.io/powershellgallery/dt/commontasks.svg)](https://www.powershellgallery.com/packages/commontasks/)

From 12ab794358f85b23fda312c447843a00ac852dff Mon Sep 17 00:00:00 2001
From: Daniel Hughes <2237515+dan-hughes@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:09:46 +0000
Subject: [PATCH 3/5] Update to latest RemoteDesktopServicesDsc

---
 RequiredModules.psd1                          |  2 +-
 doc/RemoteDesktopCertificates.adoc            |  6 +++---
 doc/RemoteDesktopCollections.adoc             |  8 ++++----
 doc/RemoteDesktopDeployment.adoc              |  4 ++--
 doc/RemoteDesktopHAMode.adoc                  |  4 ++--
 doc/RemoteDesktopLicensing.adoc               |  6 +++---
 doc/RemoteDesktopServers.adoc                 |  4 ++--
 .../RemoteDesktopCertificates.schema.psm1     |  4 ++--
 .../RemoteDesktopCollections.schema.psm1      |  8 ++++----
 .../RemoteDesktopDeployment.schema.psm1       | 19 +++++++++----------
 .../RemoteDesktopHAMode.schema.psm1           |  4 ++--
 .../RemoteDesktopLicensing.schema.psm1        |  9 ++++-----
 .../RemoteDesktopServers.schema.psm1          |  5 ++---
 .../Unit/DSCResources/DscResources.Tests.ps1  |  4 ++--
 14 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
index 4893ce8..222a9bc 100644
--- a/RequiredModules.psd1
+++ b/RequiredModules.psd1
@@ -64,7 +64,7 @@
     xRobocopy                    = '2.0.0.0'
     VSTSAgent                    = '2.0.14'
     FileContentDsc               = '1.3.0.151'
-    xRemoteDesktopSessionHost    = '3.0.0'
+    RemoteDesktopServicesDsc     = '4.1.0'
     cScom                        = '1.1.0'
 
 }
diff --git a/doc/RemoteDesktopCertificates.adoc b/doc/RemoteDesktopCertificates.adoc
index e7a34c5..fcfa249 100644
--- a/doc/RemoteDesktopCertificates.adoc
+++ b/doc/RemoteDesktopCertificates.adoc
@@ -20,9 +20,9 @@ Use this resource when you need to assign SSL/TLS certificates to RDS roles (Con
 [cols="1,3a" options="autowidth" caption=]
 |===
 | Source         | https://github.com/dsccommunity/CommonTasks/tree/main/source/DSCResources/RemoteDesktopCertificates
-| DSC Resource   | https://github.com/dsccommunity/xRemoteDesktopSessionHost[xRemoteDesktopSessionHost]
-| Documentation  | https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDCertificateConfiguration[xRDCertificateConfiguration]
-                   
+| DSC Resource   | https://github.com/dsccommunity/RemoteDesktopServicesDsc[RemoteDesktopServicesDsc]
+| Documentation  | https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDCertificateConfiguration[RDCertificateConfiguration]
+
 |===
 
 
diff --git a/doc/RemoteDesktopCollections.adoc b/doc/RemoteDesktopCollections.adoc
index 938ae23..002c8e9 100644
--- a/doc/RemoteDesktopCollections.adoc
+++ b/doc/RemoteDesktopCollections.adoc
@@ -20,9 +20,9 @@ Use this resource when you need to create RDS session collections that group ses
 [cols="1,3a" options="autowidth" caption=]
 |===
 | Source         | https://github.com/dsccommunity/CommonTasks/tree/main/source/DSCResources/RemoteDesktopCollections
-| DSC Resource   | https://github.com/dsccommunity/xRemoteDesktopSessionHost[xRemoteDesktopSessionHost]
-| Documentation  | - https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDSessionCollection[xRDSessionCollection]
-                   - https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDSessionCollectionConfiguration[xRDSessionCollectionConfiguration]
+| DSC Resource   | https://github.com/dsccommunity/RemoteDesktopServicesDsc[RemoteDesktopServicesDsc]
+| Documentation  | - https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDSessionCollection[RDSessionCollection]
+                   - https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDSessionCollectionConfiguration[RDSessionCollectionConfiguration]
 |===
 
 
@@ -81,7 +81,7 @@ Use this resource when you need to create RDS session collections that group ses
 | Settings
 |
 | Hashtable
-| Optional collection configuration settings (splatted to xRDSessionCollectionConfiguration). Supported keys: ActiveSessionLimitMin, AuthenticateUsingNLA, AutomaticReconnectionEnabled, BrokenConnectionAction, ClientDeviceRedirectionOptions, ClientPrinterAsDefault, ClientPrinterRedirected, CollectionDescription, CustomRdpProperty, DisconnectedSessionLimitMin, EncryptionLevel, IdleSessionLimitMin, MaxRedirectedMonitors, RDEasyPrintDriverEnabled, SecurityLayer, TemporaryFoldersDeletedOnExit, UserGroup, DiskPath, EnableUserProfileDisk, MaxUserProfileDiskSizeGB, IncludeFolderPath, ExcludeFolderPath, IncludeFilePath, ExcludeFilePath.
+| Optional collection configuration settings (splatted to RDSessionCollectionConfiguration). Supported keys: ActiveSessionLimitMin, AuthenticateUsingNLA, AutomaticReconnectionEnabled, BrokenConnectionAction, ClientDeviceRedirectionOptions, ClientPrinterAsDefault, ClientPrinterRedirected, CollectionDescription, CustomRdpProperty, DisconnectedSessionLimitMin, EncryptionLevel, IdleSessionLimitMin, MaxRedirectedMonitors, RDEasyPrintDriverEnabled, SecurityLayer, TemporaryFoldersDeletedOnExit, UserGroup, DiskPath, EnableUserProfileDisk, MaxUserProfileDiskSizeGB, IncludeFolderPath, ExcludeFolderPath, IncludeFilePath, ExcludeFilePath.
 |
 
 |===
diff --git a/doc/RemoteDesktopDeployment.adoc b/doc/RemoteDesktopDeployment.adoc
index 02bc3f8..6a3a2df 100644
--- a/doc/RemoteDesktopDeployment.adoc
+++ b/doc/RemoteDesktopDeployment.adoc
@@ -20,8 +20,8 @@ Use this resource when you need to deploy a new Remote Desktop Services environm
 [cols="1,3a" options="autowidth" caption=]
 |===
 | Source         | https://github.com/dsccommunity/CommonTasks/tree/main/source/DSCResources/RemoteDesktopDeployment
-| DSC Resource   | https://github.com/dsccommunity/xRemoteDesktopSessionHost[xRemoteDesktopSessionHost]
-| Documentation  | https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDSessionDeployment[xRDSessionDeployment]
+| DSC Resource   | https://github.com/dsccommunity/RemoteDesktopServicesDsc[RemoteDesktopServicesDsc]
+| Documentation  | https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDSessionDeployment[RDSessionDeployment]
 |===
 
 
diff --git a/doc/RemoteDesktopHAMode.adoc b/doc/RemoteDesktopHAMode.adoc
index 7ae3f1a..3c8459d 100644
--- a/doc/RemoteDesktopHAMode.adoc
+++ b/doc/RemoteDesktopHAMode.adoc
@@ -20,8 +20,8 @@ Use this resource when you need to configure RDS Connection Broker high availabi
 [cols="1,3a" options="autowidth" caption=]
 |===
 | Source         | https://github.com/dsccommunity/CommonTasks/tree/main/source/DSCResources/RemoteDesktopHAMode
-| DSC Resource   | https://github.com/dsccommunity/xRemoteDesktopSessionHost[xRemoteDesktopSessionHost]
-| Documentation  | https://github.com/dsccommunity/xRemoteDesktopSessionHost#xrdconnectionbrokerhamode[xRDConnectionBrokerHAMode]
+| DSC Resource   | https://github.com/dsccommunity/RemoteDesktopServicesDsc[RemoteDesktopServicesDsc]
+| Documentation  | https://github.com/dsccommunity/RemoteDesktopServicesDsc#rdconnectionbrokerhamode[RDConnectionBrokerHAMode]
 |===
 
 
diff --git a/doc/RemoteDesktopLicensing.adoc b/doc/RemoteDesktopLicensing.adoc
index 3175733..3f82a6b 100644
--- a/doc/RemoteDesktopLicensing.adoc
+++ b/doc/RemoteDesktopLicensing.adoc
@@ -20,9 +20,9 @@ Use this resource when you need to configure Remote Desktop licensing for your R
 [cols="1,3a" options="autowidth" caption=]
 |===
 | Source         | https://github.com/dsccommunity/CommonTasks/tree/main/source/DSCResources/RemoteDesktopLicensing
-| DSC Resource   | https://github.com/dsccommunity/xRemoteDesktopSessionHost[xRemoteDesktopSessionHost]
-| Documentation  | - https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDServer[xRDServer]
-                   - https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDLicenseConfiguration[xRDLicenseConfiguration]
+| DSC Resource   | https://github.com/dsccommunity/RemoteDesktopServicesDsc[RemoteDesktopServicesDsc]
+| Documentation  | - https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDServer[RDServer]
+                   - https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDLicenseConfiguration[RDLicenseConfiguration]
 |===
 
 
diff --git a/doc/RemoteDesktopServers.adoc b/doc/RemoteDesktopServers.adoc
index a9a147e..375cc82 100644
--- a/doc/RemoteDesktopServers.adoc
+++ b/doc/RemoteDesktopServers.adoc
@@ -20,8 +20,8 @@ Use this resource when you need to add or remove servers from an existing RDS de
 [cols="1,3a" options="autowidth" caption=]
 |===
 | Source         | https://github.com/dsccommunity/CommonTasks/tree/main/source/DSCResources/RemoteDesktopServers
-| DSC Resource   | https://github.com/dsccommunity/xRemoteDesktopSessionHost[xRemoteDesktopSessionHost]
-| Documentation  | https://github.com/dsccommunity/xRemoteDesktopSessionHost/tree/master/source/DSCResources/MSFT_xRDServer[xRDServer]
+| DSC Resource   | https://github.com/dsccommunity/RemoteDesktopServicesDsc[RemoteDesktopServicesDsc]
+| Documentation  | https://github.com/dsccommunity/RemoteDesktopServicesDsc/tree/main/source/DSCResources/DSC_RDServer[RDServer]
 |===
 
 
diff --git a/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.schema.psm1 b/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.schema.psm1
index 959f38b..69182d5 100644
--- a/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.schema.psm1
+++ b/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.schema.psm1
@@ -17,12 +17,12 @@ configuration RemoteDesktopCertificates
             [PsDscRunAsCredential = [PSCredential]]
         }
     #>
-    Import-DscResource -ModuleName xRemoteDesktopSessionHost
+    Import-DscResource -ModuleName RemoteDesktopServicesDsc
 
     foreach ($certificate in $Certificates)
     {
         $executionName = "rdscert_$($certificate.ConnectionBroker)_$($certificate.Role)_$($certificate.ImportPath -replace '\W', '')"
 
-        (Get-DscSplattedResource -ResourceName xRDCertificateConfiguration -ExecutionName $executionName -Properties $certificate -NoInvoke).Invoke($certificate)
+        (Get-DscSplattedResource -ResourceName RDCertificateConfiguration -ExecutionName $executionName -Properties $certificate -NoInvoke).Invoke($certificate)
     }
 }
diff --git a/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.schema.psm1 b/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.schema.psm1
index 81a2b7b..479bd86 100644
--- a/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.schema.psm1
+++ b/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.schema.psm1
@@ -41,7 +41,7 @@ configuration RemoteDesktopCollections
             }
         }
     #>
-    Import-DscResource -ModuleName xRemoteDesktopSessionHost
+    Import-DscResource -ModuleName RemoteDesktopServicesDsc
 
     foreach ($collection in $Collections)
     {
@@ -58,16 +58,16 @@ configuration RemoteDesktopCollections
                 $collectionSettings['CollectionName'] = $collection.CollectionName
             }
 
-            $collectionSettings['DependsOn'] = "[xRDSessionCollection]$executionName"
+            $collectionSettings['DependsOn'] = "[RDSessionCollection]$executionName"
             $collection.Remove('Settings')
         }
 
-        (Get-DscSplattedResource -ResourceName xRDSessionCollection -ExecutionName $executionName -Properties $collection -NoInvoke).Invoke($collection)
+        (Get-DscSplattedResource -ResourceName RDSessionCollection -ExecutionName $executionName -Properties $collection -NoInvoke).Invoke($collection)
 
         if ($null -ne $collectionSettings)
         {
             $executionName = "rdsc_settings_$($collection.CollectionName -replace '[().:\s]', '')"
-            (Get-DscSplattedResource -ResourceName xRDSessionCollectionConfiguration -ExecutionName $executionName -Properties $collectionSettings -NoInvoke).Invoke($collectionSettings)
+            (Get-DscSplattedResource -ResourceName RDSessionCollectionConfiguration -ExecutionName $executionName -Properties $collectionSettings -NoInvoke).Invoke($collectionSettings)
         }
     }
 }
diff --git a/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1 b/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1
index 5c1174e..10fc0d9 100644
--- a/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1
+++ b/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1
@@ -6,11 +6,11 @@ configuration RemoteDesktopDeployment
         [string]
         $ConnectionBroker,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [string]
         $WebAccess,
 
-        [Parameter()]
+        [Parameter(Mandatory = $true)]
         [string[]]
         $SessionHosts,
 
@@ -19,20 +19,19 @@ configuration RemoteDesktopDeployment
         $Gateways
     )
 
-    Import-DscResource -ModuleName xRemoteDesktopSessionHost
+    Import-DscResource -ModuleName RemoteDesktopServicesDsc
 
-
-    xRDSessionDeployment RDS
+    RDSessionDeployment RDS
     {
         ConnectionBroker = $ConnectionBroker
         WebAccessServer  = $WebAccess
         SessionHost      = $SessionHosts
     }
 
-    foreach ($gateway in $Gateways)
-    {
-        $executionName = "rdsgw_$($gateway.GatewayServer -replace '[().:\s]', '')"
+    # foreach ($gateway in $Gateways)
+    # {
+    #     $executionName = "rdsgw_$($gateway.GatewayServer -replace '[().:\s]', '')"
 
-        (Get-DscSplattedResource -ResourceName xRDSessionDeployment -ExecutionName $executionName -Properties $gateway -NoInvoke).Invoke($gateway)
-    }
+    #     (Get-DscSplattedResource -ResourceName xRDSessionDeployment -ExecutionName $executionName -Properties $gateway -NoInvoke).Invoke($gateway)
+    # }
 }
diff --git a/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.schema.psm1 b/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.schema.psm1
index 1a21f18..9c98603 100644
--- a/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.schema.psm1
+++ b/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.schema.psm1
@@ -28,7 +28,7 @@ configuration RemoteDesktopHAMode
         $Config
     )
 
-    Import-DscResource -ModuleName xRemoteDesktopSessionHost
+    Import-DscResource -ModuleName RemoteDesktopServicesDsc
 
     if ($DependsOn -and -not $Config)
     {
@@ -47,5 +47,5 @@ configuration RemoteDesktopHAMode
         $param.Remove('PsDscRunAsCredential')
     }
 
-    (Get-DscSplattedResource -ResourceName xRDConnectionBrokerHAMode -ExecutionName RDCBHAMode -Properties $param -NoInvoke).Invoke($param)
+    (Get-DscSplattedResource -ResourceName RDConnectionBrokerHAMode -ExecutionName RDCBHAMode -Properties $param -NoInvoke).Invoke($param)
 }
diff --git a/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.schema.psm1 b/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.schema.psm1
index 31b179d..b8e5e47 100644
--- a/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.schema.psm1
+++ b/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.schema.psm1
@@ -15,19 +15,18 @@ configuration RemoteDesktopLicensing
         $LicenseMode
     )
 
-    Import-DscResource -ModuleName xRemoteDesktopSessionHost
+    Import-DscResource -ModuleName RemoteDesktopServicesDsc
 
-
-    xRDServer RDSLicense
+    RDServer RDSLicense
     {
         Role             = 'RDS-Licensing'
         Server           = $LicenseServer
         ConnectionBroker = $ConnectionBroker
     }
 
-    xRDLicenseConfiguration Licensing
+    RDLicenseConfiguration Licensing
     {
-        DependsOn        = '[xRDServer]RDSLicense'
+        DependsOn        = '[RDServer]RDSLicense'
         ConnectionBroker = $ConnectionBroker
         LicenseServer    = $LicenseServer
         LicenseMode      = $LicenseMode
diff --git a/source/DSCResources/RemoteDesktopServers/RemoteDesktopServers.schema.psm1 b/source/DSCResources/RemoteDesktopServers/RemoteDesktopServers.schema.psm1
index 9be60ad..e851191 100644
--- a/source/DSCResources/RemoteDesktopServers/RemoteDesktopServers.schema.psm1
+++ b/source/DSCResources/RemoteDesktopServers/RemoteDesktopServers.schema.psm1
@@ -18,14 +18,13 @@ configuration RemoteDesktopServers
     }
     #>
 
-    Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName xRemoteDesktopSessionHost
+    Import-DscResource -ModuleName RemoteDesktopServicesDsc
 
     foreach ($server in $Servers)
     {
         $server = @{} + $server
 
         $executionName = "RDSRole_$($server.Role)_on_$($server.Server)" -replace '[\s(){}/\\:-]', '_'
-        (Get-DscSplattedResource -ResourceName xRDServer -ExecutionName $executionName -Properties $server -NoInvoke).Invoke($server)
+        (Get-DscSplattedResource -ResourceName RDServer -ExecutionName $executionName -Properties $server -NoInvoke).Invoke($server)
     }
 }
diff --git a/tests/Unit/DSCResources/DscResources.Tests.ps1 b/tests/Unit/DSCResources/DscResources.Tests.ps1
index cd1b0b4..7d888ba 100644
--- a/tests/Unit/DSCResources/DscResources.Tests.ps1
+++ b/tests/Unit/DSCResources/DscResources.Tests.ps1
@@ -15,7 +15,7 @@ BeforeDiscovery {
     $here = $PSScriptRoot
 
     # SqlPermissions are in conflict with the Scom* resources
-    $skippedDscResources = 'PowerShellRepositories', 'RemoteDesktopCollections', 'RemoteDesktopDeployment'
+    $skippedDscResources = ''
 
     Import-Module -Name datum
 
@@ -88,7 +88,7 @@ f1
             # in a single Windows PowerShell 5.1 process.  This avoids the
             # expensive per-resource overhead of module imports and
             # Initialize-DscResourceMetaInfo.
-            $skipped = @('PowerShellRepositories', 'RemoteDesktopCollections', 'RemoteDesktopDeployment')
+            $skipped = @()
             $resourceNames = Get-ChildItem -Path "$($moduleUnderTest.ModuleBase)\DSCResources\*" -Directory |
                 Where-Object { $_.BaseName -notin $skipped } |
                     ForEach-Object { $_.BaseName }

From 1b37dae2518b6d92c016bd311f0375459704545f Mon Sep 17 00:00:00 2001
From: Daniel Hughes <2237515+dan-hughes@users.noreply.github.com>
Date: Mon, 23 Mar 2026 13:09:53 +0000
Subject: [PATCH 4/5] Fix GUIDs

---
 .../PowerShellRepositories/PowerShellRepositories.psd1          | 2 +-
 .../RemoteDesktopCertificates/RemoteDesktopCertificates.psd1    | 2 +-
 .../RemoteDesktopCollections/RemoteDesktopCollections.psd1      | 2 +-
 .../RemoteDesktopDeployment/RemoteDesktopDeployment.psd1        | 2 +-
 .../DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.psd1   | 2 +-
 .../RemoteDesktopLicensing/RemoteDesktopLicensing.psd1          | 2 +-
 .../RenameNetworkAdapters/RenameNetworkAdapters.psd1            | 2 +-
 source/DSCResources/RestartSystem/RestartSystem.psd1            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/source/DSCResources/PowerShellRepositories/PowerShellRepositories.psd1 b/source/DSCResources/PowerShellRepositories/PowerShellRepositories.psd1
index 6a9ebe0..0bd6cf4 100644
--- a/source/DSCResources/PowerShellRepositories/PowerShellRepositories.psd1
+++ b/source/DSCResources/PowerShellRepositories/PowerShellRepositories.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = 'b3e06a63-9425-4a23-ae66-ad5086e7fc2f'
+    GUID                 = '52ca151c-530f-4540-8597-b646895253b5'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.psd1 b/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.psd1
index 997cc88..55db3ce 100644
--- a/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.psd1
+++ b/source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12dc-1101-42cc-9844-035af67576f4'
+    GUID                 = 'eecd0de5-58ad-4427-9a86-1d1c762748f9'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.psd1 b/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.psd1
index d44be30..e9f2649 100644
--- a/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.psd1
+++ b/source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12dc-4417-42cc-9844-035af67576f4'
+    GUID                 = 'e6fa48a7-3dff-40cc-8629-3579bc8ca8f8'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.psd1 b/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.psd1
index 9af403b..d1a021a 100644
--- a/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.psd1
+++ b/source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12dc-4417-42cc-9844-035af67576f4'
+    GUID                 = 'b06a609d-3144-400a-9987-0668c3c24144'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.psd1 b/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.psd1
index 092ffa6..68abbf4 100644
--- a/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.psd1
+++ b/source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12ef-4417-42cc-9844-035af67576f4'
+    GUID                 = '8ca07d94-8dd3-48c7-8da4-0afbc1df10ca'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.psd1 b/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.psd1
index 9a1207a..cacf9aa 100644
--- a/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.psd1
+++ b/source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12dc-4417-43cc-9844-035af67576f4'
+    GUID                 = '6d9375b5-41c7-41a2-b646-6f0a29357604'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RenameNetworkAdapters/RenameNetworkAdapters.psd1 b/source/DSCResources/RenameNetworkAdapters/RenameNetworkAdapters.psd1
index b963971..de7b5f5 100644
--- a/source/DSCResources/RenameNetworkAdapters/RenameNetworkAdapters.psd1
+++ b/source/DSCResources/RenameNetworkAdapters/RenameNetworkAdapters.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12dc-4437-42cc-9844-035af67576f4'
+    GUID                 = 'eebb194e-2490-42a9-9977-6cec57eb643a'
 
     Author               = 'NA'
 
diff --git a/source/DSCResources/RestartSystem/RestartSystem.psd1 b/source/DSCResources/RestartSystem/RestartSystem.psd1
index ea7b635..6203def 100644
--- a/source/DSCResources/RestartSystem/RestartSystem.psd1
+++ b/source/DSCResources/RestartSystem/RestartSystem.psd1
@@ -3,7 +3,7 @@
 
     ModuleVersion        = '0.0.1'
 
-    GUID                 = '4f8e12dc-4437-42cc-9844-035af67576f4'
+    GUID                 = '0989ff6d-e170-4a99-bd64-0302a1980d6f'
 
     Author               = 'NA'
 

From 07689ab5da5f78338dd7d7f6f32e272892bf4f3c Mon Sep 17 00:00:00 2001
From: Daniel Hughes <2237515+dan-hughes@users.noreply.github.com>
Date: Mon, 23 Mar 2026 14:00:45 +0000
Subject: [PATCH 5/5] Fix HQRM

---
 .../DscPullServerSql/DscPullServerSql.schema.psm1             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/DSCResources/DscPullServerSql/DscPullServerSql.schema.psm1 b/source/DSCResources/DscPullServerSql/DscPullServerSql.schema.psm1
index 72c9e60..1160800 100644
--- a/source/DSCResources/DscPullServerSql/DscPullServerSql.schema.psm1
+++ b/source/DSCResources/DscPullServerSql/DscPullServerSql.schema.psm1
@@ -13,11 +13,11 @@ configuration DscPullServerSql
         [string]
         $RegistrationKey,
 
-        [Parameter(Mandatory = $true)]
+        [Parameter()]
         [string]
         $SqlServer = 'localhost',
 
-        [Parameter(Mandatory = $true)]
+        [Parameter()]
         [string]
         $DatabaseName = 'DSC',