Skip to content

Commit

Permalink
Merge branch 'dev' into Win10_Fix_Working_Branch
Browse files Browse the repository at this point in the history
  • Loading branch information
mnothh authored Nov 5, 2019
2 parents 1cf4da1 + 24a835b commit 3dad751
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

## Unreleased

Win10_Fix_Working_Branch
- Fixed issue causing Assert-HasPrereqsForBitlocker to fail on Windows 10.
Credit: https://github.com/goldfinger2
([issue #47](https://github.com/PowerShell/xBitlocker/issues/47))
=======
- Fix hashtables according to the style guideline.
dev

## 1.4.0.0

Expand Down
8 changes: 6 additions & 2 deletions DSCResources/MSFT_xBLAutoBitlocker/MSFT_xBLAutoBitlocker.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,9 @@ function Set-TargetResource
else
{
Remove-FromPSBoundParametersUsingHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToRemove 'DriveType', 'MinDiskCapacityGB'
Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd @{'MountPoint' = ''}
Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd @{
'MountPoint' = ''
}

# Loop through each potential AutoBitlocker volume, see whether they are enabled for Bitlocker, and if not, enable it
foreach ($key in $autoBlVols.Keys)
Expand Down Expand Up @@ -575,7 +577,9 @@ function Test-TargetResource
else
{
Remove-FromPSBoundParametersUsingHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToRemove 'DriveType', 'MinDiskCapacityGB'
Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd @{'MountPoint' = ''}
Add-ToPSBoundParametersFromHashtable -PSBoundParametersIn $PSBoundParameters -ParamsToAdd @{
'MountPoint' = ''
}

# Check whether any potential AutoBitlocker volume is not currently enabled for Bitlocker, or doesn't have the correct settings
foreach ($key in $autoBlVols.Keys)
Expand Down

0 comments on commit 3dad751

Please sign in to comment.