Skip to content

Commit

Permalink
Merge pull request #459 from microsoft/Dev
Browse files Browse the repository at this point in the history
Upstream Merge
  • Loading branch information
NikCharlebois authored Apr 15, 2020
2 parents 5dd77b8 + 23f76f0 commit e38917e
Show file tree
Hide file tree
Showing 552 changed files with 12,558 additions and 4,480 deletions.
98 changes: 49 additions & 49 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +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/Microsoft365DSC/DSCResources/MSFT_EXOAvailabilityAddressSpace/Add-AvailabilityAddressSpace-parameterset.txt
*.log
4 changes: 2 additions & 2 deletions .vscode/GetTestCoverage.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ param(
[Parameter(Mandatory = $true)]
[string]
$CmdletModule = (Join-Path -Path $PSScriptRoot `
-ChildPath "..\Stubs\Office365.psm1" `
-ChildPath "..\Stubs\Microsoft365.psm1" `
-Resolve)
)

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"name": "Run current unit test",
"script": "${file}",
"args": [
"${workspaceRoot}/Tests/Unit/Stubs/Office365.psm1"
"${workspaceRoot}/Tests/Unit/Stubs/Microsoft365.psm1"
],
"cwd": "${file}",
"createTemporaryIntegratedConsole": true
Expand All @@ -19,7 +19,7 @@
"script": "${workspaceRoot}/.vscode/GetTestCoverage.ps1",
"args": [
"${file}",
"${workspaceRoot}/Tests/Unit/Stubs/Office365.psm1"
"${workspaceRoot}/Tests/Unit/Stubs/Microsoft365.psm1"
],
"createTemporaryIntegratedConsole": true
}
Expand Down
68 changes: 62 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,67 @@
# Change log for Office365Dsc
# Change log for Microsoft365DSC

## UNRELEASED

## 1.0.4.39

* Re-branding to Microsoft365DSC
* All components re-branded;
* AADMSGroupLifecyclePolicy
* Initial Release;
* AADGroupsNamingPolicy
* Initial Release;
* AADGroupsSettings
* Initial Release;
* AADMSGroupLifecyclePolicy
* Initial Release;
* SCAuditConfigurationPolicy
* Fix issue with the Remove scenario;
* SCDLPCompliancePolicy
* Fix issue with the Remove scenario;
* SCFilePropertyAuthority
* Fix issue with the Remove scenario;
* SCFilePlanPropertyCategory
* Fix issue with the Remove scenario;
* SCFilePlanPropertyCitation
* Fix issue with the Remove scenario;
* SCFilePlanPropertyDepartment
* Fix issue with the Remove scenario;
* SCFilePlanPropertyReferenceId
* Fix issue with the Remove scenario;
* SCFilePlanPropertySubCategory
* Fix issue with the Remove scenario;
* SCRetentionCompliancePolicy
* Fix issue with Teams Policy in the Get;
* SPOPropertyBag
* Fixed an issue where false positive drifts were being detected;
* SPOSiteAuditSettings
* Generalized the URL not to capture hardcoded dmomains;
* SPOSiteGroup
* Fixed an issue where now, groups with Null owners are not extracted;
* Generalized the URL not to capture hardcoded dmomains;
* TeamsCallingPolicy
* Removed the AllowCalling parameter since it is no longer supported;
* Fixed an issue with Policies without tags in their name (e.g. Global);
* TeamsMessagingPolicy
* Fixed and issue where the Global policy was always flagged as having
a drift;
* TeamsUpgradePolicy
* Initial Release;
* 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;
* Major refactoring, having UI dynamic and items displayed by
Resources' names;
* Metadata
* Updated Microsoft.PowerApps.Administration.PowerShell to 2.0.56;
* Updated MicrosoftTeams dependency to 1.0.5;
* Updated MSCloudLoginAssistant dependency to 1.0.6;
* Updated SharePointPnPPowerShellOnline dependency to 3.20.2004.0;

## 1.0.3.1723

* EXOHostedOutboundSpamFilterPolicy
* BREAKING CHANGE: Remove IsSingleInstance and added
Identity as key;
Expand Down Expand Up @@ -96,15 +156,11 @@
for SharingCapabilities;
* SPOTheme
* Fixed an issue with the Set-TargetResource
still using SPO management shell cmdlets instead of PnP
still using SPO management shell cmdlets instead of PnP;
* SPOUserProfileProperty
* Introduced Multi-Threading
* TeamsCallingPolicy
* Initial Release;
* TeamsChannelsPolicy
* Initial Release;
* TeamsClientConfiguration
* Initial Release;
* TeamsMeetingBroadcastConfiguration
* Initial Release;
* TeamsMeetingConfiguration
Expand Down
Loading

0 comments on commit e38917e

Please sign in to comment.