Skip to content

Commit

Permalink
Merge pull request #1240 from NikCharlebois/Dev
Browse files Browse the repository at this point in the history
Release 1.21.526.2
  • Loading branch information
NikCharlebois authored May 26, 2021
2 parents 3046477 + 03916e8 commit 442d887
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
};
4 changes: 2 additions & 2 deletions Modules/Microsoft365DSC/Microsoft365DSC.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 2021-05-20
# Generated on: 2021-05-26

@{

# Script module or binary module file associated with this manifest.
# RootModule = ''

# Version number of this module.
ModuleVersion = '1.21.526.1'
ModuleVersion = '1.21.526.2'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down

0 comments on commit 442d887

Please sign in to comment.