Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ configuration OfficeOnlineServerSetup

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

[Parameter()]
[string]
$WindowsFeatureSourcePath
)

Import-DscResource -ModuleName PSDesiredStateConfiguration
Expand All @@ -50,6 +54,13 @@ configuration OfficeOnlineServerSetup
}
}

WindowsFeature NetFx35
{
Name = 'Net-Framework-Core'
Ensure = 'Present'
Source = $WindowsFeatureSourcePath
}

xWindowsFeatureSet OfficeOnlineServer
{
Ensure = 'Present'
Expand All @@ -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',
Expand All @@ -85,7 +95,7 @@ configuration OfficeOnlineServerSetup

xService WMIPerformanceAdapter
{
DependsOn = '[xWindowsFeatureSet]OfficeOnlineServer'
DependsOn = '[xWindowsFeatureSet]OfficeOnlineServer', '[WindowsFeature]NetFx35'
Name = 'wmiApSrv'
State = 'Running'
StartupType = 'Automatic'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ LanguagePacks:
BinaryDir: C:\de-de
- Language: en-us
BinaryDir: C:\en-us
WindowsFeatureSourcePath: \\server\Data\sxs