diff --git a/CHANGELOG.md b/CHANGELOG.md index dc79ffa..ce8624a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `SharePointDSC` to `5.6.1`. - `ConfigMgrCBDsc` to `4.0.0`. +### Added + +- Added `WindowsFeatureSourcePath` parameter to `OfficeOnlineServerSetup` for + installing removed feature .net Framework 3.5. + ### Fixed - Formatting. diff --git a/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 b/source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1 index 2227d48..f0b9413 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()] + [string] + $WindowsFeatureSourcePath ) Import-DscResource -ModuleName PSDesiredStateConfiguration @@ -50,6 +54,13 @@ configuration OfficeOnlineServerSetup } } + WindowsFeature NetFx35 + { + Name = 'Net-Framework-Core' + Ensure = 'Present' + Source = $WindowsFeatureSourcePath + } + 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 b89cde0..9a9cafc 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 +WindowsFeatureSourcePath: \\server\Data\sxs