diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2c11a0eb89..fe79c0880b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,52 +4,52 @@ # review when someone opens a pull request. * @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_AntiPhishRule/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_DkimSigningConfig/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOHostedCOntentFilterRule/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/ @poiriersimon -/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/ @nikcharlebois - -/Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_O365Group/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_O365User/ @nikcharlebois - -/Modules/Office365DSC/DSCResources/MSFT_ODSettings/ @desmay - -/Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/ @nikcharlebois - -/Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOApp/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/ @ykuijs -/Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/ @nikcharlebois -/Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOSite/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/ @thorstenloeschmann -/Modules/Office365DSC/DSCResources/MSFT_SPOTheme/ @thorstenloeschmann - - -/Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/ @desmay -/Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/ @desmay -/Modules/Office365DSC/DSCResources/MSFT_TeamsUser/ @desmay - -/Modules/Office365DSC/Modules/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_AntiPhishRule/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_DkimSigningConfig/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedCOntentFilterRule/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/ @poiriersimon +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/ @nikcharlebois + +/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_O365User/ @nikcharlebois + +/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/ @desmay + +/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/ @nikcharlebois + +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/ @ykuijs +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/ @nikcharlebois +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/ @thorstenloeschmann +/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/ @thorstenloeschmann + + +/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/ @desmay +/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/ @desmay +/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/ @desmay + +/Modules/Microsoft365DSC/Modules/ @nikcharlebois diff --git a/.gitignore b/.gitignore index 68119febf3..1712c48aaf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,15 @@ .vs .psproj .sln -Modules/Office365Dsc/DscResource.Tests -Modules/Office365Dsc/DscResource.Tests/* +Modules/Microsoft365DSC/DscResource.Tests +Modules/Microsoft365DSC/DscResource.Tests/* node_modules node_modules/* markdownissues.txt start-unittests.ps1 TestDSCresource.ps1 -Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/Set-MalwareFilterPolicy.txt +Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/Set-MalwareFilterPolicy.txt Modules/start-extraction.ps1 -Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/Add-AvailabilityAddressSpace-parameterset.txt +Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/Add-AvailabilityAddressSpace-parameterset.txt *.log diff --git a/.vscode/GetTestCoverage.ps1 b/.vscode/GetTestCoverage.ps1 index d76a0c6f11..04e53c8825 100644 --- a/.vscode/GetTestCoverage.ps1 +++ b/.vscode/GetTestCoverage.ps1 @@ -7,7 +7,7 @@ param( [Parameter(Mandatory = $true)] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -25,7 +25,7 @@ if ($UnitTestFilePath.EndsWith("Tests.ps1")) $unitTestName = "$($unitTest.Name.Split('.')[1])" $unitTestFilePath = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Modules\Office365DSC\DSCResources\MSFT_$($unitTestName)\MSFT_$($unitTestName).psm1" ` + -ChildPath "..\Modules\Microsoft365DSC\DSCResources\MSFT_$($unitTestName)\MSFT_$($unitTestName).psm1" ` -Resolve) Invoke-Pester -Script $pesterParameters -CodeCoverage $UnitTestFilePath -Verbose diff --git a/CHANGELOG.md b/CHANGELOG.md index e847aeb7e9..09f4e61907 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Change log for Office365Dsc +# Change log for Microsoft365DSC ## UNRELEASED @@ -21,8 +21,8 @@ a drift; * TeamsUpgradePolicy * Initial Release; -* Office365DSCUtil - * Added the new Assert-O365DSCTemplate cmdlet to assess remote templates; +* M365DSCUtil + * Added the new Assert-M365DSCTemplate cmdlet to assess remote templates; * ReverseDSC * Change to allow ComponentsToExtract without the 'chck' prefix; * Introduction of Extraction Modes and Visual Indicators; diff --git a/Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 index d50f06623d..714d0efb15 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.psm1 @@ -32,7 +32,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -57,7 +57,7 @@ function Get-TargetResource GlobalAdminAccount = $GlobalAdminAccount } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -95,7 +95,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -165,13 +165,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -196,7 +196,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $content = '' diff --git a/Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/MSFT_AADGroupsNamingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsNamingPolicy/readme.md diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 new file mode 100644 index 0000000000..901ed203ef --- /dev/null +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADGroupsSettings/MSFT_AADGroupsSettings.psm1 @@ -0,0 +1,295 @@ +function Get-TargetResource +{ + [CmdletBinding()] + [OutputType([System.Collections.Hashtable])] + param + ( + [Parameter(Mandatory = $true)] + [System.String] + [ValidateSet('Yes')] + $IsSingleInstance, + + [Parameter()] + [System.Boolean] + $EnableGroupCreation, + + [Parameter()] + [System.Boolean] + $AllowGuestsToBeGroupOwner, + + [Parameter()] + [System.Boolean] + $AllowGuestsToAccessGroups, + + [Parameter()] + [System.String] + $GuestUsageGuidelinesUrl, + + [Parameter()] + [System.String] + $GroupCreationAllowedGroupName, + + [Parameter()] + [System.Boolean] + $AllowToAddGuests, + + [Parameter()] + [System.String] + $UsageGuidelinesUrl, + + [Parameter()] + [ValidateSet('Present', 'Absent')] + [System.String] + $Ensure = 'Present', + + [Parameter(Mandatory = $true)] + [System.Management.Automation.PSCredential] + $GlobalAdminAccount + ) + + Write-Verbose -Message "Getting configuration of AzureAD Groups Naming Policy" + #region Telemetry + $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() + $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) + $data.Add("Method", $MyInvocation.MyCommand) + Add-M365DSCTelemetryEvent -Data $data + #endregion + + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` + -Platform AzureAD + + $Policy = Get-AzureADDirectorySetting | Where-Object -FilterScript {$_.DisplayName -eq "Group.Unified"} + + if ($null -eq $Policy) + { + $currentValues = $PSBoundParameters + $currentValues.Ensure = "Absent" + return $currentValues + } + else + { + Write-Verbose -Message "Found existing AzureAD Groups Settings" + $AllowedGroupName = $null + if (-not [System.String]::IsNullOrEmpty($Policy["GroupCreationAllowedGroupId"])) + { + $groupObject = Get-AzureADGroup -ObjectId $Policy["GroupCreationAllowedGroupId"] + $AllowedGroupName = $groupObject.DisplayName + } + $result = @{ + IsSingleInstance = 'Yes' + EnableGroupCreation = $Policy["EnableGroupCreation"] + AllowGuestsToBeGroupOwner = $Policy["AllowGuestsToBeGroupOwner"] + AllowGuestsToAccessGroups = $Policy["AllowGuestsToAccessGroups"] + GuestUsageGuidelinesUrl = $Policy["GuestUsageGuidelinesUrl"] + GroupCreationAllowedGroupName = $AllowedGroupName + AllowToAddGuests = $Policy["AllowToAddGuests"] + UsageGuidelinesUrl = $Policy["UsageGuidelinesUrl"] + Ensure = "Present" + GlobalAdminAccount = $GlobalAdminAccount + } + + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" + return $result + } +} + +function Set-TargetResource +{ + [CmdletBinding()] + param + ( + [Parameter(Mandatory = $true)] + [System.String] + [ValidateSet('Yes')] + $IsSingleInstance, + + [Parameter()] + [System.Boolean] + $EnableGroupCreation, + + [Parameter()] + [System.Boolean] + $AllowGuestsToBeGroupOwner, + + [Parameter()] + [System.Boolean] + $AllowGuestsToAccessGroups, + + [Parameter()] + [System.String] + $GuestUsageGuidelinesUrl, + + [Parameter()] + [System.String] + $GroupCreationAllowedGroupName, + + [Parameter()] + [System.Boolean] + $AllowToAddGuests, + + [Parameter()] + [System.String] + $UsageGuidelinesUrl, + + [Parameter()] + [ValidateSet('Present', 'Absent')] + [System.String] + $Ensure = 'Present', + + [Parameter(Mandatory = $true)] + [System.Management.Automation.PSCredential] + $GlobalAdminAccount + ) + + Write-Verbose -Message "Setting configuration of Azure AD Groups Settings" + #region Telemetry + $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() + $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) + $data.Add("Method", $MyInvocation.MyCommand) + Add-M365DSCTelemetryEvent -Data $data + #endregion + + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` + -Platform AzureAD + + $currentPolicy = Get-TargetResource @PSBoundParameters + + # Policy should exist but it doesn't + $needToUpdate = $false + if ($Ensure -eq "Present" -and $currentPolicy.Ensure -eq "Absent") + { + $ds = (Get-AzureADDirectorySettingTemplate -id 62375ab9-6b52-47ed-826b-58e47e0e304b).CreateDirectorySetting() + New-AzureADDirectorySetting -DirectorySetting $ds + $needToUpdate = $true + } + + $Policy = Get-AzureADDirectorySetting | Where-Object -FilterScript {$_.DisplayName -eq "Group.Unified"} + + if (($Ensure -eq 'Present' -and $currentPolicy.Ensure -eq 'Present') -or $needToUpdate) + { + $groupObject = Get-AzureADGroup -SearchString $GroupCreationAllowedGroupName + $groupId = $null + if ($null -ne $groupObject) + { + $groupId = $groupObject.ObjectId + } + $Policy["EnableGroupCreation"] = [System.Boolean]$EnableGroupCreation + $Policy["AllowGuestsToBeGroupOwner"] = [System.Boolean]$AllowGuestsToBeGroupOwner + $Policy["AllowGuestsToAccessGroups"] = [System.Boolean]$AllowGuestsToAccessGroups + $Policy["GuestUsageGuidelinesUrl"] = $GuestUsageGuidelinesUrl + $Policy["GroupCreationAllowedGroupId"] = $groupId + $Policy["AllowToAddGuests"] = [System.Boolean]$AllowToAddGuests + $Policy["UsageGuidelinesUrl"] = $UsageGuidelinesUrl + + Set-AzureADDirectorySetting -Id $Policy.id -DirectorySetting $Policy + } + elseif ($Ensure -eq 'Absent' -and $currentPolicy.Ensure -eq 'Present') + { + Write-Verbose -Message "An existing Directory Setting entry exists, and we don't allow to have it removed." + throw "The AADGroupsSettings resource cannot delete existing Directory Setting entries. Please specify Present." + } +} + +function Test-TargetResource +{ + [CmdletBinding()] + [OutputType([System.Boolean])] + param + ( + [Parameter(Mandatory = $true)] + [System.String] + [ValidateSet('Yes')] + $IsSingleInstance, + + [Parameter()] + [System.Boolean] + $EnableGroupCreation, + + [Parameter()] + [System.Boolean] + $AllowGuestsToBeGroupOwner, + + [Parameter()] + [System.Boolean] + $AllowGuestsToAccessGroups, + + [Parameter()] + [System.String] + $GuestUsageGuidelinesUrl, + + [Parameter()] + [System.String] + $GroupCreationAllowedGroupName, + + [Parameter()] + [System.Boolean] + $AllowToAddGuests, + + [Parameter()] + [System.String] + $UsageGuidelinesUrl, + + [Parameter()] + [ValidateSet('Present', 'Absent')] + [System.String] + $Ensure = 'Present', + + [Parameter(Mandatory = $true)] + [System.Management.Automation.PSCredential] + $GlobalAdminAccount + ) + + Write-Verbose -Message "Testing configuration of AzureAD Groups Settings" + + $CurrentValues = Get-TargetResource @PSBoundParameters + + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" + + $ValuesToCheck = $PSBoundParameters + $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null + + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` + -Source $($MyInvocation.MyCommand.Source) ` + -DesiredValues $PSBoundParameters ` + -ValuesToCheck $ValuesToCheck.Keys + + Write-Verbose -Message "Test-TargetResource returned $TestResult" + + return $TestResult +} + +function Export-TargetResource +{ + [CmdletBinding()] + [OutputType([System.String])] + param + ( + [Parameter(Mandatory = $true)] + [System.Management.Automation.PSCredential] + $GlobalAdminAccount + ) + $InformationPreference = 'Continue' + #region Telemetry + $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() + $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) + $data.Add("Method", $MyInvocation.MyCommand) + Add-M365DSCTelemetryEvent -Data $data + #endregion + + $content = '' + $params = @{ + GlobalAdminAccount = $GlobalAdminAccount + IsSingleInstance = 'Yes' + } + $result = Get-TargetResource @params + $result.GlobalAdminAccount = Resolve-Credentials -UserName "globaladmin" + $content += " AADGroupsSettings " + (New-GUID).ToString() + "`r`n" + $content += " {`r`n" + $currentDSCBlock = Get-DSCBlock -Params $result -ModulePath $PSScriptRoot + $content += Convert-DSCStringParamToVariable -DSCBlock $currentDSCBlock -ParameterName "GlobalAdminAccount" + $content += " }`r`n" + + return $content +} + +Export-ModuleMember -Function *-TargetResource diff --git a/Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.psm1 index b61a871372..fedc07c71b 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.psm1 @@ -37,7 +37,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -70,7 +70,7 @@ function Get-TargetResource GlobalAdminAccount = $GlobalAdminAccount } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -113,7 +113,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -211,12 +211,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of AzureAD Groups Lifecycle Policy" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -241,7 +241,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion try @@ -254,7 +254,7 @@ function Export-TargetResource } $content = '' $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/MSFT_AADMSGroupLifecyclePolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_AADMSGroupLifecyclePolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 index 43f3299e82..9a97bbc665 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.psm1 @@ -39,10 +39,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message 'Getting all Accepted Domain' @@ -56,7 +56,7 @@ function Get-TargetResource Write-Verbose -Message "AcceptedDomain configuration for $($Identity) does not exist." # Check to see if $Identity matches a verified domain in the O365 Tenant - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform AzureAD $VerifiedDomains = Get-AzureADDomain | Where-Object -FilterScript { $_.IsVerified } @@ -150,10 +150,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AcceptedDomainParams = @{ @@ -163,7 +163,7 @@ function Set-TargetResource OutboundOnly = $OutboundOnly } - Write-Verbose -Message "Setting AcceptedDomain for $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $AcceptedDomainParams)" + Write-Verbose -Message "Setting AcceptedDomain for $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $AcceptedDomainParams)" Set-AcceptedDomain @AcceptedDomainParams } @@ -207,13 +207,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -238,9 +238,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllAcceptedDomains = Get-AcceptedDomain diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/MSFT_EXOAcceptedDomain.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAcceptedDomain/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAcceptedDomain/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 index 73f1e39862..3f775ac05d 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.psm1 @@ -37,10 +37,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllActiveSyncDeviceAccessRules = Get-ActiveSyncDeviceAccessRule @@ -119,10 +119,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewActiveSyncDeviceAccessRuleParams = @{ @@ -158,7 +158,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentActiveSyncDeviceAccessRuleConfig.Ensure -eq "Present") { Write-Verbose -Message "Active Sync Device Access Rule '$($Identity)' already exists, but needs updating." - Write-Verbose -Message "Setting Active Sync Device Access Rule $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $SetActiveSyncDeviceAccessRuleParams)" + Write-Verbose -Message "Setting Active Sync Device Access Rule $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $SetActiveSyncDeviceAccessRuleParams)" Set-ActiveSyncDeviceAccessRule @SetActiveSyncDeviceAccessRuleParams } } @@ -201,13 +201,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -232,9 +232,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllActiveSyncDeviceAccessRules = Get-ActiveSyncDeviceAccessRule diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/MSFT_EXOActiveSyncDeviceAccessRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOActiveSyncDeviceAccessRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 index d0ecb01e85..901c33a01a 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.psm1 @@ -39,10 +39,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllAddressBookPolicies = Get-AddressBookPolicy @@ -125,10 +125,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewAddressBookPolicyParams = @{ @@ -167,7 +167,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentAddressBookPolicyConfig.Ensure -eq "Present") { Write-Verbose -Message "Address Book Policy '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Address Book Policy $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetAddressBookPolicyParams)" + Write-Verbose -Message "Setting Address Book Policy $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetAddressBookPolicyParams)" Set-AddressBookPolicy @SetAddressBookPolicyParams } } @@ -212,13 +212,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -243,9 +243,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllAddressBookPolicies = Get-AddressBookPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/MSFT_EXOAddressBookPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAddressBookPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressBookPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 index d6d4a355e1..b6b74c3fb2 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.psm1 @@ -108,10 +108,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $nullReturn = @{ @@ -192,7 +192,7 @@ function Get-TargetResource } Write-Verbose -Message "Found AddressList $($Name)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -309,10 +309,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline if ($RecipientFilter) @@ -393,7 +393,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentAddressListConfig.Ensure -eq "Present") { Write-Verbose -Message "Address List '$($Name)' already exists. Updating settings" - Write-Verbose -Message "Setting Address List '$($Name)' with values: $(Convert-O365DscHashtableToString -Hashtable $SetAddressListParams)" + Write-Verbose -Message "Setting Address List '$($Name)' with values: $(Convert-M365DscHashtableToString -Hashtable $SetAddressListParams)" Set-AddressList @SetAddressListParams } } @@ -507,13 +507,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -538,10 +538,10 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline if ($null -eq (Get-Command 'Get-AddressList' -ErrorAction SilentlyContinue)) { diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/MSFT_EXOAddressList.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAddressList/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAddressList/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 index 050373a0b4..963f33deda 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.psm1 @@ -123,10 +123,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AntiPhishPolicies = Get-AntiPhishPolicy @@ -184,7 +184,7 @@ function Get-TargetResource } Write-Verbose -Message "Found AntiPhishPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -313,10 +313,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AntiPhishPolicies = Get-AntiPhishPolicy @@ -469,13 +469,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -500,9 +500,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/MSFT_EXOAntiPhishPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 index dd14bbace4..89ab5ee2f6 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.psm1 @@ -63,10 +63,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -78,7 +78,7 @@ function Get-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't get AntiPhishRules" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't get AntiPhishRules" -Source $MyInvocation.MyCommand.ModuleName } if ($null -ne $AntiPhishRules) @@ -115,7 +115,7 @@ function Get-TargetResource } Write-Verbose -Message "Found AntiPhishRule $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -192,10 +192,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AntiPhishRules = Get-AntiPhishRule @@ -294,8 +294,8 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null @@ -306,7 +306,7 @@ function Test-TargetResource $ValuesToCheck.Remove("Enabled") | Out-Null } - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -331,9 +331,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/MSFT_EXOAntiPhishRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAntiPhishRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAntiPhishRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 index b194740606..2336057735 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.psm1 @@ -40,10 +40,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $nullReturn = @{ @@ -138,10 +138,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewApplicationAccessPolicyParams = @{ @@ -176,7 +176,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentApplicationAccessPolicyConfig.Ensure -eq "Present" -and $currentApplicationAccessPolicyConfig.Description -ne $Description) { Write-Verbose -Message "Application Access Policy '$($Identity)' already exists, but needs updating." - Write-Verbose -Message "Setting Application Access Policy $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $SetApplicationAccessPolicyParams)" + Write-Verbose -Message "Setting Application Access Policy $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $SetApplicationAccessPolicyParams)" Set-ApplicationAccessPolicy @SetApplicationAccessPolicyParams } # CASE: Application Access Policy exists and it should, but has different values than the desired one @@ -230,13 +230,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -261,9 +261,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline try diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/MSFT_EXOApplicationAccessPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOApplicationAccessPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 index 9379b4a6eb..cfee80c041 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.psm1 @@ -49,9 +49,9 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline try @@ -80,7 +80,7 @@ function Get-TargetResource } Write-Verbose -Message "Found AtpPolicyForO365 $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -140,7 +140,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion if ('Default' -ne $Identity) @@ -148,14 +148,14 @@ function Set-TargetResource throw "EXOAtpPolicyForO365 configurations MUST specify Identity value of 'Default'" } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AtpPolicyParams = $PSBoundParameters $AtpPolicyParams.Remove('Ensure') | Out-Null $AtpPolicyParams.Remove('GlobalAdminAccount') | Out-Null $AtpPolicyParams.Remove('IsSingleInstance') | Out-Null - Write-Verbose -Message "Setting AtpPolicyForO365 $Identity with values: $(Convert-O365DscHashtableToString -Hashtable $AtpPolicyParams)" + Write-Verbose -Message "Setting AtpPolicyForO365 $Identity with values: $(Convert-M365DscHashtableToString -Hashtable $AtpPolicyParams)" Set-AtpPolicyForO365 @AtpPolicyParams } @@ -208,15 +208,15 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null $ValuesToCheck.Remove('IsSingleInstance') | Out-Null $ValuesToCheck.Remove('Verbose') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -240,13 +240,13 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/MSFT_EXOAtpPolicyForO365.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAtpPolicyForO365/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 similarity index 84% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 index f6ab879acb..bb65c66b51 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.psm1 @@ -38,7 +38,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration of AvailabilityAddressSpace for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline try @@ -47,7 +47,7 @@ function Get-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't get AvailabilityAddressSpaces" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't get AvailabilityAddressSpaces" -Source $MyInvocation.MyCommand.ModuleName } @@ -84,7 +84,7 @@ function Get-TargetResource } Write-Verbose -Message "Found AvailabilityAddressSpace $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -128,7 +128,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration of AvailabilityAddressSpace for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline try @@ -137,7 +137,7 @@ function Set-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't get AvailabilityAddressSpaces" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't get AvailabilityAddressSpaces" -Source $MyInvocation.MyCommand.ModuleName } $AvailabilityAddressSpace = $AvailabilityAddressSpaces | Where-Object -FilterScript { $_.Identity -eq $Identity } @@ -155,12 +155,12 @@ function Set-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't add new AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't add new AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName } } elseif (('Present' -eq $Ensure ) -and ($Null -ne $AvailabilityAddressSpace)) { - Write-Verbose -Message "Setting AvailabilityAddressSpace $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $AvailabilityAddressSpaceParams)" + Write-Verbose -Message "Setting AvailabilityAddressSpace $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $AvailabilityAddressSpaceParams)" # AvailabilityAddressSpace is a special case in that it does not have a "set-AvailabilityAddressSpace" cmdlet. To change values of an existing AvailabilityAddressSpace it must be removed and then added again with add-AvailabilityAddressSpace try { @@ -168,7 +168,7 @@ function Set-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't remove AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't remove AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName } try @@ -177,7 +177,7 @@ function Set-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't add new AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't add new AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName } } elseif (('Absent' -eq $Ensure ) -and ($null -ne $AvailabilityAddressSpace)) @@ -189,7 +189,7 @@ function Set-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't remove AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't remove AvailabilityAddressSpace" -Source $MyInvocation.MyCommand.ModuleName } } } @@ -235,13 +235,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -262,7 +262,7 @@ function Export-TargetResource ) $InformationPreference = "Continue" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue @@ -272,7 +272,7 @@ function Export-TargetResource } catch { - New-Office365DSCLogEntry -Error $_ -Message "Couldn't get AvailabilityAddressSpaces" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Couldn't get AvailabilityAddressSpaces" -Source $MyInvocation.MyCommand.ModuleName } $content = "" diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/MSFT_EXOAvailabilityAddressSpace.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 index 58823367e3..9ebccf6cac 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.psm1 @@ -20,7 +20,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration of Availability Config for $OrgWideAccount" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AvailabilityConfigs = Get-AvailabilityConfig @@ -75,7 +75,7 @@ function Set-TargetResource $currentAvailabilityConfig = Get-TargetResource @PSBoundParameters - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline # CASE: Availability Config doesn't exist but should; @@ -123,13 +123,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -154,9 +154,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AvailabilityConfig = Get-AvailabilityConfig diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/MSFT_EXOAvailabilityConfig.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOAvailabilityConfig/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityConfig/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 index d0c51da4f8..1442319e1c 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.psm1 @@ -39,10 +39,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $CASMailboxPlans = Get-CASMailboxPlan @@ -68,7 +68,7 @@ function Get-TargetResource } Write-Verbose -Message "Found CASMailboxPlan $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -113,10 +113,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $CASMailboxPlanParams = $PSBoundParameters @@ -128,7 +128,7 @@ function Set-TargetResource if ($null -ne $CASMailboxPlan) { - Write-Verbose -Message "Setting CASMailboxPlan $Identity with values: $(Convert-O365DscHashtableToString -Hashtable $CASMailboxPlanParams)" + Write-Verbose -Message "Setting CASMailboxPlan $Identity with values: $(Convert-M365DscHashtableToString -Hashtable $CASMailboxPlanParams)" Set-CASMailboxPlan @CASMailboxPlanParams } else @@ -177,13 +177,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -207,7 +207,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/MSFT_EXOCASMailboxPlan.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOCASMailboxPlan/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOCASMailboxPlan/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 index 14e30e8a19..daf6b24779 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.psm1 @@ -81,10 +81,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline @@ -124,7 +124,7 @@ function Get-TargetResource } Write-Verbose -Message "Found ClientAccessRule $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -211,10 +211,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline @@ -241,7 +241,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($Null -ne $ClientAccessRule)) { - Write-Verbose -Message "Setting ClientAccessRule $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $ClientAccessRuleParams)" + Write-Verbose -Message "Setting ClientAccessRule $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $ClientAccessRuleParams)" Set-ClientAccessRule @ClientAccessRuleParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $ClientAccessRule)) @@ -333,13 +333,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -363,7 +363,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/MSFT_EXOClientAccessRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOClientAccessRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOClientAccessRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 index b72ce03393..cb73845fa7 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.psm1 @@ -46,10 +46,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -63,7 +63,7 @@ function Get-TargetResource { Close-SessionsAndReturnError -ExceptionMessage $_.Exception $Message = "Error calling {Get-DkimSigningConfig}" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } $DkimSigningConfig = $DkimSigningConfigs | Where-Object -FilterScript { $_.Identity -eq $Identity } if (-not $DkimSigningConfig) @@ -87,7 +87,7 @@ function Get-TargetResource } Write-Verbose -Message "Found DkimSigningConfig $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -139,10 +139,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $DkimSigningConfigs = Get-DkimSigningConfig @@ -167,7 +167,7 @@ function Set-TargetResource $DkimSigningConfigParams.Remove('Ensure') | Out-Null $DkimSigningConfigParams.Remove('GlobalAdminAccount') | Out-Null $DkimSigningConfigParams.Remove('KeySize') | Out-Null - Write-Verbose -Message "Setting DkimSigningConfig $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $DkimSigningConfigParams)" + Write-Verbose -Message "Setting DkimSigningConfig $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $DkimSigningConfigParams)" Set-DkimSigningConfig @DkimSigningConfigParams -Confirm:$false } @@ -225,13 +225,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -255,7 +255,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -268,7 +268,7 @@ function Export-TargetResource $i = 1 $content = "" $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/MSFT_EXODkimSigningConfig.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXODkimSigningConfig/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXODkimSigningConfig/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 index 4eef3a0c33..447abdbeab 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.psm1 @@ -40,10 +40,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllEmailAddressPolicies = Get-EmailAddressPolicy @@ -127,10 +127,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewEmailAddressPolicyParams = @{ @@ -179,7 +179,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentEmailAddressPolicyConfig.Ensure -eq "Present") { Write-Verbose -Message "Email Address Policy '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Email Address Policy $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetEmailAddressPolicyParams)" + Write-Verbose -Message "Setting Email Address Policy $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetEmailAddressPolicyParams)" Set-EmailAddressPolicy @SetEmailAddressPolicyParams } } @@ -225,13 +225,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -256,9 +256,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllEmailAddressPolicies = Get-EmailAddressPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/MSFT_EXOEmailAddressPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOEmailAddressPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 index 614b866213..58dc90c120 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.psm1 @@ -105,10 +105,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $nullReturn = @{ @@ -300,10 +300,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline # RecipientFilter parameter cannot be used in combination with the IncludedRecipients parameter or any Conditional parameters (which are used to create precanned filters). @@ -386,7 +386,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentGlobalAddressListConfig.Ensure -eq "Present") { Write-Verbose -Message "Global Address List '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Global Address List $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetGlobalAddressListParams)" + Write-Verbose -Message "Setting Global Address List $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetGlobalAddressListParams)" Set-GlobalAddressList @SetGlobalAddressListParams } } @@ -497,13 +497,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -528,9 +528,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline if ($null -eq (Get-Command 'Get-GlobalAddressList' -ErrorAction SilentlyContinue)) diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/MSFT_EXOGlobalAddressList.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOGlobalAddressList/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOGlobalAddressList/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 index 9b8e1ee803..85ee631871 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.psm1 @@ -43,10 +43,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -60,7 +60,7 @@ function Get-TargetResource { Close-SessionsAndReturnError -ExceptionMessage $_.Exception $Message = "Error calling {Get-HostedConnectionFilterPolicy}" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } $HostedConnectionFilterPolicy = $HostedConnectionFilterPolicys | Where-Object -FilterScript { $_. Identity -eq $Identity } @@ -90,7 +90,7 @@ function Get-TargetResource } Write-Verbose -Message "Found HostedConnectionFilterPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -139,10 +139,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $HostedConnectionFilterPolicys = Get-HostedConnectionFilterPolicy @@ -239,15 +239,15 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null $ValuesToCheck.Remove('IsSingleInstance') | Out-Null $ValuesToCheck.Remove('Verbose') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -271,7 +271,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/MSFT_EXOHostedConnectionFilterPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedConnectionFilterPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 index 78d3d4582b..4e9828e9ca 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.psm1 @@ -233,10 +233,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $HostedContentFilterPolicies = Get-HostedContentFilterPolicy @@ -309,7 +309,7 @@ function Get-TargetResource } Write-Verbose -Message "Found HostedContentFilterPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -548,10 +548,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $HostedContentFilterPolicies = Get-HostedContentFilterPolicy @@ -573,7 +573,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($null -ne $HostedContentFilterPolicy)) { - Write-Verbose -Message "Setting HostedContentFilterPolicy $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $HostedContentFilterPolicyParams)." + Write-Verbose -Message "Setting HostedContentFilterPolicy $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $HostedContentFilterPolicyParams)." if ($PSBoundParameters.MakeDefault) { Set-HostedContentFilterPolicy @HostedContentFilterPolicyParams -MakeDefault -Confirm:$false @@ -825,18 +825,18 @@ function Test-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -861,10 +861,10 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $HostedContentFilterPolicies = Get-HostedContentFilterPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/MSFT_EXOHostedContentFilterPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 index 2bbd729ab4..9e10ea8536 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.psm1 @@ -63,10 +63,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -80,7 +80,7 @@ function Get-TargetResource { Close-SessionsAndReturnError -ExceptionMessage $_.Exception $Message = "Error calling {Get-HostedContentFilterRule}" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } $HostedContentFilterRule = $HostedContentFilterRules | Where-Object -FilterScript { $_.Identity -eq $Identity } if (-not $HostedContentFilterRule) @@ -119,7 +119,7 @@ function Get-TargetResource } Write-Verbose -Message "Found HostedContentFilterRule $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -188,10 +188,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -292,13 +292,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -322,7 +322,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/MSFT_EXOHostedContentFilterRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedContentFilterRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 index 2be8746739..cea5e985d1 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.psm1 @@ -43,10 +43,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $HostedOutboundSpamFilterPolicies = Get-HostedOutboundSpamFilterPolicy @@ -73,7 +73,7 @@ function Get-TargetResource } Write-Verbose -Message "Found HostedOutboundSpamFilterPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -122,17 +122,17 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $HostedOutboundSpamFilterPolicyParams = $PSBoundParameters $HostedOutboundSpamFilterPolicyParams.Remove('Ensure') | Out-Null $HostedOutboundSpamFilterPolicyParams.Remove('GlobalAdminAccount') | Out-Null - Write-Verbose -Message "Setting HostedOutboundSpamFilterPolicy $Identity with values: $(Convert-O365DscHashtableToString -Hashtable $HostedOutboundSpamFilterPolicyParams)" + Write-Verbose -Message "Setting HostedOutboundSpamFilterPolicy $Identity with values: $(Convert-M365DscHashtableToString -Hashtable $HostedOutboundSpamFilterPolicyParams)" Set-HostedOutboundSpamFilterPolicy @HostedOutboundSpamFilterPolicyParams } @@ -180,14 +180,14 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null $ValuesToCheck.Remove('Verbose') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -211,7 +211,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/MSFT_EXOHostedOutboundSpamFilterPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOHostedOutboundSpamFilterPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 index ebfbe4f85a..725bfb6365 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.psm1 @@ -74,7 +74,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration of InboundConnector for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $InboundConnectors = Get-InboundConnector @@ -109,7 +109,7 @@ function Get-TargetResource } Write-Verbose -Message "Found InboundConnector $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -189,7 +189,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration of InboundConnector for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $InboundConnectors = Get-InboundConnector @@ -207,7 +207,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($Null -ne $InboundConnector)) { - Write-Verbose -Message "Setting InboundConnector $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $InboundConnectorParams)" + Write-Verbose -Message "Setting InboundConnector $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $InboundConnectorParams)" Set-InboundConnector @InboundConnectorParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $InboundConnector)) @@ -295,13 +295,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -322,7 +322,7 @@ function Export-TargetResource ) $InformationPreference = "Continue" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/MSFT_EXOInboundConnector.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOInboundConnector/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOInboundConnector/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 index 3829ef54c6..56368a753e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.psm1 @@ -32,7 +32,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration of IntraOrganizationConnector for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $IntraOrganizationConnectors = Get-IntraOrganizationConnector @@ -57,7 +57,7 @@ function Get-TargetResource } Write-Verbose -Message "Found IntraOrganizationConnector $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -95,7 +95,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration of IntraOrganizationConnector for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $IntraOrganizationConnectors = Get-IntraOrganizationConnector @@ -113,7 +113,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($Null -ne $IntraOrganizationConnector)) { - Write-Verbose -Message "Setting IntraOrganizationConnector $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $IntraOrganizationConnectorParams)" + Write-Verbose -Message "Setting IntraOrganizationConnector $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $IntraOrganizationConnectorParams)" Set-IntraOrganizationConnector @IntraOrganizationConnectorParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $IntraOrganizationConnector)) @@ -160,13 +160,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -187,7 +187,7 @@ function Export-TargetResource ) $InformationPreference = "Continue" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/MSFT_EXOIntraOrganizationConnector.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOIntraOrganizationConnector/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 index d010de92bc..924fb878e7 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.psm1 @@ -43,7 +43,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -57,7 +57,7 @@ function Get-TargetResource GlobalAdminAccount = $null } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $OrgConfig = Get-OrganizationConfig @@ -128,12 +128,12 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $OrgConfig = Get-TargetResource @PSBoundParameters - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline # CASE : MailTipsAllTipsEnabled is used @@ -214,10 +214,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("MailTipsAllTipsEnabled", @@ -248,7 +248,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -256,7 +256,7 @@ function Export-TargetResource -ErrorAction SilentlyContinue $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/MSFT_EXOMailTips.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMailTips/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailTips/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 index 1f04bba25d..9f582e9666 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.psm1 @@ -31,7 +31,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -41,7 +41,7 @@ function Get-TargetResource Ensure = "Absent" } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline try @@ -102,9 +102,9 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $currentMailbox = Get-TargetResource @PSBoundParameters @@ -161,10 +161,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -193,7 +193,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/MSFT_EXOMailboxSettings.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMailboxSettings/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMailboxSettings/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 index 22c0401bf0..5a8c58aca7 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.psm1 @@ -104,10 +104,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $MalwareFilterPolicys = Get-MalwareFilterPolicy @@ -149,7 +149,7 @@ function Get-TargetResource } Write-Verbose -Message "Found MalwareFilterPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -256,7 +256,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration of MalwareFilterPolicy for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $MalwareFilterPolicys = Get-MalwareFilterPolicy @@ -275,7 +275,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($Null -ne $MalwareFilterPolicy)) { - Write-Verbose -Message "Setting MalwareFilterPolicy $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $MalwareFilterPolicyParams)" + Write-Verbose -Message "Setting MalwareFilterPolicy $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $MalwareFilterPolicyParams)" Set-MalwareFilterPolicy @MalwareFilterPolicyParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $MalwareFilterPolicy)) @@ -391,13 +391,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -418,7 +418,7 @@ function Export-TargetResource ) $InformationPreference = "Continue" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/MSFT_EXOMalwareFilterPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 index 97df8fcd18..6904293353 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.psm1 @@ -64,10 +64,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $MalwareFilterRules = Get-MalwareFilterRule @@ -99,7 +99,7 @@ function Get-TargetResource } Write-Verbose -Message "Found MalwareFilterRule $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -167,7 +167,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration of MalwareFilterRule for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $MalwareFilterRules = Get-MalwareFilterRule @@ -186,7 +186,7 @@ function Set-TargetResource elseif (('Present' -eq $Ensure ) -and ($Null -ne $MalwareFilterRule)) { $MalwareFilterRuleParams.Remove('Enabled') | Out-Null - Write-Verbose -Message "Setting MalwareFilterRule $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $MalwareFilterRuleParams)" + Write-Verbose -Message "Setting MalwareFilterRule $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $MalwareFilterRuleParams)" Set-MalwareFilterRule @MalwareFilterRuleParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $MalwareFilterRule)) @@ -261,13 +261,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -288,7 +288,7 @@ function Export-TargetResource ) $InformationPreference = "Continue" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/MSFT_EXOMalwareFilterRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMalwareFilterRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMalwareFilterRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 index 99b2343a78..ce47183c22 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.psm1 @@ -32,10 +32,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllManagementRoles = Get-ManagementRole @@ -107,10 +107,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewManagementRoleParams = @{ @@ -138,7 +138,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentManagementRoleConfig.Ensure -eq "Present") { Write-Verbose -Message "Management Role '$($Name)' already exists, but needs updating. Re-create management role." - Write-Verbose -Message "Setting Management Role $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $NewManagementRoleParams)" + Write-Verbose -Message "Setting Management Role $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $NewManagementRoleParams)" # Since there is no Set-ManagementRole cmdlet available, remove management role and re-create it Remove-ManagementRole -Identity $Name -Confirm:$false -Force New-ManagementRole @NewManagementRoleParams @@ -178,13 +178,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -209,9 +209,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllManagementRoles = Get-ManagementRole diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/MSFT_EXOManagementRole.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOManagementRole/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOManagementRole/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 similarity index 98% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 index e7cf8b34bf..c7d00ca046 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.psm1 @@ -246,10 +246,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllMobileDeviceMailboxPolicies = Get-MobileDeviceMailboxPolicy @@ -639,10 +639,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewMobileDeviceMailboxPolicyParams = @{ @@ -725,7 +725,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentMobileDeviceMailboxPolicyConfig.Ensure -eq "Present") { Write-Verbose -Message "Mobile Device Mailbox Policy '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Mobile Device Mailbox Policy $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetMobileDeviceMailboxPolicyParams)" + Write-Verbose -Message "Setting Mobile Device Mailbox Policy $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetMobileDeviceMailboxPolicyParams)" Set-MobileDeviceMailboxPolicy @SetMobileDeviceMailboxPolicyParams } } @@ -977,13 +977,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -1008,9 +1008,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllMobileDeviceMailboxPolicies = Get-MobileDeviceMailboxPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/MSFT_EXOMobileDeviceMailboxPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOMobileDeviceMailboxPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 index 37d4ea374c..a630a68b6e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.psm1 @@ -40,7 +40,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -57,7 +57,7 @@ function Get-TargetResource { return $nullReturn } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllOfflineAddressBooks = Get-OfflineAddressBook @@ -130,10 +130,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewOfflineAddressBookParams = @{ @@ -173,7 +173,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentOfflineAddressBookConfig.Ensure -eq "Present") { Write-Verbose -Message "Offline Address Book '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Offline Address Book $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetOfflineAddressBookParams)" + Write-Verbose -Message "Setting Offline Address Book $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetOfflineAddressBookParams)" Set-OfflineAddressBook @SetOfflineAddressBookParams } } @@ -219,13 +219,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -250,9 +250,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline if ($null -eq (Get-Command 'Get-OfflineAddressBook' -ErrorAction SilentlyContinue)) diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/MSFT_EXOOfflineAddressBook.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOfflineAddressBook/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOfflineAddressBook/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 index 6f518624f0..25a77a771d 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.psm1 @@ -51,10 +51,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllOnPremisesOrganizations = Get-OnPremisesOrganization @@ -155,10 +155,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewOnPremisesOrganizationParams = @{ @@ -202,7 +202,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentOnPremisesOrganizationConfig.Ensure -eq "Present") { Write-Verbose -Message "On-premises Organization '$($Identity)' already exists, but needs updating." - Write-Verbose -Message "Setting On-premises Organization $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $SetOnPremisesOrganizationParams)" + Write-Verbose -Message "Setting On-premises Organization $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $SetOnPremisesOrganizationParams)" Set-OnPremisesOrganization @SetOnPremisesOrganizationParams } } @@ -259,13 +259,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -290,9 +290,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllOnPremisesOrganizations = Get-OnPremisesOrganization diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/MSFT_EXOOnPremisesOrganization.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOnPremisesOrganization/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 similarity index 98% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 index 767fc9c6f0..6284eb9d68 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.psm1 @@ -278,10 +278,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $ConfigSettings = Get-OrganizationConfig @@ -658,7 +658,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion if ($null -ne $EwsAllowList -and $null -ne $EwsBlockList) @@ -668,11 +668,11 @@ function Set-TargetResource Write-Verbose -Message "Setting EXOOrganizationConfig" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline - Write-Verbose -Message "Setting EXOOrganizationConfig with values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Setting EXOOrganizationConfig with values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $SetValues = $PSBoundParameters $SetValues.Remove('IsSingleInstance') $SetValues.Remove('GlobalAdminAccount') @@ -958,13 +958,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -989,7 +989,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $Params = @{ diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/MSFT_EXOOrganizationConfig.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationConfig/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationConfig/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 index a0c19dbf68..3093f1ae96 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.psm1 @@ -94,10 +94,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllOrganizationRelationships = Get-OrganizationRelationship @@ -293,10 +293,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewOrganizationRelationshipParams = @{ @@ -360,7 +360,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentOrgRelationshipConfig.Ensure -eq "Present") { Write-Verbose -Message "Organization Relationship '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Organization Relationship $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetOrganizationRelationshipParams)" + Write-Verbose -Message "Setting Organization Relationship $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetOrganizationRelationshipParams)" Set-OrganizationRelationship @SetOrganizationRelationshipParams } } @@ -460,13 +460,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -491,9 +491,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllOrgRelationships = Get-OrganizationRelationship diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/MSFT_EXOOrganizationRelationship.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOrganizationRelationship/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOrganizationRelationship/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 index 8a5210e763..cf8ec4ff63 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.psm1 @@ -83,7 +83,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration of OutBoundConnector for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $OutBoundConnectors = Get-OutBoundConnector @@ -120,7 +120,7 @@ function Get-TargetResource } Write-Verbose -Message "Found OutBoundConnector $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -210,7 +210,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration of OutBoundConnector for $($Identity)" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $OutBoundConnectors = Get-OutBoundConnector @@ -229,7 +229,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($Null -ne $OutBoundConnector)) { - Write-Verbose -Message "Setting OutBoundConnector $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $OutBoundConnectorParams)" + Write-Verbose -Message "Setting OutBoundConnector $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $OutBoundConnectorParams)" Set-OutBoundConnector @OutBoundConnectorParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $OutBoundConnector)) @@ -326,13 +326,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -354,7 +354,7 @@ function Export-TargetResource ) $InformationPreference = "Continue" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline ` -ErrorAction SilentlyContinue diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/MSFT_EXOOutboundConnector.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOutboundConnector/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOutboundConnector/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 similarity index 98% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 index 2db0bfca31..efd805a846 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.psm1 @@ -329,10 +329,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllOwaMailboxPolicies = Get-OwaMailboxPolicy @@ -847,10 +847,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewOwaMailboxPolicyParams = @{ @@ -960,7 +960,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentOwaMailboxPolicyConfig.Ensure -eq "Present") { Write-Verbose -Message "OWA Mailbox Policy '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting OWA Mailbox Policy $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetOwaMailboxPolicyParams)" + Write-Verbose -Message "Setting OWA Mailbox Policy $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetOwaMailboxPolicyParams)" Set-OwaMailboxPolicy @SetOwaMailboxPolicyParams } } @@ -1295,13 +1295,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -1326,9 +1326,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllOwaMailboxPolicies = Get-OwaMailboxPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/MSFT_EXOOwaMailboxPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOOwaMailboxPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 index 31b99a2140..3ddcdf8a64 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.psm1 @@ -44,10 +44,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllPartnerApplications = Get-PartnerApplication @@ -137,10 +137,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewPartnerApplicationParams = @{ @@ -182,7 +182,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentPartnerApplicationConfig.Ensure -eq "Present") { Write-Verbose -Message "Partner Application '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Partner Application $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetPartnerApplicationParams)" + Write-Verbose -Message "Setting Partner Application $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetPartnerApplicationParams)" Set-PartnerApplication @SetPartnerApplicationParams } } @@ -232,13 +232,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -263,9 +263,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllPartnerApplications = Get-PartnerApplication diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/MSFT_EXOPartnerApplication.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOPartnerApplication/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOPartnerApplication/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 index de53ca8117..7dab0fcc19 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.psm1 @@ -27,10 +27,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllPolicyTips = Get-PolicyTipConfig @@ -95,10 +95,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewPolicyTipConfigParams = @{ @@ -131,7 +131,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentPolicyTipConfig.Ensure -eq "Present") { Write-Verbose -Message "Policy Tip Config '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Policy Tip Config $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetPolicyTipConfigParams)" + Write-Verbose -Message "Setting Policy Tip Config $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetPolicyTipConfigParams)" Set-PolicyTipConfig @SetPolicyTipConfigParams } } @@ -164,13 +164,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -195,9 +195,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllPolicyTips = Get-PolicyTipConfig diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/MSFT_EXOPolicyTipConfig.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOPolicyTipConfig/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOPolicyTipConfig/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 index 29ffc7288b..94c8745973 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.psm1 @@ -111,7 +111,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration of Remote Domain for $Identity" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $RemoteDomain = Get-RemoteDomain -Identity $Identity -ErrorAction SilentlyContinue @@ -297,7 +297,7 @@ function Set-TargetResource $currentRemoteDomainConfig = Get-TargetResource @PSBoundParameters - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $RemoteDomainParams = @{ @@ -343,7 +343,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentRemoteDomainConfig.Ensure -eq "Present") { Write-Verbose -Message "Remote Domain '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting RemoteDomain for $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $RemoteDomainParams)" + Write-Verbose -Message "Setting RemoteDomain for $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $RemoteDomainParams)" Set-RemoteDomain @RemoteDomainParams } @@ -463,13 +463,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -493,9 +493,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllRemoteDomains = Get-RemoteDomain diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/MSFT_EXORemoteDomain.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXORemoteDomain/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXORemoteDomain/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 index aa9c54bae6..a4b7b7f7e5 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.psm1 @@ -36,10 +36,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllRoleAssignmentPolicies = Get-RoleAssignmentPolicy @@ -117,10 +117,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewRoleAssignmentPolicyParams = @{ @@ -157,7 +157,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentRoleAssignmentPolicyConfig.Ensure -eq "Present" -and $null -eq (Compare-Object -ReferenceObject $($currentRoleAssignmentPolicyConfig.Roles) -DifferenceObject $Roles)) { Write-Verbose -Message "Role Assignment Policy '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Role Assignment Policy $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetRoleAssignmentPolicyParams)" + Write-Verbose -Message "Setting Role Assignment Policy $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetRoleAssignmentPolicyParams)" Set-RoleAssignmentPolicy @SetRoleAssignmentPolicyParams } # CASE: Role Assignment Policy exists and it should, but Roles attribute has different values than the desired ones @@ -208,13 +208,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -239,9 +239,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllRoleAssignmentPolicies = Get-RoleAssignmentPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/MSFT_EXORoleAssignmentPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXORoleAssignmentPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 index f67f8108e3..9f52d1b57f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.psm1 @@ -48,10 +48,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $SafeAttachmentPolicies = Get-SafeAttachmentPolicy @@ -79,7 +79,7 @@ function Get-TargetResource } Write-Verbose -Message "Found SafeAttachmentPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -133,10 +133,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $SafeAttachmentPolicyParams = $PSBoundParameters @@ -159,7 +159,7 @@ function Set-TargetResource } else { - Write-Verbose -Message "Setting SafeAttachmentPolicy $Identity with values: $(Convert-O365DscHashtableToString -Hashtable $SafeAttachmentPolicyParams)" + Write-Verbose -Message "Setting SafeAttachmentPolicy $Identity with values: $(Convert-M365DscHashtableToString -Hashtable $SafeAttachmentPolicyParams)" Set-SafeAttachmentPolicy @SafeAttachmentPolicyParams } } @@ -219,13 +219,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -250,7 +250,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/MSFT_EXOSafeAttachmentPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 index 3844404369..c8021add3e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.psm1 @@ -63,10 +63,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -80,7 +80,7 @@ function Get-TargetResource { Close-SessionsAndReturnError -ExceptionMessage $_.Exception $Message = "Error calling {Get-SafeAttachmentRule}" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } $SafeAttachmentRule = $SafeAttachmentRules | Where-Object -FilterScript { $_.Identity -eq $Identity } if (-not $SafeAttachmentRule) @@ -118,7 +118,7 @@ function Get-TargetResource } Write-Verbose -Message "Found SafeAttachmentRule $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -187,10 +187,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $SafeAttachmentRules = Get-SafeAttachmentRule @@ -289,13 +289,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -320,7 +320,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/MSFT_EXOSafeAttachmentRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeAttachmentRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 index 3669f321f5..4fba40a07e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.psm1 @@ -51,10 +51,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Write-Verbose -Message "Global ExchangeOnlineSession status:" @@ -68,7 +68,7 @@ function Get-TargetResource { Close-SessionsAndReturnError -ExceptionMessage $_.Exception $Message = "Error calling {Get-SafeLinksPolicy}" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } $SafeLinksPolicy = $SafeLinksPolicies | Where-Object -FilterScript { $_.Identity -eq $Identity } @@ -95,7 +95,7 @@ function Get-TargetResource } Write-Verbose -Message "Found SafeLinksPolicy $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -152,10 +152,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $SafeLinksPolicies = Get-SafeLinksPolicy @@ -176,7 +176,7 @@ function Set-TargetResource } elseif (('Present' -eq $Ensure ) -and ($null -ne $SafeLinksPolicy)) { - Write-Verbose -Message "Setting SafeLinksPolicy $($Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $SafeLinksPolicyParams)" + Write-Verbose -Message "Setting SafeLinksPolicy $($Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $SafeLinksPolicyParams)" Set-SafeLinksPolicy @SafeLinksPolicyParams -Confirm:$false } elseif (('Absent' -eq $Ensure ) -and ($null -ne $SafeLinksPolicy)) @@ -238,15 +238,15 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null $ValuesToCheck.Remove('IsSingleInstance') | Out-Null $ValuesToCheck.Remove('Verbose') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -271,7 +271,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/MSFT_EXOSafeLinksPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 index 1316822221..198284f8ca 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.psm1 @@ -64,10 +64,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $SafeLinksRules = Get-SafeLinksRule @@ -109,7 +109,7 @@ function Get-TargetResource } Write-Verbose -Message "Found SafeLinksRule $($Identity)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -178,10 +178,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $SafeLinksRules = Get-SafeLinksRule @@ -280,13 +280,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -312,7 +312,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/MSFT_EXOSafeLinksRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSafeLinksRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSafeLinksRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 index fa2966c2e1..d924e97ece 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.psm1 @@ -31,7 +31,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -41,7 +41,7 @@ function Get-TargetResource Ensure = "Absent" } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $mailboxes = Get-Mailbox @@ -113,7 +113,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $currentMailbox = Get-TargetResource @PSBoundParameters @@ -129,7 +129,7 @@ function Set-TargetResource #endregion $CurrentParameters = $PSBoundParameters - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline # CASE: Mailbox doesn't exist but should; @@ -212,15 +212,15 @@ function Test-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -249,7 +249,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/MSFT_EXOSharedMailbox.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSharedMailbox/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharedMailbox/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 index 07f11fb20a..f04558dee1 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.psm1 @@ -36,10 +36,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $AllSharingPolicies = Get-SharingPolicy @@ -117,10 +117,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $NewSharingPolicyParams = @{ @@ -158,7 +158,7 @@ function Set-TargetResource elseif ($Ensure -eq "Present" -and $currentSharingPolicyConfig.Ensure -eq "Present") { Write-Verbose -Message "Sharing Policy '$($Name)' already exists, but needs updating." - Write-Verbose -Message "Setting Sharing Policy $($Name) with values: $(Convert-O365DscHashtableToString -Hashtable $SetSharingPolicyParams)" + Write-Verbose -Message "Setting Sharing Policy $($Name) with values: $(Convert-M365DscHashtableToString -Hashtable $SetSharingPolicyParams)" Set-SharingPolicy @SetSharingPolicyParams } } @@ -200,13 +200,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -231,9 +231,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline [array]$AllSharingPolicies = Get-SharingPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/MSFT_EXOSharingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_EXOSharingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_EXOSharingPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 similarity index 90% rename from Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 index b54d53a838..f9b4907527 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.psm1 @@ -29,7 +29,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -39,7 +39,7 @@ function Get-TargetResource UnifiedAuditLogIngestionEnabled = $UnifiedAuditLogIngestionEnabled } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $GetResults = Get-AdminAuditLogConfig @@ -100,10 +100,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline if ($UnifiedAuditLogIngestionEnabled -eq 'Enabled') @@ -116,7 +116,7 @@ function Set-TargetResource { $Message = "Couldn't set the Audit Log Ingestion. Please run Enable-OrganizationCustomization first." Write-Verbose $Message - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } } else @@ -129,7 +129,7 @@ function Set-TargetResource { $Message = "Couldn't set the Audit Log Ingestion. Please run Enable-OrganizationCustomization first." Write-Verbose $Message - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } } } @@ -164,10 +164,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @('UnifiedAuditLogIngestionEnabled') @@ -191,7 +191,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/MSFT_O365AdminAuditLogConfig.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365AdminAuditLogConfig/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 index f778771f00..8224b730bb 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.psm1 @@ -39,7 +39,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -51,7 +51,7 @@ function Get-TargetResource Ensure = "Absent" } - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform AzureAD $ADGroup = Get-AzureADGroup | Where-Object -FilterScript {$_.MailNickName -eq $MailNickName} @@ -118,7 +118,7 @@ function Get-TargetResource catch { $Message = "An error occured retrieving info for Group $DisplayName" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } return $nullReturn } @@ -163,9 +163,9 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline $currentGroup = Get-TargetResource @PSBoundParameters @@ -324,10 +324,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters @@ -352,7 +352,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $content = '' @@ -364,7 +364,7 @@ function Export-TargetResource $i = 1 $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/MSFT_O365Group.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365Group/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365Group/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365Group/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 index 2c56312cc2..0d318cfeda 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.psm1 @@ -22,7 +22,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = $PSBoundParameters @@ -73,11 +73,11 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Write-Verbose -Message "Setting configuration of Office 365 Group $DisplayName" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform ExchangeOnline Enable-OrganizationCustomization @@ -108,10 +108,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") @@ -135,7 +135,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $exportParams = @{ diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/MSFT_O365OrgCustomizationSetting.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365OrgCustomizationSetting/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365User/MSFT_O365User.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_O365User/MSFT_O365User.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_O365User/MSFT_O365User.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365User/MSFT_O365User.psm1 index 110f5e3004..c9c85d01f8 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_O365User/MSFT_O365User.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_O365User/MSFT_O365User.psm1 @@ -108,7 +108,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Platform AzureAD -CloudCredential $GlobalAdminAccount @@ -303,7 +303,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -367,7 +367,7 @@ function Set-TargetResource { $Message = "License {$($LicenseAssignment)} doesn't exist in tenant." Write-Verbose $Message - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName } Write-Verbose -Message "Updating Office 365 User $UserPrincipalName Information" @@ -395,7 +395,7 @@ function Set-TargetResource catch { $Message = "Could not assign license {$($newLicenseAssignment)} to user {$($UserPrincipalName)}" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName throw $Message } } @@ -508,13 +508,13 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of Office 365 User $UserPrincipalName" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -559,12 +559,12 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Platform AzureAD -CloudCredential $GlobalAdminAccount $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365User/MSFT_O365User.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_O365User/MSFT_O365User.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365User/MSFT_O365User.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365User/MSFT_O365User.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_O365User/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_O365User/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_O365User/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_O365User/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 index 4c9469f22a..96e8b21c2f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.psm1 @@ -75,10 +75,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SharePointOnline $nullReturn = @{ @@ -175,7 +175,7 @@ function Get-TargetResource catch { $Message = "Failed to get Tenant client sync settings" - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName return $nullReturn } } @@ -256,10 +256,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SharePointOnline ## Configure OneDrive settings @@ -413,10 +413,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("BlockMacSync", ` @@ -454,7 +454,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SharePointOnline ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/MSFT_ODSettings.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_ODSettings/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_ODSettings/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_ODSettings/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 index 3f621f4913..c49e2c74b7 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.psm1 @@ -32,7 +32,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Cloud $GlobalAdminAccount ` @@ -105,7 +105,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -172,12 +172,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration for PowerApps Environment {$DisplayName}" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove("GlobalAdminAccount") | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -203,7 +203,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/MSFT_PPPowerAppsEnvironment.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_PPPowerAppsEnvironment/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 index 27db523f70..d917880d3b 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.psm1 @@ -24,10 +24,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = $null @@ -59,7 +59,7 @@ function Get-TargetResource GlobalAdminAccount = $GlobalAdminAccount } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -90,10 +90,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -147,12 +147,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCAuditConfigurationPolicy for $Workload" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -177,9 +177,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $policies = Get-AuditConfigurationPolicy diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/MSFT_SCAuditConfigurationPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCAuditConfigurationPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 index b450bacfea..cad8a7d044 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.psm1 @@ -47,10 +47,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = Get-CaseHoldPolicy -Case $Case -Identity $Name -ErrorAction SilentlyContinue @@ -76,7 +76,7 @@ function Get-TargetResource SharePointLocation = $PolicyObject.SharePointLocation.Name } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -130,10 +130,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -221,7 +221,7 @@ function Set-TargetResource $CreationParams.Remove("PublicFolderLocation") } - Write-Verbose "Updating Policy with values: $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose "Updating Policy with values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" Set-CaseHoldPolicy @CreationParams } elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentPolicy.Ensure)) @@ -279,12 +279,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCCaseHoldPolicy for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -309,9 +309,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter [array]$cases = Get-ComplianceCase diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/MSFT_SCCaseHoldPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 index abd0312c8d..83d7834f37 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.psm1 @@ -39,10 +39,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Rules = Get-CaseHoldRule -Policy $Policy -ErrorAction 'SilentlyContinue' @@ -69,7 +69,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -114,10 +114,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentRule = Get-TargetResource @PSBoundParameters @@ -189,12 +189,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCCaseHoldRule for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -220,9 +220,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter [array]$Rules = Get-CaseHoldRule diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/MSFT_SCCaseHoldRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCCaseHoldRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCCaseHoldRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 index 1d253da2dd..13da3b3f6f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.psm1 @@ -32,10 +32,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Case = Get-ComplianceCase -Identity $Name -ErrorAction SilentlyContinue @@ -63,7 +63,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -101,10 +101,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentCase = Get-TargetResource @PSBoundParameters @@ -185,12 +185,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCComplianceCase for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -216,9 +216,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter [array]$Cases = Get-ComplianceCase diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/MSFT_SCComplianceCase.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceCase/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceCase/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 index 26641ea512..b5c0eb6ec0 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.psm1 @@ -71,10 +71,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter if ($null -eq $Case) @@ -128,7 +128,7 @@ function Get-TargetResource $result.Remove($paramToRemove) } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -205,10 +205,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentSearch = Get-TargetResource @PSBoundParameters @@ -312,12 +312,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCComplianceSearch for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -343,9 +343,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $searches = Get-ComplianceSearch diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/MSFT_SCComplianceSearch.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearch/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearch/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 index 35dd397693..69da3dd6a3 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.psm1 @@ -57,10 +57,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $currentAction = Get-CurrentAction -SearchName $SearchName -Action $Action @@ -124,7 +124,7 @@ function Get-TargetResource Write-Verbose "Found existing $Action SCComplianceSearchAction for Search $SearchName" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" } return $result } @@ -188,10 +188,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentAction = Get-TargetResource @PSBoundParameters @@ -232,7 +232,7 @@ function Set-TargetResource Write-Verbose -Message "Creating new Compliance Search Action calling the New-ComplianceSearchAction cmdlet" - Write-Verbose -Message "Set-TargetResource Creation Parameters: `n $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose -Message "Set-TargetResource Creation Parameters: `n $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" try { @@ -264,7 +264,7 @@ function Set-TargetResource } else { - New-Office365DSCLogEntry -Error $_ -Message "Could not create a new SCComplianceSearchAction" -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message "Could not create a new SCComplianceSearchAction" -Source $MyInvocation.MyCommand.ModuleName Write-Verbose -Message "An error occured creating a new SCComplianceSearchAction" throw $_ } @@ -337,12 +337,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCComplianceSearchAction" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -368,7 +368,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Platform SecurityComplianceCenter ` -CloudCredential $GlobalAdminAccount diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/MSFT_SCComplianceSearchAction.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceSearchAction/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceSearchAction/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 index 89764050e2..a297112f2e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.psm1 @@ -65,10 +65,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $tagObject = Get-ComplianceTag -Identity $Name -ErrorAction SilentlyContinue @@ -104,7 +104,7 @@ function Get-TargetResource $result.Add("FilePlanProperty", $ConvertedFilePlanProperty) } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -175,10 +175,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentTag = Get-TargetResource @PSBoundParameters @@ -322,8 +322,8 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of ComplianceTag for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null @@ -337,7 +337,7 @@ function Test-TargetResource return $false } - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -362,9 +362,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter ` -ErrorAction SilentlyContinue $tags = Get-ComplianceTag diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/MSFT_SCComplianceTag.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCComplianceTag/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCComplianceTag/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 index e670977e6e..dacb40f1f5 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.psm1 @@ -72,10 +72,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = Get-DlpCompliancePolicy -Identity $Name -ErrorAction SilentlyContinue @@ -107,7 +107,7 @@ function Get-TargetResource TeamsLocationException = $PolicyObject.TeamsLocationException } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -186,10 +186,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -357,7 +357,7 @@ function Set-TargetResource } $CreationParams.Remove("TeamsLocationException") } - Write-Verbose "Updating Policy with values: $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose "Updating Policy with values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" Set-DLPCompliancePolicy @CreationParams } elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentPolicy.Ensure)) @@ -440,13 +440,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -471,7 +471,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/MSFT_SCDLPCompliancePolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPCompliancePolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 index 89913dddb2..9f0f63b928 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.psm1 @@ -97,10 +97,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyRule = Get-DlpComplianceRule -Identity $Name -ErrorAction SilentlyContinue @@ -181,7 +181,7 @@ function Get-TargetResource $result.Remove($paramName) } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -284,10 +284,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentRule = Get-TargetResource @PSBoundParameters @@ -309,7 +309,7 @@ function Set-TargetResource $CreationParams.Remove("GlobalAdminAccount") $CreationParams.Remove("Ensure") - Write-Verbose -Message "Calling New-DLPComplianceRule with Values: $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose -Message "Calling New-DLPComplianceRule with Values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" New-DLPComplianceRule @CreationParams } elseif (('Present' -eq $Ensure) -and ('Present' -eq $CurrentRule.Ensure)) @@ -329,7 +329,7 @@ function Set-TargetResource $UpdateParams.Remove("Policy") $UpdateParams.Add("Identity", $Name) - Write-Verbose "Updating Rule with values: $(Convert-O365DscHashtableToString -Hashtable $UpdateParams)" + Write-Verbose "Updating Rule with values: $(Convert-M365DscHashtableToString -Hashtable $UpdateParams)" Set-DLPComplianceRule @UpdateParams } elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentRule.Ensure)) @@ -437,12 +437,12 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Name", @@ -488,7 +488,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $rules = Get-DLPComplianceRule | Where-Object { $_.Mode -ne 'PendingDeletion' } diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/MSFT_SCDLPComplianceRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDLPComplianceRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDLPComplianceRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 index 1b97e36824..7a0530ef92 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.psm1 @@ -31,10 +31,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = Get-DeviceConditionalAccessPolicy -Identity $Name -ErrorAction SilentlyContinue @@ -57,7 +57,7 @@ function Get-TargetResource GlobalAdminAccount = $GlobalAdminAccount } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -95,10 +95,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -118,7 +118,7 @@ function Set-TargetResource $CreationParams.Remove("Name") $CreationParams.Add("Identity", $Name) - Write-Verbose "Updating Policy with values: $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose "Updating Policy with values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" Set-DeviceConditionalAccessPolicy @CreationParams } elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentPolicy.Ensure)) @@ -160,13 +160,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -191,7 +191,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/MSFT_SCDeviceConditionalAccessPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConditionalAccessPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 index d2827c5d42..d9545ae67c 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.psm1 @@ -31,10 +31,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = Get-DeviceConfigurationPolicy -Identity $Name -ErrorAction SilentlyContinue @@ -57,7 +57,7 @@ function Get-TargetResource GlobalAdminAccount = $GlobalAdminAccount } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -95,10 +95,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -118,7 +118,7 @@ function Set-TargetResource $CreationParams.Remove("Name") $CreationParams.Add("Identity", $Name) - Write-Verbose "Updating Policy with values: $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose "Updating Policy with values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" Set-DeviceConfigurationPolicy @CreationParams } elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentPolicy.Ensure)) @@ -160,13 +160,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -191,7 +191,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/MSFT_SCDeviceConfigurationPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCDeviceConfigurationPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 index 08dd4e4581..7028cceb2f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.psm1 @@ -23,10 +23,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $property = Get-FilePlanPropertyAuthority | Where-Object -FilterScript { $_.DisplayName -eq $Name } @@ -48,7 +48,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -77,10 +77,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Current = Get-TargetResource @PSBoundParameters @@ -126,12 +126,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCFilePlanPropertyAuthority for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -157,9 +157,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Properties = Get-FilePlanPropertyAuthority diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/MSFT_SCFilePlanPropertyAuthority.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyAuthority/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 index a0293e7b2b..2515df6053 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.psm1 @@ -23,10 +23,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $property = Get-FilePlanPropertyCategory | Where-Object -FilterScript { $_.DisplayName -eq $Name } @@ -48,7 +48,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -77,10 +77,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Current = Get-TargetResource @PSBoundParameters @@ -126,12 +126,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCFilePlanPropertyCategory for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -157,9 +157,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Properties = Get-FilePlanPropertyCategory diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/MSFT_SCFilePlanPropertyCategory.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCategory/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 index 0a0c7936c7..ed3bdfdc40 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.psm1 @@ -31,10 +31,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $property = Get-FilePlanPropertyCitation | Where-Object -FilterScript { $_.Name -eq $Name } @@ -58,7 +58,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -95,10 +95,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Current = Get-TargetResource @PSBoundParameters @@ -152,12 +152,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCFilePlanPropertyCitation for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -183,9 +183,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Properties = Get-FilePlanPropertyCitation diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/MSFT_SCFilePlanPropertyCitation.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyCitation/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 index 8430101d1f..a6c3424738 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.psm1 @@ -23,10 +23,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $property = Get-FilePlanPropertyDepartment | Where-Object -FilterScript { $_.DisplayName -eq $Name } @@ -48,7 +48,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -77,10 +77,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Current = Get-TargetResource @PSBoundParameters @@ -126,12 +126,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCFilePlanPropertyDEpartment for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -157,9 +157,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Properties = Get-FilePlanPropertyDepartment diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/MSFT_SCFilePlanPropertyDepartment.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyDepartment/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 index 628f95b66d..53fad064b7 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.psm1 @@ -23,10 +23,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $property = Get-FilePlanPropertyReferenceId | Where-Object -FilterScript { $_.DisplayName -eq $Name } @@ -48,7 +48,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -77,10 +77,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Current = Get-TargetResource @PSBoundParameters @@ -126,12 +126,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCFilePlanPropertyReferenceId for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -157,9 +157,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Properties = Get-FilePlanPropertyReferenceId diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/MSFT_SCFilePlanPropertyReferenceId.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertyReferenceId/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 index 0fc3d835ad..d2f2ebb756 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.psm1 @@ -27,10 +27,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $parent = Get-FilePlanPropertyCategory | Where-Object -FilterScript { $_.DisplayName -eq $Category } @@ -62,7 +62,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -95,10 +95,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $Current = Get-TargetResource @PSBoundParameters @@ -150,12 +150,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SCFilePlanPropertySubCategory for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -181,9 +181,9 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter [array]$Properties = Get-FilePlanPropertySubCategory diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/MSFT_SCFilePlanPropertySubCategory.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCFilePlanPropertySubCategory/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 index e4e208104a..7bc28db156 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.psm1 @@ -99,10 +99,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = Get-RetentionCompliancePolicy $Name -ErrorAction SilentlyContinue @@ -142,7 +142,7 @@ function Get-TargetResource } Write-Verbose -Message "Found RetentionCompliancePolicy $($Name)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -248,10 +248,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -508,7 +508,7 @@ function Set-TargetResource $CreationParams.Remove("SkypeLocationException") } - Write-Verbose "Updating Policy with values: $(Convert-O365DscHashtableToString -Hashtable $CreationParams)" + Write-Verbose "Updating Policy with values: $(Convert-M365DscHashtableToString -Hashtable $CreationParams)" Set-RetentionCompliancePolicy @CreationParams } elseif (('Absent' -eq $Ensure) -and ('Present' -eq $CurrentPolicy.Ensure)) @@ -618,13 +618,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -648,7 +648,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -660,7 +660,7 @@ function Export-TargetResource $i = 1 $content = '' $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/MSFT_SCRetentionCompliancePolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionCompliancePolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 index bccb45da04..ff90669200 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.psm1 @@ -58,10 +58,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $RuleObject = Get-RetentionComplianceRule -Identity $Name -ErrorAction SilentlyContinue @@ -92,7 +92,7 @@ function Get-TargetResource } Write-Verbose -Message "Found RetentionComplianceRule $($Name)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -156,10 +156,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentRule = Get-TargetResource @PSBoundParameters @@ -247,12 +247,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of RetentionComplianceRule for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -278,7 +278,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -286,7 +286,7 @@ function Export-TargetResource -ErrorAction SilentlyContinue $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/MSFT_SCRetentionComplianceRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCRetentionComplianceRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCRetentionComplianceRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 index 2942e9d8b7..7c3b7540cc 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.psm1 @@ -55,11 +55,11 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Write-Verbose -Message "Calling Test-SecurityAndComplianceConnection function:" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter try @@ -109,7 +109,7 @@ function Get-TargetResource Ensure = 'Present' } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -170,10 +170,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $label = Get-TargetResource @PSBoundParameters @@ -325,8 +325,8 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of Sensitiivity label for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null @@ -351,7 +351,7 @@ function Test-TargetResource } } - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -375,7 +375,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Platform 'SecurityComplianceCenter' ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/MSFT_SCSensitivityLabel.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCSensitivityLabel/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSensitivityLabel/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 index 8c578ef243..71213aff15 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.psm1 @@ -32,10 +32,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $PolicyObject = Get-SupervisoryReviewPolicyV2 $Name -ErrorAction SilentlyContinue @@ -59,7 +59,7 @@ function Get-TargetResource } Write-Verbose -Message "Found SupervisoryReviewPolicy $($Name)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -97,10 +97,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentPolicy = Get-TargetResource @PSBoundParameters @@ -160,12 +160,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SupervisoryReviewPolicy for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -189,7 +189,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion @@ -199,7 +199,7 @@ function Export-TargetResource $policies = Get-SupervisoryReviewPolicyV2 $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/MSFT_SCSupervisoryReviewPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 index 6bf70e1668..8ac92cd7a4 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.psm1 @@ -37,10 +37,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $RuleObjects = Get-SupervisoryReviewRule @@ -68,7 +68,7 @@ function Get-TargetResource } Write-Verbose -Message "Found SupervisoryReviewRule $($Name)" - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -111,10 +111,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SecurityComplianceCenter $CurrentRule = Get-TargetResource @PSBoundParameters @@ -176,12 +176,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SupervisoryReviewRule for $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -205,7 +205,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -214,7 +214,7 @@ function Export-TargetResource $rules = Get-SupervisoryReviewRule $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/MSFT_SCSupervisoryReviewRule.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SCSupervisoryReviewRule/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 index 13138701b5..aada4dc366 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.psm1 @@ -68,10 +68,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ IsSingleInstance = 'Yes' @@ -188,10 +188,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $CurrentParameters = $PSBoundParameters @@ -276,10 +276,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("IsSingleInstance", ` @@ -315,7 +315,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $params = @{ diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/MSFT_SPOAccessControlSettings.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOAccessControlSettings/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOAccessControlSettings/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 index 44dd0d7739..e854e02b5f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.psm1 @@ -35,7 +35,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -108,11 +108,11 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Platform PnP ` - -O365Credential $GlobalAdminAccount + -CloudCredential $GlobalAdminAccount $currentApp = Get-TargetResource @PSBoundParameters @@ -168,10 +168,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -198,7 +198,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/MSFT_SPOApp.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOApp/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOApp/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOApp/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 index 354ad8bbd4..4815db5d4c 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.psm1 @@ -25,7 +25,7 @@ function Get-TargetResource Write-Verbose -Message "Getting configuration for hub site collection $Url" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -87,7 +87,7 @@ function Set-TargetResource Write-Verbose -Message "Setting configuration for home site '$Url'" - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $currentValues = Get-TargetResource @PSBoundParameters @@ -102,7 +102,7 @@ function Set-TargetResource catch { $Message = "The specified Site Collection $($Url) for SPOHomeSite doesn't exist." - New-Office365DSCLogEntry -Error $_ -Message $Message + New-M365DSCLogEntry -Error $_ -Message $Message throw $Message } @@ -146,8 +146,8 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $valuesToCheck = @("Ensure") if ($PSBoundParameters.ContainsKey("Url")) @@ -155,7 +155,7 @@ function Test-TargetResource $valuesToCheck += "Url" } - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $valuesToCheck diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/MSFT_SPOHomeSite.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOHomeSite/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOHomeSite/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 index e508e8aafb..dda3d5d263 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.psm1 @@ -47,7 +47,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -191,7 +191,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -208,7 +208,7 @@ function Set-TargetResource catch { $Message = "The specified Site Collection {$Url} for SPOHubSite doesn't already exist." - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName throw $Message } @@ -424,10 +424,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -460,7 +460,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -471,7 +471,7 @@ function Export-TargetResource $i = 1 $content = '' $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/MSFT_SPOHubSite.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOHubSite/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOHubSite/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 index 584b6493bf..9fe4168f41 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.psm1 @@ -31,7 +31,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion try { @@ -66,7 +66,7 @@ function Get-TargetResource GlobalAdminAccount = $GlobalAdminAccount } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } } @@ -103,7 +103,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -157,12 +157,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration of SPOPropertyBag for $Key at {$Url}" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -191,7 +191,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP @@ -231,14 +231,14 @@ function Export-TargetResource ) $WarningPreference = 'SilentlyContinue' - # Implicitly load the Office365DSCUtil.psm1 module in order to be able to call + # Implicitly load the M365DSCUtil.psm1 module in order to be able to call # into the Invoke-O36DSCCommand cmdlet; - Import-Module ($ScriptRoot + "\..\..\Modules\Office365DSCUtil.psm1") -Force | Out-Null + Import-Module ($ScriptRoot + "\..\..\Modules\M365DSCUtil.psm1") -Force | Out-Null # Invoke the logic that extracts the all the Property Bag values of the current site using the # the invokation wrapper that handles throttling; $returnValue = "" - $returnValue += Invoke-O365DSCCommand -Arguments $PSBoundParameters -InvokationPath $ScriptRoot -ScriptBlock { + $returnValue += Invoke-M365DSCCommand -Arguments $PSBoundParameters -InvokationPath $ScriptRoot -ScriptBlock { $VerbosePreference = 'SilentlyContinue' $params = $args[0] $content = "" @@ -255,7 +255,7 @@ function Export-TargetResource } catch { - throw "O365DSC - Failed to connect to PnP {$siteUrl}: " + $_ + throw "M365DSC - Failed to connect to PnP {$siteUrl}: " + $_ } try @@ -272,7 +272,7 @@ function Export-TargetResource $CurrentModulePath = $params.ScriptRoot + "\MSFT_SPOPropertyBag.psm1" Import-Module $CurrentModulePath -Force | Out-Null - Import-Module ($params.ScriptRoot + "\..\..\Modules\O365DSCTelemetryEngine.psm1") -Force | Out-Null + Import-Module ($params.ScriptRoot + "\..\..\Modules\M365DSCTelemetryEngine.psm1") -Force | Out-Null $result = Get-TargetResource @getValues $result.Value = [System.String]$result.Value if (-not [System.String]::IsNullOrEmpty($result.Value)) @@ -288,7 +288,7 @@ function Export-TargetResource } catch { - throw "O365DSC - Failed to Get-PnPPropertyBag {$siteUrl}: " + $_ + throw "M365DSC - Failed to Get-PnPPropertyBag {$siteUrl}: " + $_ } } } @@ -333,7 +333,7 @@ function Export-TargetResource } while ($count -ne 0) Write-Progress -Activity "SPOPropertyBag Extraction" -PercentComplete 100 -Status "Completed" -Completed $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/MSFT_SPOPropertyBag.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOPropertyBag/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOPropertyBag/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 similarity index 98% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 index 68066f4378..59e6c452af 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.psm1 @@ -98,10 +98,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -297,10 +297,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $SearchConfigTemplatePath = Join-Path -Path $PSScriptRoot ` @@ -713,10 +713,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -742,7 +742,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/MSFT_SPOSearchManagedProperty.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSearchManagedProperty/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchManagedProperty/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 index 6152844751..055664f64e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.psm1 @@ -86,10 +86,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -204,10 +204,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP Write-Verbose -Message "Reading SearchConfigurationSettings XML file" @@ -401,10 +401,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters @@ -427,7 +427,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/MSFT_SPOSearchResultSource.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSearchResultSource/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSearchResultSource/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 index 04a59790d9..04d7178253 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 @@ -110,10 +110,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -291,10 +291,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $CurrentParameters = $PSBoundParameters @@ -451,10 +451,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("IsSingleInstance", ` @@ -498,7 +498,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $PSBoundParameters.Add("IsSingleInstance", "Yes") $result = Get-TargetResource @PSBoundParameters diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSharingSettings/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 index 6c20d141d5..fd1b9189e2 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.psm1 @@ -129,10 +129,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -362,7 +362,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -416,7 +416,7 @@ function Set-TargetResource if ($Error[0].Exception.Message -eq "File Not Found") { $Message = "The site $($Url) does not exist." - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName throw $Message } } @@ -664,12 +664,12 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration for site collection $Url" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $CurrentValues.Remove("GlobalAdminAccount") | Out-Null $keysToCheck = $CurrentValues.Keys - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $keysToCheck @@ -694,7 +694,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -706,7 +706,7 @@ function Export-TargetResource $content = '' $i = 1 $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/MSFT_SPOSite.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSite/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSite/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSite/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 index 87660abce0..13a6ef588f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.psm1 @@ -22,7 +22,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -82,10 +82,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -ConnectionUrl $Url ` -Platform PnP @@ -121,10 +121,10 @@ function Test-TargetResource Write-Verbose -Message "Testing audit settings for {$Url}" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("AuditFlags") @@ -150,7 +150,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -Platform PnP -CloudCredential $GlobalAdminAccount @@ -158,7 +158,7 @@ function Export-TargetResource $i = 1 $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/MSFT_SPOSiteAuditSettings.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteAuditSettings/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteAuditSettings/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 index ac563c98b3..daa9f63608 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.psm1 @@ -52,10 +52,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ Title = $Title @@ -168,10 +168,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $curSiteDesign = Get-TargetResource @PSBoundParameters @@ -269,13 +269,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -300,10 +300,10 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $content = '' diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/MSFT_SPOSiteDesign.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesign/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesign/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 index a2fd07f21f..b2e2810c5f 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.psm1 @@ -32,10 +32,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -115,10 +115,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $cursiteDesign = Get-PnPSiteDesign -Identity $SiteDesignTitle @@ -211,10 +211,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("UserPrincipals", ` @@ -241,10 +241,10 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $siteDesigns = Get-PnPSiteDesign diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/MSFT_SPOSiteDesignRights.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteDesignRights/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteDesignRights/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 index 7b1874d73a..bb39c24de0 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.psm1 @@ -34,7 +34,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -57,7 +57,7 @@ function Get-TargetResource catch { $Message = "The specified site collection doesn't exist." - New-Office365DSCLogEntry -Error $_ -Message $Message + New-M365DSCLogEntry -Error $_ -Message $Message throw $Message return $nullReturn } @@ -147,7 +147,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -275,13 +275,13 @@ function Test-TargetResource Write-Verbose -Message "Testing SPOSiteGroups for {$Url}" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -305,7 +305,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $InformationPreference = 'Continue' @@ -319,7 +319,7 @@ function Export-TargetResource $i = 1 $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/MSFT_SPOSiteGroup.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOSiteGroup/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOSiteGroup/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 index 66d9fe4785..62603ba555 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.psm1 @@ -44,11 +44,11 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -ConnectionUrl $SiteUrl ` - -O365Credential $GlobalAdminAccount ` + -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -140,11 +140,11 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -ConnectionUrl $SiteUrl ` - -O365Credential $GlobalAdminAccount ` + -CloudCredential $GlobalAdminAccount ` -Platform PnP $curStorageEntry = Get-TargetResource @PSBoundParameters @@ -224,10 +224,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Key", ` @@ -259,7 +259,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -270,7 +270,7 @@ function Export-TargetResource $i = 1 $content = '' $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/MSFT_SPOStorageEntity.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOStorageEntity/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOStorageEntity/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 index a50e8b64c9..a8ba2d649c 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.psm1 @@ -27,7 +27,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -78,7 +78,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -142,10 +142,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("CDNType", ` @@ -172,7 +172,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/MSFT_SPOTenantCdnPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantCdnPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 index acc0606b9a..9cb9ee83f8 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.psm1 @@ -92,10 +92,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -258,10 +258,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $CurrentParameters = $PSBoundParameters @@ -368,10 +368,10 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration for SPO Tenant" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("IsSingleInstance", ` @@ -412,7 +412,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $params = @{ diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/MSFT_SPOTenantSettings.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTenantSettings/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTenantSettings/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 index a939afa773..e8bd4033ea 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.psm1 @@ -31,10 +31,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -95,10 +95,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $CurrentPalette = Get-TargetResource @PSBoundParameters @@ -142,7 +142,7 @@ function Set-TargetResource catch { $Message = "The SPOTheme $($theme) does not exist and for that cannot be removed." - New-Office365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName + New-M365DSCLogEntry -Error $_ -Message $Message -Source $MyInvocation.MyCommand.ModuleName Write-Error $Message } } @@ -179,14 +179,14 @@ function Test-TargetResource Write-Verbose -Message "Testing configuration for SPO Theme $Name" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove("GlobalAdminAccount") | Out-Null $ValuesToCheck.Remove("Palette") | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -217,10 +217,10 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $themes = Get-PnPTenantTheme diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/MSFT_SPOTheme.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOTheme/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOTheme/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOTheme/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 index 5a85bc9cc4..9ee60c2718 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.psm1 @@ -27,10 +27,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $nullReturn = @{ @@ -65,7 +65,7 @@ function Get-TargetResource Ensure = "Present" } - Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-O365DscHashtableToString -Hashtable $result)" + Write-Verbose -Message "Get-TargetResource Result: `n $(Convert-M365DscHashtableToString -Hashtable $result)" return $result } @@ -102,10 +102,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform PnP $currentProperties = Get-TargetResource @PSBoundParameters @@ -153,9 +153,9 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -DesiredValues $PSBoundParameters ` + $TestResult = Test-Microsoft365DSCParameterState -DesiredValues $PSBoundParameters ` -Source $($MyInvocation.MyCommand.Source) ` -CurrentValues $CurrentValues @@ -185,10 +185,10 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -Platform AzureAD -O365Credential $GlobalAdminAccount + Test-MSCloudLogin -Platform AzureAD -CloudCredential $GlobalAdminAccount $result = "" # Get all instances; @@ -227,13 +227,13 @@ function Export-TargetResource ) $WarningPreference = 'SilentlyContinue' - # Implicitly load the Office365DSCUtil.psm1 module in order to be able to call + # Implicitly load the M365DSCUtil.psm1 module in order to be able to call # into the Invoke-O36DSCCommand cmdlet; - Import-Module ($ScriptRoot + "\..\..\Modules\Office365DSCUtil.psm1") -Force | Out-Null + Import-Module ($ScriptRoot + "\..\..\Modules\M365DSCUtil.psm1") -Force | Out-Null # Invoke the logic that extracts the all the Property Bag values of the current site using the # the invokation wrapper that handles throttling; - $returnValue = Invoke-O365DSCCommand -Arguments $PSBoundParameters -InvokationPath $ScriptRoot -ScriptBlock { + $returnValue = Invoke-M365DSCCommand -Arguments $PSBoundParameters -InvokationPath $ScriptRoot -ScriptBlock { $WarningPreference = 'SilentlyContinue' $params = $args[0] $content = "" @@ -252,8 +252,8 @@ function Export-TargetResource if ($result.Ensure -eq "Present") { - Import-Module ($params.ScriptRoot + "\..\..\Modules\Office365DSCUtil.psm1") -Force | Out-Null - Import-Module ($params.ScriptRoot + "\..\..\Modules\O365DSCTelemetryEngine.psm1") -Force | Out-Null + Import-Module ($params.ScriptRoot + "\..\..\Modules\M365DSCUtil.psm1") -Force | Out-Null + Import-Module ($params.ScriptRoot + "\..\..\Modules\M365DSCTelemetryEngine.psm1") -Force | Out-Null $result.Properties = ConvertTo-SPOUserProfilePropertyInstanceString -Properties $result.Properties $result.GlobalAdminAccount = Resolve-Credentials -UserName "globaladmin" @@ -311,7 +311,7 @@ function Export-TargetResource } while ($count -ne 0) Write-Progress -Activity "SPOUserProfileProperty Extraction" -PercentComplete 100 -Status "Completed" -Completed $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/MSFT_SPOUserProfileProperty.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_SPOUserProfileProperty/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_SPOUserProfileProperty/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 index 00589cf854..fed0e7d955 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.psm1 @@ -58,7 +58,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -150,7 +150,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -239,13 +239,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -271,7 +271,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/MSFT_TeamsCallingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsCallingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsCallingPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 index 20c17e0a28..3b4d74c0e6 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.psm1 @@ -39,10 +39,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform MicrosoftTeams $nullReturn = @{ @@ -136,10 +136,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform MicrosoftTeams $channel = Get-TargetResource @PSBoundParameters @@ -230,10 +230,10 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure") @@ -259,7 +259,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/MSFT_TeamsChannel.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsChannel/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannel/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 index e97370d70d..3f063badd5 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.psm1 @@ -40,7 +40,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -110,7 +110,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -181,13 +181,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -213,7 +213,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/MSFT_TeamsChannelsPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsChannelsPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsChannelsPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 index eb482bec9d..80b7ca678e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.psm1 @@ -74,10 +74,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -188,7 +188,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -278,8 +278,8 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null @@ -288,7 +288,7 @@ function Test-TargetResource { $ValuesToCheck.Remove("RestrictedSenderList") | Out-Null } - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -314,7 +314,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/MSFT_TeamsClientConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsClientConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsClientConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 index daad00069f..8b9cd36bcf 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.psm1 @@ -36,7 +36,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -124,7 +124,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -224,13 +224,13 @@ function Test-TargetResource $DesiredValues["EmergencyNumbers"] = $numbers } - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $DesiredValues)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $DesiredValues)" $ValuesToCheck = $DesiredValues $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $DesiredValues ` -ValuesToCheck $ValuesToCheck.Keys @@ -256,7 +256,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/MSFT_TeamsEmergencyCallRoutingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallRoutingPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 index 0de6671711..d1f498f99e 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.psm1 @@ -42,7 +42,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -138,7 +138,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -211,13 +211,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -243,7 +243,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/MSFT_TeamsEmergencyCallingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsEmergencyCallingPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 similarity index 91% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 index 65a4831487..1f7566f78d 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.psm1 @@ -24,10 +24,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -72,7 +72,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -112,13 +112,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -144,7 +144,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/MSFT_TeamsGuestCallingConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestCallingConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 similarity index 92% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 index 0786f51992..bb17ec878d 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.psm1 @@ -33,10 +33,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -92,7 +92,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -137,13 +137,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -169,7 +169,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/MSFT_TeamsGuestMeetingConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMeetingConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 index 917a5a3268..90fab15604 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.psm1 @@ -53,10 +53,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -154,7 +154,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -219,12 +219,12 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -250,7 +250,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/MSFT_TeamsGuestMessagingConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsGuestMessagingConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 index cb5e76dd69..0c39c9b8e9 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.psm1 @@ -44,10 +44,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -116,7 +116,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -177,12 +177,12 @@ function Test-TargetResource $CurrentValues.Remove("SdnApiToken") | Out-Null } - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -208,7 +208,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $params = @{ diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/MSFT_TeamsMeetingBroadcastConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 index 8302bc8f3d..f585c8a87c 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.psm1 @@ -42,10 +42,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -134,7 +134,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -201,12 +201,12 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -232,7 +232,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/MSFT_TeamsMeetingBroadcastPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingBroadcastPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 similarity index 95% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 index b5ea91564d..08a86e142a 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.psm1 @@ -75,10 +75,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -185,7 +185,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -272,12 +272,12 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -303,7 +303,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/MSFT_TeamsMeetingConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 index 4976492935..11bb23c162 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.psm1 @@ -94,7 +94,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -231,7 +231,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -356,13 +356,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -388,7 +388,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/MSFT_TeamsMeetingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMeetingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMeetingPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 similarity index 96% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 index 08bcb471ca..56193c4803 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.psm1 @@ -96,10 +96,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness try @@ -249,7 +249,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -372,13 +372,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null $ValuesToCheck.Remove('Tenant') | Out-Null - $TestResult = Test-Office365DSCParameterState ` + $TestResult = Test-Microsoft365DSCParameterState ` -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` @@ -405,7 +405,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/MSFT_TeamsMessagingPolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsMessagingPolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsMessagingPolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 similarity index 97% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 index 4a0108c2a4..3439910b82 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.psm1 @@ -112,7 +112,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $nullReturn = @{ @@ -333,10 +333,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform MicrosoftTeams $team = Get-TargetResource @PSBoundParameters @@ -492,9 +492,9 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" - + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" + If (!$PSBoundParameters.ContainsKey('Ensure')) { $PSBoundParameters.Add('Ensure',$Ensure) } @@ -507,7 +507,7 @@ function Test-TargetResource $ValuesToCheck.Remove("Owner") | Out-Null } - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -533,7 +533,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/MSFT_TeamsTeam.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsTeam/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsTeam/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 similarity index 90% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 index 9af1f8376f..779d943e67 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.psm1 @@ -28,10 +28,10 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness $settings = Get-CsTeamsUpgradeConfiguration @@ -73,10 +73,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform SkypeForBusiness $SetParameters = $PSBoundParameters @@ -115,13 +115,13 @@ function Test-TargetResource $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -145,7 +145,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $params = @{ diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/MSFT_TeamsUpgradeConfiguration.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradeConfiguration/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 similarity index 93% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 index 38a1b664d0..a22a9a34be 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.psm1 @@ -25,7 +25,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Write-Verbose -Message "Checking the Teams Upgrade Policies" Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` @@ -79,7 +79,7 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Write-Verbose -Message "Updating Teams Upgrade Policy {$Identity}" @@ -119,20 +119,20 @@ function Test-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion Write-Verbose -Message "Testing configuration of Team Upgrade Policy {$Identity}" $CurrentValues = Get-TargetResource @PSBoundParameters - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" $ValuesToCheck = $PSBoundParameters $ValuesToCheck.Remove('GlobalAdminAccount') | Out-Null - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck $ValuesToCheck.Keys @@ -156,7 +156,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $InformationPreference = 'Continue' Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/MSFT_TeamsUpgradePolicy.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUpgradePolicy/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUpgradePolicy/readme.md diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 similarity index 94% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 index e93674c0c0..c342f229c2 100644 --- a/Modules/Office365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.psm1 @@ -53,7 +53,7 @@ function Get-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion try @@ -120,10 +120,10 @@ function Set-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion - Test-MSCloudLogin -O365Credential $GlobalAdminAccount ` + Test-MSCloudLogin -CloudCredential $GlobalAdminAccount ` -Platform MicrosoftTeams $team = Get-TeamByName $TeamName @@ -191,10 +191,10 @@ function Test-TargetResource $CurrentValues.Remove("Role") } - Write-Verbose -Message "Current Values: $(Convert-O365DscHashtableToString -Hashtable $CurrentValues)" - Write-Verbose -Message "Target Values: $(Convert-O365DscHashtableToString -Hashtable $PSBoundParameters)" + Write-Verbose -Message "Current Values: $(Convert-M365DscHashtableToString -Hashtable $CurrentValues)" + Write-Verbose -Message "Target Values: $(Convert-M365DscHashtableToString -Hashtable $PSBoundParameters)" - $TestResult = Test-Office365DSCParameterState -CurrentValues $CurrentValues ` + $TestResult = Test-Microsoft365DSCParameterState -CurrentValues $CurrentValues ` -Source $($MyInvocation.MyCommand.Source) ` -DesiredValues $PSBoundParameters ` -ValuesToCheck @("Ensure", ` @@ -226,7 +226,7 @@ function Export-TargetResource $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Resource", $MyInvocation.MyCommand.ModuleName) $data.Add("Method", $MyInvocation.MyCommand) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion $result = "" @@ -266,12 +266,12 @@ function Export-TargetResource ) $WarningPreference = 'SilentlyContinue' - Import-Module ($ScriptRoot + "\..\..\Modules\Office365DSCUtil.psm1") -Force | Out-Null + Import-Module ($ScriptRoot + "\..\..\Modules\M365DSCUtil.psm1") -Force | Out-Null # Invoke the logic that extracts the all the Property Bag values of the current site using the # the invokation wrapper that handles throttling; $returnValue = "" - $returnValue += Invoke-O365DSCCommand -Arguments $PSBoundParameters -InvokationPath $ScriptRoot -ScriptBlock { + $returnValue += Invoke-M365DSCCommand -Arguments $PSBoundParameters -InvokationPath $ScriptRoot -ScriptBlock { $WarningPreference = 'SilentlyContinue' $params = $args[0] $content = "" @@ -279,7 +279,7 @@ function Export-TargetResource Test-MSCloudLogin -CloudCredential $params.GlobalAdminAccount ` -Platform MicrosoftTeams $GlobalAdminAccount = $params.GlobalAdminAccount - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] @@ -313,7 +313,7 @@ function Export-TargetResource } $CurrentModulePath = $params.ScriptRoot + "\MSFT_TeamsUser.psm1" Import-Module $CurrentModulePath -Force | Out-Null - Import-Module ($params.ScriptRoot + "\..\..\Modules\O365DSCTelemetryEngine.psm1") -Force | Out-Null + Import-Module ($params.ScriptRoot + "\..\..\Modules\M365DSCTelemetryEngine.psm1") -Force | Out-Null $result = Get-TargetResource @getParams $result.GlobalAdminAccount = Resolve-Credentials -UserName "globaladmin" $content += " TeamsUser " + (New-GUID).ToString() + "`r`n" diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.schema.mof similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.schema.mof rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/MSFT_TeamsUser.schema.mof diff --git a/Modules/Office365DSC/DSCResources/MSFT_TeamsUser/readme.md b/Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/readme.md similarity index 100% rename from Modules/Office365DSC/DSCResources/MSFT_TeamsUser/readme.md rename to Modules/Microsoft365DSC/DSCResources/MSFT_TeamsUser/readme.md diff --git a/Modules/Office365DSC/Dependencies/Images/AzureAD.jpg b/Modules/Microsoft365DSC/Dependencies/Images/AzureAD.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/AzureAD.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/AzureAD.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/Exchange.jpg b/Modules/Microsoft365DSC/Dependencies/Images/Exchange.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Exchange.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/Exchange.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/Logo.png b/Modules/Microsoft365DSC/Dependencies/Images/Logo.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Logo.png rename to Modules/Microsoft365DSC/Dependencies/Images/Logo.png diff --git a/Modules/Office365DSC/Dependencies/Images/Navigation.png b/Modules/Microsoft365DSC/Dependencies/Images/Navigation.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Navigation.png rename to Modules/Microsoft365DSC/Dependencies/Images/Navigation.png diff --git a/Modules/Office365DSC/Dependencies/Images/Office365.jpg b/Modules/Microsoft365DSC/Dependencies/Images/Office365.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Office365.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/Office365.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/OneDrive.jpg b/Modules/Microsoft365DSC/Dependencies/Images/OneDrive.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/OneDrive.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/OneDrive.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/PowerApps.png b/Modules/Microsoft365DSC/Dependencies/Images/PowerApps.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/PowerApps.png rename to Modules/Microsoft365DSC/Dependencies/Images/PowerApps.png diff --git a/Modules/Office365DSC/Dependencies/Images/SecurityAndCompliance.png b/Modules/Microsoft365DSC/Dependencies/Images/SecurityAndCompliance.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/SecurityAndCompliance.png rename to Modules/Microsoft365DSC/Dependencies/Images/SecurityAndCompliance.png diff --git a/Modules/Office365DSC/Dependencies/Images/SharePoint.jpg b/Modules/Microsoft365DSC/Dependencies/Images/SharePoint.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/SharePoint.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/SharePoint.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/Social.png b/Modules/Microsoft365DSC/Dependencies/Images/Social.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Social.png rename to Modules/Microsoft365DSC/Dependencies/Images/Social.png diff --git a/Modules/Office365DSC/Dependencies/Images/Teams.jpg b/Modules/Microsoft365DSC/Dependencies/Images/Teams.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Teams.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/Teams.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/Yammer.jpg b/Modules/Microsoft365DSC/Dependencies/Images/Yammer.jpg similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/Yammer.jpg rename to Modules/Microsoft365DSC/Dependencies/Images/Yammer.jpg diff --git a/Modules/Office365DSC/Dependencies/Images/default.png b/Modules/Microsoft365DSC/Dependencies/Images/default.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/default.png rename to Modules/Microsoft365DSC/Dependencies/Images/default.png diff --git a/Modules/Office365DSC/Dependencies/Images/full.png b/Modules/Microsoft365DSC/Dependencies/Images/full.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/full.png rename to Modules/Microsoft365DSC/Dependencies/Images/full.png diff --git a/Modules/Office365DSC/Dependencies/Images/lite.png b/Modules/Microsoft365DSC/Dependencies/Images/lite.png similarity index 100% rename from Modules/Office365DSC/Dependencies/Images/lite.png rename to Modules/Microsoft365DSC/Dependencies/Images/lite.png diff --git a/Modules/Office365DSC/Dependencies/Microsoft.ApplicationInsights.dll b/Modules/Microsoft365DSC/Dependencies/Microsoft.ApplicationInsights.dll similarity index 100% rename from Modules/Office365DSC/Dependencies/Microsoft.ApplicationInsights.dll rename to Modules/Microsoft365DSC/Dependencies/Microsoft.ApplicationInsights.dll diff --git a/Modules/Office365DSC/Dependencies/SearchConfigurationSettings.xml b/Modules/Microsoft365DSC/Dependencies/SearchConfigurationSettings.xml similarity index 100% rename from Modules/Office365DSC/Dependencies/SearchConfigurationSettings.xml rename to Modules/Microsoft365DSC/Dependencies/SearchConfigurationSettings.xml diff --git a/Modules/Office365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 index bd3cfd1bc4..fb350bb7cf 100644 --- a/Modules/Office365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/AADGroupsNamingPolicy/1-ConfigureGroupsNamingPolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Microsoft365DSC/Examples/Resources/AADGroupsSettings/1-ConfigureGroupsSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADGroupsSettings/1-ConfigureGroupsSettings.ps1 new file mode 100644 index 0000000000..66b232795b --- /dev/null +++ b/Modules/Microsoft365DSC/Examples/Resources/AADGroupsSettings/1-ConfigureGroupsSettings.ps1 @@ -0,0 +1,31 @@ +<# +This example is used to test new resources and showcase the usage of new resources being worked on. +It is not meant to use as a production baseline. +#> + +Configuration Example +{ + param( + [Parameter(Mandatory = $true)] + [PSCredential] + $credsGlobalAdmin + ) + Import-DscResource -ModuleName Microsoft365DSC + + node localhost + { + AADGroupsSettings GeneralGroupsSettings + { + AllowGuestsToAccessGroups = $True; + AllowGuestsToBeGroupOwner = $True; + AllowToAddGuests = $True; + EnableGroupCreation = $True; + Ensure = "Present"; + GlobalAdminAccount = $credsGlobalAdmin; + GroupCreationAllowedGroupName = "All Company"; + GuestUsageGuidelinesUrl = "https://contoso.com/guestusage"; + IsSingleInstance = "Yes"; + UsageGuidelinesUrl = "https://contoso.com/usage"; + } + } +} diff --git a/Modules/Office365DSC/Examples/Resources/AADMSGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/AADMSGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/AADMSGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/AADMSGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 index f8f1a0a284..98aa6d4388 100644 --- a/Modules/Office365DSC/Examples/Resources/AADMSGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/AADMSGroupLifecyclePolicy/1-ConfigureGroupLifecyclePolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/EXOAddressList/1-ConfigureAddressList.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOAddressList/1-ConfigureAddressList.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/EXOAddressList/1-ConfigureAddressList.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/EXOAddressList/1-ConfigureAddressList.ps1 index c4702390d4..6b92c8ab09 100644 --- a/Modules/Office365DSC/Examples/Resources/EXOAddressList/1-ConfigureAddressList.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/EXOAddressList/1-ConfigureAddressList.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/EXOMailTips/1-ConfigureMailtips.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMailTips/1-ConfigureMailtips.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/EXOMailTips/1-ConfigureMailtips.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/EXOMailTips/1-ConfigureMailtips.ps1 index 8d468c34f4..9ab423c50f 100644 --- a/Modules/Office365DSC/Examples/Resources/EXOMailTips/1-ConfigureMailtips.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMailTips/1-ConfigureMailtips.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/EXOMailboxSettings/1-ConfigureMailboxSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxSettings/1-ConfigureMailboxSettings.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/EXOMailboxSettings/1-ConfigureMailboxSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/EXOMailboxSettings/1-ConfigureMailboxSettings.ps1 index 809cd4eca6..a6b1f948b7 100644 --- a/Modules/Office365DSC/Examples/Resources/EXOMailboxSettings/1-ConfigureMailboxSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/EXOMailboxSettings/1-ConfigureMailboxSettings.ps1 @@ -18,7 +18,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/EXOOrganizationConfig/1-ConfigureOrganizationSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOOrganizationConfig/1-ConfigureOrganizationSettings.ps1 similarity index 99% rename from Modules/Office365DSC/Examples/Resources/EXOOrganizationConfig/1-ConfigureOrganizationSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/EXOOrganizationConfig/1-ConfigureOrganizationSettings.ps1 index 62159f7ebc..4f578a98f6 100644 --- a/Modules/Office365DSC/Examples/Resources/EXOOrganizationConfig/1-ConfigureOrganizationSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/EXOOrganizationConfig/1-ConfigureOrganizationSettings.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/EXOSharedMailbox/1 - CreateSharedMailbox.ps1 b/Modules/Microsoft365DSC/Examples/Resources/EXOSharedMailbox/1 - CreateSharedMailbox.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/EXOSharedMailbox/1 - CreateSharedMailbox.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/EXOSharedMailbox/1 - CreateSharedMailbox.ps1 index 665b4f2326..86e78477b6 100644 --- a/Modules/Office365DSC/Examples/Resources/EXOSharedMailbox/1 - CreateSharedMailbox.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/EXOSharedMailbox/1 - CreateSharedMailbox.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/O365AdminAuditLogConfig/1-ConfigureAuditLog.ps1 b/Modules/Microsoft365DSC/Examples/Resources/O365AdminAuditLogConfig/1-ConfigureAuditLog.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/O365AdminAuditLogConfig/1-ConfigureAuditLog.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/O365AdminAuditLogConfig/1-ConfigureAuditLog.ps1 index 89cc9d8a41..e6d53c7382 100644 --- a/Modules/Office365DSC/Examples/Resources/O365AdminAuditLogConfig/1-ConfigureAuditLog.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/O365AdminAuditLogConfig/1-ConfigureAuditLog.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/O365Group/1-CreateNewO365Group.ps1 b/Modules/Microsoft365DSC/Examples/Resources/O365Group/1-CreateNewO365Group.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/O365Group/1-CreateNewO365Group.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/O365Group/1-CreateNewO365Group.ps1 index 2d60624685..4f668ef6df 100644 --- a/Modules/Office365DSC/Examples/Resources/O365Group/1-CreateNewO365Group.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/O365Group/1-CreateNewO365Group.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/O365OrgCustomizationSetting/1-EnableCustomizationSetting.ps1 b/Modules/Microsoft365DSC/Examples/Resources/O365OrgCustomizationSetting/1-EnableCustomizationSetting.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/O365OrgCustomizationSetting/1-EnableCustomizationSetting.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/O365OrgCustomizationSetting/1-EnableCustomizationSetting.ps1 index a510b4d18f..8488fe12d0 100644 --- a/Modules/Office365DSC/Examples/Resources/O365OrgCustomizationSetting/1-EnableCustomizationSetting.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/O365OrgCustomizationSetting/1-EnableCustomizationSetting.ps1 @@ -11,7 +11,7 @@ Configuration Example $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/O365User/1-CreateNewO365User.ps1 b/Modules/Microsoft365DSC/Examples/Resources/O365User/1-CreateNewO365User.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/O365User/1-CreateNewO365User.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/O365User/1-CreateNewO365User.ps1 index cea05ab591..8f88d4d947 100644 --- a/Modules/Office365DSC/Examples/Resources/O365User/1-CreateNewO365User.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/O365User/1-CreateNewO365User.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/ODSettings/1-ConfigureOneDriveSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/ODSettings/1-ConfigureOneDriveSettings.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/ODSettings/1-ConfigureOneDriveSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/ODSettings/1-ConfigureOneDriveSettings.ps1 index 45e5c189b3..35bc22a77a 100644 --- a/Modules/Office365DSC/Examples/Resources/ODSettings/1-ConfigureOneDriveSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/ODSettings/1-ConfigureOneDriveSettings.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/PPPowerAppsEnvironment/1-NewPowerAppsEnvironment.ps1 b/Modules/Microsoft365DSC/Examples/Resources/PPPowerAppsEnvironment/1-NewPowerAppsEnvironment.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/PPPowerAppsEnvironment/1-NewPowerAppsEnvironment.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/PPPowerAppsEnvironment/1-NewPowerAppsEnvironment.ps1 index 3e07f30b00..745fee012e 100644 --- a/Modules/Office365DSC/Examples/Resources/PPPowerAppsEnvironment/1-NewPowerAppsEnvironment.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/PPPowerAppsEnvironment/1-NewPowerAppsEnvironment.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCAuditConfigurationPolicy/1-AddingNewAuditConfigurationPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCAuditConfigurationPolicy/1-AddingNewAuditConfigurationPolicy.ps1 similarity index 95% rename from Modules/Office365DSC/Examples/Resources/SCAuditConfigurationPolicy/1-AddingNewAuditConfigurationPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCAuditConfigurationPolicy/1-AddingNewAuditConfigurationPolicy.ps1 index caabc49163..30955826cd 100644 --- a/Modules/Office365DSC/Examples/Resources/SCAuditConfigurationPolicy/1-AddingNewAuditConfigurationPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCAuditConfigurationPolicy/1-AddingNewAuditConfigurationPolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 index aa572cbd0d..ded9d0b877 100644 --- a/Modules/Office365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldPolicy/1-AddingNewCaseHoldPolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCCaseHoldRule/1-AddingNewCaseHoldRule.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldRule/1-AddingNewCaseHoldRule.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/SCCaseHoldRule/1-AddingNewCaseHoldRule.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldRule/1-AddingNewCaseHoldRule.ps1 index 8599afb8d6..3a09d33ee9 100644 --- a/Modules/Office365DSC/Examples/Resources/SCCaseHoldRule/1-AddingNewCaseHoldRule.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCCaseHoldRule/1-AddingNewCaseHoldRule.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCComplianceCase/1-AddingNewComplianceCase.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceCase/1-AddingNewComplianceCase.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCComplianceCase/1-AddingNewComplianceCase.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCComplianceCase/1-AddingNewComplianceCase.ps1 index ca073c9be4..fe820a2bed 100644 --- a/Modules/Office365DSC/Examples/Resources/SCComplianceCase/1-AddingNewComplianceCase.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceCase/1-AddingNewComplianceCase.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCComplianceSearch/1-AddingNewComplianceSearch.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceSearch/1-AddingNewComplianceSearch.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/SCComplianceSearch/1-AddingNewComplianceSearch.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCComplianceSearch/1-AddingNewComplianceSearch.ps1 index c1e7da9b6e..cc178b2bbe 100644 --- a/Modules/Office365DSC/Examples/Resources/SCComplianceSearch/1-AddingNewComplianceSearch.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceSearch/1-AddingNewComplianceSearch.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCComplianceSearchAction/1-AddingNewComplianceSearchAction.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceSearchAction/1-AddingNewComplianceSearchAction.ps1 similarity index 97% rename from Modules/Office365DSC/Examples/Resources/SCComplianceSearchAction/1-AddingNewComplianceSearchAction.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCComplianceSearchAction/1-AddingNewComplianceSearchAction.ps1 index cff1520813..fe9dcfa7f6 100644 --- a/Modules/Office365DSC/Examples/Resources/SCComplianceSearchAction/1-AddingNewComplianceSearchAction.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceSearchAction/1-AddingNewComplianceSearchAction.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCComplianceTag/1-AddingNewComplianceTag.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceTag/1-AddingNewComplianceTag.ps1 similarity index 95% rename from Modules/Office365DSC/Examples/Resources/SCComplianceTag/1-AddingNewComplianceTag.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCComplianceTag/1-AddingNewComplianceTag.ps1 index 44fca6dcc3..a14c33d91a 100644 --- a/Modules/Office365DSC/Examples/Resources/SCComplianceTag/1-AddingNewComplianceTag.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCComplianceTag/1-AddingNewComplianceTag.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCDLPCompliancePolicy/1-AddingNewDLPCompliancePolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCDLPCompliancePolicy/1-AddingNewDLPCompliancePolicy.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCDLPCompliancePolicy/1-AddingNewDLPCompliancePolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCDLPCompliancePolicy/1-AddingNewDLPCompliancePolicy.ps1 index 506a7490a8..559c3b0bdd 100644 --- a/Modules/Office365DSC/Examples/Resources/SCDLPCompliancePolicy/1-AddingNewDLPCompliancePolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCDLPCompliancePolicy/1-AddingNewDLPCompliancePolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCDLPComplianceRule/1-AddingNewDLPComplianceRule.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCDLPComplianceRule/1-AddingNewDLPComplianceRule.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCDLPComplianceRule/1-AddingNewDLPComplianceRule.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCDLPComplianceRule/1-AddingNewDLPComplianceRule.ps1 index e0a8462a79..97a7e5cd2b 100644 --- a/Modules/Office365DSC/Examples/Resources/SCDLPComplianceRule/1-AddingNewDLPComplianceRule.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCDLPComplianceRule/1-AddingNewDLPComplianceRule.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyAuthority/1-AddingNewFilePlanPropertyCategory.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyAuthority/1-AddingNewFilePlanPropertyCategory.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyAuthority/1-AddingNewFilePlanPropertyCategory.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyAuthority/1-AddingNewFilePlanPropertyCategory.ps1 index d158d094ab..c724e72fba 100644 --- a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyAuthority/1-AddingNewFilePlanPropertyCategory.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyAuthority/1-AddingNewFilePlanPropertyCategory.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyCategory/1-AddingNewFilePlanPropertyCategory.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyCategory/1-AddingNewFilePlanPropertyCategory.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyCategory/1-AddingNewFilePlanPropertyCategory.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyCategory/1-AddingNewFilePlanPropertyCategory.ps1 index 5a372e03f3..dfd2180a4b 100644 --- a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyCategory/1-AddingNewFilePlanPropertyCategory.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyCategory/1-AddingNewFilePlanPropertyCategory.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyCitation/1-AddingNewCitation.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyCitation/1-AddingNewCitation.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyCitation/1-AddingNewCitation.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyCitation/1-AddingNewCitation.ps1 index 7f336183a7..eaf82001db 100644 --- a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyCitation/1-AddingNewCitation.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyCitation/1-AddingNewCitation.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyDepartment/1-AddingNewFilePlanPropertyDepartment.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyDepartment/1-AddingNewFilePlanPropertyDepartment.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyDepartment/1-AddingNewFilePlanPropertyDepartment.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyDepartment/1-AddingNewFilePlanPropertyDepartment.ps1 index 294cfb76be..fb881a859e 100644 --- a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyDepartment/1-AddingNewFilePlanPropertyDepartment.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyDepartment/1-AddingNewFilePlanPropertyDepartment.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC Node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyReferenceId/1-AddingNewFilePlanPropertyReferenceId.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyReferenceId/1-AddingNewFilePlanPropertyReferenceId.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyReferenceId/1-AddingNewFilePlanPropertyReferenceId.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyReferenceId/1-AddingNewFilePlanPropertyReferenceId.ps1 index ed56587d22..585803148e 100644 --- a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertyReferenceId/1-AddingNewFilePlanPropertyReferenceId.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertyReferenceId/1-AddingNewFilePlanPropertyReferenceId.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertySubCategory/1-AddingNewFilePlanPropertySubCategory.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertySubCategory/1-AddingNewFilePlanPropertySubCategory.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/SCFilePlanPropertySubCategory/1-AddingNewFilePlanPropertySubCategory.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertySubCategory/1-AddingNewFilePlanPropertySubCategory.ps1 index 80e713bc74..0eaca1206f 100644 --- a/Modules/Office365DSC/Examples/Resources/SCFilePlanPropertySubCategory/1-AddingNewFilePlanPropertySubCategory.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCFilePlanPropertySubCategory/1-AddingNewFilePlanPropertySubCategory.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCRetentionCompliancePolicy/1-AddingNewRetentionCompliancePolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCRetentionCompliancePolicy/1-AddingNewRetentionCompliancePolicy.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCRetentionCompliancePolicy/1-AddingNewRetentionCompliancePolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCRetentionCompliancePolicy/1-AddingNewRetentionCompliancePolicy.ps1 index fea3d69fc6..1b89258e91 100644 --- a/Modules/Office365DSC/Examples/Resources/SCRetentionCompliancePolicy/1-AddingNewRetentionCompliancePolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCRetentionCompliancePolicy/1-AddingNewRetentionCompliancePolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCRetentionComplianceRule/1-AddingNewRetentionComplianceRule.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCRetentionComplianceRule/1-AddingNewRetentionComplianceRule.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/SCRetentionComplianceRule/1-AddingNewRetentionComplianceRule.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCRetentionComplianceRule/1-AddingNewRetentionComplianceRule.ps1 index 98da760589..150bb660a4 100644 --- a/Modules/Office365DSC/Examples/Resources/SCRetentionComplianceRule/1-AddingNewRetentionComplianceRule.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCRetentionComplianceRule/1-AddingNewRetentionComplianceRule.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCSensitivityLabel/1-AddingNewSensitivityLabel.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCSensitivityLabel/1-AddingNewSensitivityLabel.ps1 similarity index 97% rename from Modules/Office365DSC/Examples/Resources/SCSensitivityLabel/1-AddingNewSensitivityLabel.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCSensitivityLabel/1-AddingNewSensitivityLabel.ps1 index ab86f1c33c..e48fa2f2a7 100644 --- a/Modules/Office365DSC/Examples/Resources/SCSensitivityLabel/1-AddingNewSensitivityLabel.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCSensitivityLabel/1-AddingNewSensitivityLabel.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCSupervisoryReviewPolicy/1-AddingNewSupervisoryReviewPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCSupervisoryReviewPolicy/1-AddingNewSupervisoryReviewPolicy.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCSupervisoryReviewPolicy/1-AddingNewSupervisoryReviewPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCSupervisoryReviewPolicy/1-AddingNewSupervisoryReviewPolicy.ps1 index f21d8908b1..a44cfac7aa 100644 --- a/Modules/Office365DSC/Examples/Resources/SCSupervisoryReviewPolicy/1-AddingNewSupervisoryReviewPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCSupervisoryReviewPolicy/1-AddingNewSupervisoryReviewPolicy.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC Node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 index fca8e7a027..bc6f54dbce 100644 --- a/Modules/Office365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SCSupervisoryReviewRule/1-AddingNewSupervisoryReviewRule.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC Node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOAccessControlSettings/1-ConfigureSPOAccessControlSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOAccessControlSettings/1-ConfigureSPOAccessControlSettings.ps1 similarity index 95% rename from Modules/Office365DSC/Examples/Resources/SPOAccessControlSettings/1-ConfigureSPOAccessControlSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOAccessControlSettings/1-ConfigureSPOAccessControlSettings.ps1 index 0828294944..1445e74477 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOAccessControlSettings/1-ConfigureSPOAccessControlSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOAccessControlSettings/1-ConfigureSPOAccessControlSettings.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOApp/1-AddingNewApps.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOApp/1-AddingNewApps.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/SPOApp/1-AddingNewApps.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOApp/1-AddingNewApps.ps1 index 10b80e5d17..fd2c7d4019 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOApp/1-AddingNewApps.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOApp/1-AddingNewApps.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOHomeSite/1-ConfigureSPOHomeSite.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOHomeSite/1-ConfigureSPOHomeSite.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SPOHomeSite/1-ConfigureSPOHomeSite.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOHomeSite/1-ConfigureSPOHomeSite.ps1 index 9eb0c1282f..c58ff36e7a 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOHomeSite/1-ConfigureSPOHomeSite.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOHomeSite/1-ConfigureSPOHomeSite.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOHubSite/1-ConfigureSPOHubSite.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOHubSite/1-ConfigureSPOHubSite.ps1 similarity index 95% rename from Modules/Office365DSC/Examples/Resources/SPOHubSite/1-ConfigureSPOHubSite.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOHubSite/1-ConfigureSPOHubSite.ps1 index 9757f1935b..bc90c42eda 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOHubSite/1-ConfigureSPOHubSite.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOHubSite/1-ConfigureSPOHubSite.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOPropertyBag/1-AddNewPropertyBagKey.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOPropertyBag/1-AddNewPropertyBagKey.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SPOPropertyBag/1-AddNewPropertyBagKey.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOPropertyBag/1-AddNewPropertyBagKey.ps1 index d58cffed98..107ba019c3 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOPropertyBag/1-AddNewPropertyBagKey.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOPropertyBag/1-AddNewPropertyBagKey.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSearchManagedProperty/1-CreateNewManagedProperty.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSearchManagedProperty/1-CreateNewManagedProperty.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/SPOSearchManagedProperty/1-CreateNewManagedProperty.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSearchManagedProperty/1-CreateNewManagedProperty.ps1 index ac225750c7..7818f002cc 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSearchManagedProperty/1-CreateNewManagedProperty.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSearchManagedProperty/1-CreateNewManagedProperty.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSearchResultSource/1-CreateNewResultSource.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSearchResultSource/1-CreateNewResultSource.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SPOSearchResultSource/1-CreateNewResultSource.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSearchResultSource/1-CreateNewResultSource.ps1 index 5cf6756d22..be802f509e 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSearchResultSource/1-CreateNewResultSource.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSearchResultSource/1-CreateNewResultSource.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSharingSettings/1-ConfigureSPOSharingSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSharingSettings/1-ConfigureSPOSharingSettings.ps1 similarity index 97% rename from Modules/Office365DSC/Examples/Resources/SPOSharingSettings/1-ConfigureSPOSharingSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSharingSettings/1-ConfigureSPOSharingSettings.ps1 index e6c36c2ce2..7452c74d47 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSharingSettings/1-ConfigureSPOSharingSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSharingSettings/1-ConfigureSPOSharingSettings.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSite/1-CreateNewSPOSite.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSite/1-CreateNewSPOSite.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/SPOSite/1-CreateNewSPOSite.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSite/1-CreateNewSPOSite.ps1 index 0b733eae59..37c9d918e1 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSite/1-CreateNewSPOSite.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSite/1-CreateNewSPOSite.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSiteAuditSettings/1-ConfigureSiteAuditSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteAuditSettings/1-ConfigureSiteAuditSettings.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/SPOSiteAuditSettings/1-ConfigureSiteAuditSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSiteAuditSettings/1-ConfigureSiteAuditSettings.ps1 index 6eeb8d98c0..fa2dd04060 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSiteAuditSettings/1-ConfigureSiteAuditSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteAuditSettings/1-ConfigureSiteAuditSettings.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSiteDesign/1-CreateNewSPOSiteDesign.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteDesign/1-CreateNewSPOSiteDesign.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/SPOSiteDesign/1-CreateNewSPOSiteDesign.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSiteDesign/1-CreateNewSPOSiteDesign.ps1 index fcf5e1453a..6370cc9d02 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSiteDesign/1-CreateNewSPOSiteDesign.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteDesign/1-CreateNewSPOSiteDesign.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSiteDesignRights/1-AssignDesignRights.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteDesignRights/1-AssignDesignRights.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/SPOSiteDesignRights/1-AssignDesignRights.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSiteDesignRights/1-AssignDesignRights.ps1 index 66dc482cb4..6670567695 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSiteDesignRights/1-AssignDesignRights.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteDesignRights/1-AssignDesignRights.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOSiteGroup/1-CreateNewSPOSiteGroup.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteGroup/1-CreateNewSPOSiteGroup.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/SPOSiteGroup/1-CreateNewSPOSiteGroup.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOSiteGroup/1-CreateNewSPOSiteGroup.ps1 index 04a32ddc10..c94e7f47cf 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOSiteGroup/1-CreateNewSPOSiteGroup.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOSiteGroup/1-CreateNewSPOSiteGroup.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOStorageEntity/1-AddingNewStorageEntity.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOStorageEntity/1-AddingNewStorageEntity.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/SPOStorageEntity/1-AddingNewStorageEntity.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOStorageEntity/1-AddingNewStorageEntity.ps1 index 87eb59100c..abf9deb997 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOStorageEntity/1-AddingNewStorageEntity.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOStorageEntity/1-AddingNewStorageEntity.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOTenantCDNPolicy/1-ConfigureCDNPolicies.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOTenantCDNPolicy/1-ConfigureCDNPolicies.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/SPOTenantCDNPolicy/1-ConfigureCDNPolicies.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOTenantCDNPolicy/1-ConfigureCDNPolicies.ps1 index 1ea38bed23..ae2ab9f420 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOTenantCDNPolicy/1-ConfigureCDNPolicies.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOTenantCDNPolicy/1-ConfigureCDNPolicies.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOTenantSettings/1-ConfigureSPOTenantSettings.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOTenantSettings/1-ConfigureSPOTenantSettings.ps1 similarity index 97% rename from Modules/Office365DSC/Examples/Resources/SPOTenantSettings/1-ConfigureSPOTenantSettings.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOTenantSettings/1-ConfigureSPOTenantSettings.ps1 index 9d30dd6af7..482cc1b91f 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOTenantSettings/1-ConfigureSPOTenantSettings.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOTenantSettings/1-ConfigureSPOTenantSettings.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOTheme/1-ConfigureSPOTheme.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOTheme/1-ConfigureSPOTheme.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/SPOTheme/1-ConfigureSPOTheme.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOTheme/1-ConfigureSPOTheme.ps1 index 7a6b52b2b2..98588bfea4 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOTheme/1-ConfigureSPOTheme.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOTheme/1-ConfigureSPOTheme.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/SPOUserProfileProperty/1-SetUserProfileProperties.ps1 b/Modules/Microsoft365DSC/Examples/Resources/SPOUserProfileProperty/1-SetUserProfileProperties.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/SPOUserProfileProperty/1-SetUserProfileProperties.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/SPOUserProfileProperty/1-SetUserProfileProperties.ps1 index 790ed79f25..11e462c8be 100644 --- a/Modules/Office365DSC/Examples/Resources/SPOUserProfileProperty/1-SetUserProfileProperties.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/SPOUserProfileProperty/1-SetUserProfileProperties.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsCallingPolicy/1-AddNewCallingPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsCallingPolicy/1-AddNewCallingPolicy.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/TeamsCallingPolicy/1-AddNewCallingPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsCallingPolicy/1-AddNewCallingPolicy.ps1 index 71120dbd59..97e8380180 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsCallingPolicy/1-AddNewCallingPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsCallingPolicy/1-AddNewCallingPolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 index 4144ab4ff3..ae81694bee 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsChannel/1-CreateTeamsChannel.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 index 0882c05e39..8b73daa3e6 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsChannelsPolicy/1-AddNewChannelsPolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsClientConfiguration/1-ConfigureTeamsClient.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsClientConfiguration/1-ConfigureTeamsClient.ps1 similarity index 95% rename from Modules/Office365DSC/Examples/Resources/TeamsClientConfiguration/1-ConfigureTeamsClient.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsClientConfiguration/1-ConfigureTeamsClient.ps1 index 490f625c8b..4d38ea40a0 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsClientConfiguration/1-ConfigureTeamsClient.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsClientConfiguration/1-ConfigureTeamsClient.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsEmergencyCallRoutingPolicy/1-AddNewEmergencyCallRoutingPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsEmergencyCallRoutingPolicy/1-AddNewEmergencyCallRoutingPolicy.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/TeamsEmergencyCallRoutingPolicy/1-AddNewEmergencyCallRoutingPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsEmergencyCallRoutingPolicy/1-AddNewEmergencyCallRoutingPolicy.ps1 index 8526ae286c..5591344406 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsEmergencyCallRoutingPolicy/1-AddNewEmergencyCallRoutingPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsEmergencyCallRoutingPolicy/1-AddNewEmergencyCallRoutingPolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsEmergencyCallingPolicy/1-AddNewEmergencyCallingPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsEmergencyCallingPolicy/1-AddNewEmergencyCallingPolicy.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/TeamsEmergencyCallingPolicy/1-AddNewEmergencyCallingPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsEmergencyCallingPolicy/1-AddNewEmergencyCallingPolicy.ps1 index 80c661d5c3..90718e8b3a 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsEmergencyCallingPolicy/1-AddNewEmergencyCallingPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsEmergencyCallingPolicy/1-AddNewEmergencyCallingPolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsGuestCallingConfiguration/1-ConfigureTeamsGuestCalling.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsGuestCallingConfiguration/1-ConfigureTeamsGuestCalling.ps1 similarity index 89% rename from Modules/Office365DSC/Examples/Resources/TeamsGuestCallingConfiguration/1-ConfigureTeamsGuestCalling.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsGuestCallingConfiguration/1-ConfigureTeamsGuestCalling.ps1 index 3306710121..b3fcc6790c 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsGuestCallingConfiguration/1-ConfigureTeamsGuestCalling.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsGuestCallingConfiguration/1-ConfigureTeamsGuestCalling.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsGuestMeetingConfiguration/1-ConfigureTeamsGuestMeeting.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsGuestMeetingConfiguration/1-ConfigureTeamsGuestMeeting.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/TeamsGuestMeetingConfiguration/1-ConfigureTeamsGuestMeeting.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsGuestMeetingConfiguration/1-ConfigureTeamsGuestMeeting.ps1 index ce1926c71f..f6e1e97053 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsGuestMeetingConfiguration/1-ConfigureTeamsGuestMeeting.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsGuestMeetingConfiguration/1-ConfigureTeamsGuestMeeting.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsGuestMessagingConfiguration/1-ConfigureTeamsGuestMessaging.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsGuestMessagingConfiguration/1-ConfigureTeamsGuestMessaging.ps1 similarity index 94% rename from Modules/Office365DSC/Examples/Resources/TeamsGuestMessagingConfiguration/1-ConfigureTeamsGuestMessaging.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsGuestMessagingConfiguration/1-ConfigureTeamsGuestMessaging.ps1 index 9e93f34843..bdfd7946c5 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsGuestMessagingConfiguration/1-ConfigureTeamsGuestMessaging.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsGuestMessagingConfiguration/1-ConfigureTeamsGuestMessaging.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsMeetingBroadcastPolicy/1-NewTeamsMeetingBrodacastPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingBroadcastPolicy/1-NewTeamsMeetingBrodacastPolicy.ps1 similarity index 93% rename from Modules/Office365DSC/Examples/Resources/TeamsMeetingBroadcastPolicy/1-NewTeamsMeetingBrodacastPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingBroadcastPolicy/1-NewTeamsMeetingBrodacastPolicy.ps1 index c849215f49..b6f0f232df 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsMeetingBroadcastPolicy/1-NewTeamsMeetingBrodacastPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingBroadcastPolicy/1-NewTeamsMeetingBrodacastPolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 new file mode 100644 index 0000000000..e8c1bfb39c --- /dev/null +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 @@ -0,0 +1,35 @@ +<# +This examples sets the Teams Meeting Configuration. +#> + +Configuration Example +{ + param( + [Parameter(Mandatory = $true)] + [PSCredential] + $credsGlobalAdmin + ) + Import-DscResource -ModuleName Microsoft365DSC + + node localhost + { + TeamsMeetingConfiguration DemoMeetingConfiguration + { + ClientAppSharingPort = 50040; + ClientAppSharingPortRange = 20; + ClientAudioPort = 50000; + ClientAudioPortRange = 20; + ClientMediaPortRangeEnabled = $True; + ClientVideoPort = 50020; + ClientVideoPortRange = 20; + CustomFooterText = "This is some custom footer text"; + DisableAnonymousJoin = $False; + EnableQoS = $False; + GlobalAdminAccount = $credsglobaladmin; + HelpURL = "https://github.com/Microsoft/Office365DSC/Help"; + Identity = "Global"; + LegalURL = "https://github.com/Microsoft/Office365DSC/Legal"; + LogoURL = "https://github.com/Microsoft/Office365DSC/Logo.png"; + } + } +} diff --git a/Modules/Office365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1 index 52f9a4c8f0..e8ddbae98b 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsMeetingPolicy/1-AddNewMeetingPolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsMessagingPolicy/1-AddNewMessagePolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsMessagingPolicy/1-AddNewMessagePolicy.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/TeamsMessagingPolicy/1-AddNewMessagePolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsMessagingPolicy/1-AddNewMessagePolicy.ps1 index 5bf6b437fa..7b03892739 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsMessagingPolicy/1-AddNewMessagePolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsMessagingPolicy/1-AddNewMessagePolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsTeam/1-CreateNewTeam.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsTeam/1-CreateNewTeam.ps1 similarity index 96% rename from Modules/Office365DSC/Examples/Resources/TeamsTeam/1-CreateNewTeam.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsTeam/1-CreateNewTeam.ps1 index ba2f5698ee..f58ef9c719 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsTeam/1-CreateNewTeam.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsTeam/1-CreateNewTeam.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsUpgradeConfiguration/1-ConfigureTeamsUpgradeConfiguration.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsUpgradeConfiguration/1-ConfigureTeamsUpgradeConfiguration.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/TeamsUpgradeConfiguration/1-ConfigureTeamsUpgradeConfiguration.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsUpgradeConfiguration/1-ConfigureTeamsUpgradeConfiguration.ps1 index 91c6a73786..d4cb0c84a9 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsUpgradeConfiguration/1-ConfigureTeamsUpgradeConfiguration.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsUpgradeConfiguration/1-ConfigureTeamsUpgradeConfiguration.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsUpgradePolicy/1-AssignUsersToTeamsUpgradePolicy.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsUpgradePolicy/1-AssignUsersToTeamsUpgradePolicy.ps1 similarity index 91% rename from Modules/Office365DSC/Examples/Resources/TeamsUpgradePolicy/1-AssignUsersToTeamsUpgradePolicy.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsUpgradePolicy/1-AssignUsersToTeamsUpgradePolicy.ps1 index a7573557c3..97ba4800d7 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsUpgradePolicy/1-AssignUsersToTeamsUpgradePolicy.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsUpgradePolicy/1-AssignUsersToTeamsUpgradePolicy.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Office365DSC/Examples/Resources/TeamsUser/1-AddUserToTeam.ps1 b/Modules/Microsoft365DSC/Examples/Resources/TeamsUser/1-AddUserToTeam.ps1 similarity index 92% rename from Modules/Office365DSC/Examples/Resources/TeamsUser/1-AddUserToTeam.ps1 rename to Modules/Microsoft365DSC/Examples/Resources/TeamsUser/1-AddUserToTeam.ps1 index d63db18566..152de2b22f 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsUser/1-AddUserToTeam.ps1 +++ b/Modules/Microsoft365DSC/Examples/Resources/TeamsUser/1-AddUserToTeam.ps1 @@ -10,7 +10,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { diff --git a/Modules/Microsoft365DSC/Examples/Resources/readme.md b/Modules/Microsoft365DSC/Examples/Resources/readme.md new file mode 100644 index 0000000000..193d8bd3ca --- /dev/null +++ b/Modules/Microsoft365DSC/Examples/Resources/readme.md @@ -0,0 +1,3 @@ +For more information about Microsoft365DSC and all of the resources, +including details and examples, please check out our +[Wiki](https://github.com/Microsoft/Microsoft365DSC/wiki) diff --git a/Modules/Office365DSC/Office365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 similarity index 86% rename from Modules/Office365DSC/Office365DSC.psd1 rename to Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 7e40b3328e..8f0ab4567a 100644 --- a/Modules/Office365DSC/Office365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -1,5 +1,5 @@ # -# Module manifest for module 'Office365DSC' +# Module manifest for module 'Microsoft365DSC' # # Generated by: Microsoft Corporation # @@ -26,10 +26,10 @@ CompanyName = 'Microsoft Corporation' # Copyright statement for this module - Copyright = '(c) 2019 Microsoft Corporation. All rights reserved.' + Copyright = '(c) 2020 Microsoft Corporation. All rights reserved.' # Description of the functionality provided by this module - Description = 'This DSC module is used to configure and monitor Office365 tenants, including SharePoint Online, Exchange, Teams, etc.' + Description = 'This DSC module is used to configure and monitor Microsoft tenants, including SharePoint Online, Exchange, Teams, etc.' # Minimum version of the PowerShell engine required by this module PowerShellVersion = '5.1' @@ -95,20 +95,20 @@ # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess NestedModules = @( - 'modules\Office365DSCUtil.psm1', - 'modules\O365DSCReverseGUI.psm1', - 'modules\O365DSCReverse.psm1', - 'modules\O365DSCLogEngine.psm1', - 'modules\O365DSCTelemetryEngine.psm1', - 'modules\O365DSCStubsUtility.psm1' + 'modules\M365DSCUtil.psm1', + 'modules\M365DSCReverseGUI.psm1', + 'modules\M365DSCReverse.psm1', + 'modules\M365DSCLogEngine.psm1', + 'modules\M365DSCTelemetryEngine.psm1', + 'modules\M365DSCStubsUtility.psm1' ) # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export. #FunctionsToExport = @() # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export. - CmdletsToExport = @('Export-O365Configuration', - 'Assert-O365DSCTemplate') + CmdletsToExport = @('Export-M365DSCConfiguration', + 'Assert-M365DSCTemplate') # Variables to export from this module # VariablesToExport = @() @@ -128,16 +128,16 @@ PSData = @{ # Tags applied to this module. These help with module discovery in online galleries. - Tags = 'DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource', 'Office365' + Tags = 'DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource', 'Microsoft365' # A URL to the license for this module. - LicenseUri = 'https://github.com/Microsoft/Office365DSC/blob/master/LICENSE' + LicenseUri = 'https://github.com/Microsoft/Microsoft365DSC/blob/master/LICENSE' # A URL to the main website for this project. - ProjectUri = 'https://github.com/Microsoft/Office365DSC' + ProjectUri = 'https://github.com/Microsoft/Microsoft365DSC' # A URL to an icon representing this module. - IconUri = 'https://github.com/microsoft/Office365DSC/raw/master/Modules/Office365DSC/Dependencies/Images/Logo.png?raw=true' + IconUri = 'https://github.com/microsoft/Microsoft365DSC/raw/master/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true' # ReleaseNotes of this module ReleaseNotes = ' diff --git a/Modules/Office365DSC/Modules/O365DSCLogEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCLogEngine.psm1 similarity index 87% rename from Modules/Office365DSC/Modules/O365DSCLogEngine.psm1 rename to Modules/Microsoft365DSC/Modules/M365DSCLogEngine.psm1 index b13e66e2d4..b76187e2d7 100644 --- a/Modules/Office365DSC/Modules/O365DSCLogEngine.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCLogEngine.psm1 @@ -2,7 +2,7 @@ whenever an error is encountered, and appends valuable troubleshooting information to the file; #> -function New-Office365DSCLogEntry +function New-M365DSCLogEntry { [CmdletBinding()] param @@ -32,7 +32,7 @@ function New-Office365DSCLogEntry $driftedData.Add("Exception", $Error.Exception.ToString()) $driftedData.Add("CustomMessage", $Message) $driftedData.Add("Source", $Source) - Add-O365DSCTelemetryEvent -Type "Error" -Data $driftedData + Add-M365DSCTelemetryEvent -Type "Error" -Data $driftedData #endregion # Obtain the ID of the current PowerShell session. While this may @@ -40,7 +40,7 @@ function New-Office365DSCLogEntry $SessionID = [System.Diagnostics.Process]::GetCurrentProcess().Id.ToString() # Generate the Error log file name based on the SessionID; - $LogFileName = $SessionID + "-O365DSC-ErrorLog.log" + $LogFileName = $SessionID + "-M365DSC-ErrorLog.log" # Build up the Error message to append to our log file; $LogContent = "[" + [System.DateTime]::Now.ToString("yyyy/MM/dd hh:mm:ss") + "]`r`n" @@ -58,7 +58,7 @@ function New-Office365DSCLogEntry } } -function Add-O365DSCEvent +function Add-M365DSCEvent { [CmdletBinding()] param( @@ -82,14 +82,14 @@ function Add-O365DSCEvent try { - [System.Diagnostics.EventLog]::CreateEventSource($Source, "Office365DSC") + [System.Diagnostics.EventLog]::CreateEventSource($Source, "Microsoft365DSC") } catch { try { - $CurrentLog = New-EventLog -LogName 'Office365DSC' -Source $Source -ErrorAction Stop - [System.Diagnostics.EventLog]::CreateEventSource($Source, "Office365DSC") + $CurrentLog = New-EventLog -LogName 'Microsoft365DSC' -Source $Source -ErrorAction Stop + [System.Diagnostics.EventLog]::CreateEventSource($Source, "Microsoft365DSC") } catch { @@ -100,7 +100,7 @@ function Add-O365DSCEvent try { - Write-EventLog -LogName 'Office365DSC' -Source $Source ` + Write-EventLog -LogName 'Microsoft365DSC' -Source $Source ` -EventID $EventID -Message $Message -EntryType $EntryType ` -ErrorAction SilentlyContinue } diff --git a/Modules/Office365DSC/Modules/O365DSCReverse.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1 similarity index 96% rename from Modules/Office365DSC/Modules/O365DSCReverse.psm1 rename to Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1 index 2ee0648683..5de4b89151 100644 --- a/Modules/Office365DSC/Modules/O365DSCReverse.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCReverse.psm1 @@ -1,4 +1,4 @@ -function Start-O365ConfigurationExtract +function Start-M365DSCConfigurationExtract { [CmdletBinding()] [OutputType([System.Collections.Hashtable])] @@ -51,7 +51,7 @@ function Start-O365ConfigurationExtract $WarningPreference = "SilentlyContinue" $organization = "" - $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the O365DSC part of O365DSC.onmicrosoft.com) + $principal = "" # Principal represents the "NetBios" name of the tenant (e.g. the M365DSC part of M365DSC.onmicrosoft.com) if ($GlobalAdminAccount.UserName.Contains("@")) { $organization = $GlobalAdminAccount.UserName.Split("@")[1] @@ -99,7 +99,7 @@ function Start-O365ConfigurationExtract $DSCContent += " [System.Management.Automation.PSCredential]`r`n" $DSCContent += " `$GlobalAdminAccount`r`n" $DSCContent += " )`r`n`r`n" - $DSCContent += " Import-DSCResource -ModuleName Office365DSC`r`n`r`n" + $DSCContent += " Import-DscResource -ModuleName Microsoft365DSC`r`n`r`n" $DSCContent += " if (`$null -eq `$GlobalAdminAccount)`r`n" $DSCContent += " {`r`n" $DSCContent += " <# Credentials #>`r`n" @@ -198,7 +198,7 @@ function Start-O365ConfigurationExtract } catch { - New-Office365DSCLogEntry -Error $_ -Message $ResourceModule.Name -Source "[O365DSCReverse]$($ResourceModule.Name)" + New-M365DSCLogEntry -Error $_ -Message $ResourceModule.Name -Source "[M365DSCReverse]$($ResourceModule.Name)" } } diff --git a/Modules/Office365DSC/Modules/O365DSCReverseGUI.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReverseGUI.psm1 similarity index 99% rename from Modules/Office365DSC/Modules/O365DSCReverseGUI.psm1 rename to Modules/Microsoft365DSC/Modules/M365DSCReverseGUI.psm1 index 53dcd52110..9f10be8aab 100644 --- a/Modules/Office365DSC/Modules/O365DSCReverseGUI.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCReverseGUI.psm1 @@ -23,7 +23,7 @@ function SectionChanged } } } -function Show-O365GUI +function Show-M365DSCGUI { [CmdletBinding()] param( @@ -547,14 +547,14 @@ function Show-O365GUI try { $GlobalAdminAccount = New-Object System.Management.Automation.PSCredential ($txtTenantAdmin.Text, (ConvertTo-SecureString -String $txtPassword.Text -AsPlainText -Force)) - Start-O365ConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` + Start-M365ConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` -ComponentsToExtract $SelectedComponents ` -Path $Path } catch { $Message = "Could not initiate the ReverseDSC Extraction" - New-Office365DSCLogEntry -Error $_ -Message $Message_ -Source "[O365DSCReverseGUI]" + New-M365DSCLogEntry -Error $_ -Message $Message_ -Source "[M365DSCReverseGUI]" } } else @@ -567,7 +567,7 @@ function Show-O365GUI $pnlMain.Controls.Add($panelMenu); #endregion - $manifest = Import-PowerShellDataFile ($PSScriptRoot + '\..\Office365DSC.psd1') + $manifest = Import-PowerShellDataFile ($PSScriptRoot + '\..\Microsoft365DSC.psd1') $version = $manifest.ModuleVersion $lblVersion = New-Object System.Windows.Forms.Label $lblVersion.Text = "v" + $version diff --git a/Modules/Office365DSC/Modules/O365DSCStubsUtility.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCStubsUtility.psm1 similarity index 99% rename from Modules/Office365DSC/Modules/O365DSCStubsUtility.psm1 rename to Modules/Microsoft365DSC/Modules/M365DSCStubsUtility.psm1 index 544375399e..0d6f9f0c33 100644 --- a/Modules/Office365DSC/Modules/O365DSCStubsUtility.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCStubsUtility.psm1 @@ -1,4 +1,4 @@ -function Get-O365StubFiles +function Get-M365StubFiles { param ( diff --git a/Modules/Office365DSC/Modules/O365DSCTelemetryEngine.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 similarity index 77% rename from Modules/Office365DSC/Modules/O365DSCTelemetryEngine.psm1 rename to Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 index 66487016a4..e172406b1c 100644 --- a/Modules/Office365DSC/Modules/O365DSCTelemetryEngine.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCTelemetryEngine.psm1 @@ -3,25 +3,25 @@ function Get-ApplicationInsightsTelemetryClient [CmdletBinding()] param() - if ($null -eq $Global:O365DSCTelemetryEngine) + if ($null -eq $Global:M365DSCTelemetryEngine) { $AI = "$PSScriptRoot\..\Dependencies\Microsoft.ApplicationInsights.dll" [Reflection.Assembly]::LoadFile($AI) | Out-Null $InstrumentationKey = "bc5aa204-0b1e-4499-a955-d6a639bdb4fa" - if ($null -ne $env:O365DSCTelemetryInstrumentationKey) + if ($null -ne $env:M365DSCTelemetryInstrumentationKey) { - $InstrumentationKey = $env:O365DSCTelemetryInstrumentationKey + $InstrumentationKey = $env:M365DSCTelemetryInstrumentationKey } $TelClient = [Microsoft.ApplicationInsights.TelemetryClient]::new() $TelClient.InstrumentationKey = $InstrumentationKey - $Global:O365DSCTelemetryEngine = $TelClient + $Global:M365DSCTelemetryEngine = $TelClient } - return $Global:O365DSCTelemetryEngine + return $Global:M365DSCTelemetryEngine } -function Add-O365DSCTelemetryEvent +function Add-M365DSCTelemetryEvent { [CmdletBinding()] param( @@ -38,7 +38,7 @@ function Add-O365DSCTelemetryEvent $Metrics ) - $TelemetryEnabled = [System.Environment]::GetEnvironmentVariable('O365DSCTelemetryEnabled', ` + $TelemetryEnabled = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryEnabled', ` [System.EnvironmentVariableTarget]::Machine) if ($null -eq $TelemetryEnabled -or $TelemetryEnabled -eq $true) { @@ -46,7 +46,7 @@ function Add-O365DSCTelemetryEvent try { - $ProjectName = [System.Environment]::GetEnvironmentVariable('O365DSCTelemetryProjectName', ` + $ProjectName = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryProjectName', ` [System.EnvironmentVariableTarget]::Machine) if ($null -ne $ProjectName) @@ -63,7 +63,7 @@ function Add-O365DSCTelemetryEvent } } -function Set-O365DSCTelemetryOption +function Set-M365DSCTelemetryOption { [CmdletBinding()] param( @@ -82,24 +82,24 @@ function Set-O365DSCTelemetryOption if ($null -ne $Enabled) { - [System.Environment]::SetEnvironmentVariable('O365DSCTelemetryEnabled', $Enabled, ` + [System.Environment]::SetEnvironmentVariable('M365DSCTelemetryEnabled', $Enabled, ` [System.EnvironmentVariableTarget]::Machine) } if ($null -ne $InstrumentationKey) { - [System.Environment]::SetEnvironmentVariable('O365DSCTelemetryInstrumentationKey', $InstrumentationKey, ` + [System.Environment]::SetEnvironmentVariable('M365DSCTelemetryInstrumentationKey', $InstrumentationKey, ` [System.EnvironmentVariableTarget]::Machine) } if ($null -ne $ProjectName) { - [System.Environment]::SetEnvironmentVariable('O365DSCTelemetryProjectName', $ProjectName, ` + [System.Environment]::SetEnvironmentVariable('M365DSCTelemetryProjectName', $ProjectName, ` [System.EnvironmentVariableTarget]::Machine) } } -function Get-O365DSCTelemetryOption +function Get-M365DSCTelemetryOption { [CmdletBinding()] param() @@ -107,11 +107,11 @@ function Get-O365DSCTelemetryOption try { return @{ - Enabled = [System.Environment]::GetEnvironmentVariable('O365DSCTelemetryEnabled', ` + Enabled = [System.Environment]::GetEnvironmentVariable('<365DSCTelemetryEnabled', ` [System.EnvironmentVariableTarget]::Machine) - InstrumentationKey = [System.Environment]::GetEnvironmentVariable('O365DSCTelemetryInstrumentationKey', ` + InstrumentationKey = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryInstrumentationKey', ` [System.EnvironmentVariableTarget]::Machine) - ProjectName = [System.Environment]::GetEnvironmentVariable('O365DSCTelemetryProjectName', ` + ProjectName = [System.Environment]::GetEnvironmentVariable('M365DSCTelemetryProjectName', ` [System.EnvironmentVariableTarget]::Machine) } } diff --git a/Modules/Office365DSC/Modules/Office365DSCUtil.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 similarity index 93% rename from Modules/Office365DSC/Modules/Office365DSCUtil.psm1 rename to Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 index aa5fe3503c..da39e2d1b2 100644 --- a/Modules/Office365DSC/Modules/Office365DSCUtil.psm1 +++ b/Modules/Microsoft365DSC/Modules/M365DSCUtil.psm1 @@ -131,7 +131,7 @@ function Get-TeamByName return $team } -function Convert-O365DscHashtableToString +function Convert-M365DscHashtableToString { param ( @@ -150,7 +150,7 @@ function Convert-O365DscHashtableToString } elseif ($pair.Value -is [System.Collections.Hashtable]) { - $str = "$($pair.Key)={$(Convert-O365DscHashtableToString -Hashtable $pair.Value)}" + $str = "$($pair.Key)={$(Convert-M365DscHashtableToString -Hashtable $pair.Value)}" } else { @@ -186,7 +186,7 @@ function New-EXOAntiPhishPolicy { $VerbosePreference = 'Continue' $BuiltParams = (Format-EXOParams -InputEXOParams $AntiPhishPolicyParams -Operation 'New' ) - Write-Verbose -Message "Creating New AntiPhishPolicy $($BuiltParams.Name) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Creating New AntiPhishPolicy $($BuiltParams.Name) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" New-AntiPhishPolicy @BuiltParams $VerbosePreference = 'SilentlyContinue' } @@ -207,7 +207,7 @@ function New-EXOAntiPhishRule { $VerbosePreference = 'Continue' $BuiltParams = (Format-EXOParams -InputEXOParams $AntiPhishRuleParams -Operation 'New') - Write-Verbose -Message "Creating New AntiPhishRule $($BuiltParams.Name) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Creating New AntiPhishRule $($BuiltParams.Name) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" New-AntiPhishRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } @@ -228,7 +228,7 @@ function New-EXOHostedContentFilterRule { $VerbosePreference = 'Continue' $BuiltParams = (Format-EXOParams -InputEXOParams $HostedContentFilterRuleParams -Operation 'New' ) - Write-Verbose -Message "Creating New HostedContentFilterRule $($BuiltParams.Name) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Creating New HostedContentFilterRule $($BuiltParams.Name) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" New-HostedContentFilterRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } @@ -249,7 +249,7 @@ function New-EXOSafeAttachmentRule { $VerbosePreference = 'Continue' $BuiltParams = (Format-EXOParams -InputEXOParams $SafeAttachmentRuleParams -Operation 'New' ) - Write-Verbose -Message "Creating New SafeAttachmentRule $($BuiltParams.Name) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Creating New SafeAttachmentRule $($BuiltParams.Name) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" New-SafeAttachmentRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } @@ -270,7 +270,7 @@ function New-EXOSafeLinksRule { $VerbosePreference = 'Continue' $BuiltParams = (Format-EXOParams -InputEXOParams $SafeLinksRuleParams -Operation 'New' ) - Write-Verbose -Message "Creating New SafeLinksRule $($BuiltParams.Name) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Creating New SafeLinksRule $($BuiltParams.Name) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" New-SafeLinksRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } @@ -293,13 +293,13 @@ function Set-EXOAntiPhishRule $BuiltParams = (Format-EXOParams -InputEXOParams $AntiPhishRuleParams -Operation 'Set' ) if ($BuiltParams.keys -gt 1) { - Write-Verbose -Message "Setting AntiPhishRule $($BuiltParams.Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Setting AntiPhishRule $($BuiltParams.Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" Set-AntiPhishRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } else { - Write-Verbose -Message "No more values to Set on AntiPhishRule $($BuiltParams.Identity) using supplied values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "No more values to Set on AntiPhishRule $($BuiltParams.Identity) using supplied values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" $VerbosePreference = 'SilentlyContinue' } } @@ -322,13 +322,13 @@ function Set-EXOAntiPhishPolicy $BuiltParams = (Format-EXOParams -InputEXOParams $AntiPhishPolicyParams -Operation 'Set' ) if ($BuiltParams.keys -gt 1) { - Write-Verbose -Message "Setting AntiPhishPolicy $($BuiltParams.Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Setting AntiPhishPolicy $($BuiltParams.Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" Set-AntiPhishPolicy @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } else { - Write-Verbose -Message "No more values to Set on AntiPhishPolicy $($BuiltParams.Identity) using supplied values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "No more values to Set on AntiPhishPolicy $($BuiltParams.Identity) using supplied values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" $VerbosePreference = 'SilentlyContinue' } } @@ -350,13 +350,13 @@ function Set-EXOHostedContentFilterRule $BuiltParams = (Format-EXOParams -InputEXOParams $HostedContentFilterRuleParams -Operation 'Set' ) if ($BuiltParams.keys -gt 1) { - Write-Verbose -Message "Setting HostedContentFilterRule $($BuiltParams.Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Setting HostedContentFilterRule $($BuiltParams.Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" Set-HostedContentFilterRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } else { - Write-Verbose -Message "No more values to Set on HostedContentFilterRule $($BuiltParams.Identity) using supplied values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "No more values to Set on HostedContentFilterRule $($BuiltParams.Identity) using supplied values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" $VerbosePreference = 'SilentlyContinue' } } @@ -407,13 +407,13 @@ function Set-EXOSafeAttachmentRule $BuiltParams = (Format-EXOParams -InputEXOParams $SafeAttachmentRuleParams -Operation 'Set' ) if ($BuiltParams.keys -gt 1) { - Write-Verbose -Message "Setting SafeAttachmentRule $($BuiltParams.Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Setting SafeAttachmentRule $($BuiltParams.Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" Set-SafeAttachmentRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } else { - Write-Verbose -Message "No more values to Set on SafeAttachmentRule $($BuiltParams.Identity) using supplied values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "No more values to Set on SafeAttachmentRule $($BuiltParams.Identity) using supplied values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" $VerbosePreference = 'SilentlyContinue' } } @@ -436,13 +436,13 @@ function Set-EXOSafeLinksRule $BuiltParams = (Format-EXOParams -InputEXOParams $SafeLinksRuleParams -Operation 'Set' ) if ($BuiltParams.keys -gt 1) { - Write-Verbose -Message "Setting SafeLinksRule $($BuiltParams.Identity) with values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "Setting SafeLinksRule $($BuiltParams.Identity) with values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" Set-SafeLinksRule @BuiltParams -Confirm:$false $VerbosePreference = 'SilentlyContinue' } else { - Write-Verbose -Message "No more values to Set on SafeLinksRule $($BuiltParams.Identity) using supplied values: $(Convert-O365DscHashtableToString -Hashtable $BuiltParams)" + Write-Verbose -Message "No more values to Set on SafeLinksRule $($BuiltParams.Identity) using supplied values: $(Convert-M365DscHashtableToString -Hashtable $BuiltParams)" $VerbosePreference = 'SilentlyContinue' } } @@ -506,7 +506,7 @@ function Compare-PSCustomObjectArrays return $DriftedProperties } -function Test-Office365DSCParameterState +function Test-Microsoft365DSCParameterState { [CmdletBinding()] param @@ -540,7 +540,7 @@ function Test-Office365DSCParameterState -and ($DesiredValues.GetType().Name -ne "CimInstance") ` -and ($DesiredValues.GetType().Name -ne "PSBoundParametersDictionary")) { - throw ("Property 'DesiredValues' in Test-Office365DscParameterState must be either a " + ` + throw ("Property 'DesiredValues' in Test-Microsoft365DSCParameterState must be either a " + ` "Hashtable or CimInstance. Type detected was $($DesiredValues.GetType().Name)") } @@ -573,7 +573,7 @@ function Test-Office365DSCParameterState } else { - $CheckDesiredValue = Test-Office365DSCObjectHasProperty -Object $DesiredValues -PropertyName $_ + $CheckDesiredValue = Test-M365DSCObjectHasProperty -Object $DesiredValues -PropertyName $_ } if ($CheckDesiredValue) @@ -806,7 +806,7 @@ function Test-Office365DSCParameterState Write-Verbose -Message ("Unable to compare property $fieldName " + ` "as the type ($($desiredType.Name)) is " + ` "not handled by the " + ` - "Test-Office365DscParameterState cmdlet") + "Test-Microsoft365DSCParameterState cmdlet") $EventValue = "$($CurrentValues.$fieldName)" $EventValue += "$($DesiredValues.$fieldName)" $DriftedParameters.Add($fieldName, $EventValue) @@ -821,7 +821,7 @@ function Test-Office365DSCParameterState if ($returnValue -eq $false) { - $EventMessage = "`r`n" + $EventMessage = "`r`n" $EventMessage += " `r`n" $EventMessage += " `r`n" @@ -833,7 +833,7 @@ function Test-Office365DSCParameterState $driftedData = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $driftedData.Add("Event", "DriftedParameter") $driftedData.Add("Parameter", "[$Source]$key") - Add-O365DSCTelemetryEvent -Type "DriftInfo" -Data $driftedData + Add-M365DSCTelemetryEvent -Type "DriftInfo" -Data $driftedData #endregion $EventMessage += " " + $DriftedParameters.$key + "`r`n" } @@ -854,19 +854,19 @@ function Test-Office365DSCParameterState } $EventMessage += " }" $EventMessage += " `r`n" - $EventMessage += "" + $EventMessage += "" - Add-O365DSCEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $Source + Add-M365DSCEvent -Message $EventMessage -EntryType 'Error' -EventID 1 -Source $Source } #region Telemetry - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion return $returnValue } -<# This is the main Office365DSC.Reverse function that extracts the DSC configuration from an existing +<# This is the main Microsoft365DSC.Reverse function that extracts the DSC configuration from an existing Office 365 Tenant. #> -function Export-O365Configuration +function Export-M365DSCConfiguration { [CmdletBinding()] param( @@ -920,7 +920,7 @@ function Export-O365Configuration $data.Add("ComponentsToExtract", $null -ne $ComponentsToExtract) $data.Add("Workloads", $null -ne $Workloads) $data.Add("MaxProcesses", $null -ne $MaxProcesses) - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion if ($null -eq $MaxProcesses) @@ -930,13 +930,13 @@ function Export-O365Configuration if (-not $Quiet) { - Show-O365GUI -Path $Path + Show-M365DSCGUI -Path $Path } else { if ($null -ne $Workloads) { - Start-O365ConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` + Start-M365DSCConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` -Workloads $Workloads ` -Path $Path -FileName $FileName ` -MaxProcesses $MaxProcesses ` @@ -945,7 +945,7 @@ function Export-O365Configuration } elseif ($null -ne $ComponentsToExtract) { - Start-O365ConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` + Start-M365DSCConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` -ComponentsToExtract $ComponentsToExtract ` -Path $Path -FileName $FileName ` -MaxProcesses $MaxProcesses ` @@ -954,7 +954,7 @@ function Export-O365Configuration } elseif ($null -ne $Mode) { - Start-O365ConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` + Start-M365DSCConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` -Mode $Mode ` -Path $Path -FileName $FileName ` -MaxProcesses $MaxProcesses ` @@ -963,7 +963,7 @@ function Export-O365Configuration } else { - Start-O365ConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` + Start-M365DSCConfigurationExtract -GlobalAdminAccount $GlobalAdminAccount ` -AllComponents ` -Path $Path -FileName $FileName ` -MaxProcesses $MaxProcesses ` @@ -995,7 +995,7 @@ function Get-SPOAdministrationUrl $UseMFASwitch = @{ } } Write-Verbose -Message "Connection to Azure AD is required to automatically determine SharePoint Online admin URL..." - Test-MSCloudLogin -Platform "AzureAD" -o365Credential $GlobalAdminAccount | Out-Null + Test-MSCloudLogin -Platform "AzureAD" -CloudCredential $GlobalAdminAccount | Out-Null Write-Verbose -Message "Getting SharePoint Online admin URL..." $defaultDomain = Get-AzureADDomain | Where-Object { ($_.Name -like "*.onmicrosoft.com" -or $_.Name -like "*.onmicrosoft.de") -and $_.IsInitial -eq $true } # We don't use IsDefault here because the default could be a custom domain @@ -1067,7 +1067,7 @@ function Split-ArrayByParts return , $outArray } -function Invoke-O365DSCCommand +function Invoke-M365DSCCommand { [CmdletBinding()] param @@ -1110,7 +1110,7 @@ function Invoke-O365DSCCommand } catch { - if ($_.Exception -like '*O365DSC - *') + if ($_.Exception -like '*M365DSC - *') { Write-Warning $_.Exception } @@ -1121,7 +1121,7 @@ function Invoke-O365DSCCommand $NewBackoff = $Backoff * 2 Write-Warning " * Throttling detected. Waiting for {$NewBackoff seconds}" Start-Sleep -Seconds $NewBackoff - return Invoke-O365DSCCommand -ScriptBlock $ScriptBlock -Backoff $NewBackoff -Arguments $Arguments -InvokationPath $InvokationPath + return Invoke-M365DSCCommand -ScriptBlock $ScriptBlock -Backoff $NewBackoff -Arguments $Arguments -InvokationPath $InvokationPath } else { @@ -1175,12 +1175,12 @@ function ConvertTo-SPOUserProfilePropertyInstanceString return $results } -function Install-O365DSCDevBranch +function Install-M365DSCDevBranch { [CmdletBinding()] param() #region Download and Extract Dev branch's ZIP - $url = "https://github.com/microsoft/Office365DSC/archive/Dev.zip" + $url = "https://github.com/microsoft/Microsoft365DSC/archive/Dev.zip" $output = "$($env:Temp)\dev.zip" $extractPath = $env:Temp + "\O365Dev" @@ -1190,7 +1190,7 @@ function Install-O365DSCDevBranch #endregion #region Install All Dependencies - $manifest = Import-PowerShellDataFile "$extractPath\Office365DSC-Dev\Modules\Office365DSC\Office365DSC.psd1" + $manifest = Import-PowerShellDataFile "$extractPath\Microsoft365DSC-Dev\Modules\Microsoft365DSC\Microsoft365DSC.psd1" $dependencies = $manifest.RequiredModules foreach ($dependency in $dependencies) { @@ -1199,14 +1199,14 @@ function Install-O365DSCDevBranch } #endregion - #region Install O365DSC - $defaultPath = 'C:\Program Files\WindowsPowerShell\Modules\Office365DSC\' + #region Install M365DSC + $defaultPath = 'C:\Program Files\WindowsPowerShell\Modules\Microsoft365DSC\' $currentVersionPath = $defaultPath + $($manifest.ModuleVersion) if (Test-Path $currentVersionPath) { Remove-Item $currentVersionPath -Recurse -Confirm:$false } - Copy-Item "$extractPath\Office365DSC-Dev\Modules\Office365DSC" -Destination $currentVersionPath -Recurse -Force + Copy-Item "$extractPath\Microsoft365DSC-Dev\Modules\Microsoft365DSC" -Destination $currentVersionPath -Recurse -Force #endregion } @@ -1273,7 +1273,7 @@ function Remove-NullEntriesFromHashtable return $Hash } -function Assert-O365DSCTemplate +function Assert-M365DSCTemplate { [CmdletBinding()] param( @@ -1291,7 +1291,7 @@ function Assert-O365DSCTemplate #region Telemetry $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new() $data.Add("Event", "AssertTemplate") - Add-O365DSCTelemetryEvent -Data $data + Add-M365DSCTelemetryEvent -Data $data #endregion if (([System.String]::IsNullOrEmpty($TemplatePath) -and [System.String]::IsNullOrEmpty($TemplateName)) -or @@ -1303,8 +1303,8 @@ function Assert-O365DSCTemplate { try { - $TemplatePath = Join-Path -Path $env:Temp -ChildPath "$TemplateName.o365" - $url = "https://office365dsc.blob.core.windows.net/office365dsc/Templates/$TemplateName.o365" + $TemplatePath = Join-Path -Path $env:Temp -ChildPath "$TemplateName.M365" + $url = "https://office365dsc.blob.core.windows.net/office365dsc/Templates/$TemplateName.M365" Invoke-WebRequest -Uri $url -OutFile $TemplatePath } catch @@ -1312,7 +1312,7 @@ function Assert-O365DSCTemplate throw $_ } } - if ((Test-Path -Path $TemplatePath) -and ($TemplatePath -like '*.o365' -or $TemplatePath -like '*.ps1')) + if ((Test-Path -Path $TemplatePath) -and ($TemplatePath -like '*.m365' -or $TemplatePath -like '*.ps1')) { $tokens = $null $errors = $null @@ -1353,10 +1353,10 @@ function Assert-O365DSCTemplate } elseif (-not (Test-Path $TemplatePath)) { - Write-Error "O365DSC Template Path {$TemplatePath} does not exist." + Write-Error "M365DSC Template Path {$TemplatePath} does not exist." } else { - Write-Error "You need to specify a path to an Office365DSC Template (*.o365 or *.ps1)" + Write-Error "You need to specify a path to an Microsoft365DSC Template (*.om65 or *.ps1)" } } diff --git a/Modules/Office365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 b/Modules/Office365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 index 8e3687e427..240aa77c7b 100644 --- a/Modules/Office365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 +++ b/Modules/Office365DSC/Examples/Resources/TeamsMeetingConfiguration/1-ConfigureTeamsMeeting.ps1 @@ -9,7 +9,7 @@ Configuration Example [PSCredential] $credsGlobalAdmin ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC node localhost { @@ -26,10 +26,10 @@ Configuration Example DisableAnonymousJoin = $False; EnableQoS = $False; GlobalAdminAccount = $credsglobaladmin; - HelpURL = "https://github.com/Microsoft/Office365DSC/Help"; + HelpURL = "https://github.com/Microsoft/Microsoft365DSC/Help"; Identity = "Global"; - LegalURL = "https://github.com/Microsoft/Office365DSC/Legal"; - LogoURL = "https://github.com/Microsoft/Office365DSC/Logo.png"; + LegalURL = "https://github.com/Microsoft/Microsoft365DSC/Legal"; + LogoURL = "https://github.com/Microsoft/Microsoft365DSC/Logo.png"; } } } diff --git a/Modules/Office365DSC/Examples/Resources/readme.md b/Modules/Office365DSC/Examples/Resources/readme.md deleted file mode 100644 index 2fd78c781d..0000000000 --- a/Modules/Office365DSC/Examples/Resources/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -For more information about Office365DSC and all of the resources, -including details and examples, please check out our -[Wiki](https://github.com/Microsoft/Office365DSC/wiki) diff --git a/README.md b/README.md index a692551aff..ea808efc3c 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The team is working on a plan to make the transition as smooth as possible. # Microsoft365DSC -![DSC Resources Flow](https://github.com/microsoft/Office365DSC/blob/master/Modules/Office365DSC/Dependencies/Images/Logo.png?raw=true) +![DSC Resources Flow](https://github.com/microsoft/Microsoft365DSC/blob/master/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true) This module allows organizations to automate the deployment, configuration, and monitoring of Microsoft 365 Tenants via PowerShell @@ -18,22 +18,22 @@ remote API calls (therefore requires internet connectivity) For information on how to get started, additional documentation or templates, please navigate to the official web site at: -[Office365DSC.com](http://Office365DSC.com) +[Microsoft365DSC.com](http://Microsoft365DSC.com) ## Branches ### master -[![Build status](https://ci.appveyor.com/api/projects/status/5a7f2ao7d1mnoqrb/branch/master?svg=true)](https://ci.appveyor.com/project/NikCharlebois/office365dsc/branch/master) -[![codecov](https://codecov.io/gh/Microsoft/office365dsc/branch/master/graph/badge.svg)](https://codecov.io/gh/Microsoft/office365dsc) +[![Build status](https://ci.appveyor.com/api/projects/status/5a7f2ao7d1mnoqrb/branch/master?svg=true)](https://ci.appveyor.com/project/NikCharlebois/Microsoft365DSC/branch/master) +[![codecov](https://codecov.io/gh/Microsoft/Microsoft365DSC/branch/master/graph/badge.svg)](https://codecov.io/gh/Microsoft/Microsoft365DSC) This is the branch containing the latest release - no contributions should be made directly to this branch. ### dev -[![Build status](https://ci.appveyor.com/api/projects/status/5a7f2ao7d1mnoqrb?svg=true)](https://ci.appveyor.com/project/NikCharlebois/office365dsc) -[![codecov](https://codecov.io/gh/microsoft/Office365DSC/branch/Dev/graph/badge.svg)](https://codecov.io/gh/microsoft/Office365DSC) +[![Build status](https://ci.appveyor.com/api/projects/status/5a7f2ao7d1mnoqrb?svg=true)](https://ci.appveyor.com/project/NikCharlebois/Microsoft365DSC) +[![codecov](https://codecov.io/gh/microsoft/Microsoft365DSC/branch/Dev/graph/badge.svg)](https://codecov.io/gh/microsoft/Microsoft365DSC) This is the development branch to which contributions should be proposed by contributors as pull requests. @@ -47,7 +47,7 @@ bits of the module from a machine that has internet connectivity, simply run the following PowerShell line: ```powershell -Install-Module -Name Office365DSC -Force +Install-Module -Name Microsoft365DSC -Force ``` ## Telemetry Disclaimer @@ -62,5 +62,5 @@ opt out to prevent telemetry to be sent back to the Microsoft365DSC team by running the following command: ```powershell -Set-O365DSCTelemetryOption -Enabled $False +Set-M365DSCTelemetryOption -Enabled $False ``` diff --git a/Tests/Integration/O365Integration.Master.Tests.ps1 b/Tests/Integration/M365DSCIntegration.Master.Tests.ps1 similarity index 99% rename from Tests/Integration/O365Integration.Master.Tests.ps1 rename to Tests/Integration/M365DSCIntegration.Master.Tests.ps1 index f2e9fcea04..f0d68b7723 100644 --- a/Tests/Integration/O365Integration.Master.Tests.ps1 +++ b/Tests/Integration/M365DSCIntegration.Master.Tests.ps1 @@ -36,7 +36,7 @@ Configuration Master $Environment = 'Public' ) - Import-DscResource -ModuleName Office365DSC + Import-DscResource -ModuleName Microsoft365DSC Node Localhost { @@ -789,10 +789,10 @@ Configuration Master DisableAnonymousJoin = $False; EnableQoS = $False; GlobalAdminAccount = $GlobalAdmin; - HelpURL = "https://github.com/Microsoft/Office365DSC/Help"; + HelpURL = "https://github.com/Microsoft/Microsoft365DSC/Help"; Identity = "Global"; - LegalURL = "https://github.com/Microsoft/Office365DSC/Legal"; - LogoURL = "https://github.com/Microsoft/Office365DSC/Logo.png"; + LegalURL = "https://github.com/Microsoft/Microsoft365DSC/Legal"; + LogoURL = "https://github.com/Microsoft/Microsoft365DSC/Logo.png"; } TeamsGuestCallingConfiguration GuestCallingConfig diff --git a/Tests/TestHarness.psm1 b/Tests/TestHarness.psm1 index d73a83c70c..ac2491d8ea 100644 --- a/Tests/TestHarness.psm1 +++ b/Tests/TestHarness.psm1 @@ -17,14 +17,14 @@ function Invoke-TestHarness ) - Write-Verbose -Message 'Starting all Office365DSC tests' + Write-Verbose -Message 'Starting all Microsoft365DSC tests' $repoDir = Join-Path -Path $PSScriptRoot -ChildPath '..\' -Resolve $testCoverageFiles = @() if ($IgnoreCodeCoverage.IsPresent -eq $false) { - Get-ChildItem -Path "$repoDir\modules\Office365DSC\DSCResources\**\*.psm1" -Recurse | ForEach-Object { + Get-ChildItem -Path "$repoDir\modules\Microsoft365DSC\DSCResources\**\*.psm1" -Recurse | ForEach-Object { if ($_.FullName -notlike '*\DSCResource.Tests\*') { $testCoverageFiles += $_.FullName @@ -38,15 +38,14 @@ function Invoke-TestHarness $testResultSettings.Add('OutputFormat', 'NUnitXml' ) $testResultSettings.Add('OutputFile', $TestResultsFile) } - Import-Module -Name "$repoDir\modules\Office365DSC\Office365DSC.psd1" + Import-Module -Name "$repoDir\modules\Microsoft365DSC\Microsoft365DSC.psd1" $testsToRun = @() # Run Unit Tests $versionsPath = Join-Path -Path $repoDir -ChildPath "\Tests\Unit\Stubs\" - $versionsToTest = (Get-ChildItem -Path $versionsPath).Name # Import the first stub found so that there is a base module loaded before the tests start $firstStub = Join-Path -Path $repoDir ` - -ChildPath "\Tests\Unit\Stubs\Office365.psm1" + -ChildPath "\Tests\Unit\Stubs\Microsoft365.psm1" Import-Module $firstStub -WarningAction SilentlyContinue $stubPath = Join-Path -Path $repoDir ` diff --git a/Tests/Unit/Office365DSC/Office365DSC.AADGroupsNamingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADGroupsNamingPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.AADGroupsNamingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADGroupsNamingPolicy.Tests.ps1 index f36d21522f..2344208eb0 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.AADGroupsNamingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADGroupsNamingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "AADGroupsNamingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.AADMSGroupLifecyclePolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADMSGroupLifecyclePolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.AADMSGroupLifecyclePolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADMSGroupLifecyclePolicy.Tests.ps1 index d734f7717e..b5f65cf353 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.AADMSGroupLifecyclePolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.AADMSGroupLifecyclePolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "AADMSGroupLifecyclePolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAcceptedDomain.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAcceptedDomain.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAcceptedDomain.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAcceptedDomain.Tests.ps1 index cdb887e071..5850d15078 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAcceptedDomain.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAcceptedDomain.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAcceptedDomain" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOActiveSyncDeviceAccessRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOActiveSyncDeviceAccessRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOActiveSyncDeviceAccessRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOActiveSyncDeviceAccessRule.Tests.ps1 index da935fec39..3f853e4196 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOActiveSyncDeviceAccessRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOActiveSyncDeviceAccessRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOActiveSyncDeviceAccessRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAddressBookPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAddressBookPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAddressBookPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAddressBookPolicy.Tests.ps1 index f7aa27e266..e54cdd5c68 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAddressBookPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAddressBookPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAddressBookPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAddressList.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAddressList.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAddressList.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAddressList.Tests.ps1 index cb1c63c501..40b7946427 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAddressList.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAddressList.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAddressList" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAntiPhishPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAntiPhishPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAntiPhishPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAntiPhishPolicy.Tests.ps1 index 83b92d833e..6bc147a720 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAntiPhishPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAntiPhishPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAntiPhishPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAntiPhishRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAntiPhishRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAntiPhishRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAntiPhishRule.Tests.ps1 index d42be5e657..1ed81c4801 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAntiPhishRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAntiPhishRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAntiPhishRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOApplicationAccessPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOApplicationAccessPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOApplicationAccessPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOApplicationAccessPolicy.Tests.ps1 index 6cd39003e5..1075627ae3 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOApplicationAccessPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOApplicationAccessPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOApplicationAccessPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAtpPolicyForO365.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAtpPolicyForO365.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAtpPolicyForO365.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAtpPolicyForO365.Tests.ps1 index 9f2f1f42fe..24adc1ac91 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAtpPolicyForO365.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAtpPolicyForO365.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAtpPolicyForO365" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAvailabilityAddressSpace.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAvailabilityAddressSpace.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAvailabilityAddressSpace.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAvailabilityAddressSpace.Tests.ps1 index 0bf83347f8..260a970dbe 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAvailabilityAddressSpace.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAvailabilityAddressSpace.Tests.ps1 @@ -4,7 +4,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAvailabilityAddressSpace" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOAvailabilityConfig.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAvailabilityConfig.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.EXOAvailabilityConfig.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAvailabilityConfig.Tests.ps1 index 6731435c37..ff2829336d 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOAvailabilityConfig.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOAvailabilityConfig.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOAvailabilityConfig" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOCASMailboxPlan.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOCASMailboxPlan.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.EXOCASMailboxPlan.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOCASMailboxPlan.Tests.ps1 index dc64daa486..29925b7be2 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOCASMailboxPlan.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOCASMailboxPlan.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOCASMailboxPlan" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOClientAccessRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOClientAccessRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOClientAccessRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOClientAccessRule.Tests.ps1 index 020ec81c28..424fd61691 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOClientAccessRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOClientAccessRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOClientAccessRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXODkimSigningConfig.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXODkimSigningConfig.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXODkimSigningConfig.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXODkimSigningConfig.Tests.ps1 index 99a35f56ee..d35e69f5e2 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXODkimSigningConfig.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXODkimSigningConfig.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXODkimSigningConfig" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOEmailAddressPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOEmailAddressPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOEmailAddressPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOEmailAddressPolicy.Tests.ps1 index ef696d4fcb..547d6d05bc 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOEmailAddressPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOEmailAddressPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOEmailAddressPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOGlobalAddressList.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOGlobalAddressList.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOGlobalAddressList.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOGlobalAddressList.Tests.ps1 index 059a7eead9..27ff45154f 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOGlobalAddressList.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOGlobalAddressList.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOGlobalAddressList" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedConnectionFilterPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedConnectionFilterPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOHostedConnectionFilterPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedConnectionFilterPolicy.Tests.ps1 index 2651f36971..cf49e5bc1b 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedConnectionFilterPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedConnectionFilterPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOHostedConnectionFilterPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedContentFilterPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedContentFilterPolicy.Tests.ps1 similarity index 99% rename from Tests/Unit/Office365DSC/Office365DSC.EXOHostedContentFilterPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedContentFilterPolicy.Tests.ps1 index 4a555604b0..98c845d343 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedContentFilterPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedContentFilterPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOHostedContentFilterPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedContentFilterRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedContentFilterRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOHostedContentFilterRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedContentFilterRule.Tests.ps1 index a01b16b918..3b859de5e0 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedContentFilterRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedContentFilterRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOHostedContentFilterRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedOutboundSpamFilterPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedOutboundSpamFilterPolicy.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.EXOHostedOutboundSpamFilterPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedOutboundSpamFilterPolicy.Tests.ps1 index 001021a945..917387c2c3 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOHostedOutboundSpamFilterPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOHostedOutboundSpamFilterPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOHostedOutboundSpamFilterPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOInboundConnector.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOInboundConnector.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOInboundConnector.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOInboundConnector.Tests.ps1 index 5c98be5073..a2e90d4cfe 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOInboundConnector.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOInboundConnector.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOInboundConnector" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOIntraOrganizationConnector.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOIntraOrganizationConnector.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOIntraOrganizationConnector.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOIntraOrganizationConnector.Tests.ps1 index f1f159c244..90db86ff7f 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOIntraOrganizationConnector.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOIntraOrganizationConnector.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOIntraOrganizationConnector" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOMailTips.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMailTips.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOMailTips.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMailTips.Tests.ps1 index 1e1bacf9d6..ba5503ebcf 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOMailTips.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMailTips.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOMailTips" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOMailboxSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMailboxSettings.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.EXOMailboxSettings.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMailboxSettings.Tests.ps1 index c019c29f4e..49e2bf37dd 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOMailboxSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMailboxSettings.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOMailboxSettings" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOMalwareFilterPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMalwareFilterPolicy.Tests.ps1 similarity index 99% rename from Tests/Unit/Office365DSC/Office365DSC.EXOMalwareFilterPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMalwareFilterPolicy.Tests.ps1 index 0ac9da9132..c1e4c1b910 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOMalwareFilterPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMalwareFilterPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOMalwareFilterPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOMalwareFilterRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMalwareFilterRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOMalwareFilterRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMalwareFilterRule.Tests.ps1 index 91744ece7a..65e08ba8b0 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOMalwareFilterRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMalwareFilterRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOMalwareFilterRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOManagementRole.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOManagementRole.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOManagementRole.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOManagementRole.Tests.ps1 index 6ccad06165..112418a46c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOManagementRole.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOManagementRole.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOManagementRole" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOMobileDeviceMailboxPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMobileDeviceMailboxPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOMobileDeviceMailboxPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMobileDeviceMailboxPolicy.Tests.ps1 index 476d7ebe12..6d57e016a6 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOMobileDeviceMailboxPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOMobileDeviceMailboxPolicy.Tests.ps1 @@ -4,7 +4,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -15,7 +15,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOMobileDeviceMailboxPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOOfflineAddressBook.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOfflineAddressBook.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOOfflineAddressBook.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOfflineAddressBook.Tests.ps1 index d2a762200c..000e86c973 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOOfflineAddressBook.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOfflineAddressBook.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOOfflineAddressBook" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOOnPremisesOrganization.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOnPremisesOrganization.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOOnPremisesOrganization.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOnPremisesOrganization.Tests.ps1 index 445ab486d8..57e554176d 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOOnPremisesOrganization.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOnPremisesOrganization.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOOnPremisesOrganization" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOOrganizationConfig.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOrganizationConfig.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOOrganizationConfig.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOrganizationConfig.Tests.ps1 index a5c583a2d7..0f6a7e328c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOOrganizationConfig.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOrganizationConfig.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOOrganizationConfig" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOOrganizationRelationship.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOrganizationRelationship.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOOrganizationRelationship.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOrganizationRelationship.Tests.ps1 index 399ea5f355..7b10ec3613 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOOrganizationRelationship.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOrganizationRelationship.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOOrganizationRelationship" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOOutboundConnector.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOutboundConnector.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOOutboundConnector.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOutboundConnector.Tests.ps1 index 724fe3546f..c28f5dbfbe 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOOutboundConnector.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOutboundConnector.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOOutboundConnector" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOOwaMailboxPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOwaMailboxPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOOwaMailboxPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOwaMailboxPolicy.Tests.ps1 index 6f5624e559..b7b323b030 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOOwaMailboxPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOOwaMailboxPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOOwaMailboxPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOPartnerApplication.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOPartnerApplication.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOPartnerApplication.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOPartnerApplication.Tests.ps1 index e12292f6d8..1ed2cebd19 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOPartnerApplication.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOPartnerApplication.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOPartnerApplication" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOPolicyTipConfig.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOPolicyTipConfig.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.EXOPolicyTipConfig.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOPolicyTipConfig.Tests.ps1 index 8a37995a5c..300b3499c4 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOPolicyTipConfig.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOPolicyTipConfig.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOPolicyTipConfig" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXORemoteDomain.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORemoteDomain.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXORemoteDomain.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORemoteDomain.Tests.ps1 index 05dda0b97e..ac4ded485b 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXORemoteDomain.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORemoteDomain.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXORemoteDomain" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXORoleAssignmentPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORoleAssignmentPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXORoleAssignmentPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORoleAssignmentPolicy.Tests.ps1 index 3cc3ed5983..d73c7c8202 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXORoleAssignmentPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXORoleAssignmentPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXORoleAssignmentPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeAttachmentPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeAttachmentPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOSafeAttachmentPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeAttachmentPolicy.Tests.ps1 index 850e42304c..28da5d3e90 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeAttachmentPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeAttachmentPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOSafeAttachmentPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeAttachmentRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeAttachmentRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOSafeAttachmentRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeAttachmentRule.Tests.ps1 index d4a9b13a10..ebdc0cea8c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeAttachmentRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeAttachmentRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOSafeAttachmentRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeLinksPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeLinksPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOSafeLinksPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeLinksPolicy.Tests.ps1 index 9673621a67..0c745aaa86 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeLinksPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeLinksPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOSafeLinksPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeLinksRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeLinksRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOSafeLinksRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeLinksRule.Tests.ps1 index 501fa21024..ee80bcd3f5 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOSafeLinksRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSafeLinksRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOSafeLinksRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOSharedMailbox.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSharedMailbox.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOSharedMailbox.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSharedMailbox.Tests.ps1 index 1595ed9efc..37b826afdf 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOSharedMailbox.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSharedMailbox.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOSharedMailbox" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.EXOSharingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSharingPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.EXOSharingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSharingPolicy.Tests.ps1 index bff3d098f5..74a3d39e00 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.EXOSharingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.EXOSharingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "EXOSharingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.O365AdminAuditLogConfig.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365AdminAuditLogConfig.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.O365AdminAuditLogConfig.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365AdminAuditLogConfig.Tests.ps1 index f789f24e6d..5eed68835b 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.O365AdminAuditLogConfig.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365AdminAuditLogConfig.Tests.ps1 @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath '..\UnitTestHelper.psm1' ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource 'O365AdminAuditLogConfig' -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.O365Group.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365Group.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.O365Group.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365Group.Tests.ps1 index 6c4eeae6fa..dd6df34aa9 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.O365Group.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365Group.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "O365Group" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.O365OrgCustomizationSetting.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365OrgCustomizationSetting.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.O365OrgCustomizationSetting.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365OrgCustomizationSetting.Tests.ps1 index 0d17b45987..0203af792f 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.O365OrgCustomizationSetting.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365OrgCustomizationSetting.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "O365OrgCustomizationSetting" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.O365User.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365User.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.O365User.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365User.Tests.ps1 index 829890ecc5..06aab484a0 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.O365User.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.O365User.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "O365User" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.ODSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.ODSettings.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.ODSettings.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.ODSettings.Tests.ps1 index af0b52eae4..62c27727ab 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.ODSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.ODSettings.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "ODSettings" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.PPowerAppsEnvironment.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPowerAppsEnvironment.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.PPowerAppsEnvironment.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPowerAppsEnvironment.Tests.ps1 index 39452e607b..cfd165e22c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.PPowerAppsEnvironment.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.PPowerAppsEnvironment.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "PPPowerAppsEnvironment" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCAuditConfigurationPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCAuditConfigurationPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCAuditConfigurationPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCAuditConfigurationPolicy.Tests.ps1 index ae863a3325..c716aaec2c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCAuditConfigurationPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCAuditConfigurationPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCAuditConfigurationPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCCaseHoldPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCCaseHoldPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCCaseHoldPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCCaseHoldPolicy.Tests.ps1 index 5229848dad..6f40c13b43 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCCaseHoldPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCCaseHoldPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCCaseHoldPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCCaseHoldRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCCaseHoldRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCCaseHoldRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCCaseHoldRule.Tests.ps1 index 70065c98a3..76f982eeec 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCCaseHoldRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCCaseHoldRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCCaseHoldRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceCase.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceCase.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCComplianceCase.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceCase.Tests.ps1 index d26b47c41f..8495d7255d 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceCase.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceCase.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCComplianceCase" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceSearch.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceSearch.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCComplianceSearch.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceSearch.Tests.ps1 index 53f4c54972..1f6f6d360a 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceSearch.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceSearch.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCComplianceSearch" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceSearchAction.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceSearchAction.Tests.ps1 similarity index 99% rename from Tests/Unit/Office365DSC/Office365DSC.SCComplianceSearchAction.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceSearchAction.Tests.ps1 index 1fbcd596ff..1bf26efef6 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceSearchAction.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceSearchAction.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCComplianceSearchAction" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceTag.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceTag.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCComplianceTag.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceTag.Tests.ps1 index 315009f860..4851945a50 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCComplianceTag.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCComplianceTag.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCComplianceTag" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCDLPCompliancePolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDLPCompliancePolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCDLPCompliancePolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDLPCompliancePolicy.Tests.ps1 index cf5ebc0cf2..67219f7ce3 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCDLPCompliancePolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDLPCompliancePolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCDLPCompliancePolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCDLPComplianceRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDLPComplianceRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCDLPComplianceRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDLPComplianceRule.Tests.ps1 index e612e84e97..7a209dc69f 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCDLPComplianceRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDLPComplianceRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCDLPComplianceRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCDeviceConditionalAccessPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDeviceConditionalAccessPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCDeviceConditionalAccessPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDeviceConditionalAccessPolicy.Tests.ps1 index 5c1c1c6ec6..62c970eaf7 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCDeviceConditionalAccessPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDeviceConditionalAccessPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCDeviceConditionalAccessPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCDeviceConfigurationPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDeviceConfigurationPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCDeviceConfigurationPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDeviceConfigurationPolicy.Tests.ps1 index 0928dbf4ac..2c82567a25 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCDeviceConfigurationPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCDeviceConfigurationPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCDeviceConfigurationPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyAuthority.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyAuthority.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyAuthority.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyAuthority.Tests.ps1 index 9360150832..e51631e81d 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyAuthority.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyAuthority.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCFilePlanPropertyAuthority" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyCategory.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyCategory.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyCategory.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyCategory.Tests.ps1 index 92a9e47b0a..763188a8b9 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyCategory.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyCategory.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCFilePlanPropertyCategory" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyCitation.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyCitation.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyCitation.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyCitation.Tests.ps1 index 2e47fdedad..cb32f1cea5 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyCitation.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyCitation.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCFilePlanPropertyCitation" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyDepartment.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyDepartment.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyDepartment.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyDepartment.Tests.ps1 index 038363c9a7..bee6b82685 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyDepartment.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyDepartment.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCFilePlanPropertyDepartment" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyReferenceId.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyReferenceId.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyReferenceId.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyReferenceId.Tests.ps1 index 9d92892b43..fabd6ef674 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertyReferenceId.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertyReferenceId.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCFilePlanPropertyReferenceId" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertySubCategory.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertySubCategory.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertySubCategory.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertySubCategory.Tests.ps1 index f348f4aaae..90efcb1907 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCFilePlanPropertySubCategory.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCFilePlanPropertySubCategory.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCFilePlanPropertySubCategory" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCRetentionCompliancePolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCRetentionCompliancePolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCRetentionCompliancePolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCRetentionCompliancePolicy.Tests.ps1 index 99a9392cd1..1eb5d0b93b 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCRetentionCompliancePolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCRetentionCompliancePolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCRetentionCompliancePolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCRetentionComplianceRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCRetentionComplianceRule.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCRetentionComplianceRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCRetentionComplianceRule.Tests.ps1 index a4d584c477..a6d56aa7ba 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCRetentionComplianceRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCRetentionComplianceRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCRetentionComplianceRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCSensitivityLabel.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSensitivityLabel.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCSensitivityLabel.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSensitivityLabel.Tests.ps1 index b3015e9286..e3bdce118d 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCSensitivityLabel.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSensitivityLabel.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCSensitivityLabel" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCSupervisoryReviewPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSupervisoryReviewPolicy.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SCSupervisoryReviewPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSupervisoryReviewPolicy.Tests.ps1 index 09fffa50f4..97b344a994 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCSupervisoryReviewPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSupervisoryReviewPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCSupervisoryReviewPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SCSupervisoryReviewRule.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSupervisoryReviewRule.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SCSupervisoryReviewRule.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSupervisoryReviewRule.Tests.ps1 index 5be59b07c7..1c36fc38b2 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SCSupervisoryReviewRule.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SCSupervisoryReviewRule.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SCSupervisoryReviewRule" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOAccessControlSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOAccessControlSettings.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOAccessControlSettings.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOAccessControlSettings.Tests.ps1 index 91b6e54287..efddfa0967 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOAccessControlSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOAccessControlSettings.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOAccessControlSettings" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOApp.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOApp.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOApp.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOApp.Tests.ps1 index 3a722b125b..22e9ffffea 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOApp.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOApp.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -12,7 +12,7 @@ $GenericStubPath = (Join-Path -Path $PSScriptRoot ` Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOApp" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOHomeSite.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOHomeSite.Tests.ps1 similarity index 95% rename from Tests/Unit/Office365DSC/Office365DSC.SPOHomeSite.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOHomeSite.Tests.ps1 index e20cb11bd2..634e2aa71a 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOHomeSite.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOHomeSite.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOHomeSite" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { @@ -96,7 +96,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } - Mock -CommandName New-Office365DSCLogEntry -MockWith { + Mock -CommandName New-M365DSCLogEntry -MockWith { } @@ -111,7 +111,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { It "Should throw an error" { { Set-TargetResource @testParams } | Should Throw "The specified Site Collection $($testParams.Url) for SPOHomeSite doesn't exist." Assert-MockCalled Get-PnPTenantSite - Assert-MockCalled New-Office365DSCLogEntry + Assert-MockCalled New-M365DSCLogEntry } } diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOHubSite.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOHubSite.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOHubSite.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOHubSite.Tests.ps1 index e563b31cde..7a7702da21 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOHubSite.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOHubSite.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -12,7 +12,7 @@ $GenericStubPath = (Join-Path -Path $PSScriptRoot ` Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOHubSite" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { @@ -23,7 +23,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { $GlobalAdminAccount = New-Object System.Management.Automation.PSCredential ("tenantadmin", $secpasswd) Mock -CommandName Test-MSCloudLogin -MockWith { } - Mock -CommandName New-Office365DSCLogEntry -MockWith {} + Mock -CommandName New-M365DSCLogEntry -MockWith {} # Test contexts Context -Name "When the site doesn't already exist" -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOPropertyBag.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOPropertyBag.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOPropertyBag.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOPropertyBag.Tests.ps1 index 3e75a64f93..3c51dff98e 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOPropertyBag.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOPropertyBag.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOPropertyBag" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSearchManagedProperty.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSearchManagedProperty.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSearchManagedProperty.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSearchManagedProperty.Tests.ps1 index c52e248bba..ff2193cd09 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSearchManagedProperty.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSearchManagedProperty.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365DSC.psm1" ` + -ChildPath "..\Stubs\Microsoft365DSC.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSearchManagedProperty" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { @@ -144,7 +144,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { GlobalAdminAccount = $GlobalAdminAccount } $xmlTemplatePath = Join-Path -Path $PSScriptRoot ` - -ChildPath "..\..\..\Modules\Office365DSC\Dependencies\SearchConfigurationSettings.xml" ` + -ChildPath "..\..\..\Modules\Microsoft365DSC\Dependencies\SearchConfigurationSettings.xml" ` -Resolve $emptyXMLTemplate = Get-Content $xmlTemplatePath Mock -CommandName Get-PnPSearchConfiguration -MockWith { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSearchResultSource.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSearchResultSource.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSearchResultSource.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSearchResultSource.Tests.ps1 index e904b8637c..9d5aa25711 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSearchResultSource.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSearchResultSource.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365DSC.psm1" ` + -ChildPath "..\Stubs\Microsoft365DSC.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSearchResultSource" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { @@ -97,7 +97,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { GlobalAdminAccount = $GlobalAdminAccount } $xmlTemplatePath = Join-Path -Path $PSScriptRoot ` - -ChildPath "..\..\..\Modules\Office365DSC\Dependencies\SearchConfigurationSettings.xml" ` + -ChildPath "..\..\..\Modules\Microsoft365DSC\Dependencies\SearchConfigurationSettings.xml" ` -Resolve $emptyXMLTemplate = Get-Content $xmlTemplatePath Mock -CommandName Get-PnPSearchConfiguration -MockWith { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSharingSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSharingSettings.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSharingSettings.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSharingSettings.Tests.ps1 index 49e51d766c..afb8aa492c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSharingSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSharingSettings.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSharingSettings" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSite.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSite.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSite.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSite.Tests.ps1 index 0eacfc593e..7e687fabe5 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSite.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSite.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -12,7 +12,7 @@ $GenericStubPath = (Join-Path -Path $PSScriptRoot ` Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSite" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { @@ -57,11 +57,11 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } Mock -CommandName New-PnPTenantSite -MockWith { - $global:O365DscSiteCreated = $true + $global:M365DscSiteCreated = $true } Mock -CommandName Get-PnPTenantSite -MockWith { - if ($global:O365DscSiteCreated -eq $false) + if ($global:M365DscSiteCreated -eq $false) { throw } @@ -111,17 +111,17 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Mock -CommandName Set-PnPTenantSite -MockWith { } Mock -CommandName Add-PnPHubSiteAssociation -MockWith { } - $global:O365DscSiteCreated = $false + $global:M365DscSiteCreated = $false It "Should return absent from the Get method" { (Get-TargetResource @testParams).Ensure | Should Be "Absent" } - $global:O365DscSiteCreated = $false + $global:M365DscSiteCreated = $false It "Should return false from the Test method" { Test-TargetResource @testParams | Should Be $false } - $global:O365DscSiteCreated = $false + $global:M365DscSiteCreated = $false It "Creates the site collection in the Set method" { Set-TargetResource @testParams Assert-MockCalled New-PnPTenantSite @@ -492,17 +492,17 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { Mock -CommandName Remove-PnPTenantSite -MockWith { } - $global:O365DscSiteCreated = $false + $global:M365DscSiteCreated = $false It "Should find the site" { (Get-TargetResource @testParams).Ensure | Should Be "Present" } - $global:O365DscSiteCreated = $false + $global:M365DscSiteCreated = $false It "Should return false from the Test method" { Test-TargetResource @testParams | Should Be $false } - $global:O365DscSiteCreated = $false + $global:M365DscSiteCreated = $false It "Should delete the site" { Set-TargetResource @testParams } diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteAuditSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteAuditSettings.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSiteAuditSettings.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteAuditSettings.Tests.ps1 index c429d3c7e8..e9d0efa1c9 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteAuditSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteAuditSettings.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSiteAuditSettings" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteDesign.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteDesign.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSiteDesign.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteDesign.Tests.ps1 index 16d98680c7..12e711887e 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteDesign.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteDesign.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSiteDesign" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteDesignRights.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteDesignRights.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSiteDesignRights.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteDesignRights.Tests.ps1 index 9170fe226f..55a49d520f 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteDesignRights.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteDesignRights.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSiteDesignRights" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteGroup.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteGroup.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOSiteGroup.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteGroup.Tests.ps1 index 68660b1118..26c1f5eab5 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOSiteGroup.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOSiteGroup.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOSiteGroup" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOStorageEntity.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOStorageEntity.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOStorageEntity.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOStorageEntity.Tests.ps1 index 3a953d7dc1..aff6888e2d 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOStorageEntity.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOStorageEntity.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOStorageEntity" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOTenantCDNPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTenantCDNPolicy.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.SPOTenantCDNPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTenantCDNPolicy.Tests.ps1 index 48a27193dc..77e90eac44 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOTenantCDNPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTenantCDNPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOTenantCDNPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOTenantSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTenantSettings.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOTenantSettings.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTenantSettings.Tests.ps1 index 32d810da66..1df4c7f1d0 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOTenantSettings.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTenantSettings.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOTenantSettings" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOTheme.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTheme.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.SPOTheme.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTheme.Tests.ps1 index f6b4169a5c..374b131c9c 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOTheme.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOTheme.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -12,7 +12,7 @@ $GenericStubPath = (Join-Path -Path $PSScriptRoot ` Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOTheme" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.SPOUserProfileProperty.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOUserProfileProperty.Tests.ps1 similarity index 95% rename from Tests/Unit/Office365DSC/Office365DSC.SPOUserProfileProperty.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOUserProfileProperty.Tests.ps1 index 176e9fce03..639e963625 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.SPOUserProfileProperty.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.SPOUserProfileProperty.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "SPOUserProfileProperty" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { @@ -32,7 +32,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture { } } - Mock -CommandName Invoke-O365DSCCommand -MockWith { + Mock -CommandName Invoke-M365DSCCommand -MockWith { } Mock -CommandName Start-Job -MockWith{ diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsCallingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsCallingPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsCallingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsCallingPolicy.Tests.ps1 index 1b9b85de02..c2de0cf918 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsCallingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsCallingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsCallingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsChannel.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsChannel.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsChannel.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsChannel.Tests.ps1 index 945abdd2dc..e9f9f36b88 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsChannel.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsChannel.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsChannel" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsChannelsPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsChannelsPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsChannelsPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsChannelsPolicy.Tests.ps1 index 3f302775da..34d79a66d7 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsChannelsPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsChannelsPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsChannelsPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsClientConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsClientConfiguration.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsClientConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsClientConfiguration.Tests.ps1 index af67d4d450..a27e172dc4 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsClientConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsClientConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsClientConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsEmergencyCallRoutingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsEmergencyCallRoutingPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsEmergencyCallRoutingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsEmergencyCallRoutingPolicy.Tests.ps1 index fca43247b7..64ebfa94e1 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsEmergencyCallRoutingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsEmergencyCallRoutingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsEmergencyCallRoutingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsEmergencyCallingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsEmergencyCallingPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsEmergencyCallingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsEmergencyCallingPolicy.Tests.ps1 index 5ef9dbf724..dd27094c63 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsEmergencyCallingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsEmergencyCallingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsEmergencyCallingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsGuestCallingConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestCallingConfiguration.Tests.ps1 similarity index 96% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsGuestCallingConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestCallingConfiguration.Tests.ps1 index 06a88f3219..390ea5c4d9 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsGuestCallingConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestCallingConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsGuestCallingConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsGuestMeetingConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestMeetingConfiguration.Tests.ps1 similarity index 96% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsGuestMeetingConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestMeetingConfiguration.Tests.ps1 index 42d42333ce..18f1e92740 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsGuestMeetingConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestMeetingConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsGuestMeetingConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsGuestMessagingConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestMessagingConfiguration.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsGuestMessagingConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestMessagingConfiguration.Tests.ps1 index 4d4555ec22..4ba067ed0f 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsGuestMessagingConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsGuestMessagingConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsGuestMessagingConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingBroadcastConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingBroadcastConfiguration.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingBroadcastConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingBroadcastConfiguration.Tests.ps1 index 504a0a7a59..dced2ca5ff 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingBroadcastConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingBroadcastConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsMeetingBroadcastConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingBroadcastPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingBroadcastPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingBroadcastPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingBroadcastPolicy.Tests.ps1 index 721cd6604d..d17abb03b5 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingBroadcastPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingBroadcastPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsMeetingBroadcastPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingConfiguration.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingConfiguration.Tests.ps1 index d85bfb9c91..98e56eb1d8 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsMeetingConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingPolicy.Tests.ps1 similarity index 99% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingPolicy.Tests.ps1 index 80d22dc326..719150f411 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsMeetingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMeetingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsMeetingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsMessagingPolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMessagingPolicy.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsMessagingPolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMessagingPolicy.Tests.ps1 index eb61013aa4..b2292302a9 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsMessagingPolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsMessagingPolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsMessagingPolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsTeam.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsTeam.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsTeam.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsTeam.Tests.ps1 index 4cf45b36b8..d1a0b8c409 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsTeam.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsTeam.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsTeam" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsUpgradeConfiguration.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpgradeConfiguration.Tests.ps1 similarity index 96% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsUpgradeConfiguration.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpgradeConfiguration.Tests.ps1 index 1163ddc50e..055aecfbf1 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsUpgradeConfiguration.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpgradeConfiguration.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -13,7 +13,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsUpgradeConfiguration" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsUpgradePolicy.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpgradePolicy.Tests.ps1 similarity index 97% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsUpgradePolicy.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpgradePolicy.Tests.ps1 index eb859e09a7..bef8f58745 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsUpgradePolicy.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUpgradePolicy.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) @@ -14,7 +14,7 @@ Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsUpgradePolicy" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Office365DSC/Office365DSC.TeamsUser.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUser.Tests.ps1 similarity index 98% rename from Tests/Unit/Office365DSC/Office365DSC.TeamsUser.Tests.ps1 rename to Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUser.Tests.ps1 index 32266703a4..93d45b73eb 100644 --- a/Tests/Unit/Office365DSC/Office365DSC.TeamsUser.Tests.ps1 +++ b/Tests/Unit/Microsoft365DSC/Microsoft365DSC.TeamsUser.Tests.ps1 @@ -3,7 +3,7 @@ param( [Parameter()] [string] $CmdletModule = (Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Stubs\Office365.psm1" ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` -Resolve) ) $GenericStubPath = (Join-Path -Path $PSScriptRoot ` @@ -12,7 +12,7 @@ $GenericStubPath = (Join-Path -Path $PSScriptRoot ` Import-Module -Name (Join-Path -Path $PSScriptRoot ` -ChildPath "..\UnitTestHelper.psm1" ` -Resolve) -$Global:DscHelper = New-O365DscUnitTestHelper -StubModule $CmdletModule ` +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` -DscResource "TeamsUser" -GenericStubModule $GenericStubPath Describe -Name $Global:DscHelper.DescribeHeader -Fixture { diff --git a/Tests/Unit/Microsoft365DSC/Office365DSC.AADGroupsSettings.Tests.ps1 b/Tests/Unit/Microsoft365DSC/Office365DSC.AADGroupsSettings.Tests.ps1 new file mode 100644 index 0000000000..a177df0a3d --- /dev/null +++ b/Tests/Unit/Microsoft365DSC/Office365DSC.AADGroupsSettings.Tests.ps1 @@ -0,0 +1,277 @@ +[CmdletBinding()] +param( + [Parameter()] + [string] + $CmdletModule = (Join-Path -Path $PSScriptRoot ` + -ChildPath "..\Stubs\Microsoft365.psm1" ` + -Resolve) +) +$GenericStubPath = (Join-Path -Path $PSScriptRoot ` + -ChildPath "..\Stubs\Generic.psm1" ` + -Resolve) +Import-Module -Name (Join-Path -Path $PSScriptRoot ` + -ChildPath "..\UnitTestHelper.psm1" ` + -Resolve) + +$Global:DscHelper = New-M365DscUnitTestHelper -StubModule $CmdletModule ` + -DscResource "AADGroupsSettings" -GenericStubModule $GenericStubPath +Describe -Name $Global:DscHelper.DescribeHeader -Fixture { + InModuleScope -ModuleName $Global:DscHelper.ModuleName -ScriptBlock { + Invoke-Command -ScriptBlock $Global:DscHelper.InitializeScript -NoNewScope + + $secpasswd = ConvertTo-SecureString "test@password1" -AsPlainText -Force + $GlobalAdminAccount = New-Object System.Management.Automation.PSCredential ("tenantadmin", $secpasswd) + + Mock -CommandName Close-SessionsAndReturnError -MockWith { + + } + + Mock -CommandName Test-MSCloudLogin -MockWith { + + } + + Mock -CommandName Get-PSSession -MockWith { + + } + + Mock -CommandName Remove-PSSession -MockWith { + + } + + Mock -CommandName Set-AzureADDirectorySetting -MockWith { + + } + + Mock -CommandName Remove-AzureADDirectorySetting -MockWith { + + } + + Mock -CommandName New-AzureADDirectorySetting -MockWith { + + } + + Mock -CommandName Get-AzureADDirectorySettingTemplate -MockWith { + $object = [PSCustomObject]::new() + $object | Add-Member -MemberType ScriptMethod -Name "CreateDirectorySetting" -Value {return [PSCustomObject]::new()} -PassThru + return $object + } + + try + { + [Contoso.Model.DirectorySetting] + } + catch + { + Add-Type -PassThru -TypeDefinition @" + namespace Contoso.Model { + public class SettingValue { + public string Name {get; set;} + public string Value {get; set;} + } + + public class DirectorySetting { + + public System.Collections.Generic.List Values {get; set;} + public System.Collections.Generic.List _values = new System.Collections.Generic.List(); + public string this[string keyName] + { + get { + if (keyName == "UsageGuidelinesUrl") + { + return "https://contoso.com/usage"; + } + else if (keyName == "AllowToAddGuests") + { + return "true"; + } + else if (keyName == "GroupCreationAllowedGroupId") + { + return "12345-12345-12345-12345-12345"; + } + else if (keyName == "GuestUsageGuidelinesUrl") + { + return "https://contoso.com/guestusage"; + } + else if (keyName == "AllowGuestsToAccessGroups") + { + return "true"; + } + else if (keyName == "AllowGuestsToBeGroupOwner") + { + return "true"; + } + else if (keyName == "EnableGroupCreation") + { + return "true"; + } + return ""; + } + set {} + } + public string DisplayName {get {return "Group.Unified";}} + public string Id {get {return "12345-12345-12345-12345-12345";}} + + public DirectorySetting (){} + } + } +"@ + } + + Mock -CommandName "Get-AzureADGroup" -MockWith { + return @{ + ObjectId = "12345-12345-12345-12345-12345" + DisplayName = "All Company" + } + } + + # Test contexts + Context -Name "The Policy should exist but it DOES NOT" -Fixture { + $Script:calledOnceAlready = $false + $testParams = @{ + AllowGuestsToAccessGroups = $True; + AllowGuestsToBeGroupOwner = $True; + AllowToAddGuests = $True; + EnableGroupCreation = $True; + Ensure = "Present"; + GlobalAdminAccount = $GlobalAdminAccount; + GroupCreationAllowedGroupName = "All Company"; + GuestUsageGuidelinesUrl = "https://contoso.com/guestusage"; + IsSingleInstance = "Yes"; + UsageGuidelinesUrl = "https://contoso.com/usage"; + } + + Mock -CommandName Get-AzureADDirectorySetting -MockWith { + if (-not $Script:calledOnceAlready) + { + $Script:calledOnceAlready = $true + return $null + } + else + { + $setting = New-Object 'Contoso.Model.DirectorySetting' + return $setting + } + } + + It "Should return Values from the Get method" { + (Get-TargetResource @testParams).Ensure | Should be 'Absent' + Assert-MockCalled -CommandName "Get-AzureADDirectorySetting" -Exactly 1 + } + $Script:calledOnceAlready = $false + It 'Should return true from the Test method' { + Test-TargetResource @testParams | Should Be $false + } + $Script:calledOnceAlready = $false + It 'Should create and set the settings the Set method' { + Set-TargetResource @testParams + Assert-MockCalled -CommandName "New-AzureADDirectorySetting" -Exactly 1 + Assert-MockCalled -CommandName "Set-AzureADDirectorySetting" -Exactly 1 + } + } + + Context -Name "The Policy exists but it SHOULD NOT" -Fixture { + $testParams = @{ + IsSingleInstance = "Yes"; + Ensure = "Absent" + GlobalAdminAccount = $GlobalAdminAccount; + } + + Mock -CommandName Get-AzureADDirectorySetting -MockWith { + $setting = New-Object 'Contoso.Model.DirectorySetting' + return $setting + } + + It "Should return Values from the Get method" { + (Get-TargetResource @testParams).Ensure | Should be 'Present' + Assert-MockCalled -CommandName "Get-AzureADDirectorySetting" -Exactly 1 + } + + It 'Should return true from the Test method' { + Test-TargetResource @testParams | Should Be $false + } + + It 'Should Prevent Remove the Policy from the Set method' { + {Set-TargetResource @testParams} | Should Throw "The AADGroupsSettings resource cannot delete existing Directory Setting entries. Please specify Present." + } + } + Context -Name "The Policy Exists and Values are already in the desired state" -Fixture { + $testParams = @{ + AllowGuestsToAccessGroups = $True; + AllowGuestsToBeGroupOwner = $True; + AllowToAddGuests = $True; + EnableGroupCreation = $True; + Ensure = "Present"; + GlobalAdminAccount = $GlobalAdminAccount; + GroupCreationAllowedGroupName = "All Company"; + GuestUsageGuidelinesUrl = "https://contoso.com/guestusage"; + IsSingleInstance = "Yes"; + UsageGuidelinesUrl = "https://contoso.com/usage"; + } + + Mock -CommandName Get-AzureADDirectorySetting -MockWith { + $setting = New-Object 'Contoso.Model.DirectorySetting' + return $setting + } + + It "Should return Values from the Get method" { + Get-TargetResource @testParams + Assert-MockCalled -CommandName "Get-AzureADDirectorySetting" -Exactly 1 + } + + It 'Should return true from the Test method' { + Test-TargetResource @testParams | Should Be $true + } + } + + Context -Name "Values are NOT in the desired state" -Fixture { + $testParams = @{ + AllowGuestsToAccessGroups = $True; + AllowGuestsToBeGroupOwner = $True; + AllowToAddGuests = $True; + EnableGroupCreation = $False; #Drift + Ensure = "Present"; + GlobalAdminAccount = $GlobalAdminAccount; + GroupCreationAllowedGroupName = "All Company"; + GuestUsageGuidelinesUrl = "https://contoso.com/guestusage"; + IsSingleInstance = "Yes"; + UsageGuidelinesUrl = "https://contoso.com/usage"; + } + + Mock -CommandName Get-AzureADDirectorySetting -MockWith { + $setting = New-Object 'Contoso.Model.DirectorySetting' + return $setting + } + + It "Should return Values from the Get method" { + Get-TargetResource @testParams + Assert-MockCalled -CommandName "Get-AzureADDirectorySetting" -Exactly 1 + } + + It 'Should return false from the Test method' { + Test-TargetResource @testParams | Should Be $false + } + + It "Should call the Set method" { + Set-TargetResource @testParams + Assert-MockCalled -CommandName 'Set-AzureADDirectorySetting' -Exactly 1 + } + } + + Context -Name "ReverseDSC Tests" -Fixture { + $testParams = @{ + GlobalAdminAccount = $GlobalAdminAccount + } + + Mock -CommandName Get-AzureADDirectorySetting -MockWith { + $setting = New-Object 'Contoso.Model.DirectorySetting' + return $setting + } + + It "Should Reverse Engineer resource from the Export method" { + Export-TargetResource @testParams + } + } + } +} + +Invoke-Command -ScriptBlock $Global:DscHelper.CleanupScript -NoNewScope diff --git a/Tests/Unit/Stubs/Generic.psm1 b/Tests/Unit/Stubs/Generic.psm1 index 58d2611ca0..6d85978cfb 100644 --- a/Tests/Unit/Stubs/Generic.psm1 +++ b/Tests/Unit/Stubs/Generic.psm1 @@ -844,7 +844,7 @@ function Remove-SafeLinksRule } #endregion -function New-Office365DSCLogEntry +function New-M365DSCLogEntry { [CmdletBinding()] param diff --git a/Tests/Unit/Stubs/Office365.psm1 b/Tests/Unit/Stubs/Microsoft365.psm1 similarity index 100% rename from Tests/Unit/Stubs/Office365.psm1 rename to Tests/Unit/Stubs/Microsoft365.psm1 diff --git a/Tests/Unit/UnitTestHelper.psm1 b/Tests/Unit/UnitTestHelper.psm1 index 18ced87786..d63daae85f 100644 --- a/Tests/Unit/UnitTestHelper.psm1 +++ b/Tests/Unit/UnitTestHelper.psm1 @@ -1,4 +1,4 @@ -function New-O365DscUnitTestHelper +function New-M365DscUnitTestHelper { [CmdletBinding()] param( @@ -24,9 +24,9 @@ function New-O365DscUnitTestHelper ) $repoRoot = Join-Path -Path $PSScriptRoot -ChildPath "..\..\" -Resolve - $moduleRoot = Join-Path -Path $repoRoot -ChildPath "Modules\Office365Dsc" + $moduleRoot = Join-Path -Path $repoRoot -ChildPath "Modules\Microsoft365Dsc" - $mainModule = Join-Path -Path $moduleRoot -ChildPath "Office365DSC.psd1" + $mainModule = Join-Path -Path $moduleRoot -ChildPath "Microsoft365DSC.psd1" Remove-Module -Name "AzureAD" -Force -ErrorAction SilentlyContinue Import-Module -Name $mainModule -Global diff --git a/appveyor.yml b/appveyor.yml index a0594b4595..249bf36c87 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ install: - npm --silent install - ps: | - $moduleName = 'Office365DSC' + $moduleName = 'Microsoft365DSC' $mainModuleFolder = "Modules\$moduleName" Install-Module ReverseDSC -RequiredVersion 2.0.0.2 -Force Install-Module AzureADPreview -RequiredVersion 2.0.2.89 -Force @@ -16,7 +16,7 @@ install: Install-Module Microsoft.PowerApps.Administration.PowerShell -RequiredVersion 2.0.56 -Force $webClient = new-object System.Net.WebClient - $url = "https://github.com/Microsoft/Office365DSC/blob/Dev/Tests/Dependencies/SharePointOnlineManagementShell_19515-12000_x64_en-us.msi?raw=true" + $url = "https://github.com/Microsoft/Microsoft365DSC/blob/Dev/Tests/Dependencies/SharePointOnlineManagementShell_19515-12000_x64_en-us.msi?raw=true" $path = $PSScriptRoot + "\SharePointOnlineManagementShell.msi" $webClient.DownloadFile($url, $path) msiexec /i $path /quiet /qn /norestart @@ -27,7 +27,7 @@ install: Import-Module MSCloudLoginAssistant -Force Import-Module AzureADPreview -Force Import-Module MicrosoftTeams -Force - [System.Environment]::SetEnvironmentVariable('O365DSCTelemetryEnabled', $false, [System.EnvironmentVariableTarget]::Machine) + [System.Environment]::SetEnvironmentVariable('M365DSCTelemetryEnabled', $false, [System.EnvironmentVariableTarget]::Machine) Import-Module -Name "$env:APPVEYOR_BUILD_FOLDER\DscResource.Tests\AppVeyor.psm1" Invoke-AppveyorInstallTask diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6d7c32b6d4..7405f678f4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,7 +15,7 @@ steps: inputs: targetType: 'inline' failOnStderr: true - script: Install-Module Microsoft.Online.SharePoint.PowerShell -RequiredVersion "16.0.19515.12000" -Force;Install-Module AzureADPreview -RequiredVersion "2.0.2.89" -Force; Install-Module MicrosoftTeams -RequiredVersion "1.0.5" -Force;Install-Module SharePointPnPPowerShellOnline -RequiredVersion "3.19.2003.0" -Force;Install-Module ReverseDSC -Requiredversion "2.0.0.2" -Force;Install-Module MSCloudLoginAssistant -Force -RequiredVersion "1.0.6";Install-Module Microsoft.PowerApps.Administration.PowerShell -Force -RequiredVersion 2.0.56;[System.Environment]::SetEnvironmentVariable('O365DSCTelemetryEnabled', $false, [System.EnvironmentVariableTarget]::Machine);Import-Module '$(build.artifactstagingdirectory)\BuildFiles\Tests\TestHarness.psm1' -Force;$results = Invoke-TestHarness; if ($results.FailedCount -gt 0){throw "Unit Test Failed"} + script: Install-Module Microsoft.Online.SharePoint.PowerShell -RequiredVersion "16.0.19515.12000" -Force;Install-Module AzureADPreview -RequiredVersion "2.0.2.89" -Force; Install-Module MicrosoftTeams -RequiredVersion "1.0.5" -Force;Install-Module SharePointPnPPowerShellOnline -RequiredVersion "3.19.2003.0" -Force;Install-Module ReverseDSC -Requiredversion "2.0.0.2" -Force;Install-Module MSCloudLoginAssistant -Force -RequiredVersion "1.0.6";Install-Module Microsoft.PowerApps.Administration.PowerShell -Force -RequiredVersion 2.0.56;[System.Environment]::SetEnvironmentVariable('M365DSCTelemetryEnabled', $false, [System.EnvironmentVariableTarget]::Machine);Import-Module '$(build.artifactstagingdirectory)\BuildFiles\Tests\TestHarness.psm1' -Force;$results = Invoke-TestHarness; if ($results.FailedCount -gt 0){throw "Unit Test Failed"} - task: PublishBuildArtifacts@1 inputs: diff --git a/package.json b/package.json index 0367281f40..be0903a2b8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "office365dsc", + "name": "Microsoft365DSC", "version": "1.0.0.0", - "description": "The Office365Dsc PowerShell module provides DSC resources that can be used to deploy, configure and manage Office 365 tenants", + "description": "The Microsoft365DSC PowerShell module provides DSC resources that can be used to deploy, configure and manage Microsoft 365 tenants", "main": "gulpfile.js", "dependencies": { "gulp": "^3.9.1", @@ -16,12 +16,12 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/Microsoft/Office365DSC.git" + "url": "git+https://github.com/Microsoft/Microsoft365DSC.git" }, "author": "Microsoft Corporation", "license": "MIT", "bugs": { - "url": "https://github.com/Microsoft/Office365DSC/issues" + "url": "https://github.com/Microsoft/Microsoft365DSC/issues" }, - "homepage": "https://github.com/Microsoft/Office365DSC#readme" + "homepage": "https://github.com/Microsoft/Microsoft365DSC#readme" }