Merge pull request #223 from AsBuiltReport/dev

v0.9.9 public release

Author: rebelinux

.github/workflows/Release.yml

@@ -29,10 +29,6 @@ jobs:
         shell: pwsh
         run: |
           Install-Module -Name Diagrammer.Core -Repository PSGallery -Force
-      - name: Install Diagrammer.Microsoft.AD module
-        shell: pwsh
-        run: |
-          Install-Module -Name Diagrammer.Microsoft.AD -Repository PSGallery -Force
       - name: Test Module Manifest
         shell: pwsh
         run: |

AsBuiltReport.Microsoft.AD.Style.ps1

@@ -35,14 +35,15 @@
             "SitesInventory": true,
             "Trusts": true
         },
-        "ExportDiagrams": false,
+        "ExportDiagrams": true,
         "ExportDiagramsFormat": [
             "pdf"
         ],
         "EnableDiagramSignature": false,
         "SignatureAuthorName": "",
         "SignatureCompanyName": "",
-        "JobsTimeOut": 900
+        "JobsTimeOut": 900,
+        "DCStatusPingCount": 2
     },
     "InfoLevel": {
         "_comment_": "0 = Disabled, 1 = Enabled, 2 = Adv Summary, 3 = Detailed",

AsBuiltReport.Microsoft.AD.json

@@ -12,7 +12,7 @@
     RootModule = 'AsBuiltReport.Microsoft.AD.psm1'
 
     # Version number of this module.
-    ModuleVersion = '0.9.8'
+    ModuleVersion = '0.9.9'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -64,15 +64,10 @@
             ModuleName = 'PScriboCharts';
             ModuleVersion = '0.9.0'
         },
-        @{
-            ModuleName = 'Diagrammer.Microsoft.AD';
-            ModuleVersion = '0.2.18'
-        },
         @{
             ModuleName = 'Diagrammer.Core';
-            ModuleVersion = '0.2.35'
+            ModuleVersion = '0.2.36.1'
         }
-
     )
 
     # Assemblies that must be loaded prior to importing this module

AsBuiltReport.Microsoft.AD.psd1

@@ -7,6 +7,35 @@ 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.9] - 2026-01-16
+
+### Added
+
+- Add disclaimer warning to README.md about report usage and liability
+- Add option to control the ping count of the DC Test-Connection cmdlet
+
+### Changed
+
+- Improve error logging and handling for initial Forest and Domain discovery process
+- Update module version to `0.9.9`
+- Upgrade Diagrammer.Core module to version `0.2.36.1`
+- Improve overall code with pwsh best practices
+- Migrate Diagrammer.Microsoft.Ad diagrams to the main report
+- Enable export of diagrams by default
+- Updated the dcdiag section to include a 60-second timeout. This keeps the report from freezing if the diagnostic check takes too long.
+
+
+### Fixed
+
+- Fix cannot index into a null array error when generating Trusts diagrams for domains with no trusts defined
+- Fix Trusts diagram generation when multiple domains are present in the report
+- Fix issue with Global:Report variable
+
+### Removed
+
+- Remove Diagrammer.Microsoft.Ad module dependency
+- Remove Image preview message from diagrams sections
+
 ## [0.9.8] - 2025-12-09
 
 ### Added

CHANGELOG.md

@@ -11,7 +11,7 @@
     ReportModuleInfo6 = - Getting dependency information:
     ProjectWebsite = - Please refer to the AsBuiltReport.Microsoft.AD github website for more detailed information about this project.
     CommunityProject = - AsBuiltReport is a community-maintained open source project. It has no sponsorship, endorsement, or affiliation with any technology vendors, their employees, or affiliates.
-    DISCLAIMER = The information in this report has been gathered through automation and direct observation. The recommendations and conclusions are based on industry best practices, technical expertise, and empirical data. While comprehensive, this assessment may not cover all possible scenarios or configurations. Implementation of these recommendations should be carried out by qualified personnel with the appropriate knowledge and experience. The author(s) assume no responsibility for any damages, including but not limited to loss of business profits, business interruption, loss of data, or other financial losses resulting from the use of or reliance on this report.
+    DISCLAIMER = This report combines automated data analysis with professional observations. While these findings offer expert insight, this assessment is not exhaustive. All recommendations should be reviewed and implemented by qualified personnel. The author(s) assume no liability for any damages-including lost profits, business interruptions, or financial losses-arising from the use of this report or its recommendations.
 '@
 
     # Get-AbrADForest
@@ -39,5 +39,110 @@
     AnonymousAccess = Anonymous Access (dsHeuristics)
     AnonymousAccessEnabled = Enabled
     AnonymousAccessDisabled = Disabled
