Merge pull request #5817 from microsoft/Dev

Release 1.25.219.1

CHANGELOG.md

@@ -64,8 +64,6 @@
   * FIXES [#5792](https://github.com/microsoft/Microsoft365DSC/issues/5792) issue where complete DSC isn't exported after generated
   * FIXES [#5793](https://github.com/microsoft/Microsoft365DSC/issues/5793) issue where PrincipalType isn't correctly captured in AzureGov
 * DEPENDENCIES
-  * Updated ExchangeOnlineManagement to version 3.7.1
-  * Updated Microsoft.Graph modules to version 2.26.0
   * Updated ReverseDSC to version 2.0.0.27
 
 # 1.25.212.2

Modules/Microsoft365DSC/DSCResources/MSFT_PPTenantSettings/MSFT_PPTenantSettings.schema.mof

@@ -2,58 +2,60 @@
 class MSFT_PPTenantSettings : OMI_BaseResource
 {
     [Key, Description("Should be set to yes"),ValueMap{"Yes"},Values{"Yes"}] string IsSingleInstance;
-    [Write, Description("TBD")] Boolean DisableCopilotFeedback;
+    [Write, Description("When using Copilot in Power Apps, allow users to submit feedback to Microsoft. Default value is false.")] Boolean DisableCopilotFeedback;
     [Write, Description("TBD")] Boolean DisableMakerMatch;
     [Write, Description("TBD")] Boolean DisableUnusedLicenseAssignment;
-    [Write, Description("TBD")] Boolean DisableCreateFromImage;
-    [Write, Description("TBD")] Boolean DisableConnectionSharingWithEveryone;
+    [Write, Description("Allow people to use AI to generate an app based on an image. Default value is false.")] Boolean DisableCreateFromImage;
+    [Write, Description("Gets or sets a value indicating whether non-admin users in the tenant can share connections with everyone. Default value is false.")] Boolean DisableConnectionSharingWithEveryone;
     [Write, Description("TBD")] Boolean AllowNewOrgChannelDefault;
-    [Write, Description("TBD")] Boolean DisableCopilot;
-    [Write, Description("TBD")] Boolean DisableCopilotWithBing;
-    [Write, Description("TBD")] Boolean DisableAdminDigest;
-    [Write, Description("TBD")] Boolean DisablePreferredDataLocationForTeamsEnvironment;
-    [Write, Description("TBD")] Boolean DisableDeveloperEnvironmentCreationByNonAdminUsers;
+    [Write, Description("Disables cloud flows copilot in Power Automate.
+
+It doesn't control the ability to add AI-related connectors or actions in the flow designer. For example, the Skills connector or AI Builder creates text with a GPT action. Default value is false.")] Boolean DisableCopilot;
+    [Write, Description("Disables the copilot-enhanced help feature within Power Automate to enhance answers on product documentation through Bing Search. Default value is false.")] Boolean DisableCopilotWithBing;
+    [Write, Description("Disables the weekly admin digest email for Managed Environments. Default value is false.")] Boolean DisableAdminDigest;
+    [Write, Description("Ignore the Teams group-preferred data location when provisioning a Teams environment. Default value is false.")] Boolean DisablePreferredDataLocationForTeamsEnvironment;
+    [Write, Description("Restrict all developer environments to be created by tenant admins, Power Platform admins, or Dynamics 365 service admins. Default is false.")] Boolean DisableDeveloperEnvironmentCreationByNonAdminUsers;
     [Write, Description("TBD")] Boolean EnvironmentRoutingAllMakers;
-    [Write, Description("TBD")] Boolean EnableDefaultEnvironmentRouting;
-    [Write, Description("TBD")] String EnableDesktopFlowDataPolicyManagement;
-    [Write, Description("TBD")] Boolean EnableCanvasAppInsights;
-    [Write, Description("TBD")] Boolean DisableCreateFromFigma;
+    [Write, Description("Enables the Default Environment routing feature that creates personal, developer environments for new makers. Default value is false.")] Boolean EnableDefaultEnvironmentRouting;
+    [Write, Description("When this setting is true, admins can view and manage desktop flow action groups in DLP policies in the Power Platform admin center. Default value is false.")] String EnableDesktopFlowDataPolicyManagement;
+    [Write, Description("Allow users to collect telemetry data about their app in Azure Application Insights. Setting this to False blocks the transmission of this data.")] Boolean EnableCanvasAppInsights;
+    [Write, Description("Allow people to create a canvas app based on a Figma file. Default value is false.")] Boolean DisableCreateFromFigma;
 
-    [Write, Description("TBD")] Boolean DisableBillingPolicyCreationByNonAdminUsers;
-    [Write, Description("TBD")] UInt32 StorageCapacityConsumptionWarningThreshold;
-    [Write, Description("TBD")] Boolean EnableTenantCapacityReportForEnvironmentAdmins;
-    [Write, Description("TBD")] Boolean EnableTenantLicensingReportForEnvironmentAdmins;
-    [Write, Description("TBD")] Boolean DisableUseOfUnassignedAIBuilderCredits;
+    [Write, Description("This is a legacy setting that is no longer used by the platform. Default value is false.")] Boolean DisableBillingPolicyCreationByNonAdminUsers;
+    [Write, Description("This setting isn't currently used by the platform but might be used in the future.")] UInt32 StorageCapacityConsumptionWarningThreshold;
+    [Write, Description("Ability to allow tenant, Power Platform, or Dynamics 365 admins to grant permissions to an environment administrator to view the Capacity summary tab. Default value is false.")] Boolean EnableTenantCapacityReportForEnvironmentAdmins;
+    [Write, Description("Ability to allow tenant, Power Platform, or Dynamics 365 admins to grant permissions to an environment administrator to view the tenant-scoped license reports. Default value is false.")] Boolean EnableTenantLicensingReportForEnvironmentAdmins;
+    [Write, Description("Ability to use unallocated AI Builder credits in environments without allocated credits. Default value is true.")] Boolean DisableUseOfUnassignedAIBuilderCredits;
     [Write, Description("TBD")] String EnableGenerativeAIFeaturesForSiteUsers;
     [Write, Description("TBD")] String EnableExternalAuthenticationProvidersInPowerPages;
-    [Write, Description("TBD")] Boolean DisableChampionsInvitationReachout;
-    [Write, Description("TBD")] Boolean DisableSkillsMatchInvitationReachout;
-    [Write, Description("TBD")] Boolean EnableOpenAiBotPublishing;
+    [Write, Description("This setting isn't currently used by the platform but might be used in the future.")] Boolean DisableChampionsInvitationReachout;
+    [Write, Description("This setting isn't currently used by the platform but might be used in the future.")] Boolean DisableSkillsMatchInvitationReachout;
+    [Write, Description("This setting isn't currently used by the platform but might be used in the future.")] Boolean EnableOpenAiBotPublishing;
     [Write, Description("TBD")] Boolean DisableAiPrompts;
-    [Write, Description("TBD")] Boolean DisableCopilotFeedbackMetadata;
+    [Write, Description("When using Copilot in Power Apps, allow users to share their prompts, questions, and requests with Microsoft. Default value is true.")] Boolean DisableCopilotFeedbackMetadata;
 
-    [Write, Description("TBD")] Boolean EnableModelDataSharing;
-    [Write, Description("TBD")] Boolean DisableDataLogging;
-    [Write, Description("TBD")] String PowerCatalogAudienceSetting;
+    [Write, Description("Ability to allow Microsoft to read Power Automate Copilot AI feature customer data (inputs and outputs) and provide improved models. Default value is false.")] Boolean EnableModelDataSharing;
+    [Write, Description("Ability to disable data logging and remove all data logged for Power Automate Copilot AI feature customer data (inputs and outputs). Default value is false.")] Boolean DisableDataLogging;
+    [Write, Description("This setting is reserved for future use. No enforcement is driven by this setting at the current time.")] String PowerCatalogAudienceSetting;
     [Write, Description("TBD")] Boolean EnableDeleteDisabledUserinAllEnvironments;
     [Write, Description("TBD")] Boolean DisableHelpSupportCopilot;
     [Write, Description("TBD")] Boolean DisableSurveyScreenshots;
-    [Write, Description("When set to true this will disable the Walk Me guidance.")] boolean WalkMeOptOut;
+    [Write, Description("This is a legacy setting that is no longer used by the platform. Default value is false.")] boolean WalkMeOptOut;
     [Write, Description("TBD")] boolean useSupportBingSearchByAllUsers;
-    [Write, Description("When set to true this will disable the NPS Comments Reachout.")] boolean DisableNPSCommentsReachout;
-    [Write, Description("When set to true this will disable the monthly newsletters.")] boolean DisableNewsletterSendout;
-    [Write, Description("When set to true this will disable production environment creation by non-admin users.")] boolean DisableEnvironmentCreationByNonAdminUsers;
-    [Write, Description("When set to true this will disable portal creation by non-admin users.")] boolean DisablePortalsCreationByNonAdminUsers;
-    [Write, Description("When set to true this will disable survey feedback that sometimes pops up on top of an app.")] boolean DisableSurveyFeedback;
-    [Write, Description("When set to true this will disable trial environment creation by non-admin users.")] boolean DisableTrialEnvironmentCreationByNonAdminUsers;
-    [Write, Description("When set to true this will disable capacity allocation by environment admins.")] boolean DisableCapacityAllocationByEnvironmentAdmins;
-    [Write, Description("When set to true this will disable support tickets to be visible by all users.")] boolean DisableSupportTicketsVisibleByAllUsers;
-    [Write, Description("When set to true this will disable docs search in the Office 365 Suite navigation bar.")] boolean DisableDocsSearch;
-    [Write, Description("When set to true this will disable community search in the Office 365 Suite navigation bar.")] boolean DisableCommunitySearch;
-    [Write, Description("When set to true this will disable Bing video search in the Office 365 Suite navigation bar.")] boolean DisableBingVideoSearch;
-    [Write, Description("When set to true this will disable the ability to share apps with the whole tenant.")] boolean DisableShareWithEveryone;
+    [Write, Description("Ability to disable re-surveying users who left prior feedback via NPS prompts in Power Platform. Default value is false.")] boolean DisableNPSCommentsReachout;
+    [Write, Description("Ability to disable the newsletter sendout feature. Default value is false.")] boolean DisableNewsletterSendout;
+    [Write, Description("Restrict all environments to be created by tenant admins, Power Platform admins, or Dynamics 365 service admins. Default value is false.")] boolean DisableEnvironmentCreationByNonAdminUsers;
+    [Write, Description("Restrict all portals to be created by tenant admins, Power Platform admins, or Dynamics 365 service admins. Default value is false.")] boolean DisablePortalsCreationByNonAdminUsers;
+    [Write, Description("Ability to disable all NPS survey feedback prompts in Power Platform. Default value is false.")] boolean DisableSurveyFeedback;
+    [Write, Description("Restrict all trial environments to be created by tenant admins, Power Platform admins, or Dynamics 365 service admins. Default value is false.")] boolean DisableTrialEnvironmentCreationByNonAdminUsers;
+    [Write, Description("Ability to disable capacity allocation by environment administrators. Default value is false.")] boolean DisableCapacityAllocationByEnvironmentAdmins;
+    [Write, Description("Allows users, who already have access to the Help + Support page in Power Platform admin center, to see support requests created by other users in the tenant. Default value is True, which means this feature is turned off by default.")] boolean DisableSupportTicketsVisibleByAllUsers;
+    [Write, Description("When this setting is true, users in the environment can see a message that indicates Microsoft Learn and documentation search categories have been turned off by the administrator. Default value is false.")] boolean DisableDocsSearch;
+    [Write, Description("When this setting is true, users in the environment can see a message that indicates community and blog search categories have been turned off by the administrator. Default value is false.")] boolean DisableCommunitySearch;
+    [Write, Description("When this setting is true, users in the environment can see a message that indicates video search categories have been turned off by the administrator. Default value is false.")] boolean DisableBingVideoSearch;
+    [Write, Description("	Ability to turn off the Share with Everyone capability for nonadmin users in all Power Apps. Default value is true.")] boolean DisableShareWithEveryone;
     [Write, Description("When set to true this will enable the ability for guests in your tenant to create Power Platform resources.")] boolean EnableGuestsToMake;
-    [Write, Description("The amount of people an app can be shared with in Dataverse for Teams (maximum is 10,000).")] uint32 ShareWithColleaguesUserLimit;
+    [Write, Description("Maximum value setting for the number of users in a security group used to share an app built using Power Apps on Microsoft Teams. Default value is 10000 but can be increased or decreased, as required.")] uint32 ShareWithColleaguesUserLimit;
     [Write, Description("Credentials of the Power Platform 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;

Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1

@@ -1703,6 +1703,8 @@ function Export-TargetResource
                 -Credential $Credential `
                 -NoEscape @('AdvancedSettings', 'LocaleSettings', 'AutoLabelingSettings')
 
+            $currentDSCBlock = $currentDSCBlock.Replace("''", "'")
+
             Write-Host $Global:M365DSCEmojiGreenCheckMark
             $dscContent += $currentDSCBlock
             Save-M365DSCPartialExport -Content $currentDSCBlock `

Modules/Microsoft365DSC/Dependencies/Manifest.psd1

@@ -22,95 +22,95 @@
         },
         @{
             ModuleName      = 'ExchangeOnlineManagement'
-            RequiredVersion = '3.7.1'
+            RequiredVersion = '3.4.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Applications'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Applications'
-            Requiredversion = '2.26.0'
+            Requiredversion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Authentication'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Devices.CorporateManagement'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement.Administration'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DeviceManagement.Enrollment'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.NetworkAccess'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.DirectoryManagement'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.Governance'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Identity.SignIns'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Reports'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Search'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Teams'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.DeviceManagement.Administration'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.DirectoryObjects'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Groups'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Beta.Groups'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Planner'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Sites'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'Microsoft.Graph.Users.Actions'
-            RequiredVersion = '2.26.0'
+            RequiredVersion = '2.25.0'
         },
         @{
             ModuleName      = 'MicrosoftTeams'

Modules/Microsoft365DSC/Microsoft365DSC.psd1

@@ -11,7 +11,7 @@
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.25.219.1'
+  ModuleVersion     = '1.25.219.2'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -200,8 +200,6 @@
   * Remove `Ensure` property from being exported.
     FIXES [#5781](https://github.com/microsoft/Microsoft365DSC/issues/5781)
 * DEPENDENCIES
-  * Updated ExchangeOnlineManagement to version 3.7.1
-  * Updated Microsoft.Graph modules to version 2.26.0
   * Updated ReverseDSC to version 2.0.0.27'
 
       # Flag to indicate whether the module requires explicit user acceptance for install/update