Merge branch 'Dev' into feat/improve-install-module

Author: FabienTschanz

.github/workflows/website-deploy-prod.yml

@@ -43,7 +43,7 @@ jobs:
     name: Deploy to Production
     needs: build
     steps:
-      - uses: actions/download-artifact@4
+      - uses: actions/download-artifact@v4
         with:
           name: website-build
       - name: Deploy

.markdownlint.json

@@ -1,5 +1,7 @@
 {
     "default": true,
+    "MD013": false,
+    "MD025": false,
     "MD029": {
         "style": "ordered"
     },

.vscode/launch.json

@@ -14,7 +14,7 @@
             "type": "PowerShell",
             "request": "launch",
             "name": "Get current unit test code overage",
-            "script": "${workspaceRoot}/.vscode/GetTestCoverage.ps1",
+            "script": "${workspaceRoot}/Tests/Scripts/Get-TestCoverage.ps1",
             "args": [
                 "${file}"
             ],

CHANGELOG.md

@@ -18,6 +18,13 @@
 * IntuneDeviceCompliancePolicyAndroidDeviceOwner
   * Fixed an issue where a JSON serialization warning was outputted
     due to the object depth exceeding two levels.
+* M365DSCDRGUtil
+  * Fixed an issue where `Rename-M365DSCCimInstanceParameter` omitted values.
+    FIXES [#6727](https://github.com/microsoft/Microsoft365DSC/issues/6727)
+    FIXES [#6779](https://github.com/microsoft/Microsoft365DSC/issues/6779)
+* M365DSCReverse
+  * Added `TenantGuid` entry to the `ConfigurationData.psd1` file during export.
+    FIXES [#6689](https://github.com/microsoft/Microsoft365DSC/issues/6689)
 * M365DSCUtil
   * Improved module installation speed for `Update-M365DSCModule`.
 * MISC
@@ -87,6 +94,8 @@
   * Fixed an issue where updating Intune assignments did not include all properties.
     FIXES [#6697](https://github.com/microsoft/Microsoft365DSC/issues/6697)
   * Updated comparison function `Compare-M365DSCComplexObject` to non-recursive.
+* M365DSCResourceGenerator
+  * Updated example generation to always create examples.
 * M365DSCReverse
   * Added handling of custom token replacements.
 * M365DSCUtil
@@ -100,17 +109,19 @@
 * MISC
   * Added and removed mismatches between parameters and their schema.
   * Added quality assurance checks for parameter and schema mismatches.
-  * Refactor EXO resources to align with the default resource code layout.
   * Moved the `Examples` folder to the top of the repository to reduce core module size.
+  * Refactored EXO resources to align with the default resource code layout.
+  * Refactored module structure.
   * Removed internal module `M365DSCExoResourceUtils`.
   * Removed unused internal functions `Remove-M365DSCCimInstanceTrailingCharacterFromExport`,
     `Update-M365DSCExchangeResourcesSettingsJSON`, `Update-M365DSCSharePointResourcesSettingsJSON`,
     `Split-ArrayByParts`, `Get-SPOUserProfilePropertyInstance` and `Remove-M365DSCEmptyValue`.
+  * Streamlined the report generation and added new visual styles.
+  * Updated the `SchemaDefinition.json` to a compressed version.
 * DEPENDENCIES
   * Updated DSCParser to version 2.0.0.21.
   * Updated MSCloudLoginAssistant to version 1.1.55.
     FIXES [#6728](https://github.com/microsoft/Microsoft365DSC/issues/6728)
-  * Streamlined the report generation and added new visual styles.
 
 # 1.25.1112.1
 

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10/MSFT_IntuneDeviceConfigurationTrustedCertificatePolicyWindows10.psm1

@@ -273,7 +273,6 @@ function Set-TargetResource
     #endregion
 
     $currentInstance = Get-TargetResource @PSBoundParameters
-
     $BoundParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters
 
     if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent')
@@ -285,20 +284,12 @@ function Set-TargetResource
         $CreateParameters = Rename-M365DSCCimInstanceParameter -Properties $CreateParameters
         $CreateParameters.Remove('Id') | Out-Null
 
-        $keys = (([Hashtable]$CreateParameters).Clone()).Keys
-        foreach ($key in $keys)
-        {
-            if ($null -ne $CreateParameters.$key -and $CreateParameters.$key.GetType().Name -like '*cimInstance*')
-            {
-                $CreateParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $CreateParameters.$key
-            }
-        }
         #region resource generator code
         $CreateParameters.Add('@odata.type', '#microsoft.graph.windows81TrustedRootCertificate')
         $policy = New-MgBetaDeviceManagementDeviceConfiguration -BodyParameter $CreateParameters
         $assignmentsHash = ConvertTo-IntunePolicyAssignment -IncludeDeviceFilter:$true -Assignments $Assignments
 
-        if ($policy.id)
+        if ($policy.Id)
         {
             Update-DeviceConfigurationPolicyAssignment -DeviceConfigurationPolicyId $policy.id `
                 -Targets $assignmentsHash `
@@ -310,28 +301,19 @@ function Set-TargetResource
     {
         Write-Verbose -Message "Updating the Intune Device Configuration Trusted Certificate Policy for Windows10 with Id {$($currentInstance.Id)}"
         $BoundParameters.Remove('Assignments') | Out-Null
+        $BoundParameters.Remove('Id') | Out-Null
 
         $UpdateParameters = ([Hashtable]$BoundParameters).Clone()
         $UpdateParameters = Rename-M365DSCCimInstanceParameter -Properties $UpdateParameters
 
-        $UpdateParameters.Remove('Id') | Out-Null
-
-        $keys = (([Hashtable]$UpdateParameters).Clone()).Keys
-        foreach ($key in $keys)
-        {
-            if ($null -ne $UpdateParameters.$key -and $UpdateParameters.$key.GetType().Name -like '*cimInstance*')
-            {
-                $UpdateParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $UpdateParameters.$key
-            }
-        }
         #region resource generator code
         $UpdateParameters.Add('@odata.type', '#microsoft.graph.windows81TrustedRootCertificate')
         Update-MgBetaDeviceManagementDeviceConfiguration  `
             -DeviceConfigurationId $currentInstance.Id `
             -BodyParameter $UpdateParameters
         $assignmentsHash = ConvertTo-IntunePolicyAssignment -IncludeDeviceFilter:$true -Assignments $Assignments
         Update-DeviceConfigurationPolicyAssignment `
-            -DeviceConfigurationPolicyId $currentInstance.id `
+            -DeviceConfigurationPolicyId $currentInstance.Id `
             -Targets $assignmentsHash `
             -Repository 'deviceManagement/deviceConfigurations'
         #endregion

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneSettingCatalogCustomPolicyWindows10/MSFT_IntuneSettingCatalogCustomPolicyWindows10.psm1

@@ -363,8 +363,8 @@ function Set-TargetResource
             }
         }
         #region resource generator code
-        Update-IntuneDeviceConfigurationPolicy  `
-            -DeviceManagementConfigurationPolicyId $currentInstance.Id `
+        Update-IntuneDeviceConfigurationPolicy `
+            -DeviceConfigurationPolicyId $currentInstance.Id `
             @UpdateParameters
 
         $assignmentsHash = ConvertTo-IntunePolicyAssignment -IncludeDeviceFilter:$true -Assignments $Assignments
@@ -847,84 +847,4 @@ function Get-SettingValue
     return $complexValue
 }
 
-function Update-IntuneDeviceConfigurationPolicy
-{
-    [CmdletBinding()]
-    [OutputType([System.Collections.Hashtable])]
-    param
-    (
-        [Parameter(Mandatory = 'true')]
-        [System.String]
-        $DeviceManagementConfigurationPolicyId,
-
-        [Parameter()]
-        [System.String]
-        $Name,
-
-        [Parameter()]
-        [System.String]
-        $Description,
-
-        [Parameter()]
-        [System.String]
-        $Platforms,
-
-        [Parameter()]
-        [System.String]
-        $Technologies,
-
-        [Parameter()]
-        [System.String]
-        $TemplateReferenceId,
-
-        [Parameter()]
-        [Array]
-        $Settings,
-
-        [Parameter()]
-        [System.String[]]
-        $RoleScopeTagIds
-    )
-
-    try
-    {
-        $Uri = (Get-MSCloudLoginConnectionProfile -Workload MicrosoftGraph).ResourceUrl + "beta/deviceManagement/configurationPolicies/$DeviceManagementConfigurationPolicyId"
-
-        $policy = @{
-            'name'              = $Name
-            'description'       = $Description
-            'platforms'         = $Platforms
-            'templateReference' = @{'templateId' = $TemplateReferenceId }
-            'technologies'      = $Technologies
-            'settings'          = $Settings
-            'roleScopeTagIds'   = $RoleScopeTagIds
-        }
-
-        if (-not $RoleScopeTagIds -or $RoleScopeTagIds.Count -eq 0)
-        {
-            # No tag IDs provided -> use the default Intune tag "0"
-            $policy['roleScopeTagIds'] = @("0")
-        }
-        else
-        {
-            # Tag IDs provided -> force array type to ensure Graph serialization consistency
-            $policy['roleScopeTagIds'] = @($RoleScopeTagIds)
-        }
-
-        $body = $policy | ConvertTo-Json -Depth 100
-        #Write-Verbose -Message $body
-        Invoke-MgGraphRequest -Method PUT -Uri $Uri -Body $body -ErrorAction Stop 4> $null
-    }
-    catch
-    {
-        New-M365DSCLogEntry -Message 'Error updating data:' `
-            -Exception $_ `
-            -Source $($MyInvocation.MyCommand.Source) `
-            -TenantId $TenantId `
-            -Credential $Credential
-
-        return $null
-    }
-}
-
 Export-ModuleMember -Function *-TargetResource

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessDriverUpdateProfileWindows10.psm1

@@ -263,7 +263,6 @@ function Set-TargetResource
     #endregion
 
     $currentInstance = Get-TargetResource @PSBoundParameters
-
     $BoundParameters = Remove-M365DSCAuthenticationParameter -BoundParameters $PSBoundParameters
 
     if ($Ensure -eq 'Present' -and $currentInstance.Ensure -eq 'Absent')
@@ -274,23 +273,14 @@ function Set-TargetResource
         $CreateParameters = Rename-M365DSCCimInstanceParameter -Properties $CreateParameters
         $CreateParameters.Remove('Id') | Out-Null
 
-        $keys = (([Hashtable]$CreateParameters).Clone()).Keys
-        foreach ($key in $keys)
-        {
-            if ($null -ne $CreateParameters.$key -and $CreateParameters.$key.GetType().Name -like '*cimInstance*')
-            {
-                $CreateParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $CreateParameters.$key
-            }
-        }
-
         #region resource generator code
         $uri = '/beta/deviceManagement/windowsDriverUpdateProfiles'
         $policy = Invoke-MgGraphRequest -Method POST -Uri $uri -Body $($CreateParameters | ConvertTo-Json)
         $assignmentsHash = ConvertTo-IntunePolicyAssignment -IncludeDeviceFilter:$true -Assignments $Assignments
 
         if ($policy.id)
         {
-            Update-DeviceConfigurationPolicyAssignment -DeviceConfigurationPolicyId $policy.id `
+            Update-DeviceConfigurationPolicyAssignment -DeviceConfigurationPolicyId $policy.Id `
                 -Targets $assignmentsHash `
                 -Repository 'deviceManagement/windowsDriverUpdateProfiles'
         }
@@ -305,14 +295,6 @@ function Set-TargetResource
         $UpdateParameters.Remove('ApprovalType') | Out-Null
         $UpdateParameters.Remove('Id') | Out-Null
 
-        $keys = (([Hashtable]$UpdateParameters).Clone()).Keys
-        foreach ($key in $keys)
-        {
-            if ($null -ne $UpdateParameters.$key -and $UpdateParameters.$key.GetType().Name -like '*cimInstance*')
-            {
-                $UpdateParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $UpdateParameters.$key
-            }
-        }
         #region resource generator code
         $uri = "/beta/deviceManagement/windowsDriverUpdateProfiles/$($currentInstance.Id)"
         Invoke-MgGraphRequest -Method PATCH -Uri $uri -Body $($UpdateParameters | ConvertTo-Json)

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneWindowsUpdateForBusinessHotpatchProfileWindows10/MSFT_IntuneWindowsUpdateForBusinessHotpatchProfileWindows10.psm1

@@ -259,14 +259,6 @@ function Set-TargetResource
         $createParameters = Rename-M365DSCCimInstanceParameter -Properties $createParameters
         $createParameters.Remove('Id') | Out-Null
 
-        $keys = (([Hashtable]$createParameters).Clone()).Keys
-        foreach ($key in $keys)
-        {
-            if ($null -ne $createParameters.$key -and $createParameters.$key.GetType().Name -like '*CimInstance*')
-            {
-                $createParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $createParameters.$key
-            }
-        }
         #region resource generator code
         $policy = Invoke-MgGraphRequest -Method POST -Uri $Script:BaseUrl `
             -Body $($createParameters | ConvertTo-Json -Depth 10)
@@ -287,18 +279,8 @@ function Set-TargetResource
 
         $updateParameters = ([Hashtable]$boundParameters).Clone()
         $updateParameters = Rename-M365DSCCimInstanceParameter -Properties $updateParameters
-
         $updateParameters.Remove('Id') | Out-Null
 
-        $keys = (([Hashtable]$updateParameters).Clone()).Keys
-        foreach ($key in $keys)
-        {
-            if ($null -ne $updateParameters.$key -and $updateParameters.$key.GetType().Name -like '*CimInstance*')
-            {
-                $updateParameters.$key = Convert-M365DSCDRGComplexTypeToHashtable -ComplexObject $updateParameters.$key
-            }
-        }
-
         #region resource generator code
         Invoke-MgGraphRequest -Method PATCH -Uri "$($Script:BaseUrl)/$($currentInstance.Id)" `
             -Body $($updateParameters | ConvertTo-Json -Depth 10)

Modules/Microsoft365DSC/Modules/M365DSCDRGUtil.psm1

@@ -27,7 +27,7 @@ function Get-StringFirstCharacterToLower
 function Rename-M365DSCCimInstanceParameter
 {
     [CmdletBinding()]
-    [OutputType([System.Collections.Hashtable], [System.Collections.Hashtable[]])]
+    [OutputType([System.Collections.Hashtable], [System.Object[]])]
     param(
         [Parameter(Mandatory = $true)]
         $Properties,
@@ -45,18 +45,26 @@ function Rename-M365DSCCimInstanceParameter
         $values = @()
         foreach ($item in $Properties)
         {
-            try
+            $itemType = $item.GetType().FullName
+            if ($itemType -like '*Hashtable*' -or $itemType -like '*CimInstance*' -or $itemType -like '*Object*')
             {
-                $values += Rename-M365DSCCimInstanceParameter -Properties $item -KeyMapping $KeyMapping
+                try
+                {
+                    $values += Rename-M365DSCCimInstanceParameter -Properties $item -KeyMapping $KeyMapping
+                }
+                catch
+                {
+                    Write-Verbose -Message "Error getting values for item {$item}"
+                }
             }
-            catch
+            else
             {
-                Write-Verbose -Message "Error getting values for item {$item}"
+                $values += $item
             }
         }
         $result = $values
 
-        return ,[System.Collections.Hashtable[]]$result
+        return ,$result
     }
     #endregion
 
@@ -69,11 +77,11 @@ function Rename-M365DSCCimInstanceParameter
     if ($type -like '*CimInstance*' -or $type -like '*Hashtable*' -or $type -like '*Object*')
     {
         $hashProperties = Get-M365DSCDRGComplexTypeToHashtable -ComplexObject $result
-        $keys = ($hashProperties.Clone()).keys
+        $keys = ($hashProperties.Clone()).Keys
 
         foreach ($key in $keys)
         {
-            $keyName = $key.Substring(0, 1).Tolower() + $key.Substring(1, $key.Length - 1)
+            $keyName = $key.Substring(0, 1).ToLower() + $key.Substring(1, $key.Length - 1)
             if ($key -in $KeyMapping.Keys)
             {
                 $keyName = $KeyMapping.$key

Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1

@@ -661,6 +661,28 @@ function Start-M365DSCConfigurationExtract
             }
         }
 
+        # If the tenant id is not a GUID, retrieve it based on the organization name
+        # Only implemented for public cloud tenants
+        if (-not ($TenantId -match ('^(\{){0,1}[0-9a-fA-F]{8}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{4}\-[0-9a-fA-F]{12}(\}){0,1}$')))
+        {
+            try
+            {
+                Write-Verbose -Message "Retrieving Tenant Id based on provided organization name."
+                $tenantGuid = (Invoke-RestMethod -Uri "https://login.microsoftonline.com/$organization/.well-known/openid-configuration" -Method Get).authorization_endpoint.Split('/')[3]
+                $currentStringReplacementMap = Get-M365DSCStringReplacementMap
+                if (-not $currentStringReplacementMap.ContainsKey($tenantGuid))
+                {
+                    $currentStringReplacementMap.Add($tenantGuid, 'TenantGuid')
+                    Set-M365DSCStringReplacementMap -Map $currentStringReplacementMap
+                }
+            }
+            catch
+            {
+                Write-Warning -Message "Failed to resolve current tenant id from organization name '$organization'. Not replacing tenant id in exported configuration.
+         If you want to have your tenant id replaced in the export, use the -TokenReplacement parameter of Export-M365DSCConfiguration."
+            }
+        }
+
         Confirm-M365DSCDependencies
         $partialExportName = $Global:PartialExportFileName
         $resourcesPath = $resourcesPath | Sort-Object $_.Name