+'@
+    NewADDiagram = ConvertFrom-StringData @'
+    genMain = Please wait while the {0} diagram is being generated
+    gereratingDiag = Generating {0} diagram
+    diagramSignature = No diagram signature specified
+    genDiagramSignature = Generating Signature SubGraph
+    genDiagramMain =  Generating Main SubGraph
+    osType = {0} is required to run the Diagrammer.Microsoft.AD. Run 'Install-WindowsFeature -Name '{0}'' to install the required modules. https://github.com/rebelinux/Diagrammer.Microsoft.AD
+    outputfolderpatherror = OutputFolderPath {0} is not a valid folder path.
+    runasadmin = The requested operation requires elevation: Run PowerShell console as administrator
+    signaturerequirements = New-AbrADDiagram: AuthorName and CompanyName must be defined if the Signature option is specified
+    psSessionClear = Clearing PowerShell Session {0}
+    psSessionSetup = Setting PowerShell Session for {0}
+    unableToConnect = Unable to connect to {0} Domain Controller Server.
+    InfoProject = - Please refer to the Diagrammer.Microsoft.AD github website for more detailed information about this project.
+    InfoDocumentation = - Documentation: https://github.com/rebelinux/Diagrammer.Microsoft.AD
+    InfoIssues = - Issues or bug reporting: https://github.com/rebelinux/Diagrammer.Microsoft.AD/issues
+    InfoCommunity = - This project is community maintained and has no sponsorship from Microsoft, its employees or any of its affiliates.
+    InfoVersion = - {0} v{1} is currently installed.
+    WarningUpdate =   - {0} v{1} update is available.
+    WarningUpdateCommand =   - Run 'Update-Module -Name {0} -Force' to install the latest version.
+
+    forestgraphlabel = Active Directory Forest Architecture
+    domaingraphlabel = Active Directory Domain Architecture
+    emptyForest = No Forest Infrastructure available to diagram
+    fDomainNaming = Domain Naming
+    fSchema = Schema
+    fFuncLevel = Functional Level
+    fInfrastructure = Infrastructure
+    fPDC = PDC Emulator
+    fRID = RID
+    fSchemaVersion = Schema Version
+    fForestRoot = Forest Root
+    fForestRootInfo = Forest Root Information
+    fForestRootLabel = Forest Root
+    fChildDomains = Child Domains
+    fNoChildDomains = No Child Domains
+
+    connectingDomain = Collecting Microsoft AD Domain information from {0}.
+    connectingForest = Collecting Microsoft AD Forest information from {0}.
+    forestRootInfo = Forest Root Information
+
+    DiagramLabel = Child Domains
+    contiguous = Contiguous
+    noncontiguous = Non Contiguous
+    osTypelast = Unable to validate if {0} is installed.
+    DiagramDummyLabel = Child Domains
+    NoChildDomain = No Child Domains
+    funcLevel = <B>Func Level</B>: {0}
+    schemaVersion = <B>Schema Ver</B>: {0}
+    infrastructure = <B>Infrastructure:</B> {0}
+    rID = <B>RID:</B> {0}
+    pdcEmulator= <B>PDC Emulator:</B> {0}
+    schema = <B>Schema:</B> {0}
+    domainNaming = <B>Domain Naming:</B> {0}
+    fsmoRoles = FSMO Roles
+    MicrosoftLogo = Microsoft Logo
+
+    SitesDiagramDummyLabel = Sites
+    sitesgraphlabel = Active Directory Site Topology
+    sitesinventorygraphlabel = Active Directory Site Inventory
+    NoSites = No Site Topology
+    NoSiteSubnet = No Site Subnets
+    siteLinkCost = Site Link Cost
+    siteLinkFrequency = Site Link Frequency
+    siteLinkFrequencyMinutes = minutes
+    siteLinkName = Site Link
+    siteLinkNameInterSiteTP = Site Link Protocol
+    NoSiteDC = No Site Domain Controllers
+    emptySites = No Site topology available to diagram
+    connectingSites = Collecting Microsoft AD Sites information from {0}.
+    buildingSites = Building Microsoft AD Sites diagram from {0}.
+
+    NoTrusts = No Trusts Topology
+    emptyTrusts = No Trust topology available to diagram
+    connectingSTrusts = Collecting Microsoft AD Trusts information from {0}.
+    genDiagTrust = Generating Trusts Diagram
+    trustsDiagramLabel = Active Directory Domains and Trusts
+    buildingTrusts = Building Microsoft AD Trust diagram from {0}.
+    trustDirection = Direction
+    trustType = Flavor
+    TrustAttributes = Type
+    AuthenticationLevel = Authentication
+    TrustRelationships = Trust Relationships
+
+    Base64Output = Displaying Base64 string
+    DiagramOutput = '{0}' diagram file '{1}' has been saved to '{2}'
+
+    caDiagramLabel = Active Directory Certificate Authority
+    caStdRootCA = Standalone Root CA
+    caEntRootCA = Enterprise Root CA
+    caEntSubCA = Enterprise Subordinate CA
+    caEnterpriseCA = Enterprise CA
+    caStandaloneCA = Standalone CA
+    caSubordinateCA = Subordinate CA
+    NoCA = No Certificate Authority Infrastructure
+    caNotBefore = Not Before
+    caNotAfter = Not After
+    caType = Type
+    caRootCaIssuer = Root CA Issuer
+    caDnsName = Dns Name
+
+    DomainControllers = Domain Controllers
+    Sites = Sites
+    Subnets = Subnets
 '@
 }

