Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@ jobs:
shell: pwsh
run: |
Install-Module -Name PSPKI -Repository PSGallery -Force
- name: Install PScriboCharts module
shell: pwsh
run: |
Install-Module -Name PScriboCharts -Repository PSGallery -Force
- name: Install Diagrammer.Core module
shell: pwsh
run: |
Expand Down
8 changes: 2 additions & 6 deletions AsBuiltReport.Microsoft.AD.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'AsBuiltReport.Microsoft.AD.psm1'

# Version number of this module.
ModuleVersion = '0.9.10'
ModuleVersion = '0.9.11'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -54,16 +54,12 @@
RequiredModules = @(
@{
ModuleName = 'AsBuiltReport.Core';
ModuleVersion = '1.5.1'
ModuleVersion = '1.6.1'
},
@{
ModuleName = 'PSPKI';
ModuleVersion = '4.3.0'
},
@{
ModuleName = 'PScriboCharts';
ModuleVersion = '0.9.0'
},
@{
ModuleName = 'Diagrammer.Core';
ModuleVersion = '0.2.37'
Expand Down
19 changes: 19 additions & 0 deletions AsBuiltReport.Microsoft.AD.psm1
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# Get assemblies files and import them
switch ($PSVersionTable.PSEdition) {
'Core' {
if ($IsMacOS) {
Import-Module ("$PSScriptRoot{0}Src{0}Tools{0}Bin{0}osx-x64{0}AsBuiltReportChart.dll" -f [System.IO.Path]::DirectorySeparatorChar)
} elseif ($IsLinux) {
Import-Module ("$PSScriptRoot{0}Src{0}Tools{0}Bin{0}linux-x64{0}AsBuiltReportChart.dll" -f [System.IO.Path]::DirectorySeparatorChar)
} elseif ($IsWindows) {
Import-Module ("$PSScriptRoot{0}Src{0}Tools{0}Bin{0}windows-x64{0}AsBuiltReportChart.dll" -f [System.IO.Path]::DirectorySeparatorChar)
}
}
'Desktop' {
Import-Module ("$PSScriptRoot{0}Src{0}Tools{0}Bin{0}windows-x64{0}AsBuiltReportChart.dll" -f [System.IO.Path]::DirectorySeparatorChar)
}
default {
Write-Verbose -Message 'Unable to find compatible assemblies.'
}
}

# Get public and private function definition files and dot source them
$Public = @(Get-ChildItem -Path $PSScriptRoot\Src\Public\*.ps1 -ErrorAction SilentlyContinue)
$Private = @(Get-ChildItem -Path $PSScriptRoot\Src\Private\*.ps1 -ErrorAction SilentlyContinue)
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

##### This project is community maintained and has no sponsorship from Microsoft, its employees or any of its affiliates.

## [0.9.11] - Unreleased

### :toolbox: Added

- Migrate all chart to AsBuiltReport.Chart
- Add bin modules to report

### :arrows_clockwise: Changed

- Update module version to `0.9.11`
- Upgrade AsBuiltReport.Core module to version `1.6.1`

### :bug: Fixed

- Fix the computer/user stats table so that it displays the correct values
- Fix Avoid using the ! negation operator warning in New-AbrADDiagram cmdlet

### :x: Removed

- Remove PscriboCharts module dependency

## [0.9.10] - 2026-01-26

### :arrows_clockwise: Changed
Expand Down
11 changes: 4 additions & 7 deletions Src/Private/Get-AbrADDomainController.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,15 @@ function Get-AbrADDomainController {
$TableParams['Caption'] = "- $($TableParams.Name)"
}
try {
# Chart Section
$sampleData = $inObj.GetEnumerator() | Select-Object @{ Name = 'Name'; Expression = { $_.key } }, @{ Name = 'Value'; Expression = { $_.value } } | Sort-Object -Property 'Category'

$chartFileItem = Get-PieChart -SampleData $sampleData -ChartName 'DomainControllerObject' -XField 'Name' -YField 'value' -ChartLegendName 'Category' -ChartTitleName 'DomainControllerObject' -ChartTitleText 'DC vs GC Distribution' -ReversePalette $True

$Chart = New-PieChart -Values $sampleData.Value -Labels $sampleData.Name -Title 'DC vs GC Distribution' -EnableLegend -LegendOrientation Horizontal -LegendAlignment UpperCenter -Width 600 -Height 400 -Format base64 -TitleFontSize 20 -TitleFontBold -EnableCustomColorPalette -CustomColorPalette $AbrCustomPalette -EnableChartBorder -ChartBorderStyle DenselyDashed -ChartBorderColor DarkBlue
} catch {
Write-PScriboMessage -IsWarning -Message "$($_.Exception.Message) (Domain Controller Count Chart)"
Write-PScriboMessage -IsWarning $_.Exception.Message
}
if ($OutObj) {
if ($chartFileItem) {
if ($Chart) {
BlankLine
Image -Text 'Domain Controller Object - Diagram' -Align 'Center' -Percent 100 -Base64 $chartFileItem
Image -Text 'Domain Controller Object - Chart' -Align 'Center' -Percent 100 -Base64 $Chart
}
$OutObj | Table @TableParams
}
Expand Down
Loading