Skip to content
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

Jump to bottom

Update PowerSTIG To Use xWebAdministration version 3.2.0 #714

Merged
merged 3 commits into from
Aug 11, 2020
Merged

Update PowerSTIG To Use xWebAdministration version 3.2.0 #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2da1b1
upgrade xWebadministration to 3.2.0
erjenkin Aug 11, 2020
701fb08
merged conflicts
erjenkin Aug 11, 2020
3e8441e
Merge branch '4.5.0' into ejenkins#713
bcwilhite Aug 11, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [Unreleased]

* Update PowerSTIG To Use xWebAdministration version 3.2.0 : [#713](https://github.com/microsoft/PowerStig/issues/713)
* Update PowerSTIG To Use xDnsServer version 1.16.0.0: [#695](https://github.com/microsoft/PowerStig/issues/695)
* Update PowerSTIG to successfully parse/apply Microsoft Windows 2012 Server DNS - V1R15: [#696](https://github.com/microsoft/PowerStig/issues/696)
* Update PowerSTIG to successfully parse/apply SQL Server 2016 Instance V1R10: [#704](https://github.com/microsoft/PowerStig/issues/704)
Expand Down
2 changes: 1 addition & 1 deletion source/DSCResources/IisServer/IisServer.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ configuration IisServer
. "$resourcePath\windows.Script.skip.ps1"
. "$resourcePath\windows.WindowsFeature.ps1"

Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.5.0.0
Import-DscResource -ModuleName xWebAdministration -ModuleVersion 3.2.0
. "$resourcePath\windows.xIisMimeTypeMapping.ps1"
. "$resourcePath\windows.xWebConfigProperty.ps1"
. "$resourcePath\windows.xIisLogging.ps1"
Expand Down
2 changes: 1 addition & 1 deletion source/DSCResources/IisSite/IisSite.schema.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ configuration IisSite
. "$resourcePath\windows.Script.skip.ps1"
. "$resourcePath\windows.WindowsFeature.ps1"

Import-DscResource -ModuleName xWebAdministration -ModuleVersion 2.5.0.0
Import-DscResource -ModuleName xWebAdministration -ModuleVersion 3.2.0
. "$resourcePath\windows.xWebSite.ps1"
. "$resourcePath\windows.xWebAppPool.ps1"
. "$resourcePath\windows.xIisMimeTypeMapping.ps1"
Expand Down
2 changes: 1 addition & 1 deletion source/PowerStig.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RequiredModules = @(
@{ModuleName = 'SqlServerDsc'; ModuleVersion = '13.3.0'},
@{ModuleName = 'WindowsDefenderDsc'; ModuleVersion = '1.0.0.0'},
@{ModuleName = 'xDnsServer'; ModuleVersion = '1.16.0.0'},
@{ModuleName = 'xWebAdministration'; ModuleVersion = '2.5.0.0'}
@{ModuleName = 'xWebAdministration'; ModuleVersion = '3.2.0'}
)

# DSC resources to export from this module
Expand Down