Skip to content

Update to RemoteDesktopServicesDsc #247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dan-hughes wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Update to RemoteDesktopServicesDsc #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e26ea33
Update Changelog
dan-hughes Mar 23, 2026
d54f3af
Fix preview PSGallery badge
dan-hughes Mar 23, 2026
12ab794
Update to latest RemoteDesktopServicesDsc
dan-hughes Mar 23, 2026
1b37dae
Fix GUIDs
dan-hughes Mar 23, 2026
07689ab
Fix HQRM
dan-hughes Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/)
Expand Down
2 changes: 1 addition & 1 deletion RequiredModules.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

}
6 changes: 3 additions & 3 deletions doc/RemoteDesktopCertificates.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

|===


Expand Down
8 changes: 4 additions & 4 deletions doc/RemoteDesktopCollections.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
|===


Expand Down Expand Up @@ -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.
|

|===
Expand Down
4 changes: 2 additions & 2 deletions doc/RemoteDesktopDeployment.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
|===


Expand Down
4 changes: 2 additions & 2 deletions doc/RemoteDesktopHAMode.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
|===


Expand Down
6 changes: 3 additions & 3 deletions doc/RemoteDesktopLicensing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
|===


Expand Down
4 changes: 2 additions & 2 deletions doc/RemoteDesktopServers.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
|===


Expand Down
4 changes: 2 additions & 2 deletions source/DSCResources/DscPullServerSql/DscPullServerSql.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ configuration DscPullServerSql
[string]
$RegistrationKey,

[Parameter(Mandatory = $true)]
[Parameter()]
[string]
$SqlServer = 'localhost',

[Parameter(Mandatory = $true)]
[Parameter()]
[string]
$DatabaseName = 'DSC',
Comment on lines +16 to 22
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Behavior contract changed to implicit SQL defaults without coverage

Line 16 and Line 20 make SqlServer/DatabaseName optional, which now allows silent fallback to 'localhost'/'DSC'. That is a meaningful behavior change and can mis-target deployments if callers omit either value. Current config asset coverage still supplies both values, so this path is untested.

Please either (a) keep these parameters required, or (b) add unit/config tests that intentionally omit them and assert the default behavior is expected.

As per coding guidelines: “Add unit tests for all commands/functions/resources”.

🧰 Tools
🪛 PSScriptAnalyzer (1.24.0)

[error] 16-16: Unexpected attribute 'Parameter'.

(UnexpectedAttribute)

[error] 20-20: Unexpected attribute 'Parameter'.