Language/en-US/MicrosoftAD.psd1

@@ -11,7 +11,7 @@
     ReportModuleInfo6 = - Obteniendo información de dependencias:
     ProjectWebsite = - Por favor consulte el sitio web de github de AsBuiltReport.Microsoft.AD para obtener información más detallada sobre este proyecto.
     CommunityProject = - AsBuiltReport es un proyecto de código abierto mantenido por la comunidad. No tiene patrocinio, respaldo o afiliación con ningún proveedor de tecnología, sus empleados o afiliados.
-    DISCLAIMER = La información en este informe ha sido recopilada mediante automatización y observación directa. Las recomendaciones y conclusiones se basan en las mejores prácticas de la industria, experiencia técnica y datos empíricos. Aunque es exhaustivo, esta evaluación puede no cubrir todos los posibles escenarios o configuraciones. La implementación de estas recomendaciones debe ser realizada por personal calificado con el conocimiento y la experiencia adecuados. El(los) autor(es) no asumen ninguna responsabilidad por daños, incluidos, entre otros, la pérdida de beneficios comerciales, interrupción del negocio, pérdida de datos u otras pérdidas financieras derivadas del uso o la confianza en este informe.
+    DISCLAIMER = Este informe combina el análisis automatizado de datos con observaciones profesionales. Si bien estos hallazgos ofrecen una perspectiva experta, esta evaluación no es exhaustiva. Todas las recomendaciones deben ser revisadas e implementadas por personal cualificado. El/los autor(es) no asumen ninguna responsabilidad por daños, incluyendo lucro cesante, interrupciones del negocio o pérdidas financieras derivadas del uso de este informe o sus recomendaciones.
 '@
 
     # Get-AbrADForest
@@ -39,5 +39,112 @@
     AnonymousAccess = Acceso Anónimo (dsHeuristics)
     AnonymousAccessEnabled = Habilitado
     AnonymousAccessDisabled = Deshabilitado
