Skip to content

Commit

Permalink
Merge pull request #1895 from microsoft/Dev
Browse files Browse the repository at this point in the history
Release 1.22.420.1
  • Loading branch information
NikCharlebois authored Apr 20, 2022
2 parents 2980c94 + dbbb409 commit 7bc0cab
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 15 deletions.
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.22.420.1

* EXOOutboundConnector
* Added support for test mode connectors.

# 1.22.413.1

* EXOAuthenticationPolicy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ function Get-TargetResource
$nullReturn.Ensure = 'Absent'
try
{
$OutBoundConnectors = Get-OutBoundConnector -ErrorAction Stop
$OutBoundConnectors = Get-OutBoundConnector -IncludeTestModeConnectors:$true -ErrorAction Stop

$OutBoundConnector = $OutBoundConnectors | Where-Object -FilterScript { $_.Identity -eq $Identity }
if ($null -eq $OutBoundConnector)
Expand Down Expand Up @@ -549,7 +549,7 @@ function Export-TargetResource

try
{
[array]$OutboundConnectors = Get-OutboundConnector -ErrorAction Stop
[array]$OutboundConnectors = Get-OutboundConnector -IncludeTestModeConnectors:$true -ErrorAction Stop
if ($OutBoundConnectors.Length -eq 0)
{
Write-Host $Global:M365DSCEmojiGreenCheckMark
Expand Down
16 changes: 4 additions & 12 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: 2022-04-13
# Generated on: 2022-04-20

@{

# Script module or binary module file associated with this manifest.
# RootModule = ''

# Version number of this module.
ModuleVersion = '1.22.413.1'
ModuleVersion = '1.22.420.1'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down Expand Up @@ -132,16 +132,8 @@
IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'

# ReleaseNotes of this module
ReleaseNotes = "* EXOAuthenticationPolicy
* Fix typo in AllowBasicAuthOfflineAddressBook (FIXES #1876)
* EXOQuarantinePolicy
* New resource
* O365Groups
* Fixed issue on export of O365Groups resource.
* DEPENDENCIES
* Updated Microsoft.Graph.* to 1.9.5.
* Updated Microsoft.PowerApps.Administration.PowerShell to 2.0.145.
* Updated MicrosoftTeams to 4.2.0."
ReleaseNotes = "* EXOOutboundConnector
* Added support for test mode connectors."

# Flag to indicate whether the module requires explicit user acceptance for install/update
# RequireLicenseAcceptance = $false
Expand Down
59 changes: 59 additions & 0 deletions docs/docs/resources/exchange/EXOQuarantinePolicy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# EXOQuarantinePolicy

## Parameters

| Parameter | Attribute | DataType | Description | Allowed Values |
| --- | --- | --- | --- | --- |
| **Identity** | Key | String | The Identity parameter specifies the QuarantinePolicy you want to modify. ||
| **EndUserQuarantinePermissionsValue** | Write | UInt32 | The EndUserQuarantinePermissionsValue parameter specifies the end-user permissions for the quarantine policy. ||
| **ESNEnabled** | Write | Boolean | The ESNEnabled parameter specifies whether to enable quarantine notifications (formerly known as end-user spam notifications) for the policy. ||
| **MultiLanguageCustomDisclaimer** | Write | StringArray[] | The MultiLanguageCustomDisclaimer parameter specifies the custom disclaimer text to use near the bottom of quarantine notifications. ||
| **MultiLanguageSenderName** | Write | StringArray[] | The MultiLanguageSenderName parameter specifies the email sender's display name to use in quarantine notifications. ||
| **MultiLanguageSetting** | Write | StringArray[] | The MultiLanguageSetting parameter specifies the language of quarantine notifications. ||
| **OrganizationBrandingEnabled** | Write | Boolean | The OrganizationBrandingEnabled parameter enables or disables organization branding in the end-user quarantine notification messages. ||
| **Ensure** | Write | String | Specifies if this QuarantinePolicy should exist. |Present, Absent|
| **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. ||
| **CertificateThumbprint** | Write | String | Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication. ||
| **CertificatePassword** | Write | PSCredential | Username can be made up to anything but password will be used for CertificatePassword ||
| **CertificatePath** | Write | String | Path to certificate used in service principal usually a PFX file. ||

# EXOQuarantinePolicy

### Description

Create or modify a EXOQuarantinePolicy in your cloud-based organization.

## Examples

### Example 1

This example is used to test new resources and showcase the usage of new resources being worked on.
It is not meant to use as a production baseline.

```powershell
Configuration Example
{
param(
[Parameter(Mandatory = $true)]
[PSCredential]
$credsGlobalAdmin
)
$OrganizationName = $credsGlobalAdmin.UserName.Split('@')[1]
Import-DscResource -ModuleName Microsoft365DSC
node localhost
{
EXOQuarantinePolicy 'ConfigureQuarantinePolicy'
{
EndUserQuarantinePermissionsValue = 87;
ESNEnabled = $False;
Identity = "$OrganizationName\DefaultFullAccessPolicy";
Ensure = "Present"
Credential = $credsGlobalAdmin
}
}
}
```

Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@

### Description

This resource configures the settings of Windows 10 compliance policies
This resource configures the settings of Android WorkProfile Device policies
in your cloud-based organization.

## Permissions Needed
Expand Down
2 changes: 2 additions & 0 deletions docs/docs/stylesheets/extra.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@media screen and (min-width: 76.25em) {
.md-sidebar {
min-width: 450px;
}
}

0 comments on commit 7bc0cab

Please sign in to comment.