(UnexpectedAttribute)

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@source/DSCResources/DscPullServerSql/DscPullServerSql.schema.psm1` around
lines 16 - 22, The parameters SqlServer and DatabaseName in
DscPullServerSql.schema.psm1 were made optional with defaults ('localhost' and
'DSC'), changing runtime behavior; either revert them to required parameters by
removing the default values and adding [ValidateNotNullOrEmpty()] to the
SqlServer and DatabaseName parameter declarations, or add unit/config tests that
exercise the new default path by invoking the resource/module without providing
SqlServer and/or DatabaseName and asserting the effective defaults ('localhost'
and 'DSC') and any downstream behavior (e.g., connection attempts) are as
expected; refer to the SqlServer and DatabaseName parameter declarations in
DscPullServerSql.schema.psm1 and the module/resource invocation tests to
implement the change.


Expand Down
2 changes: 1 addition & 1 deletion source/DSCResources/PowerShellRepositories/PowerShellRepositories.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = 'b3e06a63-9425-4a23-ae66-ad5086e7fc2f'
GUID = '52ca151c-530f-4540-8597-b646895253b5'

Author = 'NA'

Expand Down
2 changes: 1 addition & 1 deletion source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12dc-1101-42cc-9844-035af67576f4'
GUID = 'eecd0de5-58ad-4427-9a86-1d1c762748f9'

Author = 'NA'

Expand Down
4 changes: 2 additions & 2 deletions source/DSCResources/RemoteDesktopCertificates/RemoteDesktopCertificates.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 1 addition & 1 deletion source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12dc-4417-42cc-9844-035af67576f4'
GUID = 'e6fa48a7-3dff-40cc-8629-3579bc8ca8f8'

Author = 'NA'

Expand Down
8 changes: 4 additions & 4 deletions source/DSCResources/RemoteDesktopCollections/RemoteDesktopCollections.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ configuration RemoteDesktopCollections
}
}
#>
Import-DscResource -ModuleName xRemoteDesktopSessionHost
Import-DscResource -ModuleName RemoteDesktopServicesDsc

foreach ($collection in $Collections)
{
Expand All @@ -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)
}
}
}
2 changes: 1 addition & 1 deletion source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12dc-4417-42cc-9844-035af67576f4'
GUID = 'b06a609d-3144-400a-9987-0668c3c24144'

Author = 'NA'

Expand Down
19 changes: 9 additions & 10 deletions source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ configuration RemoteDesktopDeployment
[string]
$ConnectionBroker,

[Parameter()]
[Parameter(Mandatory = $true)]
[string]
$WebAccess,

[Parameter()]
[Parameter(Mandatory = $true)]
[string[]]
$SessionHosts,
Comment on lines +9 to 15
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

This silently changes the public contract.

Line 9 and Line 13 make WebAccess and SessionHosts mandatory, so existing RemoteDesktopDeployment entries that omitted them will now fail to compile. doc/RemoteDesktopDeployment.adoc still marks both as optional, and the Unreleased notes do not call out the break.

🧰 Tools
🪛 PSScriptAnalyzer (1.24.0)

[error] 9-9: Unexpected attribute 'Parameter'.

(UnexpectedAttribute)

[error] 13-13: Unexpected attribute 'Parameter'.

(UnexpectedAttribute)

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In
`@source/DSCResources/RemoteDesktopDeployment/RemoteDesktopDeployment.schema.psm1`
around lines 9 - 15, The change made WebAccess and SessionHosts parameters of
the RemoteDesktopDeployment DSC resource mandatory (the [Parameter(Mandatory =
$true)] attributes), which silently breaks existing configurations; revert these
to optional by removing or setting Mandatory to $false for the $WebAccess and
$SessionHosts parameters in RemoteDesktopDeployment.schema (or restore their
previous parameter attributes) and update doc/RemoteDesktopDeployment.adoc and
release notes to reflect any intentional contract change if you actually intend
to make them required.


Expand All @@ -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)
# }
}
2 changes: 1 addition & 1 deletion source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12ef-4417-42cc-9844-035af67576f4'
GUID = '8ca07d94-8dd3-48c7-8da4-0afbc1df10ca'

Author = 'NA'

Expand Down
4 changes: 2 additions & 2 deletions source/DSCResources/RemoteDesktopHAMode/RemoteDesktopHAMode.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ configuration RemoteDesktopHAMode
$Config
)

Import-DscResource -ModuleName xRemoteDesktopSessionHost
Import-DscResource -ModuleName RemoteDesktopServicesDsc

if ($DependsOn -and -not $Config)
{
Expand All @@ -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)
}
2 changes: 1 addition & 1 deletion source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12dc-4417-43cc-9844-035af67576f4'
GUID = '6d9375b5-41c7-41a2-b646-6f0a29357604'

Author = 'NA'

Expand Down
9 changes: 4 additions & 5 deletions source/DSCResources/RemoteDesktopLicensing/RemoteDesktopLicensing.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions source/DSCResources/RemoteDesktopServers/RemoteDesktopServers.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
2 changes: 1 addition & 1 deletion source/DSCResources/RenameNetworkAdapters/RenameNetworkAdapters.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12dc-4437-42cc-9844-035af67576f4'
GUID = 'eebb194e-2490-42a9-9977-6cec57eb643a'

Author = 'NA'

Expand Down
2 changes: 1 addition & 1 deletion source/DSCResources/RestartSystem/RestartSystem.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

ModuleVersion = '0.0.1'

GUID = '4f8e12dc-4437-42cc-9844-035af67576f4'
GUID = '0989ff6d-e170-4a99-bd64-0302a1980d6f'

Author = 'NA'

Expand Down
4 changes: 2 additions & 2 deletions tests/Unit/DSCResources/DscResources.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BeforeDiscovery {
$here = $PSScriptRoot

# SqlPermissions are in conflict with the Scom* resources
$skippedDscResources = 'PowerShellRepositories', 'RemoteDesktopCollections', 'RemoteDesktopDeployment'
$skippedDscResources = ''

Import-Module -Name datum

Expand Down Expand Up @@ -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 }
Expand Down