+'@
+    NewADDiagram = ConvertFrom-StringData @'
+    genMain = Por favor espere mientras se genera el diagrama: {0}
+    gereratingDiag= Generando diagrama de {0}
+    diagramSignature = No se ha especificado la firma del diagrama
+    genDiagramSignature = Generando Subgráfica de la firma
+    genDiagramMain = Generando Subgráfica Principal
+    osType = {0} es requerido para ejecutar Diagrammer.Microsoft.AD. Ejecute 'Install-WindowsFeature -Name '{0}'' para instalar los módulos requeridos. https://github.com/rebelinux/Diagrammer.Microsoft.AD
+    outputfolderpatherror = OutputFolderPath {0} no es una ruta de carpeta válida.
+    runasadmin = La operación solicitada requiere elevación: Ejecute la consola de PowerShell como administrador
+    signaturerequirements = New-AbrADDiagram: AuthorName y CompanyName deben estar definidos si se especifica la opción de firma
+    psSessionClear = Limpiando la sesión de PowerShell {0}
+    psSessionSetup = Configurando la sesión de PowerShell para {0}
+    unableToConnect = No se puede conectar al servidor de controlador de dominio {0}.
+    InfoProject = - Informacion: Consulte el sitio web de Diagrammer.Microsoft.AD en GitHub para obtener información más detallada sobre este proyecto.
+    InfoDocumentation =  - Documentación: https://github.com/rebelinux/Diagrammer.Microsoft.AD
+    InfoIssues =  - Reporte de problemas o errores: https://github.com/rebelinux/Diagrammer.Microsoft.AD/issues
+    InfoCommunity =  - Este proyecto es mantenido por la comunidad y no cuenta con patrocinio de Microsoft, sus empleados o cualquiera de sus afiliados.
+    InfoVersion =  - {0} v{1} está actualmente instalado.
+    WarningUpdate =   - La actualización {0} v{1} está disponible.
+    WarningUpdateCommand =   - Ejecute 'Update-Module -Name {0} -Force' para instalar la última versión.
+
+    forestgraphlabel = Arquitectura del bosque de Active Directory
+    domaingraphlabel = Arquitectura del dominio de Active Directory
+    emptyForest = No hay infraestructura de bosque disponible para diagramar
+    fDomainNaming = Nombres de dominio
+    fSchema = Esquema
+    fFuncLevel = Nivel funcional
+    fInfrastructure = Infraestructura
+    fPDC = Emulador PDC
+    fRID = RID
+    fSchemaVersion = Version del esquema
+    fForestRoot = Raíz del bosque
+    fForestRootInfo = Informació]on de la raí]iz del bosque
+    fForestRootLabel = Raiz del bosque
+    fChildDomains = Dominios secundarios
+    fNoChildDomains = No hay dominios secundarios
+
+    connectingDomain = Recopilando información del dominio de Microsoft AD desde {0}.
+    connectingForest = Recopilando información del bosque de Microsoft AD desde {0}.
+    forestRootInfo = Información de la raíz del bosque
+
+    DiagramLabel = Dominios secundarios
+    contiguous = Contiguo
+    noncontiguous = No contiguo
+    osTypelast = No se puede validar si {0} está instalado.
+    DiagramDummyLabel = Dominios secundarios
+    NoChildDomain = No hay dominios secundarios
+    funcLevel = <B>Nivel funcional</B>: {0}
+    schemaVersion = <B>Versión del esquema</B>: {0}
+    infrastructure = <B>Infraestructura:</B> {0}
+    rID = <B>RID:</B> {0}
+    pdcEmulator= <B>Emulador PDC:</B> {0}
+    schema = <B>Esquema:</B> {0}
+    domainNaming = <B>Nombres de dominio:</B> {0}
+    fsmoRoles = Roles FSMO
+    MicrosoftLogo = Logo de Microsoft
+
+    SitesDiagramDummyLabel = Sitios
+    sitesgraphlabel = Topologia del sitio de Active Directory
+    sitesinventorygraphlabel = Inventario del sitio de Active Directory
+    NoSites = No hay topologia de sitio
+    NoSiteSubnet = No hay subredes de sitio
+    siteLinkCost = Costo del enlace del sitio
+    siteLinkFrequency = Frecuencia del enlace del sitio
+    siteLinkFrequencyMinutes = minutos
+    siteLinkName = Enlace del sitio
+    siteLinkNameInterSiteTP = Protocolo del enlace del sitio
+    NoSiteDC = No hay controladores de dominio del sitio
+    emptySites = No hay topologia de sitio disponible para diagramar
+    connectingSites = Recopilando información de sitios de Microsoft AD desde {0}.
+    buildingSites = Construyendo diagrama de sitios de Microsoft AD desde {0}.
+
+    NoTrusts = No hay topologia de confianza
+    emptyTrusts = No hay topologia de confianza disponible para diagramar
+    connectingSTrusts = Recopilando información de confianza de Microsoft AD desde {0}.
+    genDiagTrust = Generando diagrama de confianzas
+    trustsDiagramLabel = Dominios y confianzas de Active Directory
+    buildingTrusts = Construyendo diagrama de confianza de Microsoft AD desde {0}.
+    trustDirection = Direccion
+    trustType = Forma
+    TrustAttributes = Tipo
+    AuthenticationLevel = Autenticacion
+    TrustRelationships = Relaciones de confianza
+
+
+
+    Base64Output = Mostrando cadena Base64
+    DiagramOutput = El diagrama de {0} '{1}' se ha guardado en '{2}'
+
+    caDiagramLabel = Autoridad de Certificacion de Active Directory
+    caStdRootCA = Autoridad de Certificacion Raiz Independiente
+    caEntRootCA = Autoridad de Certificacion Raiz Empresarial
+    caEntSubCA = Autoridad de Certificacion Subordinada Empresarial
+    caEnterpriseCA = CA Empresarial
+    caStandaloneCA = CA Independiente
+    caSubordinateCA = CA Subordinada
+    NoCA = No hay infraestructura de Autoridad de Certificacion
+    caNotBefore = No antes de
+    caNotAfter = No despues de
+    caType = Tipo
+    caRootCaIssuer = Emisor de CA Raiz
+    caDnsName = Nombre de DNS
+
+    DomainControllers = Controlador de dominio
+    Sites = Sitios
+    Subnets = Subred
 '@
 }