Skip to content

Commit

Permalink
Merge branch 'Dev' into fix/settings-catalog-wrap-one-property-element
Browse files Browse the repository at this point in the history
  • Loading branch information
FabienTschanz authored Oct 3, 2024
2 parents 26a1d28 + 0f1fa05 commit d545863
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# UNRELEASED

* AADEntitlementManagementSettings
* Added support for ApplicationSecret
* M365DSCDRGUtil
* Fixes an issue for the handling of skipped one-property elements in the
Settings Catalog. FIXES [#5086](https://github.com/microsoft/Microsoft365DSC/issues/5086)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ function Get-TargetResource
[System.String]
$TenantId,

[Parameter()]
[System.Management.Automation.PSCredential]
$ApplicationSecret,

[Parameter()]
[System.String]
$CertificateThumbprint,
Expand Down Expand Up @@ -72,6 +76,7 @@ function Get-TargetResource
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
ApplicationSecret = $ApplicationSecret
CertificateThumbprint = $CertificateThumbprint
ManagedIdentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
Expand Down Expand Up @@ -120,6 +125,10 @@ function Set-TargetResource
[System.String]
$TenantId,

[Parameter()]
[System.Management.Automation.PSCredential]
$ApplicationSecret,

[Parameter()]
[System.String]
$CertificateThumbprint,
Expand Down Expand Up @@ -181,6 +190,10 @@ function Test-TargetResource
[System.String]
$TenantId,

[Parameter()]
[System.Management.Automation.PSCredential]
$ApplicationSecret,

[Parameter()]
[System.String]
$CertificateThumbprint,
Expand Down Expand Up @@ -281,6 +294,7 @@ function Export-TargetResource
Credential = $Credential
ApplicationId = $ApplicationId
TenantId = $TenantId
ApplicationSecret = $ApplicationSecret
CertificateThumbprint = $CertificateThumbprint
ManagedIdentity = $ManagedIdentity.IsPresent
AccessTokens = $AccessTokens
Expand Down

0 comments on commit d545863

Please sign in to comment.