Merge pull request #4677 from NikCharlebois/VariousFixes

Release 1.24.515.2
microsoft · May 15, 2024 · 7af659b · 7af659b
2 parents a7fab49 + ce008fc
commit 7af659b
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log for Microsoft365DSC
 
+# 1.24.515.2
+
+* EXOManagementRoleEntry
+  * Added support for the WebSite type.
+
 # 1.24.515.1
 
 * AADActivityBasedTimeoutPolicy

diff --git a/...Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1 b/...Microsoft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.psm1
@@ -13,7 +13,7 @@ function Get-TargetResource
         $Parameters,
 
         [Parameter()]
-        [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')]
+        [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')]
         [System.String]
         $Type,
 
@@ -137,7 +137,7 @@ function Set-TargetResource
         $Parameters,
 
         [Parameter()]
-        [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')]
+        [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')]
         [System.String]
         $Type,
 
@@ -234,7 +234,7 @@ function Test-TargetResource
         $Parameters,
 
         [Parameter()]
-        [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')]
+        [ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')]
         [System.String]
         $Type,
 

diff --git a/...oft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.schema.mof b/...oft365DSC/DSCResources/MSFT_EXOManagementRoleEntry/MSFT_EXOManagementRoleEntry.schema.mof
@@ -3,7 +3,7 @@ class MSFT_EXOManagementRoleEntry : OMI_BaseResource
 {
     [Key, Description("The Identity parameter specifies the role entry that you want to modify.")] String Identity;
     [Write, Description("The Parameters parameter specifies the parameters to be added to or removed from the role entry.")] String Parameters[];
-    [Write, Description("The Type parameter specifies the type of role entry to return."), ValueMap{"Cmdlet","Script","ApplicationPermission"}, Values{"Cmdlet","Script","ApplicationPermission"}] String Type;
+    [Write, Description("The Type parameter specifies the type of role entry to return."), ValueMap{"Cmdlet","Script","ApplicationPermission","WebService"}, Values{"Cmdlet","Script","ApplicationPermission","WebService"}] String Type;
     [Write, Description("Credentials of the Exchange Global Admin"), EmbeddedInstance("MSFT_Credential")] string Credential;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;
     [Write, Description("Id of the Azure Active Directory tenant used for authentication.")] String TenantId;

diff --git a/...65DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 b/...65DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1
@@ -160,7 +160,11 @@ function Set-TargetResource
 
         [Parameter()]
         [Switch]
-        $ManagedIdentity
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
     Write-Verbose -Message "Setting configuration of Teams Meeting Broadcast Policy {$Identity}"
 
@@ -204,6 +208,7 @@ function Set-TargetResource
     $SetParams.Remove('CertificateThumbprint') | Out-Null
     $SetParams.Remove('Ensure') | Out-Null
     $SetParams.Remove('ManagedIdentity') | Out-Null
+    $SetParams.Remove('AccessTokens') | Out-Null
 
     if ($Ensure -eq 'Present' -and $currentValues.Ensure -eq 'Absent')
     {
@@ -270,7 +275,11 @@ function Test-TargetResource
 
         [Parameter()]
         [Switch]
-        $ManagedIdentity
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
     #Ensure the proper dependencies are installed in the current environment.
     Confirm-M365DSCDependencies
@@ -327,7 +336,11 @@ function Export-TargetResource
 
         [Parameter()]
         [Switch]
-        $ManagedIdentity
+        $ManagedIdentity,
+
+        [Parameter()]
+        [System.String[]]
+        $AccessTokens
     )
     $ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' `
         -InboundParameters $PSBoundParameters
@@ -360,6 +373,7 @@ function Export-TargetResource
                 TenantId              = $TenantId
                 CertificateThumbprint = $CertificateThumbprint
                 ManagedIdentity       = $ManagedIdentity.IsPresent
+                AccessTokens          = $AccessTokens
             }
             Write-Host "    |---[$i/$($policies.Length)] $($policy.Identity)" -NoNewline
             $Results = Get-TargetResource @Params

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2024-05-14
+# Generated on: 2024-05-15
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.24.515.1'
+  ModuleVersion     = '1.24.515.2'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -149,7 +149,8 @@
     * AADGroupSettings
       * Added support for parameter NewUnifiedGroupWritebackDefault
     * EXOManagementRoleEntry
-      * Initial Rrelease
+      * Initial Release
+      * Added support for the WebSite type.
     * IntuneAntivirusPolicyWindows10SettingCatalog
       * Add missing properties from templates
       * Update setting handling so that the value is reverted to default when unset

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1
@@ -397,6 +397,8 @@ function Get-M365DSCTelemetryOption
                     [System.EnvironmentVariableTarget]::Machine)
             ProjectName        = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryProjectName', `
                     [System.EnvironmentVariableTarget]::Machine)
+            ConnectionString   = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryConnectionString', `
+                    [System.EnvironmentVariableTarget]::Machine)
         }
     }
     catch