diff --git a/CHANGELOG.md b/CHANGELOG.md index 582db95..a25ece9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +- Corrected typo in logging in Set-ADOEnvironment +- Improved logging in Set-ADOEnvironment +- Fixed issue in Convert-M365DSCExportToPowerShellDataFile where resources with "Profile" in the + name wasn't converted properly +- Fixed issue in Convert-M365DSCExportToPowerShellDataFile where multiple versions of + M365DSC.CompositeResources being installed caused errors + ## [0.2.5] - 2024-03-19 - Added required version range for ObjectGraphTools diff --git a/source/Public/Convert-M365DSCExportToPowerShellDataFile.ps1 b/source/Public/Convert-M365DSCExportToPowerShellDataFile.ps1 index dbbdf23..80fe9ed 100644 --- a/source/Public/Convert-M365DSCExportToPowerShellDataFile.ps1 +++ b/source/Public/Convert-M365DSCExportToPowerShellDataFile.ps1 @@ -94,7 +94,8 @@ function Convert-M365DSCExportToPowerShellDataFile $Obj_Export = Get-Content $Path_JsonReport | ConvertFrom-Json # Load Example data from module M365DSC.CompositeResources - $Obj_M365DataExample = Import-PSDataFile (((Get-Module -ListAvailable M365DSC.CompositeResources).path | Split-Path) + '\M365ConfigurationDataExample.psd1') + $M365DSCCRModule = Get-Module -ListAvailable M365DSC.CompositeResources | Sort-Object -Property Version | Select-Object -Last 1 + $Obj_M365DataExample = Import-PSDataFile (Join-Path -Path ($M365DSCCRModule.Path | Split-Path) -ChildPath 'M365ConfigurationDataExample.psd1') # Group Object $Obj_Export_Groups = $Obj_Export | Group-Object 'resourcename' @@ -110,7 +111,8 @@ function Convert-M365DSCExportToPowerShellDataFile -replace "^$($Workload | Convert-M365WorkLoadName )" ` -replace '(?