From b79beb0e9f222d77cd4025e6e26e07bbebb41316 Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Mon, 22 Sep 2025 17:25:01 +0200 Subject: [PATCH 1/5] Add SourcePath parameter to OfficeOnlineServerSetup configuration and update YAML config --- .../OfficeOnlineServerSetup.schema.psm1 | 16 +++++++++++++--- .../Assets/Config/OfficeOnlineServerSetup.yml | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 index 2227d48a..61768360 100644 --- a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 +++ b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 @@ -33,7 +33,11 @@ configuration OfficeOnlineServerSetup [Parameter(Mandatory = $true)] [string] - $Path + $Path, + + [Parameter(Mandatory = $true)] + [string] + $SourcePath ) Import-DscResource -ModuleName PSDesiredStateConfiguration @@ -50,6 +54,13 @@ configuration OfficeOnlineServerSetup } } + WindowsFeature NetFx35 + { + Name = 'Net-Framework-Core' + Ensure = 'Present' + Source = $SourcePath + } + xWindowsFeatureSet OfficeOnlineServer { Ensure = 'Present' @@ -74,7 +85,6 @@ configuration OfficeOnlineServerSetup 'Web-ISAPI-Filter', 'Web-Includes', 'NET-Framework-Features', - 'NET-Framework-Core', 'NET-HTTP-Activation', 'NET-Non-HTTP-Activ', 'NET-WCF-HTTP-Activation45', @@ -85,7 +95,7 @@ configuration OfficeOnlineServerSetup xService WMIPerformanceAdapter { - DependsOn = '[xWindowsFeatureSet]OfficeOnlineServer' + DependsOn = '[xWindowsFeatureSet]OfficeOnlineServer', '[WindowsFeature]NetFx35' Name = 'wmiApSrv' State = 'Running' StartupType = 'Automatic' diff --git a/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml b/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml index b89cde08..7247c735 100644 --- a/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml +++ b/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml @@ -4,3 +4,4 @@ LanguagePacks: BinaryDir: C:\de-de - Language: en-us BinaryDir: C:\en-us +SourcePath: \\server\Data\sxs From 146a031e7ea5a32f021ae119e2befcdd47b1e7e5 Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Mon, 22 Sep 2025 17:26:57 +0200 Subject: [PATCH 2/5] Rename SourcePath to WindowsFeatureSourcePath in OfficeOnlineServerSetup configuration and YAML file --- .../OfficeOnlineServerSetup.schema.psm1 | 4 ++-- .../DSCResources/Assets/Config/OfficeOnlineServerSetup.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 index 61768360..b028ab99 100644 --- a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 +++ b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 @@ -37,7 +37,7 @@ configuration OfficeOnlineServerSetup [Parameter(Mandatory = $true)] [string] - $SourcePath + $WindowsFeatureSourcePath ) Import-DscResource -ModuleName PSDesiredStateConfiguration @@ -58,7 +58,7 @@ configuration OfficeOnlineServerSetup { Name = 'Net-Framework-Core' Ensure = 'Present' - Source = $SourcePath + Source = $WindowsFeatureSourcePath } xWindowsFeatureSet OfficeOnlineServer diff --git a/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml b/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml index 7247c735..9a9cafc7 100644 --- a/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml +++ b/tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml @@ -4,4 +4,4 @@ LanguagePacks: BinaryDir: C:\de-de - Language: en-us BinaryDir: C:\en-us -SourcePath: \\server\Data\sxs +WindowsFeatureSourcePath: \\server\Data\sxs From 294d78ea1fed300322a7f77a1b2846be5d9f24d4 Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Mon, 22 Sep 2025 17:28:48 +0200 Subject: [PATCH 3/5] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc79ffa7..860497d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `GPRegistryPolicyDsc` to `1.3.1`. - `SharePointDSC` to `5.6.1`. - `ConfigMgrCBDsc` to `4.0.0`. +- Add `WindowsFeatureSourcePath` parameter to `OfficeOnlineServerSetup` for + installing removed feature .net Framework 3.5. ### Fixed From 68d67cfdcd6389d6a0122f1818ea22475e17e822 Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Mon, 22 Sep 2025 19:06:43 +0200 Subject: [PATCH 4/5] Fixed changelog --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 860497d1..ce8624a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `GPRegistryPolicyDsc` to `1.3.1`. - `SharePointDSC` to `5.6.1`. - `ConfigMgrCBDsc` to `4.0.0`. -- Add `WindowsFeatureSourcePath` parameter to `OfficeOnlineServerSetup` for + +### Added + +- Added `WindowsFeatureSourcePath` parameter to `OfficeOnlineServerSetup` for installing removed feature .net Framework 3.5. ### Fixed From 6f0b153e18308207df901d4b1ad96a8e18b7364c Mon Sep 17 00:00:00 2001 From: Raimund Andree Date: Mon, 22 Sep 2025 21:35:19 +0200 Subject: [PATCH 5/5] Remove mandatory requirement for WindowsFeatureSourcePath parameter in OfficeOnlineServerSetup configuration --- .../OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 index b028ab99..f0b94134 100644 --- a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 +++ b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 @@ -35,7 +35,7 @@ configuration OfficeOnlineServerSetup [string] $Path, - [Parameter(Mandatory = $true)] + [Parameter()] [string] $WindowsFeatureSourcePath )