From 158a175657e1974dae066d8c42d73142cfa43a2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 28 May 2025 19:08:07 +0200 Subject: [PATCH 01/24] chore: Update comments --- .../Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 | 4 +++- .../Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 | 2 +- .../Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 | 2 +- .../Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 | 4 ++-- .../Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 | 1 + .../Standards/Invoke-CIPPStandardPhishingSimulations.ps1 | 1 + .../Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 | 2 +- .../Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 | 4 ++-- 8 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 index 2adbd34d30fb6..5ce13b7a1b635 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 @@ -14,7 +14,9 @@ function Invoke-CIPPStandardAppDeploy { Entra (AAD) Standards TAG ADDEDCOMPONENT - {"type":"textField","name":"standards.AppDeploy.appids","label":"Application IDs, comma separated"} + {"type":"select","multiple":false,"creatable":false,"label":"App Approval Mode","name":"standards.AppDeploy.mode","options":[{"label":"Template","value":"template"},{"label":"Copy Permissions","value":"copy"}]} + {"type":"autoComplete","multiple":true,"creatable":false,"label":"Select Applications","name":"standards.AppDeploy.templateIds","api":{"url":"/api/ListAppApprovalTemplates","labelField":"TemplateName","valueField":"TemplateId","queryKey":"StdAppApprovalTemplateList","addedField":{"AppId":"AppId"}},"condition":{"field":"standards.AppDeploy.mode","compareType":"is","compareValue":"template"}} + {"type":"textField","name":"standards.AppDeploy.appids","label":"Application IDs, comma separated","condition":{"field":"standards.AppDeploy.mode","compareType":"isNot","compareValue":"template"}} IMPACT Low Impact ADDEDDATE diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 index 81dd57b818ee5..95933ef4a8630 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 @@ -7,7 +7,7 @@ function Invoke-CIPPStandardEXOOutboundSpamLimits { .SYNOPSIS (Label) Set Exchange Outbound Spam Limits .DESCRIPTION - (Helptext) Configures the outbound spam recipient limits (external per hour, internal per hour, per day) and the action to take when a limit is reached. The 'Set Outbound Spam Alert e-mail' standard is recommended to configure together with this one. + (Helptext) Configures the outbound spam recipient limits (external per hour, internal per hour, per day) and the action to take when a limit is reached. The 'Set Outbound Spam Alert e-mail' standard is recommended to configure together with this one. (DocsDescription) Configures the Exchange Online outbound spam recipient limits for external per hour, internal per hour, and per day, along with the action to take (e.g., BlockUser, Alert) when these limits are exceeded. This helps prevent abuse and manage email flow. Microsoft's recommendations can be found [here.](https://learn.microsoft.com/en-us/defender-office-365/recommended-settings-for-eop-and-office365#eop-outbound-spam-policy-settings) The 'Set Outbound Spam Alert e-mail' standard is recommended to configure together with this one. .NOTES CAT diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 index 1b334a8a5f908..3dee4368cb32b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 @@ -21,7 +21,7 @@ function Invoke-CIPPStandardGroupTemplate { ADDEDDATE 2023-12-30 ADDEDCOMPONENT - {"type":"autoComplete","name":"groupTemplate","label":"Select Group Template","api":{"url":"/api/ListGroupTemplates","labelField":"Displayname","valueField":"GUID","queryKey":"ListGroupTemplates"}} + {"type":"autoComplete","name":"groupTemplate","label":"Select Group Template","api":{"url":"/api/ListGroupTemplates","labelField":"Displayname","altLabelField":"displayName","valueField":"GUID","queryKey":"ListGroupTemplates"}} UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 index fe8b8bf7e5b92..be1c7a1f938ec 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 @@ -22,9 +22,9 @@ function Invoke-CIPPStandardMalwareFilterPolicy { {"type":"textField","name":"standards.MalwareFilterPolicy.OptionalFileTypes","required":false,"label":"Optional File Types, Comma separated"} {"type":"select","multiple":false,"creatable":true,"label":"QuarantineTag","name":"standards.MalwareFilterPolicy.QuarantineTag","options":[{"label":"AdminOnlyAccessPolicy","value":"AdminOnlyAccessPolicy"},{"label":"DefaultFullAccessPolicy","value":"DefaultFullAccessPolicy"},{"label":"DefaultFullAccessWithNotificationPolicy","value":"DefaultFullAccessWithNotificationPolicy"}]} {"type":"switch","label":"Enable Internal Sender Admin Notifications","required":false,"name":"standards.MalwareFilterPolicy.EnableInternalSenderAdminNotifications"} - {"type":"textField","name":"standards.MalwareFilterPolicy.InternalSenderAdminAddress","required":false,"label":"Internal Sender Admin Address"} + {"type":"textField","name":"standards.MalwareFilterPolicy.InternalSenderAdminAddress","required":false,"label":"Internal Sender Admin Address","condition":{"field":"standards.MalwareFilterPolicy.EnableInternalSenderAdminNotifications","compareType":"is","compareValue":true}} {"type":"switch","label":"Enable External Sender Admin Notifications","required":false,"name":"standards.MalwareFilterPolicy.EnableExternalSenderAdminNotifications"} - {"type":"textField","name":"standards.MalwareFilterPolicy.ExternalSenderAdminAddress","required":false,"label":"External Sender Admin Address"} + {"type":"textField","name":"standards.MalwareFilterPolicy.ExternalSenderAdminAddress","required":false,"label":"External Sender Admin Address","condition":{"field":"standards.MalwareFilterPolicy.EnableExternalSenderAdminNotifications","compareType":"is","compareValue":true}} IMPACT Low Impact ADDEDDATE diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 index bf14d2d3496c1..f5b8ca797452a 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 @@ -14,6 +14,7 @@ function Invoke-CIPPStandardPhishSimSpoofIntelligence { Defender Standards TAG ADDEDCOMPONENT + {"type":"switch","label":"Remove extra domains from the allow list","name":"standards.PhishSimSpoofIntelligence.RemoveExtraDomains","defaultValue":false,"required":false} {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"label":"Allowed Domains","name":"standards.PhishSimSpoofIntelligence.AllowedDomains"} IMPACT Medium Impact diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 index 73b822ee21925..f463de8bb1f7a 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 @@ -17,6 +17,7 @@ function Invoke-CIPPStandardPhishingSimulations { {"type":"autoComplete","multiple":true,"creatable":true,"required":true,"label":"Phishing Simulation Domains","name":"standards.PhishingSimulations.Domains"} {"type":"autoComplete","multiple":true,"creatable":true,"required":true,"label":"Phishing Simulation Sender IP Ranges","name":"standards.PhishingSimulations.SenderIpRanges"} {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"label":"Phishing Simulation Urls","name":"standards.PhishingSimulations.PhishingSimUrls"} + {"type":"switch","label":"Remove extra urls","name":"standards.PhishingSimulations.RemoveExtraUrls","defaultValue":false,"required":false} IMPACT Medium Impact ADDEDDATE diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 index f6d3c895de4ec..8bb738474fe02 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 @@ -21,7 +21,7 @@ function Invoke-CIPPStandardSafeAttachmentPolicy { {"type":"select","multiple":false,"label":"Safe Attachment Action","name":"standards.SafeAttachmentPolicy.SafeAttachmentAction","options":[{"label":"Allow","value":"Allow"},{"label":"Block","value":"Block"},{"label":"DynamicDelivery","value":"DynamicDelivery"}]} {"type":"select","multiple":false,"creatable":true,"label":"QuarantineTag","name":"standards.SafeAttachmentPolicy.QuarantineTag","options":[{"label":"AdminOnlyAccessPolicy","value":"AdminOnlyAccessPolicy"},{"label":"DefaultFullAccessPolicy","value":"DefaultFullAccessPolicy"},{"label":"DefaultFullAccessWithNotificationPolicy","value":"DefaultFullAccessWithNotificationPolicy"}]} {"type":"switch","label":"Redirect","name":"standards.SafeAttachmentPolicy.Redirect"} - {"type":"textField","name":"standards.SafeAttachmentPolicy.RedirectAddress","label":"Redirect Address","required":false} + {"type":"textField","name":"standards.SafeAttachmentPolicy.RedirectAddress","label":"Redirect Address","required":false,"condition":{"field":"standards.SafeAttachmentPolicy.Redirect","compareType":"is","compareValue":true}} IMPACT Low Impact ADDEDDATE diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 index e20f3d2d24697..44ab3736c126d 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 @@ -33,9 +33,9 @@ function Invoke-CIPPStandardSpamFilterPolicy { {"type":"switch","name":"standards.SpamFilterPolicy.MarkAsSpamWebBugsInHtml","label":"Mark as spam if message contains web bugs (also known as web beacons)","defaultValue":false} {"type":"switch","name":"standards.SpamFilterPolicy.MarkAsSpamSensitiveWordList","label":"Mark as spam if message contains words from the sensitive words list","defaultValue":false} {"type":"switch","name":"standards.SpamFilterPolicy.EnableLanguageBlockList","label":"Enable language block list","defaultValue":false} - {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"name":"standards.SpamFilterPolicy.LanguageBlockList","label":"Languages to block (uppercase ISO 639-1 two-letter)"} + {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"name":"standards.SpamFilterPolicy.LanguageBlockList","label":"Languages to block (uppercase ISO 639-1 two-letter)","condition":{"field":"standards.SpamFilterPolicy.EnableLanguageBlockList","compareType":"is","compareValue":true}} {"type":"switch","name":"standards.SpamFilterPolicy.EnableRegionBlockList","label":"Enable region block list","defaultValue":false} - {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"name":"standards.SpamFilterPolicy.RegionBlockList","label":"Regions to block (uppercase ISO 3166-1 two-letter)"} + {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"name":"standards.SpamFilterPolicy.RegionBlockList","label":"Regions to block (uppercase ISO 3166-1 two-letter)","condition":{"field":"standards.SpamFilterPolicy.EnableRegionBlockList","compareType":"is","compareValue":true}} {"type":"autoComplete","multiple":true,"creatable":true,"required":false,"name":"standards.SpamFilterPolicy.AllowedSenderDomains","label":"Allowed sender domains"} IMPACT Medium Impact From 323e64dba7f2efe4a3688d1dd68b69702540d41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 28 May 2025 19:10:42 +0200 Subject: [PATCH 02/24] feat: Add Invoke-CIPPStandardEXODirectSend function to manage Direct Send state --- .../Invoke-CIPPStandardEXODirectSend.ps1 | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 new file mode 100644 index 0000000000000..81dac6aed1bd0 --- /dev/null +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 @@ -0,0 +1,90 @@ +function Invoke-CIPPStandardEXODirectSend { + <# + .FUNCTIONALITY + Internal + .COMPONENT + (APIName) EXODirectSend + .SYNOPSIS + (Label) Set Direct Send state + .DESCRIPTION + (Helptext) Sets the state of Direct Send in Exchange Online. Direct Send allows applications to send emails directly to Exchange Online mailboxes as the tenants domains, without requiring authentication. + (DocsDescription) Controls whether applications can use Direct Send to send emails directly to Exchange Online mailboxes as the tenants domains, without requiring authentication. A detailed explanation from Microsoft can be found [here.](https://learn.microsoft.com/en-us/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-microsoft-365-or-office-365) + .NOTES + CAT + Exchange Standards + TAG + ADDEDCOMPONENT + {"type":"autoComplete","multiple":false,"creatable":false,"label":"Select value","name":"standards.EXODirectSend.state","options":[{"label":"Enabled","value":"enabled"},{"label":"Disabled","value":"disabled"}]} + IMPACT + Medium Impact + ADDEDDATE + 2025-05-28 + POWERSHELLEQUIVALENT + Set-OrganizationConfig -RejectDirectSend \$true/\$false + RECOMMENDEDBY + UPDATECOMMENTBLOCK + Run the Tools\Update-StandardsComments.ps1 script to update this comment block + .LINK + https://docs.cipp.app/user-documentation/tenant/standards/list-standards + #> + + param ($Tenant, $Settings) + + + # Get current organization config + try { + $CurrentConfig = (New-ExoRequest -TenantID $Tenant -cmdlet 'Get-OrganizationConfig' -Select 'RejectDirectSend').RejectDirectSend + } catch { + $ErrorMessage = Get-CippException -Exception $_ + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to retrieve current Direct Send configuration: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage + return + } + + # Determine desired state. These double negative MS loves are a bit confusing + $DesiredStateName = $Settings.state.value ?? $Settings.state + $DesiredState = $DesiredStateName -eq 'disabled' ? $true : $false + $StateIsCorrect = $CurrentConfig -eq $DesiredState + + # Input validation + if ([string]::IsNullOrWhiteSpace($DesiredStateName) -or $DesiredState -eq 'Select a value') { + Write-LogMessage -API 'Standards' -tenant $Tenant -message 'EXODirectSend: Invalid state parameter set' -sev Error + Return + } + + # Remediate if needed + if ($Settings.remediate -eq $true) { + + Write-Host 'Time to remediate' + if ($StateIsCorrect -eq $true) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Direct Send is already set to $DesiredStateName." -sev Info + } else { + try { + $null = New-ExoRequest -TenantID $Tenant -cmdlet 'Set-OrganizationConfig' -cmdParams @{ RejectDirectSend = $DesiredState } + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Direct Send has been set to $DesiredStateName." -sev Info + $CurrentState = $DesiredState + } catch { + $ErrorMessage = Get-CippException -Exception $_ + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Failed to set Direct Send state: $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage + } + } + } + + # Alert if needed + if ($Settings.alert -eq $true) { + + if ($StateIsCorrect -eq $true) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Direct Send is set to $DesiredStateName as required." -sev Info + } else { + $CurrentStateName = $CurrentState ? 'disabled' : 'enabled' + Write-StandardsAlert -message "Direct Send is $CurrentStateName but should be $DesiredStateName" -object $CurrentConfig -tenant $Tenant -standardName 'EXODirectSend' -standardId $Settings.standardId + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Direct Send is $CurrentStateName but should be $DesiredStateName." -sev Info + } + } + + # Report if needed + if ($Settings.report -eq $true) { + + Set-CIPPStandardsCompareField -FieldName 'standards.EXODirectSend' -FieldValue $StateIsCorrect -Tenant $Tenant + Add-CIPPBPAField -FieldName 'EXODirectSend' -FieldValue $StateIsCorrect -StoreAs bool -Tenant $Tenant + } +} From 1c82501ff973ac01c183bb33a700e6ce75f17e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 28 May 2025 19:11:22 +0200 Subject: [PATCH 03/24] chore: Simplify documentation link generation in Update-StandardsComments.ps1 Chore: Update docs link save a EXO call if input validation triggers, aka more BRRRR --- ...Invoke-CIPPStandardActivityBasedTimeout.ps1 | 2 +- .../Standards/Invoke-CIPPStandardAddDKIM.ps1 | 2 +- .../Invoke-CIPPStandardAnonReportDisable.ps1 | 2 +- .../Invoke-CIPPStandardAntiPhishPolicy.ps1 | 2 +- .../Invoke-CIPPStandardAntiSpamSafeList.ps1 | 2 +- .../Standards/Invoke-CIPPStandardAppDeploy.ps1 | 2 +- .../Invoke-CIPPStandardAtpPolicyForO365.ps1 | 2 +- .../Standards/Invoke-CIPPStandardAuditLog.ps1 | 2 +- .../Invoke-CIPPStandardAuthMethodsSettings.ps1 | 2 +- .../Invoke-CIPPStandardAutoAddProxy.ps1 | 2 +- .../Invoke-CIPPStandardAutoExpandArchive.ps1 | 2 +- .../Invoke-CIPPStandardAutopilotProfile.ps1 | 2 +- .../Invoke-CIPPStandardAutopilotStatusPage.ps1 | 2 +- .../Standards/Invoke-CIPPStandardBookings.ps1 | 2 +- .../Standards/Invoke-CIPPStandardBranding.ps1 | 2 +- .../Invoke-CIPPStandardCloudMessageRecall.ps1 | 2 +- ...e-CIPPStandardConditionalAccessTemplate.ps1 | 2 +- ...CIPPStandardDefaultPlatformRestrictions.ps1 | 2 +- .../Invoke-CIPPStandardDelegateSentItems.ps1 | 2 +- ...nvoke-CIPPStandardDeletedUserRentention.ps1 | 2 +- ...PPStandardDisableAddShortcutsToOneDrive.ps1 | 2 +- ...andardDisableAdditionalStorageProviders.ps1 | 2 +- .../Invoke-CIPPStandardDisableAppCreation.ps1 | 2 +- ...Invoke-CIPPStandardDisableBasicAuthSMTP.ps1 | 2 +- .../Invoke-CIPPStandardDisableEmail.ps1 | 2 +- ...PStandardDisableExternalCalendarSharing.ps1 | 2 +- ...nvoke-CIPPStandardDisableGuestDirectory.ps1 | 2 +- .../Invoke-CIPPStandardDisableGuests.ps1 | 2 +- ...nvoke-CIPPStandardDisableM365GroupUsers.ps1 | 2 +- ...Invoke-CIPPStandardDisableOutlookAddins.ps1 | 2 +- .../Invoke-CIPPStandardDisableQRCodePin.ps1 | 2 +- .../Invoke-CIPPStandardDisableReshare.ps1 | 2 +- .../Invoke-CIPPStandardDisableSMS.ps1 | 2 +- ...e-CIPPStandardDisableSecurityGroupUsers.ps1 | 2 +- ...-CIPPStandardDisableSelfServiceLicenses.ps1 | 2 +- ...CIPPStandardDisableSharePointLegacyAuth.ps1 | 2 +- ...Invoke-CIPPStandardDisableSharedMailbox.ps1 | 2 +- .../Invoke-CIPPStandardDisableTNEF.ps1 | 2 +- ...nvoke-CIPPStandardDisableTenantCreation.ps1 | 2 +- ...nvoke-CIPPStandardDisableUserSiteCreate.ps1 | 2 +- .../Invoke-CIPPStandardDisableViva.ps1 | 2 +- .../Invoke-CIPPStandardDisableVoice.ps1 | 2 +- ...voke-CIPPStandardDisablex509Certificate.ps1 | 2 +- .../Invoke-CIPPStandardEXODirectSend.ps1 | 16 ++++++++-------- ...ke-CIPPStandardEXODisableAutoForwarding.ps1 | 2 +- ...nvoke-CIPPStandardEXOOutboundSpamLimits.ps1 | 2 +- ...ke-CIPPStandardEnableAppConsentRequests.ps1 | 2 +- ...nvoke-CIPPStandardEnableCustomerLockbox.ps1 | 2 +- .../Invoke-CIPPStandardEnableFIDO2.ps1 | 2 +- .../Invoke-CIPPStandardEnableHardwareOAuth.ps1 | 2 +- ...Invoke-CIPPStandardEnableLitigationHold.ps1 | 2 +- .../Invoke-CIPPStandardEnableMailTips.ps1 | 2 +- ...nvoke-CIPPStandardEnableMailboxAuditing.ps1 | 2 +- ...nvoke-CIPPStandardEnableOnlineArchiving.ps1 | 2 +- .../Invoke-CIPPStandardEnablePronouns.ps1 | 2 +- .../Invoke-CIPPStandardExcludedfileExt.ps1 | 2 +- .../Invoke-CIPPStandardExternalMFATrusted.ps1 | 2 +- .../Invoke-CIPPStandardFocusedInbox.ps1 | 2 +- ...PPStandardGlobalQuarantineNotifications.ps1 | 2 +- .../Invoke-CIPPStandardGroupTemplate.ps1 | 2 +- .../Invoke-CIPPStandardGuestInvite.ps1 | 2 +- ...ke-CIPPStandardIntuneComplianceSettings.ps1 | 2 +- .../Invoke-CIPPStandardIntuneTemplate.ps1 | 2 +- .../Invoke-CIPPStandardLegacyMFACleanup.ps1 | 2 +- .../Standards/Invoke-CIPPStandardMDMScope.ps1 | 2 +- .../Invoke-CIPPStandardMailContacts.ps1 | 2 +- .../Invoke-CIPPStandardMalwareFilterPolicy.ps1 | 2 +- .../Invoke-CIPPStandardMessageExpiration.ps1 | 2 +- .../Standards/Invoke-CIPPStandardNudgeMFA.ps1 | 2 +- .../Invoke-CIPPStandardOauthConsent.ps1 | 2 +- .../Invoke-CIPPStandardOauthConsentLowSec.ps1 | 2 +- .../Invoke-CIPPStandardOutBoundSpamAlert.ps1 | 2 +- ...-CIPPStandardPWcompanionAppAllowedState.ps1 | 2 +- ...ardPWdisplayAppInformationRequiredState.ps1 | 2 +- ...voke-CIPPStandardPasswordExpireDisabled.ps1 | 2 +- .../Invoke-CIPPStandardPerUserMFA.ps1 | 2 +- .../Invoke-CIPPStandardPhishProtection.ps1 | 2 +- ...e-CIPPStandardPhishSimSpoofIntelligence.ps1 | 2 +- .../Invoke-CIPPStandardPhishingSimulations.ps1 | 2 +- .../Invoke-CIPPStandardProfilePhotos.ps1 | 2 +- ...voke-CIPPStandardQuarantineRequestAlert.ps1 | 2 +- .../Invoke-CIPPStandardQuarantineTemplate.ps1 | 2 +- .../Invoke-CIPPStandardRetentionPolicyTag.ps1 | 2 +- .../Invoke-CIPPStandardRotateDKIM.ps1 | 2 +- .../Invoke-CIPPStandardSPAzureB2B.ps1 | 2 +- .../Invoke-CIPPStandardSPDirectSharing.ps1 | 2 +- ...ke-CIPPStandardSPDisableLegacyWorkflows.ps1 | 2 +- ...oke-CIPPStandardSPDisallowInfectedFiles.ps1 | 2 +- .../Invoke-CIPPStandardSPEmailAttestation.ps1 | 2 +- ...ke-CIPPStandardSPExternalUserExpiration.ps1 | 2 +- .../Invoke-CIPPStandardSPSyncButtonState.ps1 | 2 +- ...Invoke-CIPPStandardSafeAttachmentPolicy.ps1 | 2 +- .../Invoke-CIPPStandardSafeLinksPolicy.ps1 | 2 +- .../Invoke-CIPPStandardSafeSendersDisable.ps1 | 2 +- .../Invoke-CIPPStandardSecurityDefaults.ps1 | 2 +- .../Invoke-CIPPStandardSendFromAlias.ps1 | 2 +- ...voke-CIPPStandardSendReceiveLimitTenant.ps1 | 2 +- ...CIPPStandardSharePointMassDeletionAlert.ps1 | 2 +- .../Invoke-CIPPStandardShortenMeetings.ps1 | 2 +- .../Invoke-CIPPStandardSpamFilterPolicy.ps1 | 2 +- .../Standards/Invoke-CIPPStandardSpoofWarn.ps1 | 2 +- .../Invoke-CIPPStandardStaleEntraDevices.ps1 | 2 +- .../Standards/Invoke-CIPPStandardTAP.ps1 | 2 +- ...nvoke-CIPPStandardTeamsEmailIntegration.ps1 | 2 +- .../Invoke-CIPPStandardTeamsEnrollUser.ps1 | 2 +- ...e-CIPPStandardTeamsExternalAccessPolicy.ps1 | 2 +- ...ke-CIPPStandardTeamsExternalFileSharing.ps1 | 2 +- ...IPPStandardTeamsFederationConfiguration.ps1 | 2 +- ...ke-CIPPStandardTeamsGlobalMeetingPolicy.ps1 | 2 +- ...StandardTeamsMeetingRecordingExpiration.ps1 | 2 +- ...voke-CIPPStandardTeamsMeetingsByDefault.ps1 | 2 +- ...Invoke-CIPPStandardTeamsMessagingPolicy.ps1 | 2 +- ...nvoke-CIPPStandardTenantDefaultTimezone.ps1 | 2 +- ...nvoke-CIPPStandardTransportRuleTemplate.ps1 | 2 +- .../Standards/Invoke-CIPPStandardUndoOauth.ps1 | 2 +- ...nvoke-CIPPStandardUserPreferredLanguage.ps1 | 2 +- .../Invoke-CIPPStandardUserSubmissions.ps1 | 2 +- .../Invoke-CIPPStandardallowOAuthTokens.ps1 | 2 +- .../Invoke-CIPPStandardallowOTPTokens.ps1 | 2 +- .../Invoke-CIPPStandardcalDefault.ps1 | 2 +- .../Invoke-CIPPStandarddisableMacSync.ps1 | 2 +- ...nvoke-CIPPStandardintuneBrandingProfile.ps1 | 2 +- .../Invoke-CIPPStandardintuneDeviceReg.ps1 | 2 +- ...-CIPPStandardintuneDeviceRetirementDays.ps1 | 2 +- .../Invoke-CIPPStandardintuneRequireMFA.ps1 | 2 +- .../Standards/Invoke-CIPPStandardlaps.ps1 | 2 +- .../Invoke-CIPPStandardsharingCapability.ps1 | 2 +- ...ke-CIPPStandardsharingDomainRestriction.ps1 | 2 +- .../Invoke-CIPPStandardunmanagedSync.ps1 | 2 +- Tools/Update-StandardsComments.ps1 | 18 +----------------- 130 files changed, 137 insertions(+), 153 deletions(-) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardActivityBasedTimeout.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardActivityBasedTimeout.ps1 index 62c6169db6690..f9516efe5c202 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardActivityBasedTimeout.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardActivityBasedTimeout.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardActivityBasedTimeout { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAddDKIM.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAddDKIM.ps1 index bf26916464046..6a885ec4b92da 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAddDKIM.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAddDKIM.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardAddDKIM { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAnonReportDisable.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAnonReportDisable.ps1 index 496859c365a5b..5a0d65510fe51 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAnonReportDisable.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAnonReportDisable.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardAnonReportDisable { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiPhishPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiPhishPolicy.ps1 index 475fd682e14d3..b01f7b252593f 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiPhishPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiPhishPolicy.ps1 @@ -46,7 +46,7 @@ function Invoke-CIPPStandardAntiPhishPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiSpamSafeList.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiSpamSafeList.ps1 index c40cbf8f5d752..ccfb85dcff9db 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiSpamSafeList.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAntiSpamSafeList.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardAntiSpamSafeList { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 index 5ce13b7a1b635..fb768688f7de8 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAppDeploy.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardAppDeploy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAtpPolicyForO365.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAtpPolicyForO365.ps1 index 14b1a578b0c8e..bed3d5c481099 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAtpPolicyForO365.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAtpPolicyForO365.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardAtpPolicyForO365 { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuditLog.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuditLog.ps1 index 7d2b7e5375dbb..e7a19162c0fb7 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuditLog.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuditLog.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardAuditLog { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuthMethodsSettings.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuthMethodsSettings.ps1 index 05566b9bf36e5..623858a3e3ca3 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuthMethodsSettings.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAuthMethodsSettings.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardAuthMethodsSettings { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1 index 5b2e1186408a0..09a97aabe0d21 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoAddProxy.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardAutoAddProxy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param( $Tenant, diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoExpandArchive.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoExpandArchive.ps1 index c498e2d9767d0..14d1b614fc2b4 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoExpandArchive.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutoExpandArchive.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardAutoExpandArchive { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1 index c616f54b9c6be..cf616b4218726 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotProfile.ps1 @@ -37,7 +37,7 @@ function Invoke-CIPPStandardAutopilotProfile { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/ + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1 index 0a1b4241144ce..e8957cb84d8cd 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardAutopilotStatusPage.ps1 @@ -33,7 +33,7 @@ function Invoke-CIPPStandardAutopilotStatusPage { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/ + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBookings.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBookings.ps1 index a287b61d8f0a3..67d733214ee78 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBookings.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBookings.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardBookings { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBranding.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBranding.ps1 index 0b1a515a67051..24ddefaffd0b3 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBranding.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardBranding.ps1 @@ -30,7 +30,7 @@ function Invoke-CIPPStandardBranding { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardCloudMessageRecall.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardCloudMessageRecall.ps1 index a4bf6df6a795c..194596088dfea 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardCloudMessageRecall.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardCloudMessageRecall.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardCloudMessageRecall { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1 index ca7a409b41228..2bf8af08593ec 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardConditionalAccessTemplate.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardConditionalAccessTemplate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/ + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'ConditionalAccess' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDefaultPlatformRestrictions.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDefaultPlatformRestrictions.ps1 index e5399290ab485..cc7c578585bf3 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDefaultPlatformRestrictions.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDefaultPlatformRestrictions.ps1 @@ -34,7 +34,7 @@ function Invoke-CIPPStandardDefaultPlatformRestrictions { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDelegateSentItems.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDelegateSentItems.ps1 index b3a234aa026d9..322dce4b8c8ba 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDelegateSentItems.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDelegateSentItems.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDelegateSentItems { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeletedUserRentention.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeletedUserRentention.ps1 index 2fb54f813fc13..f6cbe319cab9b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeletedUserRentention.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeletedUserRentention.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDeletedUserRentention { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAddShortcutsToOneDrive.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAddShortcutsToOneDrive.ps1 index d4171ac615fd9..cf37d42fa5165 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAddShortcutsToOneDrive.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAddShortcutsToOneDrive.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDisableAddShortcutsToOneDrive { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1 index 82f8ffc7a1eb2..2608c92914fc7 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAdditionalStorageProviders.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableAdditionalStorageProviders { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAppCreation.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAppCreation.ps1 index 8f40a6afbd4d3..e295bf78dec1e 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAppCreation.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableAppCreation.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableAppCreation { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableBasicAuthSMTP.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableBasicAuthSMTP.ps1 index cd8cd600d9e4d..9dba24fe66bb3 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableBasicAuthSMTP.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableBasicAuthSMTP.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardDisableBasicAuthSMTP { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableEmail.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableEmail.ps1 index 73588500031f7..2316844428a2b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableEmail.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableEmail.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisableEmail { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableExternalCalendarSharing.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableExternalCalendarSharing.ps1 index e0bb7130eb1c0..71024b35dad28 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableExternalCalendarSharing.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableExternalCalendarSharing.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableExternalCalendarSharing { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuestDirectory.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuestDirectory.ps1 index 822a884179ca5..bd3f35789266e 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuestDirectory.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuestDirectory.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDisableGuestDirectory { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1 index 5faf7964760c8..26510a937dafc 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableGuests.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardDisableGuests { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableM365GroupUsers.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableM365GroupUsers.ps1 index 7331d1d315f3c..f6fc18ff4b307 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableM365GroupUsers.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableM365GroupUsers.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisableM365GroupUsers { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableOutlookAddins.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableOutlookAddins.ps1 index 0f6f6829f9af9..f098710e5e57a 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableOutlookAddins.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableOutlookAddins.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableOutlookAddins { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableQRCodePin.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableQRCodePin.ps1 index 24f2a9212ad6d..358f1bfb76e57 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableQRCodePin.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableQRCodePin.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisableQRCodePin { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableReshare.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableReshare.ps1 index 95c2ece96ddda..c6aa08a662503 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableReshare.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableReshare.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableReshare { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSMS.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSMS.ps1 index a2158e3e118f2..076ea346d5d39 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSMS.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSMS.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDisableSMS { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSecurityGroupUsers.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSecurityGroupUsers.ps1 index 50fbca62f91d0..434754a89f43b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSecurityGroupUsers.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSecurityGroupUsers.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisableSecurityGroupUsers { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSelfServiceLicenses.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSelfServiceLicenses.ps1 index 8a7bf96b3b3c2..62a20519f44c6 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSelfServiceLicenses.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSelfServiceLicenses.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDisableSelfServiceLicenses { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharePointLegacyAuth.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharePointLegacyAuth.ps1 index 98d2e0816ab34..5e63504dcceaa 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharePointLegacyAuth.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharePointLegacyAuth.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardDisableSharePointLegacyAuth { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharedMailbox.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharedMailbox.ps1 index 1d6163a188297..66bc9dc3e30f0 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharedMailbox.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableSharedMailbox.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableSharedMailbox { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTNEF.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTNEF.ps1 index 589832537c7d6..be6f3437ba1e1 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTNEF.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTNEF.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDisableTNEF { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param ($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTenantCreation.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTenantCreation.ps1 index 835cec11cd10e..59487435b3439 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTenantCreation.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableTenantCreation.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardDisableTenantCreation { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableUserSiteCreate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableUserSiteCreate.ps1 index 6746aebd60c8c..144eec1b1fdf8 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableUserSiteCreate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableUserSiteCreate.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisableUserSiteCreate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableViva.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableViva.ps1 index ba8661834447f..59d7a1055f196 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableViva.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableViva.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisableViva { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableVoice.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableVoice.ps1 index 00957e8e0b72b..3ad258c913e11 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableVoice.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisableVoice.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardDisableVoice { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisablex509Certificate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisablex509Certificate.ps1 index 75b5d42aafe3d..518c4ab96cd12 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisablex509Certificate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDisablex509Certificate.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardDisablex509Certificate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 index 81dac6aed1bd0..146c78a3a5f8d 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODirectSend.ps1 @@ -31,6 +31,14 @@ function Invoke-CIPPStandardEXODirectSend { param ($Tenant, $Settings) + # Determine desired state. These double negative MS loves are a bit confusing + $DesiredStateName = $Settings.state.value ?? $Settings.state + # Input validation + if ([string]::IsNullOrWhiteSpace($DesiredStateName) -or $DesiredStateName -eq 'Select a value') { + Write-LogMessage -API 'Standards' -tenant $Tenant -message 'EXODirectSend: Invalid state parameter set' -sev Error + Return + } + # Get current organization config try { $CurrentConfig = (New-ExoRequest -TenantID $Tenant -cmdlet 'Get-OrganizationConfig' -Select 'RejectDirectSend').RejectDirectSend @@ -40,17 +48,9 @@ function Invoke-CIPPStandardEXODirectSend { return } - # Determine desired state. These double negative MS loves are a bit confusing - $DesiredStateName = $Settings.state.value ?? $Settings.state $DesiredState = $DesiredStateName -eq 'disabled' ? $true : $false $StateIsCorrect = $CurrentConfig -eq $DesiredState - # Input validation - if ([string]::IsNullOrWhiteSpace($DesiredStateName) -or $DesiredState -eq 'Select a value') { - Write-LogMessage -API 'Standards' -tenant $Tenant -message 'EXODirectSend: Invalid state parameter set' -sev Error - Return - } - # Remediate if needed if ($Settings.remediate -eq $true) { diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODisableAutoForwarding.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODisableAutoForwarding.ps1 index 2d8736b335c94..8267956ad6377 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODisableAutoForwarding.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXODisableAutoForwarding.ps1 @@ -29,7 +29,7 @@ function Invoke-CIPPStandardEXODisableAutoForwarding { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 index 95933ef4a8630..e596c065199ba 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEXOOutboundSpamLimits.ps1 @@ -31,7 +31,7 @@ function Invoke-CIPPStandardEXOOutboundSpamLimits { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableAppConsentRequests.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableAppConsentRequests.ps1 index bd8e6b6ed84f3..4f2fe48c8f424 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableAppConsentRequests.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableAppConsentRequests.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardEnableAppConsentRequests { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableCustomerLockbox.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableCustomerLockbox.ps1 index c3ca2af54dce4..729c765dcc9f5 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableCustomerLockbox.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableCustomerLockbox.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardEnableCustomerLockbox { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableFIDO2.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableFIDO2.ps1 index 1b2a901adc4d0..dc5b9e9e5da74 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableFIDO2.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableFIDO2.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardEnableFIDO2 { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableHardwareOAuth.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableHardwareOAuth.ps1 index ac9829d7cc3e5..405a2747e0bce 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableHardwareOAuth.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableHardwareOAuth.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardEnableHardwareOAuth { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableLitigationHold.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableLitigationHold.ps1 index e80b6077345c1..4fe60d3f807d0 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableLitigationHold.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableLitigationHold.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardEnableLitigationHold { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1 index b4671d72e7ea3..9c948ccfda1aa 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailTips.ps1 @@ -29,7 +29,7 @@ function Invoke-CIPPStandardEnableMailTips { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailboxAuditing.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailboxAuditing.ps1 index fe5c4d787a4e5..e23baaf3aeb7b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailboxAuditing.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableMailboxAuditing.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardEnableMailboxAuditing { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableOnlineArchiving.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableOnlineArchiving.ps1 index 8e7bfae1e5cf0..4ec2259debd73 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableOnlineArchiving.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnableOnlineArchiving.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardEnableOnlineArchiving { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnablePronouns.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnablePronouns.ps1 index 5d985dfd46161..e3c27cd633adc 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnablePronouns.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardEnablePronouns.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardEnablePronouns { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param ($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExcludedfileExt.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExcludedfileExt.ps1 index 397fa353f78b3..34cbf330fed0e 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExcludedfileExt.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExcludedfileExt.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardExcludedfileExt { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExternalMFATrusted.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExternalMFATrusted.ps1 index 555db83fe8e11..99dcf906b2d89 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExternalMFATrusted.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardExternalMFATrusted.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardExternalMFATrusted { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1 index 8a93f34c80b57..d15885b991024 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardFocusedInbox.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardFocusedInbox { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGlobalQuarantineNotifications.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGlobalQuarantineNotifications.ps1 index 1c6a295d03f09..73a6749533539 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGlobalQuarantineNotifications.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGlobalQuarantineNotifications.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardGlobalQuarantineNotifications { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param ($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 index 3dee4368cb32b..0fed0c0460318 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGroupTemplate.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardGroupTemplate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/ + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'GroupTemplate' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGuestInvite.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGuestInvite.ps1 index b244ebc807778..4cb15592d6633 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGuestInvite.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardGuestInvite.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardGuestInvite { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 index 2651942d5e9e4..c1d0bdfe93ca5 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneComplianceSettings.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardIntuneComplianceSettings { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1 index 764d98142507a..ac90ae92bc351 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardIntuneTemplate.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardIntuneTemplate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/ + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'intuneTemplate' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardLegacyMFACleanup.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardLegacyMFACleanup.ps1 index 94409b104bbbf..a65075bccb2a2 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardLegacyMFACleanup.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardLegacyMFACleanup.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardLegacyMFACleanup { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMDMScope.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMDMScope.ps1 index cf7d650b67a1b..e49351739558b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMDMScope.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMDMScope.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardMDMScope { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailContacts.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailContacts.ps1 index 08a05f78cc577..55655ccc1d8f8 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailContacts.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailContacts.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardMailContacts { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 index be1c7a1f938ec..42e34db49f3a8 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMalwareFilterPolicy.ps1 @@ -36,7 +36,7 @@ function Invoke-CIPPStandardMalwareFilterPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMessageExpiration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMessageExpiration.ps1 index f82c686840e22..4a46e10ac85ca 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMessageExpiration.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMessageExpiration.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardMessageExpiration { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 index 431236b6e6ba7..98c73b0c93723 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardNudgeMFA.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardNudgeMFA { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1 index f5b56fbcc994e..9d00b6a527e78 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsent.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardOauthConsent { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($tenant, $settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsentLowSec.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsentLowSec.ps1 index b6e08c1594a0d..8338bcf4b1086 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsentLowSec.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOauthConsentLowSec.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardOauthConsentLowSec { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOutBoundSpamAlert.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOutBoundSpamAlert.ps1 index bfd0d7263cce1..bcf78c7d5f739 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOutBoundSpamAlert.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardOutBoundSpamAlert.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardOutBoundSpamAlert { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWcompanionAppAllowedState.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWcompanionAppAllowedState.ps1 index 0fbabebf7ef01..2322f74afe7fd 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWcompanionAppAllowedState.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWcompanionAppAllowedState.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardPWcompanionAppAllowedState { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWdisplayAppInformationRequiredState.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWdisplayAppInformationRequiredState.ps1 index f0555cc4c69df..7dacd622acbd6 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWdisplayAppInformationRequiredState.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPWdisplayAppInformationRequiredState.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardPWdisplayAppInformationRequiredState { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1 index c2db0ebf36e13..bd3e581bbd97c 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPasswordExpireDisabled.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardPasswordExpireDisabled { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPerUserMFA.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPerUserMFA.ps1 index a7709b6b2cbb6..a9cb8cf01c4e2 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPerUserMFA.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPerUserMFA.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardPerUserMFA { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishProtection.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishProtection.ps1 index 6701703620a28..5469ef708182f 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishProtection.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishProtection.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardPhishProtection { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 index f5b8ca797452a..12bcc22805712 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishSimSpoofIntelligence.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardPhishSimSpoofIntelligence { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 index f463de8bb1f7a..742871deffa8f 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardPhishingSimulations.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardPhishingSimulations { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardProfilePhotos.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardProfilePhotos.ps1 index 9a3f76a85da68..2eb1b62221315 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardProfilePhotos.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardProfilePhotos.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardProfilePhotos { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/global-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineRequestAlert.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineRequestAlert.ps1 index 79f52025b76ba..088cfe4f5ffa5 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineRequestAlert.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineRequestAlert.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardQuarantineRequestAlert { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param ($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineTemplate.ps1 index c8f98fc6a7c20..566754a66bdc4 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineTemplate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardQuarantineTemplate.ps1 @@ -36,7 +36,7 @@ function Invoke-CIPPStandardQuarantineTemplate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRetentionPolicyTag.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRetentionPolicyTag.ps1 index 274d1bbf26622..77587b18e6aba 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRetentionPolicyTag.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRetentionPolicyTag.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardRetentionPolicyTag { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRotateDKIM.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRotateDKIM.ps1 index 52d311bbb2363..178f2fe033c48 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRotateDKIM.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardRotateDKIM.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardRotateDKIM { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPAzureB2B.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPAzureB2B.ps1 index 1a338e3bcdc34..51d24c66defff 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPAzureB2B.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPAzureB2B.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardSPAzureB2B { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDirectSharing.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDirectSharing.ps1 index 2ecddc643c4ba..b6d529cfeac5f 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDirectSharing.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDirectSharing.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardSPDirectSharing { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisableLegacyWorkflows.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisableLegacyWorkflows.ps1 index c7d05240bf85a..3093949eceab1 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisableLegacyWorkflows.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisableLegacyWorkflows.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardSPDisableLegacyWorkflows { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisallowInfectedFiles.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisallowInfectedFiles.ps1 index e75f394574286..60278d1c2e11b 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisallowInfectedFiles.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPDisallowInfectedFiles.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardSPDisallowInfectedFiles { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1 index 25a6448568410..7c0ed3fb7d4de 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPEmailAttestation.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardSPEmailAttestation { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPExternalUserExpiration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPExternalUserExpiration.ps1 index aa8f99ab850b6..7fc1b7fd1c14e 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPExternalUserExpiration.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPExternalUserExpiration.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardSPExternalUserExpiration { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPSyncButtonState.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPSyncButtonState.ps1 index 65788c9dd8bea..ba222bb08412a 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPSyncButtonState.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSPSyncButtonState.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardSPSyncButtonState { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 index 8bb738474fe02..edd59d6cbaa46 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeAttachmentPolicy.ps1 @@ -33,7 +33,7 @@ function Invoke-CIPPStandardSafeAttachmentPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeLinksPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeLinksPolicy.ps1 index 199d74e38e1cd..e360efddabf2c 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeLinksPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeLinksPolicy.ps1 @@ -32,7 +32,7 @@ function Invoke-CIPPStandardSafeLinksPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeSendersDisable.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeSendersDisable.ps1 index 72899c27ce9bf..00c5f576900da 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeSendersDisable.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSafeSendersDisable.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardSafeSendersDisable { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSecurityDefaults.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSecurityDefaults.ps1 index b301ee6ca1d81..a8f7552c87c56 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSecurityDefaults.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSecurityDefaults.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardSecurityDefaults { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendFromAlias.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendFromAlias.ps1 index 69182838b6381..8577b4368988f 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendFromAlias.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendFromAlias.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardSendFromAlias { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendReceiveLimitTenant.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendReceiveLimitTenant.ps1 index 21a2a4ecf256c..344f83bc00bc5 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendReceiveLimitTenant.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSendReceiveLimitTenant.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardSendReceiveLimitTenant { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1 index 444fee2a48a46..cad89dfd00494 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSharePointMassDeletionAlert.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardSharePointMassDeletionAlert { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param ($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardShortenMeetings.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardShortenMeetings.ps1 index e18b5df97e764..a92efc0b4b32a 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardShortenMeetings.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardShortenMeetings.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardShortenMeetings { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 index 44ab3736c126d..6ca1652b5e012 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpamFilterPolicy.ps1 @@ -47,7 +47,7 @@ function Invoke-CIPPStandardSpamFilterPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/defender-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpoofWarn.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpoofWarn.ps1 index 8a843339b622c..076829cac9f32 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpoofWarn.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardSpoofWarn.ps1 @@ -29,7 +29,7 @@ function Invoke-CIPPStandardSpoofWarn { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardStaleEntraDevices.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardStaleEntraDevices.ps1 index 0b76b4d35cb9a..e85947eca52c2 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardStaleEntraDevices.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardStaleEntraDevices.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardStaleEntraDevices { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTAP.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTAP.ps1 index 7aeb33c4d391c..22343488189bc 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTAP.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTAP.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardTAP { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEmailIntegration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEmailIntegration.ps1 index 7e33ceca0f9c8..d54b70a007969 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEmailIntegration.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEmailIntegration.ps1 @@ -26,7 +26,7 @@ Function Invoke-CIPPStandardTeamsEmailIntegration { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEnrollUser.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEnrollUser.ps1 index e9bc422d13ebb..ffc9d8ddc6525 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEnrollUser.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsEnrollUser.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardTeamsEnrollUser { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalAccessPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalAccessPolicy.ps1 index 4d760b73749de..0022db5231070 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalAccessPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalAccessPolicy.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardTeamsExternalAccessPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalFileSharing.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalFileSharing.ps1 index b5bf59dcde73f..3230484f898cc 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalFileSharing.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsExternalFileSharing.ps1 @@ -30,7 +30,7 @@ function Invoke-CIPPStandardTeamsExternalFileSharing { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsFederationConfiguration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsFederationConfiguration.ps1 index 56de1b3d54997..d52c75cef0362 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsFederationConfiguration.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsFederationConfiguration.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardTeamsFederationConfiguration { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsGlobalMeetingPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsGlobalMeetingPolicy.ps1 index 5b37cbf775dd5..7c949243b8d8c 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsGlobalMeetingPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsGlobalMeetingPolicy.ps1 @@ -29,7 +29,7 @@ function Invoke-CIPPStandardTeamsGlobalMeetingPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'TeamsGlobalMeetingPolicy' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingRecordingExpiration.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingRecordingExpiration.ps1 index 5704afc73934f..bc8cbd0efb893 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingRecordingExpiration.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingRecordingExpiration.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardTeamsMeetingRecordingExpiration { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'TeamsMeetingRecordingExpiration' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingsByDefault.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingsByDefault.ps1 index 59fe213f54a03..3353d39162a1e 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingsByDefault.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMeetingsByDefault.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardTeamsMeetingsByDefault { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMessagingPolicy.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMessagingPolicy.ps1 index 6de85ba0ad644..a1bf1aa2ad49c 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMessagingPolicy.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTeamsMessagingPolicy.ps1 @@ -33,7 +33,7 @@ Function Invoke-CIPPStandardTeamsMessagingPolicy { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/teams-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'TeamsMessagingPolicy' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTenantDefaultTimezone.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTenantDefaultTimezone.ps1 index ef65f7da3fb54..1365cdc31f757 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTenantDefaultTimezone.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTenantDefaultTimezone.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardTenantDefaultTimezone { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTransportRuleTemplate.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTransportRuleTemplate.ps1 index 1289d16822967..b867b66a54de6 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTransportRuleTemplate.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardTransportRuleTemplate.ps1 @@ -23,7 +23,7 @@ function Invoke-CIPPStandardTransportRuleTemplate { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/ + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) ##$Rerun -Type Standard -Tenant $Tenant -Settings $Settings 'TransportRuleTemplate' diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUndoOauth.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUndoOauth.ps1 index 9d52de5b0f999..fd43f8ced6647 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUndoOauth.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUndoOauth.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardUndoOauth { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserPreferredLanguage.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserPreferredLanguage.ps1 index 0bbc6e4372b72..8d78372a969d8 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserPreferredLanguage.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserPreferredLanguage.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardUserPreferredLanguage { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 index aa6ebe2138664..d340bf05639ce 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardUserSubmissions { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1 index 391d6454ebc96..500c0af7ec872 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOAuthTokens.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardallowOAuthTokens { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOTPTokens.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOTPTokens.ps1 index 45d16942ac511..ce374e86fd149 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOTPTokens.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardallowOTPTokens.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardallowOTPTokens { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardcalDefault.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardcalDefault.ps1 index 97534b7ac800c..11f3f95605db3 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardcalDefault.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardcalDefault.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardcalDefault { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/exchange-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings, $QueueItem) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandarddisableMacSync.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandarddisableMacSync.ps1 index 667fec2147b36..6f3c1f886b160 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandarddisableMacSync.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandarddisableMacSync.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandarddisableMacSync { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneBrandingProfile.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneBrandingProfile.ps1 index b7aaa6277e060..cc0cb204840a8 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneBrandingProfile.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneBrandingProfile.ps1 @@ -34,7 +34,7 @@ function Invoke-CIPPStandardintuneBrandingProfile { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceReg.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceReg.ps1 index cbe8ef576aa13..eb9e1693da54c 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceReg.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceReg.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardintuneDeviceReg { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceRetirementDays.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceRetirementDays.ps1 index 247bea0bbfa8b..07d19f264bdf1 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceRetirementDays.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneDeviceRetirementDays.ps1 @@ -26,7 +26,7 @@ function Invoke-CIPPStandardintuneDeviceRetirementDays { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneRequireMFA.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneRequireMFA.ps1 index e6a7f929a4c8e..43a5da1d2d245 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneRequireMFA.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardintuneRequireMFA.ps1 @@ -23,7 +23,7 @@ function Invoke-CIPPStandardintuneRequireMFA { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/intune-standards#medium-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardlaps.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardlaps.ps1 index dde78c661881b..b6f53ee67fda7 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardlaps.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardlaps.ps1 @@ -25,7 +25,7 @@ function Invoke-CIPPStandardlaps { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/entra-aad-standards#low-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingCapability.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingCapability.ps1 index 60f6fe4d9ea48..c65bf679b010c 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingCapability.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingCapability.ps1 @@ -28,7 +28,7 @@ function Invoke-CIPPStandardsharingCapability { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingDomainRestriction.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingDomainRestriction.ps1 index a420a627aab13..3fa2f071bda43 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingDomainRestriction.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardsharingDomainRestriction.ps1 @@ -27,7 +27,7 @@ function Invoke-CIPPStandardsharingDomainRestriction { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardunmanagedSync.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardunmanagedSync.ps1 index 89db8f4391a0e..a84306c4a5494 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardunmanagedSync.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardunmanagedSync.ps1 @@ -24,7 +24,7 @@ function Invoke-CIPPStandardunmanagedSync { UPDATECOMMENTBLOCK Run the Tools\Update-StandardsComments.ps1 script to update this comment block .LINK - https://docs.cipp.app/user-documentation/tenant/standards/list-standards/sharepoint-standards#high-impact + https://docs.cipp.app/user-documentation/tenant/standards/list-standards #> param($Tenant, $Settings) diff --git a/Tools/Update-StandardsComments.ps1 b/Tools/Update-StandardsComments.ps1 index ffd0b9c16fedf..523af0db7bf37 100644 --- a/Tools/Update-StandardsComments.ps1 +++ b/Tools/Update-StandardsComments.ps1 @@ -124,23 +124,7 @@ foreach ($Standard in $StandardsInfo) { $NewComment.Add(" Run the Tools\Update-StandardsComments.ps1 script to update this comment block`n") # -Online help link $NewComment.Add(" .LINK`n") - $DocsLink = 'https://docs.cipp.app/user-documentation/tenant/standards/list-standards/' - - switch ($Standard.cat) { - 'Global Standards' { $DocsLink += 'global-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - 'Entra (AAD) Standards' { $DocsLink += 'entra-aad-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - 'Exchange Standards' { $DocsLink += 'exchange-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - 'Defender Standards' { $DocsLink += 'defender-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - 'Intune Standards' { $DocsLink += 'intune-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - 'SharePoint Standards' { $DocsLink += 'sharepoint-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - 'Teams Standards' { $DocsLink += 'teams-standards#' + $Standard.impact.ToLower() -replace ' ', '-' } - Default {} - } - - switch ($Standard.impact) { - condition { } - Default {} - } + $DocsLink = 'https://docs.cipp.app/user-documentation/tenant/standards/list-standards' $NewComment.Add(" $DocsLink`n") $NewComment.Add(' #>') From 0eb798ddf4863931c6a0150d00b2a0377fb903ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 28 May 2025 19:41:28 +0200 Subject: [PATCH 04/24] better error handling and logging --- .../Teams-Sharepoint/Invoke-AddTeam.ps1 | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-AddTeam.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-AddTeam.ps1 index 9f76c94071de5..25c14b579a3e8 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-AddTeam.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Teams-Sharepoint/Invoke-AddTeam.ps1 @@ -14,14 +14,14 @@ Function Invoke-AddTeam { $Headers = $Request.Headers Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug' - $userobj = $Request.body + # Interact with the body of the request + $TeamObj = $Request.Body + $TenantID = $TeamObj.tenantid - - - $Owners = ($userobj.owner) + $Owners = ($TeamObj.owner) try { if ($null -eq $Owners) { - throw "You have to add at least one owner to the team" + throw 'You have to add at least one owner to the team' } $Owners = $Owners | ForEach-Object { $OwnerID = "https://graph.microsoft.com/beta/users('$($_)')" @@ -34,28 +34,31 @@ Function Invoke-AddTeam { $TeamsSettings = [PSCustomObject]@{ 'template@odata.bind' = "https://graph.microsoft.com/v1.0/teamsTemplates('standard')" - 'visibility' = $userobj.visibility - 'displayName' = $userobj.displayname - 'description' = $userobj.description - 'members' = @($owners) + 'visibility' = $TeamObj.visibility + 'displayName' = $TeamObj.displayName + 'description' = $TeamObj.description + 'members' = @($Owners) } | ConvertTo-Json -Depth 10 + # Write-Host $TeamsSettings - Write-Host $TeamsSettings - New-GraphPostRequest -AsApp $true -uri 'https://graph.microsoft.com/beta/teams' -tenantid $Userobj.tenantid -type POST -body $TeamsSettings -verbose - Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantid) -message "Added Team $($userobj.displayname)" -Sev 'Info' - $body = [pscustomobject]@{'Results' = 'Success. Team has been added' } + $null = New-GraphPostRequest -AsApp $true -uri 'https://graph.microsoft.com/beta/teams' -tenantid $TenantID -type POST -body $TeamsSettings -Verbose + $Message = "Successfully created Team: '$($TeamObj.displayName)'" + Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantID -message $Message -Sev Info + $StatusCode = [HttpStatusCode]::OK } catch { - Write-LogMessage -headers $Request.Headers -API $APINAME -tenant $($userobj.tenantid) -message "Adding Team failed. Error: $($_.Exception.Message)" -Sev 'Error' - $body = [pscustomobject]@{'Results' = "Failed. Error message: $($_.Exception.Message)" } + $ErrorMessage = Get-CippException -Exception $_ + $Message = "Failed to create Team: '$($TeamObj.displayName)'. Error: $($ErrorMessage.NormalizedError)" + Write-LogMessage -headers $Headers -API $APINAME -tenant $TenantID -message $Message -Sev Error -LogData $ErrorMessage + $StatusCode = [HttpStatusCode]::InternalServerError } # Associate values to output bindings by calling 'Push-OutputBinding'. Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{ - StatusCode = [HttpStatusCode]::OK - Body = $Body + StatusCode = $StatusCode + Body = @{ Results = $Message } }) } From e3ad53ec78a107fbbaa3cecac558c9bd2c396d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 28 May 2025 20:16:07 +0200 Subject: [PATCH 05/24] casing --- .../Email-Exchange/Administration/Invoke-ExecGroupsDelete.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecGroupsDelete.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecGroupsDelete.ps1 index ec24ebf11a386..b7c6519c353f5 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecGroupsDelete.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Email-Exchange/Administration/Invoke-ExecGroupsDelete.ps1 @@ -21,7 +21,7 @@ Function Invoke-ExecGroupsDelete { $DisplayName = $Request.Query.displayName ?? $Request.Body.displayName Try { - $Result = Remove-CIPPGroup -ID $ID -Grouptype $GroupType -TenantFilter $TenantFilter -DisplayName $DisplayName -APIName $APIName -Headers $Headers + $Result = Remove-CIPPGroup -ID $ID -GroupType $GroupType -TenantFilter $TenantFilter -DisplayName $DisplayName -APIName $APIName -Headers $Headers $StatusCode = [HttpStatusCode]::OK } catch { $Result = "$($_.Exception.Message)" From bd14e9b9bd845cf80f6f68b02376cb6328b6e36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Wed, 28 May 2025 21:26:39 +0200 Subject: [PATCH 06/24] chore: update licenses data to newest from MS --- ConversionTable.csv | 14 +++++++++++++- Modules/CIPPCore/Public/ConversionTable.csv | 14 +++++++++++++- Modules/CippExtensions/ConversionTable.csv | 14 +++++++++++++- Modules/CippExtensions/Public/ConversionTable.csv | 14 +++++++++++++- 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ConversionTable.csv b/ConversionTable.csv index 057931a0ca5eb..2f2e83b3e09e9 100644 --- a/ConversionTable.csv +++ b/ConversionTable.csv @@ -1634,6 +1634,18 @@ Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,COPILOT_STUDIO_IN_COPILOT_FOR_M365,fe6c28b3-d468-44ea-bbd0-a10a5167435c,Copilot Studio in Copilot for M365 +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_SHAREPOINT,0aedf20c-091d-420b-aadf-30c042609612,Microsoft 365 Copilot for SharePoint +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales,a2194428-ead1-4fc1-bb81-ab8675125f42,Microsoft Copilot for Sales +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales_PowerAutomate,0c1c2af2-6c51-43c7-9c55-fa487ac147ff,Microsoft Copilot for Sales with Power Automate +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_USER,b622badb-1b45-48d5-920f-4b27a2c0996c,Microsoft Viva Insights +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_BACKEND,ff7b261f-d98b-415b-827c-42a3fdf015af,Microsoft Viva Insights Backend +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams @@ -4887,7 +4899,7 @@ PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f- PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_P2_GOV,37396c73-2203-48e6-8be1-d882dae53275,Common Data Service for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_FOR_PROJECT_GCC_P5,684a2229-5c57-43ab-b69f-f86fe8997358,Common Data Service for Project P5 for GCC PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,FLOW_FOR_PROJECT_GOV,16687e20-06f9-4577-9cc0-34a2704260fc,Data integration for Project with Power Automate for GCC -PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,DO NOT USE - AI Builder capacity Per User add-on +PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,AI Builder capacity Per User add-on PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_S1_GOV,49f06c3d-da7d-4fa0-bcce-1458fdd18a59,Power Apps for Office 365 F3 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P1_GOV,c42aa49a-f357-45d5-9972-bc29df885fee,Power Apps for Office 365 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P2_GOV,0a20c815-5e81-4727-9bdc-2b5a117850c3,Power Apps for Office 365 for Government diff --git a/Modules/CIPPCore/Public/ConversionTable.csv b/Modules/CIPPCore/Public/ConversionTable.csv index 057931a0ca5eb..2f2e83b3e09e9 100644 --- a/Modules/CIPPCore/Public/ConversionTable.csv +++ b/Modules/CIPPCore/Public/ConversionTable.csv @@ -1634,6 +1634,18 @@ Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,COPILOT_STUDIO_IN_COPILOT_FOR_M365,fe6c28b3-d468-44ea-bbd0-a10a5167435c,Copilot Studio in Copilot for M365 +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_SHAREPOINT,0aedf20c-091d-420b-aadf-30c042609612,Microsoft 365 Copilot for SharePoint +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales,a2194428-ead1-4fc1-bb81-ab8675125f42,Microsoft Copilot for Sales +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales_PowerAutomate,0c1c2af2-6c51-43c7-9c55-fa487ac147ff,Microsoft Copilot for Sales with Power Automate +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_USER,b622badb-1b45-48d5-920f-4b27a2c0996c,Microsoft Viva Insights +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_BACKEND,ff7b261f-d98b-415b-827c-42a3fdf015af,Microsoft Viva Insights Backend +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams @@ -4887,7 +4899,7 @@ PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f- PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_P2_GOV,37396c73-2203-48e6-8be1-d882dae53275,Common Data Service for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_FOR_PROJECT_GCC_P5,684a2229-5c57-43ab-b69f-f86fe8997358,Common Data Service for Project P5 for GCC PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,FLOW_FOR_PROJECT_GOV,16687e20-06f9-4577-9cc0-34a2704260fc,Data integration for Project with Power Automate for GCC -PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,DO NOT USE - AI Builder capacity Per User add-on +PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,AI Builder capacity Per User add-on PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_S1_GOV,49f06c3d-da7d-4fa0-bcce-1458fdd18a59,Power Apps for Office 365 F3 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P1_GOV,c42aa49a-f357-45d5-9972-bc29df885fee,Power Apps for Office 365 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P2_GOV,0a20c815-5e81-4727-9bdc-2b5a117850c3,Power Apps for Office 365 for Government diff --git a/Modules/CippExtensions/ConversionTable.csv b/Modules/CippExtensions/ConversionTable.csv index 057931a0ca5eb..2f2e83b3e09e9 100644 --- a/Modules/CippExtensions/ConversionTable.csv +++ b/Modules/CippExtensions/ConversionTable.csv @@ -1634,6 +1634,18 @@ Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,COPILOT_STUDIO_IN_COPILOT_FOR_M365,fe6c28b3-d468-44ea-bbd0-a10a5167435c,Copilot Studio in Copilot for M365 +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_SHAREPOINT,0aedf20c-091d-420b-aadf-30c042609612,Microsoft 365 Copilot for SharePoint +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales,a2194428-ead1-4fc1-bb81-ab8675125f42,Microsoft Copilot for Sales +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales_PowerAutomate,0c1c2af2-6c51-43c7-9c55-fa487ac147ff,Microsoft Copilot for Sales with Power Automate +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_USER,b622badb-1b45-48d5-920f-4b27a2c0996c,Microsoft Viva Insights +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_BACKEND,ff7b261f-d98b-415b-827c-42a3fdf015af,Microsoft Viva Insights Backend +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams @@ -4887,7 +4899,7 @@ PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f- PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_P2_GOV,37396c73-2203-48e6-8be1-d882dae53275,Common Data Service for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_FOR_PROJECT_GCC_P5,684a2229-5c57-43ab-b69f-f86fe8997358,Common Data Service for Project P5 for GCC PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,FLOW_FOR_PROJECT_GOV,16687e20-06f9-4577-9cc0-34a2704260fc,Data integration for Project with Power Automate for GCC -PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,DO NOT USE - AI Builder capacity Per User add-on +PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,AI Builder capacity Per User add-on PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_S1_GOV,49f06c3d-da7d-4fa0-bcce-1458fdd18a59,Power Apps for Office 365 F3 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P1_GOV,c42aa49a-f357-45d5-9972-bc29df885fee,Power Apps for Office 365 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P2_GOV,0a20c815-5e81-4727-9bdc-2b5a117850c3,Power Apps for Office 365 for Government diff --git a/Modules/CippExtensions/Public/ConversionTable.csv b/Modules/CippExtensions/Public/ConversionTable.csv index 057931a0ca5eb..2f2e83b3e09e9 100644 --- a/Modules/CippExtensions/Public/ConversionTable.csv +++ b/Modules/CippExtensions/Public/ConversionTable.csv @@ -1634,6 +1634,18 @@ Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat Microsoft 365 Copilot (Education Faculty),Microsoft_365_Copilot_EDU,ad9c22b3-52d7-4e7e-973c-88121ea96436,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,COPILOT_STUDIO_IN_COPILOT_FOR_M365,fe6c28b3-d468-44ea-bbd0-a10a5167435c,Copilot Studio in Copilot for M365 +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_SHAREPOINT,0aedf20c-091d-420b-aadf-30c042609612,Microsoft 365 Copilot for SharePoint +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_APPS,a62f8878-de10-42f3-b68f-6149a25ceb97,Microsoft 365 Copilot in Productivity Apps +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales,a2194428-ead1-4fc1-bb81-ab8675125f42,Microsoft Copilot for Sales +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,Microsoft_Copilot_for_Sales_PowerAutomate,0c1c2af2-6c51-43c7-9c55-fa487ac147ff,Microsoft Copilot for Sales with Power Automate +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_BUSINESS_CHAT,3f30311c-6b1e-48a4-ab79-725b469da960,Microsoft Copilot with Graph-grounded chat +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_USER,b622badb-1b45-48d5-920f-4b27a2c0996c,Microsoft Viva Insights +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,WORKPLACE_ANALYTICS_INSIGHTS_BACKEND,ff7b261f-d98b-415b-827c-42a3fdf015af,Microsoft Viva Insights Backend +Microsoft 365 Copilot for Sales,Microsoft_Copilot_for_Sales,15f2e9fc-b782-4f73-bf51-81d8b7fff6f4,M365_COPILOT_CONNECTORS,89f1c4c8-0878-40f7-804d-869c9128ab5d,Power Platform Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,GRAPH_CONNECTORS_COPILOT,82d30987-df9b-4486-b146-198b21d164c7,Graph Connectors in Microsoft 365 Copilot Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_INTELLIGENT_SEARCH,931e4a88-a67f-48b5-814f-16a5f1e6028d,Intelligent Search Microsoft Copilot for Microsoft 365,M365_Copilot,a809996b-059e-42e2-9866-db24b99a9782,M365_COPILOT_TEAMS,b95945de-b3bd-46db-8437-f2beb6ea2347,Microsoft 365 Copilot in Microsoft Teams @@ -4887,7 +4899,7 @@ PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f- PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_P2_GOV,37396c73-2203-48e6-8be1-d882dae53275,Common Data Service for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,DYN365_CDS_FOR_PROJECT_GCC_P5,684a2229-5c57-43ab-b69f-f86fe8997358,Common Data Service for Project P5 for GCC PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,FLOW_FOR_PROJECT_GOV,16687e20-06f9-4577-9cc0-34a2704260fc,Data integration for Project with Power Automate for GCC -PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,DO NOT USE - AI Builder capacity Per User add-on +PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,CDSAICAPACITY_PERUSER,91f50f7b-2204-4803-acac-5cf5668b8b39,AI Builder capacity Per User add-on PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_S1_GOV,49f06c3d-da7d-4fa0-bcce-1458fdd18a59,Power Apps for Office 365 F3 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P1_GOV,c42aa49a-f357-45d5-9972-bc29df885fee,Power Apps for Office 365 for Government PowerApps & Flow GCC Test - O365 & Dyn365 Plans,POWERFLOWGCC_TEST,0f13a262-dc6f-4800-8dc6-a62f72c95fad,POWERAPPS_O365_P2_GOV,0a20c815-5e81-4727-9bdc-2b5a117850c3,Power Apps for Office 365 for Government From d0f585eea19d621b3ecc00f3f70aa3fd33d7df0d Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 28 May 2025 16:33:40 -0400 Subject: [PATCH 07/24] fix email check --- .../Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 index aa6ebe2138664..7934ed2d0bff3 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 @@ -93,7 +93,7 @@ function Invoke-CIPPStandardUserSubmissions { Write-LogMessage -API 'Standards' -tenant $Tenant -message 'User Submission policy is already configured' -sev Info } else { if ($state -eq 'enable') { - if (([string]::IsNullOrWhiteSpace())) { + if (([string]::IsNullOrWhiteSpace($Settings.email))) { $PolicyParams = @{ EnableReportToMicrosoft = $true ReportJunkToCustomizedAddress = $false From 832633198c1c691db88866ac1c45b2b278171eb6 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 28 May 2025 16:37:48 -0400 Subject: [PATCH 08/24] Update Invoke-CIPPStandardUserSubmissions.ps1 --- .../Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 index 7934ed2d0bff3..89963a2ffca0f 100644 --- a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardUserSubmissions.ps1 @@ -93,7 +93,7 @@ function Invoke-CIPPStandardUserSubmissions { Write-LogMessage -API 'Standards' -tenant $Tenant -message 'User Submission policy is already configured' -sev Info } else { if ($state -eq 'enable') { - if (([string]::IsNullOrWhiteSpace($Settings.email))) { + if (([string]::IsNullOrWhiteSpace($Email))) { $PolicyParams = @{ EnableReportToMicrosoft = $true ReportJunkToCustomizedAddress = $false From 579e129d96ad0b39cde5806695049cb996b83e9f Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Wed, 28 May 2025 20:09:52 +0100 Subject: [PATCH 09/24] feat: Add mailbox recipient limits standardization script Add new PowerShell script to standardize mailbox recipient limits across tenants. This script will help enforce consistent recipient limits for mailboxes in the CIPP platform. Updated to use Bulk requests for more efficient handling. Updated to take Mailbox Plans into account to ensure we are not attempting to set values higher than mailbox plans are already set at. Tweak to account for the "Unlimited" default value Refactor mailbox recipient limits script to improve efficiency and accuracy. Consolidated mailbox plan retrieval and updated filtering logic to ensure only relevant mailboxes are processed based on recipient limits. --- ...oke-CIPPStandardMailboxRecipientLimits.ps1 | 180 ++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailboxRecipientLimits.ps1 diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailboxRecipientLimits.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailboxRecipientLimits.ps1 new file mode 100644 index 0000000000000..fca1c64d74ed5 --- /dev/null +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardMailboxRecipientLimits.ps1 @@ -0,0 +1,180 @@ +function Invoke-CIPPStandardMailboxRecipientLimits { + <# + .FUNCTIONALITY + Internal + .COMPONENT + (APIName) MailboxRecipientLimits + .SYNOPSIS + (Label) Set Mailbox Recipient Limits + .DESCRIPTION + (Helptext) Sets the maximum number of recipients that can be specified in the To, Cc, and Bcc fields of a message for all mailboxes in the tenant. + (DocsDescription) This standard configures the recipient limits for all mailboxes in the tenant. The recipient limit determines the maximum number of recipients that can be specified in the To, Cc, and Bcc fields of a message. This helps prevent spam and manage email flow. + .NOTES + CAT + Exchange Standards + TAG + ADDEDCOMPONENT + {"type":"number","name":"standards.MailboxRecipientLimits.RecipientLimit","label":"Recipient Limit","defaultValue":500} + IMPACT + Low Impact + ADDEDDATE + 2025-05-28 + POWERSHELLEQUIVALENT + Set-Mailbox -RecipientLimits + RECOMMENDEDBY + "CIPP" + #> + + param($Tenant, $Settings) + + # Input validation + if ([Int32]$Settings.RecipientLimit -lt 0 -or [Int32]$Settings.RecipientLimit -gt 10000) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message 'MailboxRecipientLimits: Invalid RecipientLimit parameter set. Must be between 0 and 10000.' -sev Error + return + } + + # Get mailbox plans first + $MailboxPlans = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MailboxPlan' -cmdParams @{ ResultSize = 'Unlimited' } + + # Create a hashtable of mailbox plans for quick lookup + $MailboxPlanLookup = @{} + foreach ($Plan in $MailboxPlans) { + $MailboxPlanLookup[$Plan.Guid] = $Plan + } + + # Get mailboxes that need updating (either different from target limit or have "Unlimited" set) + $Requests = @( + @{ + CmdletInput = @{ + CmdletName = 'Get-Mailbox' + Parameters = @{ + ResultSize = 'Unlimited' + Filter = "RecipientLimits -ne '$($Settings.RecipientLimit)' -or RecipientLimits -eq 'Unlimited'" + } + } + } + ) + + $Mailboxes = New-ExoBulkRequest -tenantid $Tenant -cmdletArray $Requests + + # Process mailboxes and categorize them based on their plan limits + $MailboxResults = $Mailboxes | ForEach-Object { + $Mailbox = $_ + $Plan = $MailboxPlanLookup[$Mailbox.MailboxPlanId] + + if ($Plan) { + $PlanMaxRecipients = $Plan.MaxRecipientsPerMessage + + # If mailbox has "Unlimited" set but has a plan, use the plan's limit as the current limit + $CurrentLimit = if ($Mailbox.RecipientLimits -eq 'Unlimited') { + $PlanMaxRecipients + } + else { + $Mailbox.RecipientLimits + } + + if ($Settings.RecipientLimit -gt $PlanMaxRecipients) { + [PSCustomObject]@{ + Type = 'PlanIssue' + Mailbox = $Mailbox + CurrentLimit = $CurrentLimit + PlanLimit = $PlanMaxRecipients + PlanName = $Plan.DisplayName + } + } + elseif ($CurrentLimit -ne $Settings.RecipientLimit) { + [PSCustomObject]@{ + Type = 'ToUpdate' + Mailbox = $Mailbox + } + } + } + elseif ($Mailbox.RecipientLimits -ne $Settings.RecipientLimit) { + [PSCustomObject]@{ + Type = 'ToUpdate' + Mailbox = $Mailbox + } + } + } + + # Separate mailboxes into their respective categories + $MailboxesToUpdate = $MailboxResults | Where-Object { $_.Type -eq 'ToUpdate' } | Select-Object -ExpandProperty Mailbox + $MailboxesWithPlanIssues = $MailboxResults | Where-Object { $_.Type -eq 'PlanIssue' } | ForEach-Object { + [PSCustomObject]@{ + Identity = $_.Mailbox.Identity + CurrentLimit = $_.CurrentLimit + PlanLimit = $_.PlanLimit + PlanName = $_.PlanName + } + } + + # Remediation + if ($Settings.remediate -eq $true) { + if ($MailboxesWithPlanIssues.Count -gt 0) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Found $($MailboxesWithPlanIssues.Count) mailboxes where the requested recipient limit ($($Settings.RecipientLimit)) exceeds their mailbox plan limit. These mailboxes will not be updated." -sev Info + foreach ($Mailbox in $MailboxesWithPlanIssues) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Mailbox $($Mailbox.Identity) has plan $($Mailbox.PlanName) with maximum limit of $($Mailbox.PlanLimit)" -sev Info + } + } + + if ($MailboxesToUpdate.Count -gt 0) { + try { + # Create batch requests for mailbox updates + $UpdateRequests = $MailboxesToUpdate | ForEach-Object { + @{ + CmdletInput = @{ + CmdletName = 'Set-Mailbox' + Parameters = @{ + Identity = $_.Identity + RecipientLimits = $Settings.RecipientLimit + } + } + } + } + + # Execute batch update + $null = New-ExoBulkRequest -tenantid $Tenant -cmdletArray $UpdateRequests + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Successfully set recipient limits to $($Settings.RecipientLimit) for $($MailboxesToUpdate.Count) mailboxes" -sev Info + } + catch { + $ErrorMessage = Get-CippException -Exception $_ + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Could not set recipient limits. $($ErrorMessage.NormalizedError)" -sev Error -LogData $ErrorMessage + } + } + else { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "All mailboxes already have the correct recipient limit of $($Settings.RecipientLimit)" -sev Info + } + } + + # Alert + if ($Settings.alert -eq $true) { + if ($MailboxesToUpdate.Count -eq 0 -and $MailboxesWithPlanIssues.Count -eq 0) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "All mailboxes have the correct recipient limit of $($Settings.RecipientLimit)" -sev Info + } + else { + $AlertMessage = "Found $($MailboxesToUpdate.Count) mailboxes with incorrect recipient limits" + if ($MailboxesWithPlanIssues.Count -gt 0) { + $AlertMessage += " and $($MailboxesWithPlanIssues.Count) mailboxes where the requested limit exceeds their mailbox plan limit" + } + Write-StandardsAlert -message $AlertMessage -object ($MailboxesToUpdate + $MailboxesWithPlanIssues) -tenant $Tenant -standardName 'MailboxRecipientLimits' -standardId $Settings.standardId + Write-LogMessage -API 'Standards' -tenant $Tenant -message $AlertMessage -sev Info + } + } + + # Report + if ($Settings.report -eq $true) { + $ReportData = @{ + MailboxesToUpdate = $MailboxesToUpdate + MailboxesWithPlanIssues = $MailboxesWithPlanIssues + } + Add-CIPPBPAField -FieldName 'MailboxRecipientLimits' -FieldValue $ReportData -StoreAs json -Tenant $Tenant + + if ($MailboxesToUpdate.Count -eq 0 -and $MailboxesWithPlanIssues.Count -eq 0) { + $FieldValue = $true + } + else { + $FieldValue = $ReportData + } + Set-CIPPStandardsCompareField -FieldName 'standards.MailboxRecipientLimits' -FieldValue $FieldValue -Tenant $Tenant + } +} \ No newline at end of file From 800d924e6b9135560c56c010d5a530ad45860d48 Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Wed, 28 May 2025 22:50:51 +0100 Subject: [PATCH 10/24] feat: Add mail contact deployment standard script Add new PowerShell script for deploying mail contacts in CIPP standards. This script provides functionality to manage and deploy mail contact configurations across tenant environments. Tweak to prevent early code exit Further adjustment to code execution Streamlined --- .../Invoke-CIPPStandardDeployMailContact.ps1 | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeployMailContact.ps1 diff --git a/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeployMailContact.ps1 b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeployMailContact.ps1 new file mode 100644 index 0000000000000..1802ac42847a7 --- /dev/null +++ b/Modules/CIPPCore/Public/Standards/Invoke-CIPPStandardDeployMailContact.ps1 @@ -0,0 +1,103 @@ +function Invoke-CIPPStandardDeployMailContact { + <# + .FUNCTIONALITY + Internal + .COMPONENT + (APIName) DeployMailContact + .SYNOPSIS + (Label) Deploy Mail Contact + .DESCRIPTION + (Helptext) Creates a new mail contact in Exchange Online across all selected tenants. The contact will be visible in the Global Address List. + (DocsDescription) This standard creates a new mail contact in Exchange Online. Mail contacts are useful for adding external email addresses to your organization's address book. They can be used for distribution lists, shared mailboxes, and other collaboration scenarios. + .NOTES + CAT + Exchange Standards + TAG + ADDEDCOMPONENT + {"type":"textField","name":"standards.DeployMailContact.ExternalEmailAddress","label":"External Email Address","required":true} + {"type":"textField","name":"standards.DeployMailContact.DisplayName","label":"Display Name","required":true} + {"type":"textField","name":"standards.DeployMailContact.FirstName","label":"First Name","required":false} + {"type":"textField","name":"standards.DeployMailContact.LastName","label":"Last Name","required":false} + IMPACT + Low Impact + ADDEDDATE + 2025-05-28 + POWERSHELLEQUIVALENT + New-MailContact + RECOMMENDEDBY + "CIPP" + #> + + param($Tenant, $Settings) + + # Input validation + if ([string]::IsNullOrWhiteSpace($Settings.DisplayName)) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message 'DeployMailContact: DisplayName cannot be empty or just whitespace.' -sev Error + return + } + + try { + $null = [System.Net.Mail.MailAddress]::new($Settings.ExternalEmailAddress) + } + catch { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "DeployMailContact: Invalid email address format: $($Settings.ExternalEmailAddress)" -sev Error + return + } + + # Prepare contact data for reuse + $ContactData = @{ + DisplayName = $Settings.DisplayName + ExternalEmailAddress = $Settings.ExternalEmailAddress + FirstName = $Settings.FirstName + LastName = $Settings.LastName + } + + # Check if contact already exists + try { + $ExistingContact = New-ExoRequest -tenantid $Tenant -cmdlet 'Get-MailContact' -cmdParams @{ + Identity = $Settings.ExternalEmailAddress + ErrorAction = 'Stop' + } + } + catch { + if ($_.Exception.Message -like "*couldn't be found*") { + $ExistingContact = $null + } + else { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Error checking for existing mail contact: $(Get-CippException -Exception $_).NormalizedError" -sev Error + return + } + } + + # Remediation + if ($Settings.remediate -eq $true -and -not $ExistingContact) { + try { + $NewContactParams = $ContactData.Clone() + $NewContactParams.Name = $Settings.DisplayName + $null = New-ExoRequest -tenantid $Tenant -cmdlet 'New-MailContact' -cmdParams $NewContactParams + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Successfully created mail contact $($Settings.DisplayName) with email $($Settings.ExternalEmailAddress)" -sev Info + } + catch { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Could not create mail contact. $(Get-CippException -Exception $_).NormalizedError" -sev Error + } + } + + # Alert + if ($Settings.alert -eq $true) { + if ($ExistingContact) { + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Mail contact $($Settings.DisplayName) already exists" -sev Info + } + else { + Write-StandardsAlert -message "Mail contact $($Settings.DisplayName) needs to be created" -object $ContactData -tenant $Tenant -standardName 'DeployMailContact' -standardId $Settings.standardId + Write-LogMessage -API 'Standards' -tenant $Tenant -message "Mail contact $($Settings.DisplayName) needs to be created" -sev Info + } + } + + # Report + if ($Settings.report -eq $true) { + $ReportData = $ContactData.Clone() + $ReportData.Exists = [bool]$ExistingContact + Add-CIPPBPAField -FieldName 'DeployMailContact' -FieldValue $ReportData -StoreAs json -Tenant $Tenant + Set-CIPPStandardsCompareField -FieldName 'standards.DeployMailContact' -FieldValue $($ExistingContact ? $true : $ReportData) -Tenant $Tenant + } +} \ No newline at end of file From 0dddb94f17e5a271071e271480e5ab6ffda3c81d Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Thu, 29 May 2025 01:31:53 +0100 Subject: [PATCH 11/24] Created a function to remove proxy addresses, and set primary smtp addresses --- .../Users/Invoke-SetUserAliases.ps1 | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 new file mode 100644 index 0000000000000..92c7d744443b0 --- /dev/null +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 @@ -0,0 +1,147 @@ +using namespace System.Net + +Function Invoke-SetUserAliases { + <# + .FUNCTIONALITY + Entrypoint + .ROLE + Identity.User.ReadWrite + #> + [CmdletBinding()] + param($Request, $TriggerMetadata) + + $APIName = $Request.Params.CIPPEndpoint + $Headers = $Request.Headers + Write-LogMessage -headers $Headers -API $ApiName -message 'Accessed this API' -Sev 'Debug' + + $UserObj = $Request.Body + if ([string]::IsNullOrWhiteSpace($UserObj.id)) { + $body = @{'Results' = @('Failed to manage aliases. No user ID provided') } + Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{ + StatusCode = [HttpStatusCode]::BadRequest + Body = $Body + }) + return + } + + $Results = [System.Collections.Generic.List[object]]::new() + $Aliases = if ($UserObj.AddedAliases) { ($UserObj.AddedAliases) -split '\s' } + $RemoveAliases = if ($UserObj.RemovedAliases) { ($UserObj.RemovedAliases) -split '\s' } + + try { + if ($Aliases -or $RemoveAliases -or $UserObj.MakePrimary) { + # Get current mailbox + $CurrentMailbox = New-ExoRequest -tenantid $UserObj.tenantFilter -cmdlet 'Get-Mailbox' -cmdParams @{ Identity = $UserObj.id } -UseSystemMailbox $true + + if (-not $CurrentMailbox) { + throw 'Could not find mailbox for user' + } + + $CurrentProxyAddresses = @($CurrentMailbox.EmailAddresses) + Write-Host "Current proxy addresses: $($CurrentProxyAddresses -join ', ')" + $NewProxyAddresses = @($CurrentProxyAddresses) + + # Handle setting primary address + if ($UserObj.MakePrimary) { + $PrimaryAddress = $UserObj.MakePrimary + Write-Host "Attempting to set primary address: $PrimaryAddress" + + # Normalize the primary address format + if ($PrimaryAddress -notlike 'SMTP:*') { + $PrimaryAddress = "SMTP:$($PrimaryAddress -replace '^smtp:', '')" + } + Write-Host "Normalized primary address: $PrimaryAddress" + + # Check if the address exists in the current addresses (case-insensitive) + $ExistingAddress = $CurrentProxyAddresses | Where-Object { + $current = $_.ToLower() + $target = $PrimaryAddress.ToLower() + Write-Host "Comparing: '$current' with '$target'" + $current -eq $target + } + + if (-not $ExistingAddress) { + Write-Host "Available addresses: $($CurrentProxyAddresses -join ', ')" + throw "Cannot set primary address. Address $($PrimaryAddress -replace '^SMTP:', '') not found in user's addresses." + } + + # Convert all current SMTP addresses to lowercase (secondary) + $NewProxyAddresses = $NewProxyAddresses | ForEach-Object { + if ($_ -like 'SMTP:*') { + $_.ToLower() + } + else { + $_ + } + } + + # Remove any existing version of the address (case-insensitive) + $NewProxyAddresses = $NewProxyAddresses | Where-Object { + $_.ToLower() -ne $PrimaryAddress.ToLower() + } + # Add the new primary address at the beginning + $NewProxyAddresses = @($PrimaryAddress) + $NewProxyAddresses + + Write-LogMessage -API $ApiName -tenant ($UserObj.tenantFilter) -headers $Headers -message "Set primary address for $($CurrentMailbox.DisplayName)" -Sev Info + $null = $results.Add('Success. Set new primary address.') + } + + # Remove specified aliases + if ($RemoveAliases) { + foreach ($Alias in $RemoveAliases) { + # Normalize the alias format + if ($Alias -notlike 'smtp:*') { + $Alias = "smtp:$Alias" + } + # Remove the alias case-insensitively + $NewProxyAddresses = $NewProxyAddresses | Where-Object { + $_.ToLower() -ne $Alias.ToLower() + } + } + Write-LogMessage -API $ApiName -tenant ($UserObj.tenantFilter) -headers $Headers -message "Removed Aliases from $($CurrentMailbox.DisplayName)" -Sev Info + $null = $results.Add('Success. Removed specified aliases from user.') + } + + # Add new aliases + if ($Aliases) { + $AliasesToAdd = @() + foreach ($Alias in $Aliases) { + # Normalize the alias format + if ($Alias -notlike 'smtp:*') { + $Alias = "smtp:$Alias" + } + # Check if the alias exists case-insensitively + if (-not ($NewProxyAddresses | Where-Object { $_.ToLower() -eq $Alias.ToLower() })) { + $AliasesToAdd = $AliasesToAdd + $Alias + } + } + if ($AliasesToAdd.Count -gt 0) { + $NewProxyAddresses = $NewProxyAddresses + $AliasesToAdd + Write-LogMessage -API $ApiName -tenant ($UserObj.tenantFilter) -headers $Headers -message "Added Aliases to $($CurrentMailbox.DisplayName)" -Sev Info + $null = $results.Add('Success. Added new aliases to user.') + } + } + + # Update the mailbox with new proxy addresses + $Params = @{ + Identity = $UserObj.id + EmailAddresses = $NewProxyAddresses + } + $null = New-ExoRequest -tenantid $UserObj.tenantFilter -cmdlet 'Set-Mailbox' -cmdParams $Params -UseSystemMailbox $true + } + else { + $null = $results.Add('No alias changes specified.') + } + } + catch { + $ErrorMessage = Get-CippException -Exception $_ + Write-LogMessage -API $ApiName -tenant ($UserObj.tenantFilter) -headers $Headers -message "Alias management failed. $($ErrorMessage.NormalizedError)" -Sev Error -LogData $ErrorMessage + $null = $results.Add("Failed to manage aliases: $($ErrorMessage.NormalizedError)") + } + + $body = @{'Results' = @($results) } + Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{ + StatusCode = [HttpStatusCode]::OK + Body = $Body + }) +} \ No newline at end of file From bad241851af9b2f64ccf85c6be4ec9bfe839e40d Mon Sep 17 00:00:00 2001 From: John Duprey Date: Wed, 28 May 2025 22:21:39 -0400 Subject: [PATCH 12/24] typo --- Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 b/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 index 6dc103ab667e4..f3cee2080ca4b 100644 --- a/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 +++ b/Modules/CIPPCore/Public/Test-CIPPAccessPermissions.ps1 @@ -163,7 +163,7 @@ function Test-CIPPAccessPermissions { try { $MFAServicePolicy = New-GraphGetRequest -uri 'https://graph.microsoft.com/beta/policies/mfaServicePolicy' -tenantid $env:TenantID -AsApp $true -NoAuthCheck $true if ($MFAServicePolicy.rememberMfaOnTrustedDevice.isEnabled -eq $true -and $MFAServicePolicy.rememberMfaOnTrustedDevice.allowedNumberOfDays -gt 0) { - $ErrorMessages.Add("MFA Service Policy has a session lifetime of $($MFAServicePolicy.rememberMfaOnTrustedDevice.allowedNumberOfDays) days. This may cause athentication issues for your service account.") | Out-Null + $ErrorMessages.Add("MFA Service Policy has a session lifetime of $($MFAServicePolicy.rememberMfaOnTrustedDevice.allowedNumberOfDays) days. This may cause authentication issues for your service account.") | Out-Null $Links.Add([PSCustomObject]@{ Text = 'Troubleshooting' Href = 'https://docs.cipp.app/troubleshooting/troubleshooting#multi-factor-authentication-troubleshooting' From 5b294807270620cae99e749a5f1b633f5901e836 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Thu, 29 May 2025 15:00:56 +0200 Subject: [PATCH 13/24] add Terrl word --- cspell.json | 117 ++++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 58 deletions(-) diff --git a/cspell.json b/cspell.json index 376f61639b3f6..a46f912f562a7 100644 --- a/cspell.json +++ b/cspell.json @@ -4,66 +4,67 @@ "dictionaryDefinitions": [], "dictionaries": [], "words": [ - "Intune", - "Entra", - "GDAP", - "CIPP", - "CIPP-API", - "OBEE", - "TNEF", - "winmail", - "AITM", - "Yubikey", - "Sherweb", - "Autotask", - "Connectwise", - "Datto", - "Bluetrait", - "ADMS", - "SSPR", - "PSTN", - "Passwordless", + "ADMS", + "AITM", + "Autotask", + "Bluetrait", + "CIPP", + "CIPP-API", + "Connectwise", + "Datto", + "Entra", + "GDAP", + "Intune", + "OBEE", + "Passwordless", + "PSTN", + "Sherweb", + "SSPR", + "Terrl", + "TNEF", + "winmail", + "Yubikey" ], "ignoreWords": [ - "tenantid", - "APINAME", - "CIPPBPA", - "CIPPCA", - "CIPPSPO", - "CIPPAPI", - "Addins", - "Helptext", - "ADDEDCOMPONENT", - "ADDEDDATE", - "POWERSHELLEQUIVALENT", - "RECOMMENDEDBY", - "UPDATECOMMENTBLOCK", - "DISABLEDFEATURES", - "pscustomobject", - "microsoftonline", - "mdo_safeattachments", - "mdo_highconfidencespamaction", - "mdo_highconfidencephishaction", - "mdo_phisspamacation", - "mdo_spam_notifications_only_for_admins", - "mdo_antiphishingpolicies", - "mdo_phishthresholdlevel", - "mdo_autoforwardingmode", - "mdo_blockmailforward", - "mdo_zapspam", - "mdo_zapphish", - "mdo_zapmalware", - "mdo_safedocuments", - "mdo_commonattachmentsfilter", - "mdo_safeattachmentpolicy", - "mdo_safelinksforemail", - "mdo_safelinksforOfficeApps", - "exo_storageproviderrestricted", - "exo_individualsharing", - "exo_outlookaddins", - "exo_mailboxaudit", - "exo_mailtipsenabled", - "mip_search_auditlog", + "tenantid", + "APINAME", + "CIPPBPA", + "CIPPCA", + "CIPPSPO", + "CIPPAPI", + "Addins", + "Helptext", + "ADDEDCOMPONENT", + "ADDEDDATE", + "POWERSHELLEQUIVALENT", + "RECOMMENDEDBY", + "UPDATECOMMENTBLOCK", + "DISABLEDFEATURES", + "pscustomobject", + "microsoftonline", + "mdo_safeattachments", + "mdo_highconfidencespamaction", + "mdo_highconfidencephishaction", + "mdo_phisspamacation", + "mdo_spam_notifications_only_for_admins", + "mdo_antiphishingpolicies", + "mdo_phishthresholdlevel", + "mdo_autoforwardingmode", + "mdo_blockmailforward", + "mdo_zapspam", + "mdo_zapphish", + "mdo_zapmalware", + "mdo_safedocuments", + "mdo_commonattachmentsfilter", + "mdo_safeattachmentpolicy", + "mdo_safelinksforemail", + "mdo_safelinksforOfficeApps", + "exo_storageproviderrestricted", + "exo_individualsharing", + "exo_outlookaddins", + "exo_mailboxaudit", + "exo_mailtipsenabled", + "mip_search_auditlog" ], "import": [] } From 5fc9a6d4d0ad365846c3dc4ca5ea820d7982e45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Thu, 29 May 2025 15:03:04 +0200 Subject: [PATCH 14/24] Feat: Add TERRL status scripted alert --- .../Public/Alerts/Get-CIPPAlertTERRL.ps1 | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Modules/CIPPCore/Public/Alerts/Get-CIPPAlertTERRL.ps1 diff --git a/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertTERRL.ps1 b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertTERRL.ps1 new file mode 100644 index 0000000000000..4fa7a04e843cb --- /dev/null +++ b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertTERRL.ps1 @@ -0,0 +1,39 @@ +function Get-CIPPAlertTERRL { + <# + .FUNCTIONALITY + Entrypoint + #> + [CmdletBinding()] + Param ( + [Parameter(Mandatory = $false)] + [Alias('input')] + $InputValue, + $TenantFilter + ) + + try { + # Set threshold with fallback to 80% + $Threshold = if ([string]::IsNullOrWhiteSpace($InputValue)) { 80 } else { [int]$InputValue } + + # Get TERRL status + $TerrlStatus = New-ExoRequest -tenantid $TenantFilter -cmdlet 'Get-LimitsEnforcementStatus' + + if ($TerrlStatus) { + $UsagePercentage = [math]::Round(($TerrlStatus.ObservedValue / $TerrlStatus.Threshold) * 100, 2) + + if ($UsagePercentage -gt $Threshold) { + $AlertData = [PSCustomObject]@{ + UsagePercentage = $UsagePercentage + CurrentVolume = $TerrlStatus.ObservedValue + ThresholdLimit = $TerrlStatus.Threshold + EnforcementEnabled = $TerrlStatus.EnforcementEnabled + Verdict = $TerrlStatus.Verdict + Message = 'Tenant is at {0}% of their TERRL limit (using {1} of {2} messages). Tenant Enforcement Status: {3}' -f $UsagePercentage, $TerrlStatus.ObservedValue, $TerrlStatus.Threshold, $TerrlStatus.Verdict + } + Write-AlertTrace -cmdletName $MyInvocation.MyCommand -tenantFilter $TenantFilter -data $AlertData + } + } + } catch { + Write-AlertMessage -tenant $($TenantFilter) -message "Could not get TERRL status for $($TenantFilter): $(Get-NormalizedError -message $_.Exception.message)" + } +} From 11dca75f2bc68538b975bfde9756b326432eabd6 Mon Sep 17 00:00:00 2001 From: Jr7468 Date: Fri, 30 May 2025 00:25:23 +0100 Subject: [PATCH 15/24] Add functionality to add proxy addresses --- .../Identity/Administration/Users/Invoke-SetUserAliases.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 index 92c7d744443b0..3ca90f60b72a7 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-SetUserAliases.ps1 @@ -25,8 +25,8 @@ Function Invoke-SetUserAliases { } $Results = [System.Collections.Generic.List[object]]::new() - $Aliases = if ($UserObj.AddedAliases) { ($UserObj.AddedAliases) -split '\s' } - $RemoveAliases = if ($UserObj.RemovedAliases) { ($UserObj.RemovedAliases) -split '\s' } + $Aliases = if ($UserObj.AddedAliases) { ($UserObj.AddedAliases -split ',').ForEach({ $_.Trim() }) } + $RemoveAliases = if ($UserObj.RemovedAliases) { ($UserObj.RemovedAliases -split ',').ForEach({ $_.Trim() }) } try { if ($Aliases -or $RemoveAliases -or $UserObj.MakePrimary) { From 4ae5cd9190db07919b0a55aff9720e2e74b58b28 Mon Sep 17 00:00:00 2001 From: Zac Richards <107489668+Zacgoose@users.noreply.github.com> Date: Fri, 30 May 2025 09:47:51 +0800 Subject: [PATCH 16/24] Make it possible to ignore disabled apps, backwards compatible --- .../Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 index efd1326fbcc57..97259dcefefc4 100644 --- a/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 +++ b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 @@ -14,13 +14,20 @@ function Get-CIPPAlertHuntressRogueApps { [Parameter(Mandatory = $false)] [Alias('input')] $InputValue, - $TenantFilter + $TenantFilter, + [Parameter(Mandatory = $false)] + [Alias('ignoreDisabledApps')] + [bool]$IgnoreDisabledApps = $false ) try { $RogueApps = Invoke-RestMethod -Uri 'https://raw.githubusercontent.com/huntresslabs/rogueapps/main/public/rogueapps.json' $RogueAppFilter = $RogueApps.appId -join "','" $ServicePrincipals = New-GraphGetRequest -uri "https://graph.microsoft.com/beta/servicePrincipals?`$filter=appId in ('$RogueAppFilter')" -tenantid $TenantFilter + # If IgnoreDisabledApps is true, filter out disabled service principals + if ($IgnoreDisabledApps) { + $ServicePrincipals = $ServicePrincipals | Where-Object { $_.accountEnabled -eq $true } + } if (($ServicePrincipals | Measure-Object).Count -gt 0) { $AlertData = foreach ($ServicePrincipal in $ServicePrincipals) { From f1f68602391c71cfa4f151009351111e3d682633 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Fri, 30 May 2025 00:11:53 -0400 Subject: [PATCH 17/24] Update sherweb license management add new allowed roles support to entra group roles --- .../Authentication/Get-CIPPAccessRole.ps1 | 30 ++++++++++++------- .../Administration/Users/Invoke-EditUser.ps1 | 6 ++-- .../Entrypoints/Invoke-ExecCSPLicense.ps1 | 8 ++--- Modules/CIPPCore/Public/New-CIPPUserTask.ps1 | 2 +- .../Sherweb/Remove-SherwebSubscription.ps1 | 28 ++++++++++++++++- .../Sherweb/Set-SherwebSubscription.ps1 | 27 ++++++++++++++++- 6 files changed, 82 insertions(+), 19 deletions(-) diff --git a/Modules/CIPPCore/Public/Authentication/Get-CIPPAccessRole.ps1 b/Modules/CIPPCore/Public/Authentication/Get-CIPPAccessRole.ps1 index a43351bc11f74..799aae7c44666 100644 --- a/Modules/CIPPCore/Public/Authentication/Get-CIPPAccessRole.ps1 +++ b/Modules/CIPPCore/Public/Authentication/Get-CIPPAccessRole.ps1 @@ -16,24 +16,34 @@ function Get-CIPPAccessRole { Internal #> [CmdletBinding()] - param($Request) + param($Request, $Headers) - $CacheAccessUserRoleTable = Get-CIPPTable -tablename 'cacheAccessUserRole' - $CachedRoles = Get-CIPPAzDataTableEntity @CacheAccessUserRoleTable -Filter "PartitionKey eq 'AccessUser' and RowKey eq '$($Request.Headers.'x-ms-client-principal-name')'" | Select-Object -ExpandProperty Role | ConvertFrom-Json + $Headers = $Request.Headers ?? $Headers - $SwaCreds = ([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($request.headers.'x-ms-client-principal')) | ConvertFrom-Json) + $CacheAccessUserRoleTable = Get-CIPPTable -tablename 'cacheAccessUserRoles' + + $SwaCreds = ([System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($Headers.'x-ms-client-principal')) | ConvertFrom-Json) $SwaRoles = $SwaCreds.userRoles + $Username = $SwaCreds.userDetails + + $CachedRoles = Get-CIPPAzDataTableEntity @CacheAccessUserRoleTable -Filter "PartitionKey eq 'AccessUser' and RowKey eq '$Username'" | Select-Object -ExpandProperty Role | ConvertFrom-Json + + Write-Information "SWA Roles: $($SwaRoles -join ', ')" + Write-Information "Cached Roles: $($CachedRoles -join ', ')" # Combine SWA roles and cached roles into a single deduplicated list $AllRoles = [System.Collections.Generic.List[string]]::new() - if ($null -ne $SwaRoles) { - $AllRoles.AddRange($SwaRoles) + + foreach ($Role in $SwaRoles) { + if (-not $AllRoles.Contains($Role)) { + $AllRoles.Add($Role) + } } - if ($null -ne $CachedRoles) { - $AllRoles.AddRange($CachedRoles) + foreach ($Role in $CachedRoles) { + if (-not $AllRoles.Contains($Role)) { + $AllRoles.Add($Role) + } } - - # Remove duplicates and ensure we have a clean array $CombinedRoles = $AllRoles | Select-Object -Unique # For debugging diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1 index e2f1dac8cffd7..33d5b08ceea5b 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Identity/Administration/Users/Invoke-EditUser.ps1 @@ -1,6 +1,6 @@ using namespace System.Net -Function Invoke-EditUser { +function Invoke-EditUser { <# .FUNCTIONALITY Entrypoint @@ -89,7 +89,7 @@ Function Invoke-EditUser { if ($licenses -or $UserObj.removeLicenses) { if ($UserObj.sherwebLicense.value) { - $null = Set-SherwebSubscription -TenantFilter $UserObj.tenantFilter -SKU $UserObj.sherwebLicense.value -Add 1 + $null = Set-SherwebSubscription -Headers $Headers -TenantFilter $UserObj.tenantFilter -SKU $UserObj.sherwebLicense.value -Add 1 $null = $Results.Add('Added Sherweb License, scheduling assignment') $taskObject = [PSCustomObject]@{ TenantFilter = $UserObj.tenantFilter @@ -135,6 +135,8 @@ Function Invoke-EditUser { $ErrorMessage = Get-CippException -Exception $_ Write-LogMessage -API $ApiName -tenant ($UserObj.tenantFilter) -headers $Headers -message "License assign API failed. $($ErrorMessage.NormalizedError)" -Sev Error -LogData $ErrorMessage $null = $results.Add( "We've failed to assign the license. $($ErrorMessage.NormalizedError)") + Write-Warning "License assign API failed. $($_.Exception.Message)" + Write-Information $_.InvocationInfo.PositionMessage } #Add Aliases, removal currently not supported. diff --git a/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecCSPLicense.ps1 b/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecCSPLicense.ps1 index 652ccd0d6da8e..fc6ce44569e4f 100644 --- a/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecCSPLicense.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/Invoke-ExecCSPLicense.ps1 @@ -21,18 +21,18 @@ Function Invoke-ExecCSPLicense { try { if ($Action -eq 'Add') { - $null = Set-SherwebSubscription -tenantFilter $TenantFilter -SKU $SKU -add $Request.Body.Add + $null = Set-SherwebSubscription -Headers $Headers -tenantFilter $TenantFilter -SKU $SKU -add $Request.Body.Add } if ($Action -eq 'Remove') { - $null = Set-SherwebSubscription -tenantFilter $TenantFilter -SKU $SKU -remove $Request.Body.Remove + $null = Set-SherwebSubscription -Headers $Headers -tenantFilter $TenantFilter -SKU $SKU -remove $Request.Body.Remove } if ($Action -eq 'NewSub') { - $null = Set-SherwebSubscription -tenantFilter $TenantFilter -SKU $SKU -Quantity $Request.Body.Quantity + $null = Set-SherwebSubscription -Headers $Headers -tenantFilter $TenantFilter -SKU $SKU -Quantity $Request.Body.Quantity } if ($Action -eq 'Cancel') { - $null = Remove-SherwebSubscription -tenantFilter $TenantFilter -SubscriptionIds $Request.Body.SubscriptionIds + $null = Remove-SherwebSubscription -Headers $Headers -tenantFilter $TenantFilter -SubscriptionIds $Request.Body.SubscriptionIds } $Result = 'License change executed successfully.' $StatusCode = [HttpStatusCode]::OK diff --git a/Modules/CIPPCore/Public/New-CIPPUserTask.ps1 b/Modules/CIPPCore/Public/New-CIPPUserTask.ps1 index 7675569baf19b..3c228ef1006b8 100644 --- a/Modules/CIPPCore/Public/New-CIPPUserTask.ps1 +++ b/Modules/CIPPCore/Public/New-CIPPUserTask.ps1 @@ -21,7 +21,7 @@ function New-CIPPUserTask { try { if ($UserObj.licenses.value) { if ($UserObj.sherwebLicense.value) { - $License = Set-SherwebSubscription -TenantFilter $UserObj.tenantFilter -SKU $UserObj.sherwebLicense.value -Add 1 + $License = Set-SherwebSubscription -Headers $Headers -TenantFilter $UserObj.tenantFilter -SKU $UserObj.sherwebLicense.value -Add 1 $null = $results.Add('Added Sherweb License, scheduling assignment') $taskObject = [PSCustomObject]@{ TenantFilter = $UserObj.tenantFilter diff --git a/Modules/CippExtensions/Public/Sherweb/Remove-SherwebSubscription.ps1 b/Modules/CippExtensions/Public/Sherweb/Remove-SherwebSubscription.ps1 index 87ca1c483d48b..b24e173dd4881 100644 --- a/Modules/CippExtensions/Public/Sherweb/Remove-SherwebSubscription.ps1 +++ b/Modules/CippExtensions/Public/Sherweb/Remove-SherwebSubscription.ps1 @@ -4,8 +4,34 @@ function Remove-SherwebSubscription { [string]$CustomerId, [Parameter(Mandatory = $true)] [string[]]$SubscriptionIds, - [string]$TenantFilter + [string]$TenantFilter, + $Headers ) + + if ($Headers) { + # Get extension config and check for AllowedCustomRoles + $Table = Get-CIPPTable -TableName Extensionsconfig + $ExtensionConfig = (Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json + $Config = $ExtensionConfig.Sherweb + + $AllowedRoles = $Config.AllowedCustomRoles.value + if ($AllowedRoles -and $Headers.'x-ms-client-principal') { + $UserRoles = Get-CIPPAccessRole -Headers $Headers + $Allowed = $false + foreach ($Role in $UserRoles) { + if ($AllowedRoles -contains $Role) { + Write-Information "User has allowed CIPP role: $Role" + $Allowed = $true + break + } + } + if (-not $Allowed) { + throw 'This user is not allowed to modify Sherweb Licenses.' + } + } + } + + if ($TenantFilter) { $TenantFilter = (Get-Tenants -TenantFilter $TenantFilter).customerId $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId diff --git a/Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1 b/Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1 index 62c27063a6679..62a2c5ccf2ffa 100644 --- a/Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1 +++ b/Modules/CippExtensions/Public/Sherweb/Set-SherwebSubscription.ps1 @@ -7,8 +7,33 @@ function Set-SherwebSubscription { [int]$Quantity, [int]$Add, [int]$Remove, - [string]$TenantFilter + [string]$TenantFilter, + $Headers ) + + if ($Headers) { + # Get extension config and check for AllowedCustomRoles + $Table = Get-CIPPTable -TableName Extensionsconfig + $ExtensionConfig = (Get-CIPPAzDataTableEntity @Table).config | ConvertFrom-Json + $Config = $ExtensionConfig.Sherweb + + $AllowedRoles = $Config.AllowedCustomRoles.value + if ($AllowedRoles -and $Headers.'x-ms-client-principal') { + $UserRoles = Get-CIPPAccessRole -Headers $Headers + $Allowed = $false + foreach ($Role in $UserRoles) { + if ($AllowedRoles -contains $Role) { + Write-Information "User has allowed CIPP role: $Role" + $Allowed = $true + break + } + } + if (-not $Allowed) { + throw 'This user is not allowed to modify Sherweb subscriptions.' + } + } + } + if ($TenantFilter) { $TenantFilter = (Get-Tenants -TenantFilter $TenantFilter).customerId $CustomerId = Get-ExtensionMapping -Extension 'Sherweb' | Where-Object { $_.RowKey -eq $TenantFilter } | Select-Object -ExpandProperty IntegrationId From 6cbbd8dcc83b731eb43d9c41e21632ca94dfba57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20Kj=C3=A6rg=C3=A5rd?= Date: Fri, 30 May 2025 11:19:22 +0200 Subject: [PATCH 18/24] Chore: Update license files to newest from MS --- ConversionTable.csv | 109 ++++++++++++++++++ Modules/CIPPCore/Public/ConversionTable.csv | 109 ++++++++++++++++++ Modules/CippExtensions/ConversionTable.csv | 109 ++++++++++++++++++ .../CippExtensions/Public/ConversionTable.csv | 109 ++++++++++++++++++ 4 files changed, 436 insertions(+) diff --git a/ConversionTable.csv b/ConversionTable.csv index 2f2e83b3e09e9..704f7c507d5fb 100644 --- a/ConversionTable.csv +++ b/ConversionTable.csv @@ -1,4 +1,6 @@ Product_Display_Name,String_Id,GUID,Service_Plan_Name,Service_Plan_Id,Service_Plans_Included_Friendly_Names +10-Year Audit Log Retention Add On,10_ALR_ADDON,c2e41e49-e2a2-4c55-832a-cf13ffba1d6a,Auditing_10Year_ Retention_ Add_On,7d16094b-4db8-41ff-a182-372a90a85407,Auditing 10Year Retention Add On +Advanced Communications,ADV_COMMS,e4654015-5daf-4a48-9b37-4f309dddd88b,TEAMS_ADVCOMMS,604ec28a-ae18-4bc6-91b0-11da94504ba9,Microsoft 365 Advanced Communications AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,CDSAICAPACITY,a7c70a41-5e02-4271-93e6-d9b4184d83f5,AI Builder capacity add-on AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,SPZA,0bfc98ed-1dbc-4a97-b246-701754e48b17,APP CONNECT @@ -6,6 +8,9 @@ App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,EXCHANGE_S_FOUNDATIO App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,M365_AUDIT_PLATFORM,f6de4823-28fa-440b-b886-4783fa86ddba,Microsoft 365 Audit Platform App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_A,5f3b1ded-75c0-4b31-8e6e-9b077eaadfd5,Microsoft Application Protection and Governance (A) App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_D,2e6ffd72-52d1-4541-8f6c-938f9a8d4cdc,Microsoft Application Protection and Governance (D) +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_PREMIUM_GOV,1b66aedf-8ca1-4f73-af76-ec76c6180f98,Azure Information Protection Premium P1 for GCC +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_ENTERPRISE_GOV,6a76346d-5d6e-4051-9fe3-ed3f312b5597,Azure Rights Management Career Coach for faculty,CAREERCOACH_FACULTY,95de1760-7682-406d-98c9-52ef14e51e2b,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Career Coach for students,CAREERCOACH_STUDENTS,01c8007a-57d2-41e0-a3c3-0b46ead16cc4,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Clipchamp Premium,Clipchamp_Premium,0fe440c5-f2bf-442b-a4f4-9a7af77a200b,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -159,6 +164,9 @@ Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Ent Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS,ca00cff5-2568-4d03-bb6c-a653a8f360ca,Common Data Service for Customer Insights Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,DYN365_CUSTOMER_INSIGHTS_BASE,ee85d528-c4b4-4a99-9b07-fb9a1365dc93,Dynamics 365 Customer Insights @@ -245,6 +253,20 @@ Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,EXCHANG Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,D365_Finance,9f0e1b4e-9b33-4300-b451-b2c662cd4ff7,Microsoft Dynamics 365 for Finance Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_CDS_FINANCE,e95d7060-d4d9-400a-a2bd-a244bf0b609e,Common Data Service for Dynamics 365 Finance +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsCDSAttach,e564d403-7eaf-4c91-b92f-bb0dc62026e1,Dynamics 365 Project Operations CDS Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsAttach,fa7675bd-6717-40e7-8172-d0bbcbe1ab12,Dynamics 365 Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,PROJECT_FOR_PROJECT_OPERATIONS_ATTACH,6d8e07c6-9613-484f-8cc1-a66c5c3979bb,Project for Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,SHAREPOINTSTANDARD,c7699d2e-19aa-44de-8edf-1736da088ca1,SharePoint (Plan 1) Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,DYN365_ENTERPRISE_CASE_MANAGEMENT,2822a3a1-9b8f-4432-8989-e11669a60dc8,Dynamics 365 for Case Management Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,Retired - Microsoft Social Engagement Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -282,6 +304,62 @@ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,DYN365_ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -401,6 +479,15 @@ Dynamics 365 for Project Service Automation Enterprise Edition for Government,DY Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1d8c8e0e-4308-4db5-8a41-b129dbdaea20,Dynamics 365 for Project Service Automation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,Forms_Pro_PS_GCC,e98256c5-17d0-4987-becc-e991c52d55c6,Microsoft Dynamics 365 Customer Voice for Project Service Automation for GCC +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTWAC_GOV,8f9f0f3b-ca90-406c-a842-95579171f8ec,Office for the Web for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,PROJECT_CLIENT_SUBSCRIPTION_GOV,45c6831b-ad74-4c7f-bd03-7c2b3fa39067,Project Online Desktop Client +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINT_PROJECT_GOV,e57afa78-1f19-4542-ba13-b32cd4d8f472,Project Online Service for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,DYN365_ENTERPRISE_P1,d56f3deb-50d8-465a-bedb-f079817ccac1,DYNAMICS 365 CUSTOMER ENGAGEMENT PLAN Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,MICROSOFT SOCIAL ENGAGEMENT - SERVICE DISCONTINUATION @@ -490,6 +577,19 @@ Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,EXCHANGE FOUNDATION Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,POWERAPPS FOR DYNAMICS 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_CDS_SUPPLYCHAINMANAGEMENT,b6a8b974-2956-4e14-ae81-f0384c363528,Common Data Service for Dynamics 365 Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_FOR_IOM_USL,9e6d1620-dce9-4655-8933-af8fa5bccc9c,Data Integration for IOM with Power Automate USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,CDS_FOR_IOM,2bb89402-51e9-4c5a-be33-e954a9dd1ba6,Dataverse for IOM +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_DemandPlanning,e8b616eb-1a6d-42b4-84c7-b63870791349,DO NOT USE - Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM,1224eae4-0d91-474a-8a52-27ec96a63fe7,Dynamics 365 for Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM,616cf6e2-f52f-4738-b463-10003061fcd3,Dynamics 365 Intelligent Order Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM_USER,81375e2f-5ef7-4773-96aa-e3279f50bd21,Dynamics 365 Intelligent Order Management USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM_Premium,0363c8e5-c30d-4d7c-a621-7b6cab5e0482,Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,DYN365_CDS_DYN_APPS,2d925ad8-2479-4bd8-bb76-5b80f1d48935,Common Data Service Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Hiring_Free_PLAN,f815ac79-c5dd-4bcc-9b78-d97f7b817d0d,Dynamics 365 for Talent: Attract Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Onboarding_Free_PLAN,300b8114-8555-4313-b861-0c115d820f50,Dynamics 365 for Talent: Onboard @@ -657,6 +757,8 @@ Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2 Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2b-ade1-6766d50a9d9c,RMS_S_BASIC,31cf2cfc-6b0d-4adc-a336-88b724ed8122,Microsoft Azure Rights Management Service Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,EXCHANGE_S_STANDARD_GOV,e9b4930a-925f-45e2-ac2a-3f7788ca6fdd,Exchange Online (Plan 1) for Government Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,EXCHANGE_S_ENTERPRISE_GOV,8c3069c0-ccdb-44be-ab77-986203a67df2,Exchange Online (Plan 2) for Government +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 Exchange Online (Plan 2),EXCHANGEENTERPRISE,19ec0d23-8335-4cbd-94ac-6050e30712fa,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,EXCHANGE ONLINE (PLAN 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,Exchange Online (Plan 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 @@ -670,6 +772,9 @@ Exchange Online Essentials,EXCHANGE_S_ESSENTIALS,e8f81a67-bd96-4074-b108-cf193eb Exchange Online Kiosk,EXCHANGEDESKLESS,80b2d799-d2ba-4d2a-8842-fb0d0f3a4b82,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,EXCHANGE ONLINE KIOSK Exchange Online POP,EXCHANGETELCO,cb0a98a8-11bc-494c-83d9-c1b1ac65327e,EXCHANGE_B_STANDARD,90927877-dcff-4af6-b346-2332c0b15bb7,EXCHANGE ONLINE POP Exchange Online Protection,EOP_ENTERPRISE,45a2423b-e884-448d-a831-d9e139c52d2f,EOP_ENTERPRISE,326e2b78-9d27-42c9-8509-46c827743a17,Exchange Online Protection +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,DYN365_CDS_P1_GOV,ce361df2-f2a5-4713-953f-4050ba09aad8,Common Data Service for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,FLOW_P1_GOV,774da41c-a8b3-47c1-8322-b9c1ab68be9f,Power Automate (Plan 1) for Government Intune,INTUNE_A,061f9ace-7d42-4136-88ac-31dc755f143f,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,MICROSOFT INTUNE Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,AAD_EDU,3a3976ce-de18-4a87-a78e-5e9245e252df,Microsoft Entra ID for Education @@ -3604,6 +3709,8 @@ Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,TEAMS_FRE Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,WHITEBOARD_FIRSTLINE1,36b29273-c6d0-477a-aca6-6fbe24f538e3,WHITEBOARD (FIRSTLINE) Microsoft Teams Calling Plan pay-as-you-go (country zone 1 - US),Microsoft_Teams_Calling_Plan_pay_as_you_go_(country_zone_1_US),9b196e97-5830-4c2e-adc2-1e10ebf5dee5,MCOPSTN_PAYG_1,156a1efe-17cd-4b03-9f17-2eb512298fb3,Microsoft Teams Calling Plan pay-as-you-go - country zone 1 Microsoft Teams Domestic Calling Plan (240 min),MCOPSTN_6,729dbb8f-8d56-4994-8e33-2f218f549544,MCOPSTN6,346d83bf-6fe6-42ca-b424-b9300d2e21bf,Microsoft 365 Domestic Calling Plan (240 min) +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,MCOPSTN1_GOV,3c8a8792-7866-409b-bb61-1b20ace0368b,Domestic Calling Plan for Government +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Teams Essentials,Teams_Ess,fde42873-30b6-436b-b361-21af5a6b84ae,TeamsEss,f4f2f6de-6830-442b-a433-e92249faebe2,Microsoft Teams Essentials Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,Exchange Online Kiosk Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,FORMS_PLAN_E1,159f4cd6-e380-449f-a816-af1a9ef76344,Microsoft Forms (Plan E1) @@ -5050,6 +5157,8 @@ Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c, Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c,EXCHANGE_S_FOUNDATION PBI_PREMIUM_EM1_ADDON,a64b30ba-f310-4065-b444-2670ef146db0,Power BI Premium EM1 Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User,0d3366f3-266e-4117-b422-7cabbc165e7c,Power Pages Authenticated Users per site monthly capacity Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User_GCCH,18e74ca2-b5f0-4802-9a8b-00d2ff1e8322,Power Pages Authenticated Users per site monthly capacity GCCH +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,PowerPages_Authenticated_User_CN,967d9574-a076-4bb7-ab89-f41f64bc142e,Power Pages Authenticated Users per site monthly capacity China Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,PowerPages_Authenticated_User_GCC,cdf787bd-1546-48d2-9e93-b21f9ea7067a,Power Pages Authenticated Users per site monthly capacity GCC Power Pages authenticated users T1 100 users/per site/month capacity pack_USGOV_DOD,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_USGOV_DOD,b54f012e-69e1-43b1-87d0-666def064940,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site diff --git a/Modules/CIPPCore/Public/ConversionTable.csv b/Modules/CIPPCore/Public/ConversionTable.csv index 2f2e83b3e09e9..704f7c507d5fb 100644 --- a/Modules/CIPPCore/Public/ConversionTable.csv +++ b/Modules/CIPPCore/Public/ConversionTable.csv @@ -1,4 +1,6 @@ Product_Display_Name,String_Id,GUID,Service_Plan_Name,Service_Plan_Id,Service_Plans_Included_Friendly_Names +10-Year Audit Log Retention Add On,10_ALR_ADDON,c2e41e49-e2a2-4c55-832a-cf13ffba1d6a,Auditing_10Year_ Retention_ Add_On,7d16094b-4db8-41ff-a182-372a90a85407,Auditing 10Year Retention Add On +Advanced Communications,ADV_COMMS,e4654015-5daf-4a48-9b37-4f309dddd88b,TEAMS_ADVCOMMS,604ec28a-ae18-4bc6-91b0-11da94504ba9,Microsoft 365 Advanced Communications AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,CDSAICAPACITY,a7c70a41-5e02-4271-93e6-d9b4184d83f5,AI Builder capacity add-on AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,SPZA,0bfc98ed-1dbc-4a97-b246-701754e48b17,APP CONNECT @@ -6,6 +8,9 @@ App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,EXCHANGE_S_FOUNDATIO App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,M365_AUDIT_PLATFORM,f6de4823-28fa-440b-b886-4783fa86ddba,Microsoft 365 Audit Platform App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_A,5f3b1ded-75c0-4b31-8e6e-9b077eaadfd5,Microsoft Application Protection and Governance (A) App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_D,2e6ffd72-52d1-4541-8f6c-938f9a8d4cdc,Microsoft Application Protection and Governance (D) +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_PREMIUM_GOV,1b66aedf-8ca1-4f73-af76-ec76c6180f98,Azure Information Protection Premium P1 for GCC +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_ENTERPRISE_GOV,6a76346d-5d6e-4051-9fe3-ed3f312b5597,Azure Rights Management Career Coach for faculty,CAREERCOACH_FACULTY,95de1760-7682-406d-98c9-52ef14e51e2b,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Career Coach for students,CAREERCOACH_STUDENTS,01c8007a-57d2-41e0-a3c3-0b46ead16cc4,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Clipchamp Premium,Clipchamp_Premium,0fe440c5-f2bf-442b-a4f4-9a7af77a200b,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -159,6 +164,9 @@ Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Ent Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS,ca00cff5-2568-4d03-bb6c-a653a8f360ca,Common Data Service for Customer Insights Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,DYN365_CUSTOMER_INSIGHTS_BASE,ee85d528-c4b4-4a99-9b07-fb9a1365dc93,Dynamics 365 Customer Insights @@ -245,6 +253,20 @@ Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,EXCHANG Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,D365_Finance,9f0e1b4e-9b33-4300-b451-b2c662cd4ff7,Microsoft Dynamics 365 for Finance Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_CDS_FINANCE,e95d7060-d4d9-400a-a2bd-a244bf0b609e,Common Data Service for Dynamics 365 Finance +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsCDSAttach,e564d403-7eaf-4c91-b92f-bb0dc62026e1,Dynamics 365 Project Operations CDS Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsAttach,fa7675bd-6717-40e7-8172-d0bbcbe1ab12,Dynamics 365 Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,PROJECT_FOR_PROJECT_OPERATIONS_ATTACH,6d8e07c6-9613-484f-8cc1-a66c5c3979bb,Project for Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,SHAREPOINTSTANDARD,c7699d2e-19aa-44de-8edf-1736da088ca1,SharePoint (Plan 1) Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,DYN365_ENTERPRISE_CASE_MANAGEMENT,2822a3a1-9b8f-4432-8989-e11669a60dc8,Dynamics 365 for Case Management Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,Retired - Microsoft Social Engagement Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -282,6 +304,62 @@ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,DYN365_ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -401,6 +479,15 @@ Dynamics 365 for Project Service Automation Enterprise Edition for Government,DY Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1d8c8e0e-4308-4db5-8a41-b129dbdaea20,Dynamics 365 for Project Service Automation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,Forms_Pro_PS_GCC,e98256c5-17d0-4987-becc-e991c52d55c6,Microsoft Dynamics 365 Customer Voice for Project Service Automation for GCC +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTWAC_GOV,8f9f0f3b-ca90-406c-a842-95579171f8ec,Office for the Web for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,PROJECT_CLIENT_SUBSCRIPTION_GOV,45c6831b-ad74-4c7f-bd03-7c2b3fa39067,Project Online Desktop Client +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINT_PROJECT_GOV,e57afa78-1f19-4542-ba13-b32cd4d8f472,Project Online Service for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,DYN365_ENTERPRISE_P1,d56f3deb-50d8-465a-bedb-f079817ccac1,DYNAMICS 365 CUSTOMER ENGAGEMENT PLAN Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,MICROSOFT SOCIAL ENGAGEMENT - SERVICE DISCONTINUATION @@ -490,6 +577,19 @@ Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,EXCHANGE FOUNDATION Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,POWERAPPS FOR DYNAMICS 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_CDS_SUPPLYCHAINMANAGEMENT,b6a8b974-2956-4e14-ae81-f0384c363528,Common Data Service for Dynamics 365 Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_FOR_IOM_USL,9e6d1620-dce9-4655-8933-af8fa5bccc9c,Data Integration for IOM with Power Automate USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,CDS_FOR_IOM,2bb89402-51e9-4c5a-be33-e954a9dd1ba6,Dataverse for IOM +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_DemandPlanning,e8b616eb-1a6d-42b4-84c7-b63870791349,DO NOT USE - Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM,1224eae4-0d91-474a-8a52-27ec96a63fe7,Dynamics 365 for Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM,616cf6e2-f52f-4738-b463-10003061fcd3,Dynamics 365 Intelligent Order Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM_USER,81375e2f-5ef7-4773-96aa-e3279f50bd21,Dynamics 365 Intelligent Order Management USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM_Premium,0363c8e5-c30d-4d7c-a621-7b6cab5e0482,Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,DYN365_CDS_DYN_APPS,2d925ad8-2479-4bd8-bb76-5b80f1d48935,Common Data Service Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Hiring_Free_PLAN,f815ac79-c5dd-4bcc-9b78-d97f7b817d0d,Dynamics 365 for Talent: Attract Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Onboarding_Free_PLAN,300b8114-8555-4313-b861-0c115d820f50,Dynamics 365 for Talent: Onboard @@ -657,6 +757,8 @@ Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2 Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2b-ade1-6766d50a9d9c,RMS_S_BASIC,31cf2cfc-6b0d-4adc-a336-88b724ed8122,Microsoft Azure Rights Management Service Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,EXCHANGE_S_STANDARD_GOV,e9b4930a-925f-45e2-ac2a-3f7788ca6fdd,Exchange Online (Plan 1) for Government Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,EXCHANGE_S_ENTERPRISE_GOV,8c3069c0-ccdb-44be-ab77-986203a67df2,Exchange Online (Plan 2) for Government +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 Exchange Online (Plan 2),EXCHANGEENTERPRISE,19ec0d23-8335-4cbd-94ac-6050e30712fa,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,EXCHANGE ONLINE (PLAN 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,Exchange Online (Plan 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 @@ -670,6 +772,9 @@ Exchange Online Essentials,EXCHANGE_S_ESSENTIALS,e8f81a67-bd96-4074-b108-cf193eb Exchange Online Kiosk,EXCHANGEDESKLESS,80b2d799-d2ba-4d2a-8842-fb0d0f3a4b82,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,EXCHANGE ONLINE KIOSK Exchange Online POP,EXCHANGETELCO,cb0a98a8-11bc-494c-83d9-c1b1ac65327e,EXCHANGE_B_STANDARD,90927877-dcff-4af6-b346-2332c0b15bb7,EXCHANGE ONLINE POP Exchange Online Protection,EOP_ENTERPRISE,45a2423b-e884-448d-a831-d9e139c52d2f,EOP_ENTERPRISE,326e2b78-9d27-42c9-8509-46c827743a17,Exchange Online Protection +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,DYN365_CDS_P1_GOV,ce361df2-f2a5-4713-953f-4050ba09aad8,Common Data Service for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,FLOW_P1_GOV,774da41c-a8b3-47c1-8322-b9c1ab68be9f,Power Automate (Plan 1) for Government Intune,INTUNE_A,061f9ace-7d42-4136-88ac-31dc755f143f,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,MICROSOFT INTUNE Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,AAD_EDU,3a3976ce-de18-4a87-a78e-5e9245e252df,Microsoft Entra ID for Education @@ -3604,6 +3709,8 @@ Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,TEAMS_FRE Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,WHITEBOARD_FIRSTLINE1,36b29273-c6d0-477a-aca6-6fbe24f538e3,WHITEBOARD (FIRSTLINE) Microsoft Teams Calling Plan pay-as-you-go (country zone 1 - US),Microsoft_Teams_Calling_Plan_pay_as_you_go_(country_zone_1_US),9b196e97-5830-4c2e-adc2-1e10ebf5dee5,MCOPSTN_PAYG_1,156a1efe-17cd-4b03-9f17-2eb512298fb3,Microsoft Teams Calling Plan pay-as-you-go - country zone 1 Microsoft Teams Domestic Calling Plan (240 min),MCOPSTN_6,729dbb8f-8d56-4994-8e33-2f218f549544,MCOPSTN6,346d83bf-6fe6-42ca-b424-b9300d2e21bf,Microsoft 365 Domestic Calling Plan (240 min) +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,MCOPSTN1_GOV,3c8a8792-7866-409b-bb61-1b20ace0368b,Domestic Calling Plan for Government +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Teams Essentials,Teams_Ess,fde42873-30b6-436b-b361-21af5a6b84ae,TeamsEss,f4f2f6de-6830-442b-a433-e92249faebe2,Microsoft Teams Essentials Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,Exchange Online Kiosk Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,FORMS_PLAN_E1,159f4cd6-e380-449f-a816-af1a9ef76344,Microsoft Forms (Plan E1) @@ -5050,6 +5157,8 @@ Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c, Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c,EXCHANGE_S_FOUNDATION PBI_PREMIUM_EM1_ADDON,a64b30ba-f310-4065-b444-2670ef146db0,Power BI Premium EM1 Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User,0d3366f3-266e-4117-b422-7cabbc165e7c,Power Pages Authenticated Users per site monthly capacity Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User_GCCH,18e74ca2-b5f0-4802-9a8b-00d2ff1e8322,Power Pages Authenticated Users per site monthly capacity GCCH +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,PowerPages_Authenticated_User_CN,967d9574-a076-4bb7-ab89-f41f64bc142e,Power Pages Authenticated Users per site monthly capacity China Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,PowerPages_Authenticated_User_GCC,cdf787bd-1546-48d2-9e93-b21f9ea7067a,Power Pages Authenticated Users per site monthly capacity GCC Power Pages authenticated users T1 100 users/per site/month capacity pack_USGOV_DOD,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_USGOV_DOD,b54f012e-69e1-43b1-87d0-666def064940,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site diff --git a/Modules/CippExtensions/ConversionTable.csv b/Modules/CippExtensions/ConversionTable.csv index 2f2e83b3e09e9..704f7c507d5fb 100644 --- a/Modules/CippExtensions/ConversionTable.csv +++ b/Modules/CippExtensions/ConversionTable.csv @@ -1,4 +1,6 @@ Product_Display_Name,String_Id,GUID,Service_Plan_Name,Service_Plan_Id,Service_Plans_Included_Friendly_Names +10-Year Audit Log Retention Add On,10_ALR_ADDON,c2e41e49-e2a2-4c55-832a-cf13ffba1d6a,Auditing_10Year_ Retention_ Add_On,7d16094b-4db8-41ff-a182-372a90a85407,Auditing 10Year Retention Add On +Advanced Communications,ADV_COMMS,e4654015-5daf-4a48-9b37-4f309dddd88b,TEAMS_ADVCOMMS,604ec28a-ae18-4bc6-91b0-11da94504ba9,Microsoft 365 Advanced Communications AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,CDSAICAPACITY,a7c70a41-5e02-4271-93e6-d9b4184d83f5,AI Builder capacity add-on AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,SPZA,0bfc98ed-1dbc-4a97-b246-701754e48b17,APP CONNECT @@ -6,6 +8,9 @@ App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,EXCHANGE_S_FOUNDATIO App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,M365_AUDIT_PLATFORM,f6de4823-28fa-440b-b886-4783fa86ddba,Microsoft 365 Audit Platform App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_A,5f3b1ded-75c0-4b31-8e6e-9b077eaadfd5,Microsoft Application Protection and Governance (A) App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_D,2e6ffd72-52d1-4541-8f6c-938f9a8d4cdc,Microsoft Application Protection and Governance (D) +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_PREMIUM_GOV,1b66aedf-8ca1-4f73-af76-ec76c6180f98,Azure Information Protection Premium P1 for GCC +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_ENTERPRISE_GOV,6a76346d-5d6e-4051-9fe3-ed3f312b5597,Azure Rights Management Career Coach for faculty,CAREERCOACH_FACULTY,95de1760-7682-406d-98c9-52ef14e51e2b,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Career Coach for students,CAREERCOACH_STUDENTS,01c8007a-57d2-41e0-a3c3-0b46ead16cc4,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Clipchamp Premium,Clipchamp_Premium,0fe440c5-f2bf-442b-a4f4-9a7af77a200b,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -159,6 +164,9 @@ Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Ent Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS,ca00cff5-2568-4d03-bb6c-a653a8f360ca,Common Data Service for Customer Insights Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,DYN365_CUSTOMER_INSIGHTS_BASE,ee85d528-c4b4-4a99-9b07-fb9a1365dc93,Dynamics 365 Customer Insights @@ -245,6 +253,20 @@ Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,EXCHANG Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,D365_Finance,9f0e1b4e-9b33-4300-b451-b2c662cd4ff7,Microsoft Dynamics 365 for Finance Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_CDS_FINANCE,e95d7060-d4d9-400a-a2bd-a244bf0b609e,Common Data Service for Dynamics 365 Finance +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsCDSAttach,e564d403-7eaf-4c91-b92f-bb0dc62026e1,Dynamics 365 Project Operations CDS Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsAttach,fa7675bd-6717-40e7-8172-d0bbcbe1ab12,Dynamics 365 Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,PROJECT_FOR_PROJECT_OPERATIONS_ATTACH,6d8e07c6-9613-484f-8cc1-a66c5c3979bb,Project for Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,SHAREPOINTSTANDARD,c7699d2e-19aa-44de-8edf-1736da088ca1,SharePoint (Plan 1) Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,DYN365_ENTERPRISE_CASE_MANAGEMENT,2822a3a1-9b8f-4432-8989-e11669a60dc8,Dynamics 365 for Case Management Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,Retired - Microsoft Social Engagement Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -282,6 +304,62 @@ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,DYN365_ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -401,6 +479,15 @@ Dynamics 365 for Project Service Automation Enterprise Edition for Government,DY Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1d8c8e0e-4308-4db5-8a41-b129dbdaea20,Dynamics 365 for Project Service Automation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,Forms_Pro_PS_GCC,e98256c5-17d0-4987-becc-e991c52d55c6,Microsoft Dynamics 365 Customer Voice for Project Service Automation for GCC +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTWAC_GOV,8f9f0f3b-ca90-406c-a842-95579171f8ec,Office for the Web for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,PROJECT_CLIENT_SUBSCRIPTION_GOV,45c6831b-ad74-4c7f-bd03-7c2b3fa39067,Project Online Desktop Client +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINT_PROJECT_GOV,e57afa78-1f19-4542-ba13-b32cd4d8f472,Project Online Service for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,DYN365_ENTERPRISE_P1,d56f3deb-50d8-465a-bedb-f079817ccac1,DYNAMICS 365 CUSTOMER ENGAGEMENT PLAN Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,MICROSOFT SOCIAL ENGAGEMENT - SERVICE DISCONTINUATION @@ -490,6 +577,19 @@ Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,EXCHANGE FOUNDATION Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,POWERAPPS FOR DYNAMICS 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_CDS_SUPPLYCHAINMANAGEMENT,b6a8b974-2956-4e14-ae81-f0384c363528,Common Data Service for Dynamics 365 Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_FOR_IOM_USL,9e6d1620-dce9-4655-8933-af8fa5bccc9c,Data Integration for IOM with Power Automate USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,CDS_FOR_IOM,2bb89402-51e9-4c5a-be33-e954a9dd1ba6,Dataverse for IOM +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_DemandPlanning,e8b616eb-1a6d-42b4-84c7-b63870791349,DO NOT USE - Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM,1224eae4-0d91-474a-8a52-27ec96a63fe7,Dynamics 365 for Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM,616cf6e2-f52f-4738-b463-10003061fcd3,Dynamics 365 Intelligent Order Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM_USER,81375e2f-5ef7-4773-96aa-e3279f50bd21,Dynamics 365 Intelligent Order Management USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM_Premium,0363c8e5-c30d-4d7c-a621-7b6cab5e0482,Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,DYN365_CDS_DYN_APPS,2d925ad8-2479-4bd8-bb76-5b80f1d48935,Common Data Service Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Hiring_Free_PLAN,f815ac79-c5dd-4bcc-9b78-d97f7b817d0d,Dynamics 365 for Talent: Attract Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Onboarding_Free_PLAN,300b8114-8555-4313-b861-0c115d820f50,Dynamics 365 for Talent: Onboard @@ -657,6 +757,8 @@ Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2 Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2b-ade1-6766d50a9d9c,RMS_S_BASIC,31cf2cfc-6b0d-4adc-a336-88b724ed8122,Microsoft Azure Rights Management Service Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,EXCHANGE_S_STANDARD_GOV,e9b4930a-925f-45e2-ac2a-3f7788ca6fdd,Exchange Online (Plan 1) for Government Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,EXCHANGE_S_ENTERPRISE_GOV,8c3069c0-ccdb-44be-ab77-986203a67df2,Exchange Online (Plan 2) for Government +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 Exchange Online (Plan 2),EXCHANGEENTERPRISE,19ec0d23-8335-4cbd-94ac-6050e30712fa,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,EXCHANGE ONLINE (PLAN 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,Exchange Online (Plan 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 @@ -670,6 +772,9 @@ Exchange Online Essentials,EXCHANGE_S_ESSENTIALS,e8f81a67-bd96-4074-b108-cf193eb Exchange Online Kiosk,EXCHANGEDESKLESS,80b2d799-d2ba-4d2a-8842-fb0d0f3a4b82,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,EXCHANGE ONLINE KIOSK Exchange Online POP,EXCHANGETELCO,cb0a98a8-11bc-494c-83d9-c1b1ac65327e,EXCHANGE_B_STANDARD,90927877-dcff-4af6-b346-2332c0b15bb7,EXCHANGE ONLINE POP Exchange Online Protection,EOP_ENTERPRISE,45a2423b-e884-448d-a831-d9e139c52d2f,EOP_ENTERPRISE,326e2b78-9d27-42c9-8509-46c827743a17,Exchange Online Protection +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,DYN365_CDS_P1_GOV,ce361df2-f2a5-4713-953f-4050ba09aad8,Common Data Service for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,FLOW_P1_GOV,774da41c-a8b3-47c1-8322-b9c1ab68be9f,Power Automate (Plan 1) for Government Intune,INTUNE_A,061f9ace-7d42-4136-88ac-31dc755f143f,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,MICROSOFT INTUNE Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,AAD_EDU,3a3976ce-de18-4a87-a78e-5e9245e252df,Microsoft Entra ID for Education @@ -3604,6 +3709,8 @@ Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,TEAMS_FRE Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,WHITEBOARD_FIRSTLINE1,36b29273-c6d0-477a-aca6-6fbe24f538e3,WHITEBOARD (FIRSTLINE) Microsoft Teams Calling Plan pay-as-you-go (country zone 1 - US),Microsoft_Teams_Calling_Plan_pay_as_you_go_(country_zone_1_US),9b196e97-5830-4c2e-adc2-1e10ebf5dee5,MCOPSTN_PAYG_1,156a1efe-17cd-4b03-9f17-2eb512298fb3,Microsoft Teams Calling Plan pay-as-you-go - country zone 1 Microsoft Teams Domestic Calling Plan (240 min),MCOPSTN_6,729dbb8f-8d56-4994-8e33-2f218f549544,MCOPSTN6,346d83bf-6fe6-42ca-b424-b9300d2e21bf,Microsoft 365 Domestic Calling Plan (240 min) +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,MCOPSTN1_GOV,3c8a8792-7866-409b-bb61-1b20ace0368b,Domestic Calling Plan for Government +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Teams Essentials,Teams_Ess,fde42873-30b6-436b-b361-21af5a6b84ae,TeamsEss,f4f2f6de-6830-442b-a433-e92249faebe2,Microsoft Teams Essentials Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,Exchange Online Kiosk Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,FORMS_PLAN_E1,159f4cd6-e380-449f-a816-af1a9ef76344,Microsoft Forms (Plan E1) @@ -5050,6 +5157,8 @@ Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c, Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c,EXCHANGE_S_FOUNDATION PBI_PREMIUM_EM1_ADDON,a64b30ba-f310-4065-b444-2670ef146db0,Power BI Premium EM1 Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User,0d3366f3-266e-4117-b422-7cabbc165e7c,Power Pages Authenticated Users per site monthly capacity Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User_GCCH,18e74ca2-b5f0-4802-9a8b-00d2ff1e8322,Power Pages Authenticated Users per site monthly capacity GCCH +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,PowerPages_Authenticated_User_CN,967d9574-a076-4bb7-ab89-f41f64bc142e,Power Pages Authenticated Users per site monthly capacity China Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,PowerPages_Authenticated_User_GCC,cdf787bd-1546-48d2-9e93-b21f9ea7067a,Power Pages Authenticated Users per site monthly capacity GCC Power Pages authenticated users T1 100 users/per site/month capacity pack_USGOV_DOD,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_USGOV_DOD,b54f012e-69e1-43b1-87d0-666def064940,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site diff --git a/Modules/CippExtensions/Public/ConversionTable.csv b/Modules/CippExtensions/Public/ConversionTable.csv index 2f2e83b3e09e9..704f7c507d5fb 100644 --- a/Modules/CippExtensions/Public/ConversionTable.csv +++ b/Modules/CippExtensions/Public/ConversionTable.csv @@ -1,4 +1,6 @@ Product_Display_Name,String_Id,GUID,Service_Plan_Name,Service_Plan_Id,Service_Plans_Included_Friendly_Names +10-Year Audit Log Retention Add On,10_ALR_ADDON,c2e41e49-e2a2-4c55-832a-cf13ffba1d6a,Auditing_10Year_ Retention_ Add_On,7d16094b-4db8-41ff-a182-372a90a85407,Auditing 10Year Retention Add On +Advanced Communications,ADV_COMMS,e4654015-5daf-4a48-9b37-4f309dddd88b,TEAMS_ADVCOMMS,604ec28a-ae18-4bc6-91b0-11da94504ba9,Microsoft 365 Advanced Communications AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,CDSAICAPACITY,a7c70a41-5e02-4271-93e6-d9b4184d83f5,AI Builder capacity add-on AI Builder Capacity add-on,CDSAICAPACITY,d2dea78b-507c-4e56-b400-39447f4738f8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,SPZA,0bfc98ed-1dbc-4a97-b246-701754e48b17,APP CONNECT @@ -6,6 +8,9 @@ App Connect IW,SPZA_IW,8f0c5670-4e56-4892-b06d-91c085d7004f,EXCHANGE_S_FOUNDATIO App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,M365_AUDIT_PLATFORM,f6de4823-28fa-440b-b886-4783fa86ddba,Microsoft 365 Audit Platform App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_A,5f3b1ded-75c0-4b31-8e6e-9b077eaadfd5,Microsoft Application Protection and Governance (A) App governance add-on to Microsoft Defender for Cloud Apps,Microsoft_Cloud_App_Security_App_Governance_Add_On,9706eed9-966f-4f1b-94f6-bb2b4af99a5b,MICROSOFT_APPLICATION_PROTECTION_AND_GOVERNANCE_D,2e6ffd72-52d1-4541-8f6c-938f9a8d4cdc,Microsoft Application Protection and Governance (D) +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_PREMIUM_GOV,1b66aedf-8ca1-4f73-af76-ec76c6180f98,Azure Information Protection Premium P1 for GCC +Azure Information Protection Premium P1 for Government,RIGHTSMANAGEMENT_CE_GOV ,78362de1-6942-4bb8-83a1-a32aa67e6e2c,RMS_S_ENTERPRISE_GOV,6a76346d-5d6e-4051-9fe3-ed3f312b5597,Azure Rights Management Career Coach for faculty,CAREERCOACH_FACULTY,95de1760-7682-406d-98c9-52ef14e51e2b,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Career Coach for students,CAREERCOACH_STUDENTS,01c8007a-57d2-41e0-a3c3-0b46ead16cc4,CAREERCOACH_EDU,80f0ae31-0dfb-425c-b3fc-36f40170eb35,Career Coach Clipchamp Premium,Clipchamp_Premium,0fe440c5-f2bf-442b-a4f4-9a7af77a200b,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -159,6 +164,9 @@ Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Ent Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Customer Service Enterprise Admin,Dynamics_365_Customer_Service_Enterprise_admin_trial,94a6fbd4-6a2f-4990-b356-dc7dd8bed08a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Customer Service Voice Channel Add-in,DYN365_CS_VOICE,dadd2312-b5b1-4fa0-8c15-0903de3e2303,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS_BASE,d04ca659-b119-4a92-b8fc-3ede584a9d65,Dataverse for Cust Insights BASE Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,CDS_CUSTOMER_INSIGHTS,ca00cff5-2568-4d03-bb6c-a653a8f360ca,Common Data Service for Customer Insights Dynamics 365 Customer Insights Standalone,DYN365_CUSTOMER_INSIGHTS_BASE,0c250654-c7f7-461f-871a-7222f6592cf2,DYN365_CUSTOMER_INSIGHTS_BASE,ee85d528-c4b4-4a99-9b07-fb9a1365dc93,Dynamics 365 Customer Insights @@ -245,6 +253,20 @@ Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,EXCHANG Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,D365_Finance,9f0e1b4e-9b33-4300-b451-b2c662cd4ff7,Microsoft Dynamics 365 for Finance Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Finance,DYN365_FINANCE,55c9eb4e-c746-45b4-b255-9ab6b19d5c62,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_CDS_FINANCE,e95d7060-d4d9-400a-a2bd-a244bf0b609e,Common Data Service for Dynamics 365 Finance +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 for Finance Attach to Qualifying Dynamics 365 Base Offer,DYN365_FINANCE_ATTACH,d721f2e4-099b-4105-b40e-872e46cad402,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsCDSAttach,e564d403-7eaf-4c91-b92f-bb0dc62026e1,Dynamics 365 Project Operations CDS Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,CDS_AI_Capacity_FI,5d85ec34-44e5-43b6-a9aa-d1b4c1d3aa3b,AI Builder Capacity Add-on +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_Finance_Attach,223e33cb-eee0-462d-b1bd-e9a5febf8e85,Dynamics 365 for Finance Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,D365_ProjectOperationsAttach,fa7675bd-6717-40e7-8172-d0bbcbe1ab12,Dynamics 365 Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,PROJECT_FOR_PROJECT_OPERATIONS_ATTACH,6d8e07c6-9613-484f-8cc1-a66c5c3979bb,Project for Project Operations Attach +Dynamics 365 Finance Attach to Qualifying Base Offer Embedded with Project Management & Accounting,DYN365_FINANCE_ATTACH_ISVEMB_PROJOPS,db5bd06c-b99a-4c54-98e9-90fea5164c88,SHAREPOINTSTANDARD,c7699d2e-19aa-44de-8edf-1736da088ca1,SharePoint (Plan 1) Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,DYN365_ENTERPRISE_CASE_MANAGEMENT,2822a3a1-9b8f-4432-8989-e11669a60dc8,Dynamics 365 for Case Management Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,Retired - Microsoft Social Engagement Dynamics 365 for Case Management Enterprise Edition,DYN365_ENTERPRISE_CASE_MANAGEMENT,d39fb075-21ae-42d0-af80-22a2599749e0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation @@ -282,6 +304,62 @@ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,DYN365_ Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 Dynamics 365 Commerce,DYN365_RETAIL,79909bd8-4c69-4202-939e-11bc4385b134,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center,DYNAMICS_365_CONTACT_CENTER,dfb1700c-013e-4132-8bce-0d319c43a95d,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CC,2a9d72b3-1714-440f-babf-bf92bf9683d8,Dynamics 365 Contact Center +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,39a78eb6-3a8a-4e1e-878a-575a5c8984e7,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital,DYNAMICS_365_CONTACT_CENTER_DIGITAL,59d3d0bf-df39-4b8b-8601-ea6c09a7fd66,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CC_DIGITAL,0ef2b4e3-0a2b-450d-8c5f-a52203c40f50,Dynamics 365 Contact Center Digital +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING_TPS,47c2b191-a5fb-4129-b690-00c474d2f623,Dynamics 365 Customer Service Digital Messaging add-on +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,DYN365_CS_MESSAGING,43b076f2-1123-45ba-a339-2e170ee58c53,Dynamics 365 Customer Service Digital Messaging Application Integration +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Digital Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_DIGITAL_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,7e6e6091-1680-4532-9370-6cd4598483ac,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice,DYNAMICS_365_CONTACT_CENTER_VOICE,79e2368c-4568-48d5-a352-b0344afabcf8,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CC_VOICE,57517633-b4ad-4db8-8c1a-65f443424490,Dynamics 365 Contact Center Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,DYN365_CS_VOICE,f6ec6dfa-2402-468d-a455-89be11116d43,Dynamics 365 for Customer Service Voice Add-in +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWER_VIRTUAL_AGENTS_D365_CS_VOICE,a3dce1be-e9ca-453a-9483-e69a5b46ce98,Power Virtual Agents for Customer Service Voice +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTWAC,e95bec33-7c88-4a70-8e19-b10bd9d0c014,Office for the Web +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,SHAREPOINTENTERPRISE,5dbe027f-2339-4123-9542-606e4d348a72,SharePoint (Plan 2) +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Contact Center Voice Add-on for Customer Service Enterprise,DYNAMICS_365_CONTACT_CENTER_VOICE_ADD_ON_FOR_CUSTOMER_SERVICE_ENTERPRISE,73e8b747-20bf-463d-8ffd-274a7d65d0bc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT_FPA,426ec19c-d5b1-4548-b894-6fe75028c30d,Dynamics 365 Customer Service Chat Application Integration Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,DYN365_CS_CHAT,f69129db-6dc1-4107-855e-0aaebbcd9dd4,Dynamics 365 for Customer Service Chat Dynamics 365 for Customer Service Chat,DYN365_CS_CHAT,7d7af6c2-0be6-46df-84d1-c181b0272909,POWER_VIRTUAL_AGENTS_D365_CS_CHAT,19e4c3a8-3ebe-455f-a294-4f3479873ae3,Power Virtual Agents for Chat @@ -401,6 +479,15 @@ Dynamics 365 for Project Service Automation Enterprise Edition for Government,DY Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government Dynamics 365 for Project Service Automation Enterprise Edition for Government,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1ec19b5f-7542-4b20-b01f-fb5d3f040e2d,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,DYN365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,1d8c8e0e-4308-4db5-8a41-b129dbdaea20,Dynamics 365 for Project Service Automation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,Forms_Pro_PS_GCC,e98256c5-17d0-4987-becc-e991c52d55c6,Microsoft Dynamics 365 Customer Voice for Project Service Automation for GCC +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTWAC_GOV,8f9f0f3b-ca90-406c-a842-95579171f8ec,Office for the Web for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,PROJECT_CLIENT_SUBSCRIPTION_GOV,45c6831b-ad74-4c7f-bd03-7c2b3fa39067,Project Online Desktop Client +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINT_PROJECT_GOV,e57afa78-1f19-4542-ba13-b32cd4d8f472,Project Online Service for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,SHAREPOINTENTERPRISE_GOV,153f85dd-d912-4762-af6c-d6e0fb4f6692,SharePoint Plan 2G +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,FLOW_DYN_APPS_GOV,2c6af4f1-e7b6-4d59-bbc8-eaa884f42d69,Power Automate for Dynamics 365 for Government +Dynamics 365 for Project Service Automation for Government,D365_ENTERPRISE_PROJECT_SERVICE_AUTOMATION_GOV,6c827f0a-42cb-4cff-b1cd-f4104c16ede3,POWERAPPS_DYN_APPS_GOV,3089c02b-e533-4b73-96a5-01fa648c3c3c,PowerApps for Dynamics 365 for Government Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,DYN365_ENTERPRISE_P1,d56f3deb-50d8-465a-bedb-f079817ccac1,DYNAMICS 365 CUSTOMER ENGAGEMENT PLAN Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Sales and Customer Service Enterprise Edition,DYN365_ENTERPRISE_SALES_CUSTOMERSERVICE,8edc2cf8-6438-4fa9-b6e3-aa1660c640cc,NBENTERPRISE,03acaee3-9492-4f40-aed4-bcb6b32981b6,MICROSOFT SOCIAL ENGAGEMENT - SERVICE DISCONTINUATION @@ -490,6 +577,19 @@ Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,EXCHANGE FOUNDATION Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,FLOW FOR DYNAMICS 365 Dynamics 365 for Supply Chain Management,DYN365_SCM,f2e48cb3-9da0-42cd-8464-4a54ce198ad0,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,POWERAPPS FOR DYNAMICS 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,Power_Pages_Internal_User,60bf28f9-2b70-4522-96f7-335f5e06c941,Power Pages Internal User +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_CDS_SUPPLYCHAINMANAGEMENT,b6a8b974-2956-4e14-ae81-f0384c363528,Common Data Service for Dynamics 365 Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_FOR_IOM_USL,9e6d1620-dce9-4655-8933-af8fa5bccc9c,Data Integration for IOM with Power Automate USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,CDS_FOR_IOM,2bb89402-51e9-4c5a-be33-e954a9dd1ba6,Dataverse for IOM +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_DemandPlanning,e8b616eb-1a6d-42b4-84c7-b63870791349,DO NOT USE - Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_REGULATORY_SERVICE,c7657ae3-c0b0-4eed-8c1d-6a7967bd9c65,"Dynamics 365 for Finance and Operations, Enterprise edition - Regulatory Service" +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM,1224eae4-0d91-474a-8a52-27ec96a63fe7,Dynamics 365 for Supply Chain Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM,616cf6e2-f52f-4738-b463-10003061fcd3,Dynamics 365 Intelligent Order Management +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,DYN365_IOM_USER,81375e2f-5ef7-4773-96aa-e3279f50bd21,Dynamics 365 Intelligent Order Management USL +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,D365_SCM_Premium,0363c8e5-c30d-4d7c-a621-7b6cab5e0482,Dynamics 365 Supply Chain Management Premium +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,POWERAPPS_DYN_APPS,874fc546-6efe-4d22-90b8-5c4e7aa59f4b,Power Apps for Dynamics 365 +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation +Dynamics 365 Supply Chain Management Premium,Dynamics_365_Supply_Chain_Management_Premium,9467fd84-2758-4287-b1fa-6a908c441b8a,FLOW_DYN_APPS,7e6d7d78-73de-46ba-83b1-6d25117334ba,Power Automate for Dynamics 365 Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,DYN365_CDS_DYN_APPS,2d925ad8-2479-4bd8-bb76-5b80f1d48935,Common Data Service Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Hiring_Free_PLAN,f815ac79-c5dd-4bcc-9b78-d97f7b817d0d,Dynamics 365 for Talent: Attract Dynamics 365 for Talent,SKU_Dynamics_365_for_HCM_Trial,3a256e9a-15b6-4092-b0dc-82993f4debc6,Dynamics_365_Onboarding_Free_PLAN,300b8114-8555-4313-b861-0c115d820f50,Dynamics 365 for Talent: Onboard @@ -657,6 +757,8 @@ Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2 Exchange Online (Plan 1) for Students,EXCHANGESTANDARD_STUDENT,ad2fe44a-915d-4e2b-ade1-6766d50a9d9c,RMS_S_BASIC,31cf2cfc-6b0d-4adc-a336-88b724ed8122,Microsoft Azure Rights Management Service Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,EXCHANGE_S_STANDARD_GOV,e9b4930a-925f-45e2-ac2a-3f7788ca6fdd,Exchange Online (Plan 1) for Government Exchange Online (Plan 1) for GCC,EXCHANGESTANDARD_GOV,f37d5ebf-4bf1-4aa2-8fa3-50c51059e983,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,EXCHANGE_S_ENTERPRISE_GOV,8c3069c0-ccdb-44be-ab77-986203a67df2,Exchange Online (Plan 2) for Government +Exchange Online (Plan 2) for GCC,EXCHANGEENTERPRISE_GOV,7be8dc28-4da4-4e6d-b9b9-c60f2806df8a,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 Exchange Online (Plan 2),EXCHANGEENTERPRISE,19ec0d23-8335-4cbd-94ac-6050e30712fa,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,EXCHANGE ONLINE (PLAN 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,EXCHANGE_S_ENTERPRISE,efb87545-963c-4e0d-99df-69c6916d9eb0,Exchange Online (Plan 2) Exchange Online (Plan 2) for Faculty,EXCHANGEENTERPRISE_FACULTY,0b7b15a8-7fd2-4964-bb96-5a566d4e3c15,INTUNE_O365,882e1d05-acd1-4ccb-8708-6ee03664b117,Mobile Device Management for Office 365 @@ -670,6 +772,9 @@ Exchange Online Essentials,EXCHANGE_S_ESSENTIALS,e8f81a67-bd96-4074-b108-cf193eb Exchange Online Kiosk,EXCHANGEDESKLESS,80b2d799-d2ba-4d2a-8842-fb0d0f3a4b82,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,EXCHANGE ONLINE KIOSK Exchange Online POP,EXCHANGETELCO,cb0a98a8-11bc-494c-83d9-c1b1ac65327e,EXCHANGE_B_STANDARD,90927877-dcff-4af6-b346-2332c0b15bb7,EXCHANGE ONLINE POP Exchange Online Protection,EOP_ENTERPRISE,45a2423b-e884-448d-a831-d9e139c52d2f,EOP_ENTERPRISE,326e2b78-9d27-42c9-8509-46c827743a17,Exchange Online Protection +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,DYN365_CDS_P1_GOV,ce361df2-f2a5-4713-953f-4050ba09aad8,Common Data Service for Government +Flow Plan 1 for Government,FLOW_P1_GOV,2b3b0c87-36af-4d15-8124-04a691cc2546,FLOW_P1_GOV,774da41c-a8b3-47c1-8322-b9c1ab68be9f,Power Automate (Plan 1) for Government Intune,INTUNE_A,061f9ace-7d42-4136-88ac-31dc755f143f,INTUNE_A,c1ec4a95-1f05-45b3-a911-aa3fa01094f5,MICROSOFT INTUNE Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,EXCHANGE_S_FOUNDATION,113feb6c-3fe4-4440-bddc-54d774bf0318,Exchange Foundation Intune for Education,INTUNE_EDU,d9d89b70-a645-4c24-b041-8d3cb1884ec7,AAD_EDU,3a3976ce-de18-4a87-a78e-5e9245e252df,Microsoft Entra ID for Education @@ -3604,6 +3709,8 @@ Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,TEAMS_FRE Microsoft Teams (Free),TEAMS_FREE,16ddbbfc-09ea-4de2-b1d7-312db6112d70,WHITEBOARD_FIRSTLINE1,36b29273-c6d0-477a-aca6-6fbe24f538e3,WHITEBOARD (FIRSTLINE) Microsoft Teams Calling Plan pay-as-you-go (country zone 1 - US),Microsoft_Teams_Calling_Plan_pay_as_you_go_(country_zone_1_US),9b196e97-5830-4c2e-adc2-1e10ebf5dee5,MCOPSTN_PAYG_1,156a1efe-17cd-4b03-9f17-2eb512298fb3,Microsoft Teams Calling Plan pay-as-you-go - country zone 1 Microsoft Teams Domestic Calling Plan (240 min),MCOPSTN_6,729dbb8f-8d56-4994-8e33-2f218f549544,MCOPSTN6,346d83bf-6fe6-42ca-b424-b9300d2e21bf,Microsoft 365 Domestic Calling Plan (240 min) +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,MCOPSTN1_GOV,3c8a8792-7866-409b-bb61-1b20ace0368b,Domestic Calling Plan for Government +Microsoft Teams Domestic Calling Plan for GCC,MCOPSTN_1_GOV,923f58ab-fca1-46a1-92f9-89fda21238a8,EXCHANGE_S_FOUNDATION_GOV,922ba911-5694-4e99-a794-73aed9bfeec8,Exchange Foundation for Government Microsoft Teams Essentials,Teams_Ess,fde42873-30b6-436b-b361-21af5a6b84ae,TeamsEss,f4f2f6de-6830-442b-a433-e92249faebe2,Microsoft Teams Essentials Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,EXCHANGE_S_DESKLESS,4a82b400-a79f-41a4-b4e2-e94f5787b113,Exchange Online Kiosk Microsoft Teams Essentials (AAD Identity),TEAMS_ESSENTIALS_AAD,3ab6abff-666f-4424-bfb7-f0bc274ec7bc,FORMS_PLAN_E1,159f4cd6-e380-449f-a816-af1a9ef76344,Microsoft Forms (Plan E1) @@ -5050,6 +5157,8 @@ Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c, Power BI Premium EM1,PBI_PREMIUM_EM1_ADDON,bc757c42-5622-4583-a483-a9e537fcb71c,EXCHANGE_S_FOUNDATION PBI_PREMIUM_EM1_ADDON,a64b30ba-f310-4065-b444-2670ef146db0,Power BI Premium EM1 Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User,0d3366f3-266e-4117-b422-7cabbc165e7c,Power Pages Authenticated Users per site monthly capacity Power Pages authenticated users T1 100 users/per site/month capacity pack,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack,debc9e58-f2d7-412c-a0b6-575608564228,PowerPages_Authenticated_User_GCCH,18e74ca2-b5f0-4802-9a8b-00d2ff1e8322,Power Pages Authenticated Users per site monthly capacity GCCH +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site +Power Pages authenticated users T1 100 users/per site/month capacity pack CN_CN,Power Pages authenticated users T1_CN_CN,9a3c2a19-06c0-41b1-b2ea-13528d7b2e17,PowerPages_Authenticated_User_CN,967d9574-a076-4bb7-ab89-f41f64bc142e,Power Pages Authenticated Users per site monthly capacity China Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site Power Pages authenticated users T1 100 users/per site/month capacity pack_GCC,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_GCC,27cb5f12-2e3f-4997-a649-45298673e6a1,PowerPages_Authenticated_User_GCC,cdf787bd-1546-48d2-9e93-b21f9ea7067a,Power Pages Authenticated Users per site monthly capacity GCC Power Pages authenticated users T1 100 users/per site/month capacity pack_USGOV_DOD,Power_Pages_authenticated_users_T1_100_users/per_site/month_capacity_pack_USGOV_DOD,b54f012e-69e1-43b1-87d0-666def064940,DV_PowerPages_Authenticated_User,7aae746a-3463-4737-b295-3c1a16c31438,Dataverse for Power Pages Authenticated users per site From 5481e116ce818b582d46a017ed023ab4c6989807 Mon Sep 17 00:00:00 2001 From: KelvinTegelaar <49186168+KelvinTegelaar@users.noreply.github.com> Date: Fri, 30 May 2025 14:18:58 +0200 Subject: [PATCH 19/24] incorrect alias --- .../CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 index 97259dcefefc4..0efe50733dc52 100644 --- a/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 +++ b/Modules/CIPPCore/Public/Alerts/Get-CIPPAlertHuntressRogueApps.ps1 @@ -16,7 +16,6 @@ function Get-CIPPAlertHuntressRogueApps { $InputValue, $TenantFilter, [Parameter(Mandatory = $false)] - [Alias('ignoreDisabledApps')] [bool]$IgnoreDisabledApps = $false ) From 2dec5a350c2de2525ce890cbdc1d2c85adc7e2fb Mon Sep 17 00:00:00 2001 From: John Duprey Date: Fri, 30 May 2025 09:08:43 -0400 Subject: [PATCH 20/24] Update Invoke-ListDomainHealth.ps1 --- .../HTTP Functions/Tenant/Standards/Invoke-ListDomainHealth.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListDomainHealth.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListDomainHealth.ps1 index cbe90862aac0d..fa5a96de8dcb1 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListDomainHealth.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Standards/Invoke-ListDomainHealth.ps1 @@ -39,7 +39,7 @@ function Invoke-ListDomainHealth { Set-DnsResolver -Resolver $Resolver - $UserRoles = Get-CIPPAccessPermissions -Request $Request + $UserRoles = Get-CIPPAccessRole -Request $Request $APIName = $Request.Params.CIPPEndpoint $Headers = $Request.Headers From 34a7089d0b83cb717b701232414d4168f8965202 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Fri, 30 May 2025 12:36:41 -0400 Subject: [PATCH 21/24] directory object lookup function --- .../CIPP/Core/Invoke-ListDirectoryObjects.ps1 | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListDirectoryObjects.ps1 diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListDirectoryObjects.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListDirectoryObjects.ps1 new file mode 100644 index 0000000000000..42d4da8b80851 --- /dev/null +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Core/Invoke-ListDirectoryObjects.ps1 @@ -0,0 +1,44 @@ +function Invoke-ListDirectoryObjects { + <# + .FUNCTIONALITY + Entrypoint + .ROLE + CIPP.Core.Read + #> + [CmdletBinding()] + param($Request, $TriggerMetadata) + + $APIName = $Request.Params.CIPPEndpoint + $Headers = $Request.Headers + Write-LogMessage -headers $Headers -API $APIName -message 'Accessed this API' -Sev 'Debug' + + $TenantFilter = $Request.Body.tenantFilter + $AsApp = $Request.Body.asApp + $Ids = $Request.Body.ids + + $BaseUri = 'https://graph.microsoft.com/beta/directoryObjects/getByIds' + if ($Request.Body.'$select') { + $Uri = '{0}?$select={1}' -f $BaseUri, $Request.Body.'$select' + } else { + $Uri = $BaseUri + } + + $Body = @{ + ids = $Ids + } | ConvertTo-Json -Depth 10 + + try { + $Results = New-GraphPOSTRequest -tenantid $TenantFilter -uri $Uri -body $Body -AsApp $AsApp + $StatusCode = [System.Net.HttpStatusCode]::OK + } catch { + $StatusCode = [System.Net.HttpStatusCode]::BadRequest + $Results = $_.Exception.Message + Write-Warning "Error retrieving directory objects: $Results" + Write-Information $_.InvocationInfo.PositionMessage + } + + Push-OutputBinding -Name Response -Value ([HttpResponseContext]@{ + StatusCode = $StatusCode + Body = $Results + }) +} From ac169615fe63abc970dcc2d01bd519d0e1334dfe Mon Sep 17 00:00:00 2001 From: John Duprey Date: Fri, 30 May 2025 12:37:35 -0400 Subject: [PATCH 22/24] improve ca policy list --- .../Conditional/Invoke-ListConditionalAccessPolicies.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ListConditionalAccessPolicies.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ListConditionalAccessPolicies.ps1 index d4c8fba42f9cd..91f7251eccc7a 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ListConditionalAccessPolicies.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/Tenant/Conditional/Invoke-ListConditionalAccessPolicies.ps1 @@ -1,6 +1,6 @@ using namespace System.Net -Function Invoke-ListConditionalAccessPolicies { +function Invoke-ListConditionalAccessPolicies { <# .FUNCTIONALITY Entrypoint @@ -164,6 +164,7 @@ Function Invoke-ListConditionalAccessPolicies { $AllRoleDefinitions = ($GraphRequest | Where-Object { $_.id -eq 'roleDefinitions' }).body.value $GroupListOutput = ($GraphRequest | Where-Object { $_.id -eq 'groups' }).body.value $UserListOutput = ($GraphRequest | Where-Object { $_.id -eq 'users' }).body.value + $AllServicePrincipals = ($GraphRequest | Where-Object { $_.id -eq 'servicePrincipals' }).body.value $GraphRequest = foreach ($cap in $ConditionalAccessPolicyOutput) { @@ -180,8 +181,8 @@ Function Invoke-ListConditionalAccessPolicies { excludePlatforms = ($cap.conditions.platforms.excludePlatforms) -join ',' includeLocations = (Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.includeLocations) -join ',' excludeLocations = (Get-LocationNameFromId -Locations $AllNamedLocations -id $cap.conditions.locations.excludeLocations) -join ',' - includeApplications = ($cap.conditions.applications.includeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -id $_ }) -join ',' - excludeApplications = ($cap.conditions.applications.excludeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -id $_ }) -join ',' + includeApplications = ($cap.conditions.applications.includeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $_ }) -join ',' + excludeApplications = ($cap.conditions.applications.excludeApplications | ForEach-Object { Get-ApplicationNameFromId -Applications $AllApplications -ServicePrincipals $AllServicePrincipals -id $_ }) -join ',' includeUserActions = ($cap.conditions.applications.includeUserActions | Out-String) includeAuthenticationContextClassReferences = ($cap.conditions.applications.includeAuthenticationContextClassReferences | Out-String) includeUsers = ($cap.conditions.users.includeUsers | ForEach-Object { Get-UserNameFromId -Users $UserListOutput -id $_ }) | Out-String From 3ec1ead04b1f26e9b0193ab3f1c649df07997fb0 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Fri, 30 May 2025 13:42:05 -0400 Subject: [PATCH 23/24] up version --- version_latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version_latest.txt b/version_latest.txt index ae9a76b9249ad..cd1d2e94f31d7 100644 --- a/version_latest.txt +++ b/version_latest.txt @@ -1 +1 @@ -8.0.0 +8.0.1 From 3bc409de2e522dbe2038e8f60ce671caa487dcc2 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Fri, 30 May 2025 15:10:04 -0400 Subject: [PATCH 24/24] Update Invoke-ExecCreateSAMApp.ps1 --- .../HTTP Functions/CIPP/Setup/Invoke-ExecCreateSAMApp.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCreateSAMApp.ps1 b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCreateSAMApp.ps1 index 7d3dcfcf58196..c2ff4d5c89db1 100644 --- a/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCreateSAMApp.ps1 +++ b/Modules/CIPPCore/Public/Entrypoints/HTTP Functions/CIPP/Setup/Invoke-ExecCreateSAMApp.ps1 @@ -1,6 +1,6 @@ using namespace System.Net -Function Invoke-ExecCreateSAMApp { +function Invoke-ExecCreateSAMApp { <# .FUNCTIONALITY Entrypoint,AnyTenant @@ -19,7 +19,7 @@ Function Invoke-ExecCreateSAMApp { $URL = ($Request.headers.'x-ms-original-url').split('/api') | Select-Object -First 1 $TenantId = (Invoke-RestMethod 'https://graph.microsoft.com/v1.0/organization' -Headers @{ authorization = "Bearer $($Token.access_token)" } -Method GET -ContentType 'application/json').value.id #Find Existing app registration - $AppId = (Invoke-RestMethod 'https://graph.microsoft.com/v1.0/applications' -Headers @{ authorization = "Bearer $($Token.access_token)" } -Method GET -ContentType 'application/json' -Body "{ `"filter`": `"displayName eq 'CIPP-SAM'`" }").value | Select-Object -Last 1 + $AppId = (Invoke-RestMethod "https://graph.microsoft.com/v1.0/applications?`$filter=displayName eq 'CIPP-SAM'" -Headers @{ authorization = "Bearer $($Token.access_token)" } -Method GET -ContentType 'application/json').value | Select-Object -Last 1 #Check if the appId has the redirect URI, if not, add it. if ($AppId) { Write-Host "Found existing app: $($AppId.id). Reusing."