Skip to content

Commit

Permalink
Updated to latest version if Microsoft365DSC and cleaned up dependenc…
Browse files Browse the repository at this point in the history
…ies (#40)

* Update Microsoft365DSC module version to 1.25.205.1

* Remove deprecated ProtectedData and DscBuildHelpers modules

* Pin DscBuildHelpers module version to 0.3.0-preview0003

* 'Get-DscResourceProperty' is not a public function hence in needs to be called in the module context

* Back to default

* Update changelog

* Add dummy localization strings for DscConfig.M365
  • Loading branch information
raandree authored Feb 10, 2025
1 parent 8642e9e commit 732e400
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 5,106 deletions.
14 changes: 13 additions & 1 deletion .build/CreateDscCompositeResources.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,19 @@ function New-DscCompositeResourceCode
[void]$code.AppendLine("configuration $CompositeResourceName {")
[void]$code.AppendLine(' param (')

$dscParameters = Get-DscResourceProperty -ModuleInfo (Get-Module -Name $DscResourceModuleName -ListAvailable) -ResourceName $DscResourceName |
$m = Import-Module -Name DscBuildHelpers -Force -PassThru
$dscParameters = & $m {
param (
[Parameter(Mandatory = $true)]
[string]
$DscResourceModuleName,

[Parameter(Mandatory = $true)]
[string]
$DscResourceName
)
Get-DscResourceProperty -ModuleInfo (Get-Module -Name $DscResourceModuleName -ListAvailable) -ResourceName $DscResourceName
} -DscResourceModuleName $DscResourceModuleName -DscResourceName $DscResourceName |
Where-Object -FilterScript { $_.Name -notin 'PsDscRunAsCredential', 'DependsOn' }

if (-not $dscParameters)
Expand Down
14 changes: 1 addition & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
!output/
output/*

!output/RequiredModules
output/RequiredModules/*
output

source/DSCResources
source/DSCResources.yml

!output/RequiredModules/ProtectedData
output/RequiredModules/ProtectedData/*
!output/RequiredModules/ProtectedData/9.9.9

!output/RequiredModules/DscBuildHelpers
output/RequiredModules/DscBuildHelpers/*
!output/RequiredModules/DscBuildHelpers/9.9.9
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed

- Updated the `Microsoft365DSC` module to version `1.25.205.1` in `RequiredModules.psd1`.
- Updated the `DscBuildHelpers` module to version `0.3.0-preview0003` in `RequiredModules.psd1`.
- `Get-DscResourceProperty` is not a public function hence in needs to be called in the module context.

### Removed

- `DscBuildHelpers` module and in gitignore
- `ProtectedData` module and in gitignore

## [0.5.0] - 2024-10-31

### Added
Expand Down
4 changes: 2 additions & 2 deletions RequiredModules.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
}

'Microsoft365DSC' = '1.24.1016.1'
Microsoft365DSC = '1.25.205.1'

InvokeBuild = 'latest'
PSScriptAnalyzer = 'latest'
Expand All @@ -21,7 +21,7 @@
Datum = 'latest'
'Datum.ProtectedData' = 'latest'
ProtectedData = 'latest'
DscBuildHelpers = 'latest'
DscBuildHelpers = '0.3.0-preview0003'
'DscResource.Test' = 'latest'
MarkdownLinkCheck = 'latest'
'DscResource.AnalyzerRules' = 'latest'
Expand Down
67 changes: 0 additions & 67 deletions output/RequiredModules/DscBuildHelpers/9.9.9/DscBuildHelpers.psd1

This file was deleted.

Loading

0 comments on commit 732e400

Please sign in to comment.