diff --git a/CHANGELOG.md b/CHANGELOG.md index bdf111f..b559e50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ The format is based on and uses the types of changes according to [Keep a Change ## [Unreleased] +### Changed + +- Updated sync function to include connection info. + ## [0.1.3] - 2024-05-28 ### Added diff --git a/helpers/Build-Help.ps1 b/helpers/Build-Help.ps1 index c00d0b8..359b09f 100644 --- a/helpers/Build-Help.ps1 +++ b/helpers/Build-Help.ps1 @@ -4,10 +4,10 @@ Import-Module .\output\module\M365FoundationsCISReport\*\*.psd1 <# - $ver = "v0.1.2" + $ver = "v0.1.3" git checkout main git pull origin main - git tag -a $ver -m "Release version $ver Bugfix Update" + git tag -a $ver -m "Release version $ver refactor Update" git push origin $ver "Fix: PR #37" git push origin $ver diff --git a/source/Private/Merge-CISExcelAndCsvData.ps1 b/source/Private/Merge-CISExcelAndCsvData.ps1 index b63eacf..bc09c22 100644 --- a/source/Private/Merge-CISExcelAndCsvData.ps1 +++ b/source/Private/Merge-CISExcelAndCsvData.ps1 @@ -23,11 +23,10 @@ function Merge-CISExcelAndCsvData { foreach ($property in $excelItem.PSObject.Properties) { $newObject | Add-Member -MemberType NoteProperty -Name $property.Name -Value $property.Value } - + $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Connection' -Value $csvRow.Connection $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Status' -Value $csvRow.Status $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_Details' -Value $csvRow.Details $newObject | Add-Member -MemberType NoteProperty -Name 'CSV_FailureReason' -Value $csvRow.FailureReason - return $newObject } @@ -37,7 +36,7 @@ function Merge-CISExcelAndCsvData { if ($csvRow) { CreateMergedObject -excelItem $item -csvRow $csvRow } else { - CreateMergedObject -excelItem $item -csvRow ([PSCustomObject]@{Status=$null; Details=$null; FailureReason=$null}) + CreateMergedObject -excelItem $item -csvRow ([PSCustomObject]@{Connection=$null;Status=$null; Details=$null; FailureReason=$null }) } }