Skip to content

Commit 4376ba7

Browse files
authored
Added WindowsFeatureSourcePath parameter to OfficeOnlineServerSetup (#237)
* Add SourcePath parameter to OfficeOnlineServerSetup configuration and update YAML config * Rename SourcePath to WindowsFeatureSourcePath in OfficeOnlineServerSetup configuration and YAML file * Updated changelog * Fixed changelog * Remove mandatory requirement for WindowsFeatureSourcePath parameter in OfficeOnlineServerSetup configuration
1 parent 2a24ddf commit 4376ba7

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2727
- `SharePointDSC` to `5.6.1`.
2828
- `ConfigMgrCBDsc` to `4.0.0`.
2929

30+
### Added
31+
32+
- Added `WindowsFeatureSourcePath` parameter to `OfficeOnlineServerSetup` for
33+
installing removed feature .net Framework 3.5.
34+
3035
### Fixed
3136

3237
- Formatting.

source/DSCResources/OfficeOnlineServerSetup/OfficeOnlineServerSetup.schema.psm1

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ configuration OfficeOnlineServerSetup
3333

3434
[Parameter(Mandatory = $true)]
3535
[string]
36-
$Path
36+
$Path,
37+
38+
[Parameter()]
39+
[string]
40+
$WindowsFeatureSourcePath
3741
)
3842

3943
Import-DscResource -ModuleName PSDesiredStateConfiguration
@@ -50,6 +54,13 @@ configuration OfficeOnlineServerSetup
5054
}
5155
}
5256

57+
WindowsFeature NetFx35
58+
{
59+
Name = 'Net-Framework-Core'
60+
Ensure = 'Present'
61+
Source = $WindowsFeatureSourcePath
62+
}
63+
5364
xWindowsFeatureSet OfficeOnlineServer
5465
{
5566
Ensure = 'Present'
@@ -74,7 +85,6 @@ configuration OfficeOnlineServerSetup
7485
'Web-ISAPI-Filter',
7586
'Web-Includes',
7687
'NET-Framework-Features',
77-
'NET-Framework-Core',
7888
'NET-HTTP-Activation',
7989
'NET-Non-HTTP-Activ',
8090
'NET-WCF-HTTP-Activation45',
@@ -85,7 +95,7 @@ configuration OfficeOnlineServerSetup
8595

8696
xService WMIPerformanceAdapter
8797
{
88-
DependsOn = '[xWindowsFeatureSet]OfficeOnlineServer'
98+
DependsOn = '[xWindowsFeatureSet]OfficeOnlineServer', '[WindowsFeature]NetFx35'
8999
Name = 'wmiApSrv'
90100
State = 'Running'
91101
StartupType = 'Automatic'

tests/Unit/DSCResources/Assets/Config/OfficeOnlineServerSetup.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ LanguagePacks:
44
BinaryDir: C:\de-de
55
- Language: en-us
66
BinaryDir: C:\en-us
7+
WindowsFeatureSourcePath: \\server\Data\sxs

0 commit comments

Comments
 (0)