Merge branch 'Dev' into M365M-3258-SCDLPComplianceRule

.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
 

.github/workflows/PublishToGallery.yml

@@ -3,7 +3,7 @@ name: Publish to PowerShell Gallery
 on:
   push:
     branches:
-      - master
+      - Master
 
 jobs:
   PublishToGallery:

.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

CHANGELOG.md

@@ -4,6 +4,17 @@
 
 * SCDLPComplianceRule
   * Fix #4259 and #3845
+# 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
 
@@ -19,6 +30,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 +67,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

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationDevicePolicy/MSFT_IntuneAppConfigurationDevicePolicy.psm1

@@ -200,11 +200,17 @@ function Get-TargetResource
             }
         }
 
+        $payloadJson = $null
+        if (-not [System.String]::IsNullOrEmpty($getValue.AdditionalProperties.payloadJson))
+        {
+            $payloadJson = [System.Text.Encoding]::ASCII.GetString([System.Convert]::FromBase64String($getValue.AdditionalProperties.payloadJson))
+        }
+
         $results = @{
             #region resource generator code
             ConnectedAppsEnabled  = $getValue.AdditionalProperties.connectedAppsEnabled
             PackageId             = $getValue.AdditionalProperties.packageId
-            PayloadJson           = $getValue.AdditionalProperties.payloadJson
+            PayloadJson           = $payloadJson
             PermissionActions     = $complexPermissionActions
             ProfileApplicability  = $enumProfileApplicability
             EncodedSettingXml     = $getValue.AdditionalProperties.encodedSettingXml
@@ -362,6 +368,11 @@ function Set-TargetResource
         $platform = 'ios'
     }
 
+    if (-not [System.String]::IsNullOrEmpty($BoundParameters.PayloadJson))
+    {
+        $BoundParameters.PayloadJson = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($BoundParameters.PayloadJson))
+    }
+
     $mobileApps = Get-MgBetaDeviceAppManagementMobileApp -All
     $targetedApps = @()
     foreach ($targetedApp in $TargetedMobileApps)

Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1

@@ -149,8 +149,8 @@ function Get-TargetResource
     )
 
     Write-Verbose -Message 'Getting configuration for SPO Tenant'
-    $ConnectionMode = New-M365DSCConnection -Workload 'PNP' -InboundParameters $PSBoundParameters
     $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' -InboundParameters $PSBoundParameters
+    $ConnectionMode = New-M365DSCConnection -Workload 'PNP' -InboundParameters $PSBoundParameters
 
     #Ensure the proper dependencies are installed in the current environment.
     Confirm-M365DSCDependencies
@@ -393,11 +393,11 @@ function Set-TargetResource
     Add-M365DSCTelemetryEvent -Data $data
     #endregion
 
-    $ConnectionMode = New-M365DSCConnection -Workload 'PNP' -InboundParameters $PSBoundParameters
     if (-not [string]::IsNullOrEmpty($TenantDefaultTimezone))
     {
         $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' -InboundParameters $PSBoundParameters
     }
+    $ConnectionMode = New-M365DSCConnection -Workload 'PNP' -InboundParameters $PSBoundParameters
 
     $CurrentParameters = $PSBoundParameters
     $CurrentParameters.Remove('Credential') | Out-Null
@@ -672,10 +672,10 @@ function Export-TargetResource
 
     try
     {
-        $ConnectionMode = New-M365DSCConnection -Workload 'PNP' `
-            -InboundParameters $PSBoundParameters
         $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftGraph' `
             -InboundParameters $PSBoundParameters
+        $ConnectionMode = New-M365DSCConnection -Workload 'PNP' `
+            -InboundParameters $PSBoundParameters
 
         #Ensure the proper dependencies are installed in the current environment.
         Confirm-M365DSCDependencies

Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1

@@ -262,7 +262,7 @@ function Get-TargetResource
         $StreamingAttendeeMode = 'Enabled',
 
         [Parameter()]
-        [ValidateSet('Disabled', 'Enabled')]
+        [ValidateSet('Disabled', 'AutoAcceptInTenant', 'AutoAcceptAll')]
         [System.String]
         $TeamsCameraFarEndPTZMode,
 
@@ -683,7 +683,7 @@ function Set-TargetResource
         $StreamingAttendeeMode = 'Enabled',
 
         [Parameter()]
-        [ValidateSet('Disabled', 'Enabled')]
+        [ValidateSet('Disabled', 'AutoAcceptInTenant', 'AutoAcceptAll')]
         [System.String]
         $TeamsCameraFarEndPTZMode,
 
@@ -1065,7 +1065,7 @@ function Test-TargetResource
         $StreamingAttendeeMode = 'Enabled',
 
         [Parameter()]
-        [ValidateSet('Disabled', 'Enabled')]
+        [ValidateSet('Disabled', 'AutoAcceptInTenant', 'AutoAcceptAll')]
         [System.String]
         $TeamsCameraFarEndPTZMode,
 

Modules/Microsoft365DSC/Microsoft365DSC.psd1

@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2024-06-05
+# Generated on: 2024-06-12
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.24.605.1'
+  ModuleVersion     = '1.24.612.1'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -142,15 +142,15 @@
       IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
       # ReleaseNotes of this module
-      ReleaseNotes = '* AADEntitlementManagementRoleAssignment
-      * Initial Release.
-    * M365DSCResourceGenerator
-      * Add support for generating Intune settings catalog policies
-    * M365DSCDRGUtil
-      * Add multiple commands for Intune policies that use the settings catalog
-    * DEPENDENCIES
-      * Updated MSCloudLoginAssistant to version 1.1.17.
-      * Updated ReverseDSC to version 2.0.0.20.'
+      ReleaseNotes = '* 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'
 
       # Flag to indicate whether the module requires explicit user acceptance for install/update
       # RequireLicenseAcceptance = $false