Merge branch 'Dev' of github.com:swisscom/Microsoft365DSC into O365Or…

…gSettings-fix-parameter-defaults-to-false-if-not-specified
swisscom · Jun 21, 2024 · e6f51ff · e6f51ff
2 parents 927f4cf + 1a2176b
commit e6f51ff
Show file tree

Hide file tree

Showing 343 changed files with 3,769 additions and 769 deletions.
diff --git a/.github/workflows/PublishGitHubPages.yml b/.github/workflows/PublishGitHubPages.yml
@@ -2,7 +2,7 @@ name: Generate Resources & Deploy GitHub Pages
 on:
   push:
     branches:
-      - master
+      - Master
       - Dev
 jobs:
   GenerateResource:
@@ -38,7 +38,7 @@ jobs:
     needs: GenerateResource
     runs-on: ubuntu-latest
 
-    permissions:    
+    permissions:
       contents: write
       pages: write
 

diff --git a/.github/workflows/PublishToGallery.yml b/.github/workflows/PublishToGallery.yml
@@ -3,7 +3,7 @@ name: Publish to PowerShell Gallery
 on:
   push:
     branches:
-      - master
+      - Master
 
 jobs:
   PublishToGallery:

diff --git a/.github/workflows/website-deploy-prod.yml b/.github/workflows/website-deploy-prod.yml
@@ -3,7 +3,7 @@ on: [push]
 
 jobs:
   build:
-    if: github.repository == 'microsoft/Microsoft365DSC' && github.event.ref == 'refs/heads/master'
+    if: github.repository == 'microsoft/Microsoft365DSC' && github.event.ref == 'refs/heads/Master'
     runs-on: ubuntu-latest
     environment:
       name: PROD
@@ -36,7 +36,7 @@ jobs:
           path: ${{ github.workspace }}/generator/build
 
   deploy_prod:
-    if: github.repository == 'microsoft/Microsoft365DSC' && github.event.ref == 'refs/heads/master'
+    if: github.repository == 'microsoft/Microsoft365DSC' && github.event.ref == 'refs/heads/Master'
     runs-on: ubuntu-latest
     environment:
       name: PROD

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,29 @@
 * O365OrgSettings
   * FIXES [#4741](https://github.com/microsoft/Microsoft365DSC/issues/4741)
 
+# 1.24.619.1
+
+* SCDLPComplianceRule
+  * Fix #4259 and #3845
+* TeamsM365App
+  * Initial release.
+* DEPENDENCIES
+  * Updated MicrosoftTeams to version 6.4.0.
+* MISC
+  * Improved telemetry around Export sizes.
+
+# 1.24.612.1
+
+* IntuneAppConfigurationDevicePolicy
+  * Add conversion from `payloadJson` to actual JSON.
+* SPOTenantSettings
+  * Connect to Graph before Sharepoint Online.
+    FIXES [#4746](https://github.com/microsoft/Microsoft365DSC/issues/4746)
+* TeamsMeetingPolicy
+  * Updated the allowed values for the TeamsCameraFarEndTPTXZmode property.
+* M365DSCResourceGenerator
+  * Fix formatting and missing escape character in Resource Generator
+
 # 1.24.605.1
 
 * AADAuthenticationFlowPolicy
@@ -19,6 +42,8 @@
 * M365DSCDRGUtil
   * Add multiple commands for Intune policies that use the settings catalog.
   * Improve comparison of Intune assignments in `Compare-M365DSCIntunePolicyAssignment`
+* TeamsMeetingPolicy
+  * Updated the allowed values for the TeamsCameraFarEndTPTXZmode property.
 * DEPENDENCIES
   * Updated MSCloudLoginAssistant to version 1.1.17.
   * Updated ReverseDSC to version 2.0.0.20.
@@ -54,13 +79,13 @@
 
 * IntuneDeviceConfigurationPlatformScriptWindows
   * Initial Release
-  FIXES [#4157](https://github.com/microsoft/Microsoft365DSC/issues/4157)
+    FIXES [#4157](https://github.com/microsoft/Microsoft365DSC/issues/4157)
 * IntuneDeviceConfigurationPlatformScriptMacOS
   * Initial Release
-  FIXES [#4157](https://github.com/microsoft/Microsoft365DSC/issues/4157)
+    FIXES [#4157](https://github.com/microsoft/Microsoft365DSC/issues/4157)
 * IntuneDeviceEnrollmentPlatformRestriction
   * Fix missing export of the default policy
-  FIXES [#4694](https://github.com/microsoft/Microsoft365DSC/issues/4694)
+    FIXES [#4694](https://github.com/microsoft/Microsoft365DSC/issues/4694)
 * IntuneDeviceEnrollmentStatusPageWindows10
   * Return all authentication methods when retrieving the policies otherwise
     it may fail deducing the OrganizationName via TenantId

diff --git a/...C/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1 b/...C/DSCResources/MSFT_AADActivityBasedTimeoutPolicy/MSFT_AADActivityBasedTimeoutPolicy.psm1
@@ -489,6 +489,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1 b/...s/Microsoft365DSC/DSCResources/MSFT_AADAdministrativeUnit/MSFT_AADAdministrativeUnit.psm1
@@ -104,7 +104,6 @@ function Get-TargetResource
     $nullResult.Ensure = 'Absent'
     try
     {
-
         $getValue = $null
         #region resource generator code
         if (-not [string]::IsNullOrEmpty($Id))
@@ -1069,6 +1068,11 @@ function Export-TargetResource
         }
         foreach ($config in $Script:exportedInstances)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADApplication/MSFT_AADApplication.psm1
@@ -911,6 +911,11 @@ function Export-TargetResource
         [array] $Script:exportedInstances = Get-MgApplication -Filter $Filter -All -ErrorAction Stop
         foreach ($AADApp in $Script:exportedInstances)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             Write-Host "    |---[$i/$($Script:exportedInstances.Count)] $($AADApp.DisplayName)" -NoNewline
             $Params = @{
                 ApplicationId         = $ApplicationId

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADAttributeSet/MSFT_AADAttributeSet.psm1
@@ -341,6 +341,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
 
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline

diff --git a/...T_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1 b/...T_AADAuthenticationContextClassReference/MSFT_AADAuthenticationContextClassReference.psm1
@@ -365,6 +365,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id + " - " + $config.DisplayName
 
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline

diff --git a/...65DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.psm1 b/...65DSC/DSCResources/MSFT_AADAuthenticationFlowPolicy/MSFT_AADAuthenticationFlowPolicy.psm1
@@ -332,6 +332,11 @@ function Export-TargetResource
     $dscContent = ''
     try
     {
+        if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+        {
+            $Global:M365DSCExportResourceInstancesCount++
+        }
+
         $Params = @{
             IsSingleInstance       = 'Yes'
             Credential             = $Credential

diff --git a/...C/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1 b/...C/DSCResources/MSFT_AADAuthenticationMethodPolicy/MSFT_AADAuthenticationMethodPolicy.psm1
@@ -583,6 +583,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...henticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1 b/...henticationMethodPolicyAuthenticator/MSFT_AADAuthenticationMethodPolicyAuthenticator.psm1
@@ -785,6 +785,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...rces/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1 b/...rces/MSFT_AADAuthenticationMethodPolicyEmail/MSFT_AADAuthenticationMethodPolicyEmail.psm1
@@ -523,6 +523,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
 
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline

diff --git a/...rces/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1 b/...rces/MSFT_AADAuthenticationMethodPolicyFido2/MSFT_AADAuthenticationMethodPolicyFido2.psm1
@@ -551,6 +551,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
             $params = @{

diff --git a/...esources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1 b/...esources/MSFT_AADAuthenticationMethodPolicySms/MSFT_AADAuthenticationMethodPolicySms.psm1
@@ -499,6 +499,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
             $params = @{

diff --git a/...SFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1 b/...SFT_AADAuthenticationMethodPolicySoftware/MSFT_AADAuthenticationMethodPolicySoftware.psm1
@@ -499,6 +499,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
             $params = @{

diff --git a/...T_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1 b/...T_AADAuthenticationMethodPolicyTemporary/MSFT_AADAuthenticationMethodPolicyTemporary.psm1
@@ -568,6 +568,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...rces/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1 b/...rces/MSFT_AADAuthenticationMethodPolicyVoice/MSFT_AADAuthenticationMethodPolicyVoice.psm1
@@ -512,6 +512,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
             $params = @{

diff --git a/...ources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1 b/...ources/MSFT_AADAuthenticationMethodPolicyX509/MSFT_AADAuthenticationMethodPolicyX509.psm1
@@ -575,6 +575,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             Write-Host "    |---[$i/$($getValue.Count)] $displayedKey" -NoNewline
             $params = @{

diff --git a/...CResources/MSFT_AADAuthenticationStrengthPolicy/MSFT_AADAuthenticationStrengthPolicy.psm1 b/...CResources/MSFT_AADAuthenticationStrengthPolicy/MSFT_AADAuthenticationStrengthPolicy.psm1
@@ -385,6 +385,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.Id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1 b/...Microsoft365DSC/DSCResources/MSFT_AADAuthorizationPolicy/MSFT_AADAuthorizationPolicy.psm1
@@ -570,7 +570,10 @@ function Export-TargetResource
 
     try
     {
-        $dscContent = ''
+        if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+        {
+            $Global:M365DSCExportResourceInstancesCount++
+        }
 
         $params = @{
             IsSingleInstance      = 'Yes'

diff --git a/...t365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1 b/...t365DSC/DSCResources/MSFT_AADConditionalAccessPolicy/MSFT_AADConditionalAccessPolicy.psm1
@@ -2051,6 +2051,11 @@ function Export-TargetResource
             Write-Host "`r`n" -NoNewline
             foreach ($Policy in $Policies)
             {
+                if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+                {
+                    $Global:M365DSCExportResourceInstancesCount++
+                }
+
                 Write-Host "    |---[$i/$($Policies.Count)] $($Policy.DisplayName)" -NoNewline
                 $Params = @{
                     DisplayName           = $Policy.DisplayName

diff --git a/...t365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicy/MSFT_AADCrossTenantAccessPolicy.psm1 b/...t365DSC/DSCResources/MSFT_AADCrossTenantAccessPolicy/MSFT_AADCrossTenantAccessPolicy.psm1
@@ -341,6 +341,11 @@ function Export-TargetResource
 
     try
     {
+        if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+        {
+            $Global:M365DSCExportResourceInstancesCount++
+        }
+
         $dscContent = ''
         $params = @{
             IsSingleInstance      = 'Yes'

diff --git a/...AccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1 b/...AccessPolicyConfigurationDefault/MSFT_AADCrossTenantAccessPolicyConfigurationDefault.psm1
@@ -450,6 +450,11 @@ function Export-TargetResource
 
     try
     {
+        if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+        {
+            $Global:M365DSCExportResourceInstancesCount++
+        }
+
         $dscContent = ''
         $Params = @{
             IsSingleInstance      = 'Yes'

diff --git a/...AccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1 b/...AccessPolicyConfigurationPartner/MSFT_AADCrossTenantAccessPolicyConfigurationPartner.psm1
@@ -485,6 +485,11 @@ function Export-TargetResource
         Write-Host "`r`n" -NoNewline
         foreach ($entry in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             Write-Host "    |---[$i/$($getValue.Count)] $($entry.TenantId)" -NoNewline
             $Params = @{
                 PartnerTenantId       = $entry.TenantId

diff --git a/...SFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1 b/...SFT_AADEntitlementManagementAccessPackage/MSFT_AADEntitlementManagementAccessPackage.psm1
@@ -934,6 +934,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...ssPackageAssignmentPolicy/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy.psm1 b/...ssPackageAssignmentPolicy/MSFT_AADEntitlementManagementAccessPackageAssignmentPolicy.psm1
@@ -925,6 +925,11 @@ function Export-TargetResource
         }
         foreach ($config in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $displayedKey = $config.id
             if (-not [String]::IsNullOrEmpty($config.displayName))
             {

diff --git a/...mentManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1 b/...mentManagementAccessPackageCatalog/MSFT_AADEntitlementManagementAccessPackageCatalog.psm1
@@ -465,6 +465,11 @@ function Export-TargetResource
 
         foreach ($catalogId in $getValue)
         {
+            if ($null -ne $Global:M365DSCExportResourceInstancesCount)
+            {
+                $Global:M365DSCExportResourceInstancesCount++
+            }
+
             $config = Get-MgBetaEntitlementManagementAccessPackageCatalog -AccessPackageCatalogId $catalogId
             $displayedKey = $config.id
             if (-not [String]::IsNullOrEmpty($config.displayName))
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Publish to PowerShell Gallery @@
     on:
       push:
         branches:
-          - master
+          - Master
     jobs:
       PublishToGallery:
@@ Expand Down @@