Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.24.515.2 #4678

Merged
merged 6 commits into from
May 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change log for Microsoft365DSC

# 1.24.515.2

* EXOManagementRoleEntry
* Added support for the WebSite type.

# 1.24.515.1

* AADActivityBasedTimeoutPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function Get-TargetResource
$Parameters,

[Parameter()]
[ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')]
[ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')]
[System.String]
$Type,

Expand Down Expand Up @@ -137,7 +137,7 @@ function Set-TargetResource
$Parameters,

[Parameter()]
[ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')]
[ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')]
[System.String]
$Type,

Expand Down Expand Up @@ -234,7 +234,7 @@ function Test-TargetResource
$Parameters,

[Parameter()]
[ValidateSet('Cmdlet', 'Script', 'ApplicationPermission')]
[ValidateSet('Cmdlet', 'Script', 'ApplicationPermission', 'WebService')]
[System.String]
$Type,

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down Expand Up @@ -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')
{
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -327,7 +336,11 @@ function Export-TargetResource

[Parameter()]
[Switch]
$ManagedIdentity
$ManagedIdentity,

[Parameter()]
[System.String[]]
$AccessTokens
)
$ConnectionMode = New-M365DSCConnection -Workload 'MicrosoftTeams' `
-InboundParameters $PSBoundParameters
Expand Down Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions Modules/Microsoft365DSC/Microsoft365DSC.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -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 = @()
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/resources/exchange/EXOManagementRoleEntry.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| --- | --- | --- | --- | --- |
| **Identity** | Key | String | The Identity parameter specifies the role entry that you want to modify. | |
| **Parameters** | Write | StringArray[] | The Parameters parameter specifies the parameters to be added to or removed from the role entry. | |
| **Type** | Write | String | The Type parameter specifies the type of role entry to return. | `Cmdlet`, `Script`, `ApplicationPermission` |
| **Type** | Write | String | The Type parameter specifies the type of role entry to return. | `Cmdlet`, `Script`, `ApplicationPermission`, `WebService` |
| **Credential** | Write | PSCredential | Credentials of the Exchange Global Admin | |
| **ApplicationId** | Write | String | Id of the Azure Active Directory application to authenticate with. | |
| **TenantId** | Write | String | Id of the Azure Active Directory tenant used for authentication. | |
Expand Down
Loading