From 891e49fa7322273d6ac1934704605cb3f3bf01c7 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Fri, 8 Jan 2021 07:31:07 -0500 Subject: [PATCH 1/5] Initial --- CHANGELOG.md | 4 ++++ .../MSFT_AADTenantDetails.psm1 | 21 ++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cff0bce255..4ebc09b77b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ # 1.21.113.1 +* AADTenantDetails + * Fixes an issue where the Set would fail if Service Principal + was used. + (Issue [#1002](https://github.com/microsoft/Microsoft365DSC/issues/1002)) * DEPENDENCIES * Updated Microsoft.PowerApps.Administration.PowerShell to 2.0.102; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 index 013dbf8472..3581d1acf1 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_AADTenantDetails/MSFT_AADTenantDetails.psm1 @@ -168,9 +168,24 @@ function Set-TargetResource $currentParameters = $PSBoundParameters - $currentParameters - $currentParameters.Remove("GlobalAdminAccount") | Out-Null - $currentParameters.Remove("isSingleInstance") | Out-Null + $currentParameters.Remove("IsSingleInstance") | Out-Null + + if ($currentParameters.ContainsKey("GlobalAdminAccount")) + { + $currentParameters.Remove("GlobalAdminAccount") | Out-Null + } + if ($currentParameters.ContainsKey("ApplicationId")) + { + $currentParameters.Remove("ApplicationId") | Out-Null + } + if ($currentParameters.ContainsKey("TenantId")) + { + $currentParameters.Remove("TenantId") | Out-Null + } + if ($currentParameters.ContainsKey("CertificateThumbprint")) + { + $currentParameters.Remove("CertificateThumbprint") | Out-Null + } try { Set-AzureADTenantDetail @currentParameters From e34024757c89ede7cc97392f5320a225e2ada0d7 Mon Sep 17 00:00:00 2001 From: vlad doster Date: Mon, 18 Jan 2021 03:35:19 -0600 Subject: [PATCH 2/5] (docs) update README.md - reduce verbiage - correct spelling - correct grammar --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ac5200c6d4..84ef4b9d11 100644 --- a/README.md +++ b/README.md @@ -53,9 +53,9 @@ and be released to [PowerShell Gallery](https://www.powershellgallery.com/). ## How to Install -In order to acquire the latest +To acquire the latest bits of the module from a machine that has internet connectivity, -simply run the following PowerShell line: +run the following PowerShell line: ```powershell Install-Module -Name Microsoft365DSC -Force -AllowClobber @@ -66,10 +66,10 @@ Install-Module -Name Microsoft365DSC -Force -AllowClobber Microsoft365DSC captures Telemetry data about the names of the resources in which a configuration drift has been detected, along with the type of exceptions being thrown by errors in the various modules. While no -sensitive data is ever being captured, App Insights which is used for -the analytics of the Telemetry, does capture information about the city -where the telemetry entries where captured from by default. Users can -opt out to prevent telemetry to be sent back to the Microsoft365DSC team +sensitive data is ever captured, App Insights, which performs +telemetry analytics, captures information about the city +where the telemetry entries were captured by default. Users can +opt-out to prevent telemetry from being sent back to the Microsoft365DSC team by running the following command: ```powershell From cdc0d4938a5f95c5f7d68499fdb712e5a4a49a1e Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 20 Jan 2021 09:32:07 -0500 Subject: [PATCH 3/5] Initial --- CHANGELOG.md | 6 ++++++ Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce05cf345d..29d691f362 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change log for Microsoft365DSC + +# 1.21.120.1 + +* DEPENDENCIES + * Replaced the SharePointPnPPowerShellOnline dependency by the new + PnP.PowerShell core module; # 1.21.113.1 * AADTenantDetails diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 7937b3a2fe..9cb1004d96 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -100,12 +100,12 @@ RequiredVersion = "1.0.42" }, @{ - ModuleName = "ReverseDSC" - RequiredVersion = "2.0.0.7" + ModuleName = "PnP.PowerShell" + RequiredVersion = "1.1.0" }, @{ - ModuleName = "SharePointPnPPowerShellOnline" - RequiredVersion = "3.28.2012.0" + ModuleName = "ReverseDSC" + RequiredVersion = "2.0.0.7" } ) From b129a78f3fc05de966ea46bfdfdc514a04a288f8 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 20 Jan 2021 10:15:50 -0500 Subject: [PATCH 4/5] Updated MSCloudLoginAssistant --- CHANGELOG.md | 2 +- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29d691f362..745443541c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # Change log for Microsoft365DSC - # 1.21.120.1 * DEPENDENCIES + * Updated MSCloudLoginAssistant to version 1.0.44; * Replaced the SharePointPnPPowerShellOnline dependency by the new PnP.PowerShell core module; # 1.21.113.1 diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index 9cb1004d96..bba0a454ae 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2021-01-14 +# Generated on: 2021-01-20 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.21.113.1' + ModuleVersion = '1.21.120.1' # Supported PSEditions # CompatiblePSEditions = @() @@ -97,7 +97,7 @@ }, @{ ModuleName = "MSCloudLoginAssistant" - RequiredVersion = "1.0.42" + RequiredVersion = "1.0.44" }, @{ ModuleName = "PnP.PowerShell" @@ -180,12 +180,9 @@ IconUri = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true' # ReleaseNotes of this module - ReleaseNotes = "* AADRoleDefinition - * Filters out role definitions without any assigned permissions. - Fixes Issue #1007; - * DEPENDENCIES - * Updated Microsoft.PowerApps.Administration.PowerShell - to 2.0.104;" + ReleaseNotes = "* DEPENDENCIES + * Replaced the SharePointPnPPowerShellOnline dependency by the new + PnP.PowerShell core module;" # Flag to indicate whether the module requires explicit user acceptance for install/update # RequireLicenseAcceptance = $false From b1f3c3e2b2c00c1cddd264a530bde3f3f9629ba4 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 20 Jan 2021 11:51:00 -0500 Subject: [PATCH 5/5] Release 1.21.120.1 --- CHANGELOG.md | 3 ++- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 745443541c..1ace44af07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,10 @@ # 1.21.120.1 * DEPENDENCIES - * Updated MSCloudLoginAssistant to version 1.0.44; + * Updated MSCloudLoginAssistant to version 1.0.45; * Replaced the SharePointPnPPowerShellOnline dependency by the new PnP.PowerShell core module; + # 1.21.113.1 * AADTenantDetails diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index bba0a454ae..9c7b4c362c 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -97,7 +97,7 @@ }, @{ ModuleName = "MSCloudLoginAssistant" - RequiredVersion = "1.0.44" + RequiredVersion = "1.0.45" }, @{ ModuleName = "PnP.PowerShell" @@ -181,6 +181,7 @@ # ReleaseNotes of this module ReleaseNotes = "* DEPENDENCIES + * Updated MSCloudLoginAssistant to version 1.0.45; * Replaced the SharePointPnPPowerShellOnline dependency by the new PnP.PowerShell core module;"