Merge pull request #1392 from microsoft/Dev

Release 1.21.825.1

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change log for Microsoft365DSC
 
+# 1.21.825.1
+
+* SPOTenantSettings
+  * Added the DisabledWebpartIds & ConditionalAccessPolicy properties;
+* DEPENDENCIES;
+  * Updated AzureADPreview to version 2.0.2.138;
+  * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.131;
+  * Updated Microsoft.Teams to version 2.5.0;
+* MISC
+  * Additional display alignment fixes for Export;
+
 # 1.21.804.1
 
 * SCDLPComplianceRule

Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1

@@ -470,7 +470,7 @@ function Export-TargetResource
             else
             {
                 Write-Host "`r`n" -NoNewline
-            }g
+            }
             $i = 1
             foreach ($SafeLinksPolicy in $SafeLinksPolicies)
             {

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppConfigurationPolicy/MSFT_IntuneAppConfigurationPolicy.psm1

@@ -319,7 +319,15 @@ function Export-TargetResource
     }
     catch
     {
-        Write-Host $Global:M365DSCEmojiRedX
+        if ($_.Exception -like '*401*')
+        {
+            Write-Host "`r`n    $($Global:M365DSCEmojiYellowCircle) The current tenant is not registered for Intune."
+        }
+        else
+        {
+            Write-Host $Global:M365DSCEmojiRedX
+        }
+
         try
         {
             Write-Verbose -Message $_

Modules/Microsoft365DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1

@@ -673,11 +673,14 @@ function Export-TargetResource
     }
     catch
     {
-        Write-Host $Global:M365DSCEmojiRedX
         if ($_.Exception -like '*401*')
         {
             Write-Host "`r`n    $($Global:M365DSCEmojiYellowCircle) The current tenant is not registered for Intune."
         }
+        else
+        {
+            Write-Host $Global:M365DSCEmojiRedX
+        }
         try
         {
             Write-Verbose -Message $_

Modules/Microsoft365DSC/DSCResources/MSFT_SPOOrgAssetsLibrary/MSFT_SPOOrgAssetsLibrary.psm1

@@ -450,7 +450,7 @@ function Export-TargetResource
         $i = 1
         $dscContent = ''
 
-        if ($orgAssets.Length -gt 0)
+        if ($orgAssets.Length -eq 0)
         {
             Write-Host $Global:M365DSCEmojiGreenCheckMark
         }
@@ -462,7 +462,7 @@ function Export-TargetResource
         {
             foreach ($orgAssetLib in $orgAssets.OrgAssetsLibraries)
             {
-                Write-Host "    [$i/$($orgAssets.Length)] $LibraryUrl" -NoNewline
+                Write-Host "    [$i/$($orgAssets.Length)] $($orgAssetLib.libraryurl.DecodedUrl)" -NoNewline
                 $Params = @{
                     GlobalAdminAccount    = $GlobalAdminAccount
                     LibraryUrl            = "https://$tenantName.sharepoint.com/$($orgAssetLib.libraryurl.DecodedUrl)"

Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteScript/MSFT_SPOSiteScript.psm1

@@ -457,7 +457,7 @@ function Export-TargetResource
         }
         foreach ($script in $siteScripts)
         {
-            Write-Host "    [$i/$($siteScripts.Length)] $($script.Title)"
+            Write-Host "    [$i/$($siteScripts.Length)] $($script.Title)" -NoNewline
             $params = @{
                 Identity              = $script.Id
                 Title                 = $script.Title

Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1

@@ -83,6 +83,15 @@ function Get-TargetResource
         [System.String]
         $MarkNewFilesSensitiveByDefault,
 
+        [Parameter()]
+        [ValidateSet("AllowFullAccess", "AllowLimitedAccess", "BlockAccess")]
+        [System.String]
+        $ConditionalAccessPolicy,
+
+        [Parameter()]
+        [System.Guid[]]
+        $DisabledWebPartIds,
+
         [Parameter()]
         [ValidateSet("Present", "Absent")]
         [System.String]
@@ -170,6 +179,8 @@ function Get-TargetResource
             FilePickerExternalImageSearchEnabled          = $SPOTenantSettings.FilePickerExternalImageSearchEnabled
             HideDefaultThemes                             = $SPOTenantSettings.HideDefaultThemes
             MarkNewFilesSensitiveByDefault                = $SPOTenantSettings.MarkNewFilesSensitiveByDefault
+            ConditionalAccessPolicy                       = $SPOTenantSettings.ConditionalAccessPolicy
+            DisabledWebPartIds                            = $SPOTenantSettings.DisabledWebPartIds
             GlobalAdminAccount                            = $GlobalAdminAccount
             ApplicationId                                 = $ApplicationId
             TenantId                                      = $TenantId
@@ -293,6 +304,15 @@ function Set-TargetResource
         [System.String]
         $MarkNewFilesSensitiveByDefault,
 
+        [Parameter()]
+        [ValidateSet("AllowFullAccess","AllowLimitedAccess", "BlockAccess")]
+        [System.String]
+        $ConditionalAccessPolicy,
+
+        [Parameter()]
+        [System.Guid[]]
+        $DisabledWebPartIds,
+
         [Parameter()]
         [ValidateSet("Present", "Absent")]
         [System.String]
@@ -448,6 +468,15 @@ function Test-TargetResource
         [System.String]
         $MarkNewFilesSensitiveByDefault,
 
+        [Parameter()]
+        [ValidateSet("AllowFullAccess", "AllowLimitedAccess", "BlockAccess")]
+        [System.String]
+        $ConditionalAccessPolicy,
+
+        [Parameter()]
+        [System.Guid[]]
+        $DisabledWebPartIds,
+
         [Parameter()]
         [ValidateSet("Present", "Absent")]
         [System.String]
@@ -522,7 +551,9 @@ function Test-TargetResource
             "ApplyAppEnforcedRestrictionsToAdHocRecipients", `
             "FilePickerExternalImageSearchEnabled", `
             "HideDefaultThemes", `
-            "MarkNewFilesSensitiveByDefault"
+            "MarkNewFilesSensitiveByDefault", `
+            "ConditionalAccessPolicy", `
+            "DisabledWebPartIds"
             )
 
     Write-Verbose -Message "Test-TargetResource returned $TestResult"

Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof

@@ -20,6 +20,8 @@ class MSFT_SPOTenantSettings : OMI_BaseResource
     [Write, Description("")] boolean FilePickerExternalImageSearchEnabled;
     [Write, Description("Defines if the default themes are visible or hidden")] boolean HideDefaultThemes;
     [Write, Description("Allow or block external sharing until at least one Office DLP policy scans the content of the file."), ValueMap{"AllowExternalSharing","BlockExternalSharing"}, Values{"AllowExternalSharing","BlockExternalSharing"}] string MarkNewFilesSensitiveByDefault;
+    [Write, Description("Allow or Block Conditional Access Policy on the SharePoint Tenant"), ValueMap{"AllowFullAccess", "AllowLimitedAccess", "BlockAccess"}, Values{"AllowFullAccess", "AllowLimitedAccess", "BlockAccess"}] string ConditionalAccessPolicy;
+    [Write, Description("Provide GUID for the Web Parts that are to be disabled on the Sharepoint Site")] string DisabledWebPartIds;
     [Write, Description("Only accepted value is 'Present'."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] String Ensure;
     [Write, Description("Credentials of the SharePoint Global Admin"), EmbeddedInstance("MSFT_Credential")] string GlobalAdminAccount;
     [Write, Description("Id of the Azure Active Directory application to authenticate with.")] String ApplicationId;