From 75c69641ff0a016d9f60b2f1985bec6e4c766116 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 26 May 2021 15:43:58 -0400 Subject: [PATCH 1/3] Fixes to schema --- .../MSFT_IntuneDeviceCompliancePolicyMacOS.schema.mof | 4 ++-- .../MSFT_IntuneDeviceCompliancePolicyWindows10.schema.mof | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.schema.mof index a5f7ea231d..b4b86bc2ba 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyMacOS/MSFT_IntuneDeviceCompliancePolicyMacOS.schema.mof @@ -10,12 +10,12 @@ class MSFT_IntuneDeviceCompliancePolicyMacOS : OMI_BaseResource [Write, Description("PasswordMinutesOfInactivityBeforeLock of the MacOS device compliance policy.")] Uint32 PasswordMinutesOfInactivityBeforeLock; [Write, Description("PasswordPreviousPasswordBlockCount of the MacOS device compliance policy.")] Uint32 PasswordPreviousPasswordBlockCount; [Write, Description("PasswordMinimumCharacterSetCount of the MacOS device compliance policy.")] Uint32 PasswordMinimumCharacterSetCount; - [Write, Description("PasswordRequiredType of the MacOS device compliance policy.")], ValueMap{"DeviceDefault","Alphanumeric","Numeric"}, Values{"DeviceDefault","Alphanumeric","Numeric"}] String PasswordRequiredType; + [Write, Description("PasswordRequiredType of the MacOS device compliance policy."), ValueMap{"DeviceDefault","Alphanumeric","Numeric"}, Values{"DeviceDefault","Alphanumeric","Numeric"}] String PasswordRequiredType; [Write, Description("OsMinimumVersion of the MacOS device compliance policy.")] String OsMinimumVersion; [Write, Description("OsMaximumVersion of the MacOS device compliance policy.")] String OsMaximumVersion; [Write, Description("SystemIntegrityProtectionEnabled of the MacOS device compliance policy.")] Boolean SystemIntegrityProtectionEnabled; [Write, Description("DeviceThreatProtectionEnabled of the MacOS device compliance policy.")] Boolean DeviceThreatProtectionEnabled; - [Write, Description("DeviceThreatProtectionRequiredSecurityLevel of the MacOS device compliance policy.")], ValueMap{"Unavailable","Secured","Low", "Medium","High","NotSet"}, Values{"Unavailable","Secured","Low", "Medium","High","NotSet"} String DeviceThreatProtectionRequiredSecurityLevel; + [Write, Description("DeviceThreatProtectionRequiredSecurityLevel of the MacOS device compliance policy."), ValueMap{"Unavailable","Secured","Low", "Medium","High","NotSet"}, Values{"Unavailable","Secured","Low", "Medium","High","NotSet"}] String DeviceThreatProtectionRequiredSecurityLevel; [Write, Description("StorageRequireEncryption of the MacOS device compliance policy.")] Boolean StorageRequireEncryption; [Write, Description("FirewallEnabled of the MacOS device compliance policy.")] Boolean FirewallEnabled; [Write, Description("FirewallBlockAllIncoming of the MacOS device compliance policy.")] Boolean FirewallBlockAllIncoming; diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.schema.mof b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.schema.mof index db5e9a4729..5d516be1d5 100644 --- a/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.schema.mof +++ b/Modules/Microsoft365DSC/DSCResources/MSFT_IntuneDeviceCompliancePolicyWindows10/MSFT_IntuneDeviceCompliancePolicyWindows10.schema.mof @@ -10,7 +10,7 @@ class MSFT_IntuneDeviceCompliancePolicyWindows10 : OMI_BaseResource [Write, Description("PasswordExpirationDays of the Windows 10 device compliance policy.")] Uint32 PasswordExpirationDays; [Write, Description("PasswordMinimumLength of the Windows 10 device compliance policy.")] Uint32 PasswordMinimumLength; [Write, Description("PasswordMinimumCharacterSetCount of the Windows 10 device compliance policy.")] Uint32 PasswordMinimumCharacterSetCount; - [Write, Description("PasswordRequiredType of the Windows 10 device compliance policy.")], ValueMap{"DeviceDefault","Alphanumeric","Numeric"}, Values{"DeviceDefault","Alphanumeric","Numeric"}] String PasswordRequiredType; + [Write, Description("PasswordRequiredType of the Windows 10 device compliance policy."), ValueMap{"DeviceDefault","Alphanumeric","Numeric"}, Values{"DeviceDefault","Alphanumeric","Numeric"}] String PasswordRequiredType; [Write, Description("PasswordPreviousPasswordBlockCount of the Windows 10 device compliance policy.")] Uint32 PasswordPreviousPasswordBlockCount; [Write, Description("RequireHealthyDeviceReport of the Windows 10 device compliance policy.")] Boolean RequireHealthyDeviceReport; [Write, Description("OsMinimumVersion of the Windows 10 device compliance policy.")] String OsMinimumVersion; @@ -30,11 +30,11 @@ class MSFT_IntuneDeviceCompliancePolicyWindows10 : OMI_BaseResource [Write, Description("AntivirusRequired of the Windows 10 device compliance policy.")] Boolean AntivirusRequired; [Write, Description("AntiSpywareRequired of the Windows 10 device compliance policy.")] Boolean AntiSpywareRequired; [Write, Description("DeviceThreatProtectionEnabled of the Windows 10 device compliance policy.")] Boolean DeviceThreatProtectionEnabled; - [Write, Description("DeviceThreatProtectionRequiredSecurityLevel of the Windows 10 device compliance policy.")], ValueMap{"Unavailable","Secured","Low", "Medium","High","NotSet"}, Values{"Unavailable","Secured","Low", "Medium","High","NotSet"} String DeviceThreatProtectionRequiredSecurityLevel; + [Write, Description("DeviceThreatProtectionRequiredSecurityLevel of the Windows 10 device compliance policy."), ValueMap{"Unavailable","Secured","Low", "Medium","High","NotSet"}, Values{"Unavailable","Secured","Low", "Medium","High","NotSet"}] String DeviceThreatProtectionRequiredSecurityLevel; [Write, Description("ConfigurationManagerComplianceRequired of the Windows 10 device compliance policy.")] Boolean ConfigurationManagerComplianceRequired; [Write, Description("TPMRequired of the Windows 10 device compliance policy.")] Boolean TPMRequired; [Write, Description("DeviceCompliancePolicyScript of the Windows 10 device compliance policy.")] String DeviceCompliancePolicyScript; - [Write, Description("ValidOperatingSystemBuildRanges of the Windows 10 device compliance policy.")] Array ValidOperatingSystemBuildRanges; + [Write, Description("ValidOperatingSystemBuildRanges of the Windows 10 device compliance policy.")] String ValidOperatingSystemBuildRanges[]; [Write, Description("Present ensures the policy exists, absent ensures it is removed."), ValueMap{"Present","Absent"}, Values{"Present","Absent"}] string Ensure; [Required, Description("Credentials of the Intune Admin"), EmbeddedInstance("MSFT_Credential")] String GlobalAdminAccount; }; From 76033338d4dcb030d08c7a17874ee75f383a9043 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 26 May 2021 15:44:22 -0400 Subject: [PATCH 2/3] Update Microsoft365DSC.psd1 --- Modules/Microsoft365DSC/Microsoft365DSC.psd1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 index bec3b32b99..227b4d17a6 100644 --- a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 +++ b/Modules/Microsoft365DSC/Microsoft365DSC.psd1 @@ -3,7 +3,7 @@ # # Generated by: Microsoft Corporation # -# Generated on: 2021-05-20 +# Generated on: 2021-05-26 @{ @@ -11,7 +11,7 @@ # RootModule = '' # Version number of this module. - ModuleVersion = '1.21.526.1' + ModuleVersion = '1.21.526.2' # Supported PSEditions # CompatiblePSEditions = @() From 03916e806d879cca8f02f68d03282a2d9e4d0b54 Mon Sep 17 00:00:00 2001 From: Nik Charlebois Date: Wed, 26 May 2021 15:44:44 -0400 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35293ed0be..fa22bea8e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # Change log for Microsoft365DSC -1.21.526.1 +1.21.526.2 * EXOSafeAttachmentRule * Fixed issue #1213 Policy X already has rule Y associated with it if rule exists already