Skip to content

Commit

Permalink
Merge branch 'Dev' into fix3869
Browse files Browse the repository at this point in the history
  • Loading branch information
@ykuijs
ykuijs authored Nov 13, 2023
2 parents 8796b5b + 70f2c0a commit 25033b6
Show file tree
Hide file tree
Showing 13 changed files with 43 additions and 41 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
FIXES [#3582](https://github.com/microsoft/Microsoft365DSC/issues/3582)
* MISC
* Added a QA check to test if all used subclasses actually exist in the MOF schema.
* DEPENDENCIES
* Updated Microsoft. Graph dependencies to version 2.9.0.

# 1.23.1108.1

Expand Down
4 changes: 2 additions & 2 deletions ...ionPolicy/MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.schema.mof
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ClassVersion("1.0.0.0")]
class MSFT_DeviceManagementConfigurationPolicyAssignments
class MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments
{
[Write, Description("The type of the target assignment."), ValueMap{"#microsoft.graph.groupAssignmentTarget","#microsoft.graph.allLicensedUsersAssignmentTarget","#microsoft.graph.allDevicesAssignmentTarget","#microsoft.graph.exclusionGroupAssignmentTarget","#microsoft.graph.configurationManagerCollectionAssignmentTarget"}, Values{"#microsoft.graph.groupAssignmentTarget","#microsoft.graph.allLicensedUsersAssignmentTarget","#microsoft.graph.allDevicesAssignmentTarget","#microsoft.graph.exclusionGroupAssignmentTarget","#microsoft.graph.configurationManagerCollectionAssignmentTarget"}] String dataType;
[Write, Description("The type of filter of the target assignment i.e. Exclude or Include. Possible values are:none, include, exclude."), ValueMap{"none","include","exclude"}, Values{"none","include","exclude"}] String deviceAndAppManagementAssignmentFilterType;
Expand All @@ -14,7 +14,7 @@ class MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy : OMI
[Key, Description("Identity of the account protection local administrator password solution policy.")] String Identity;
[Required, Description("Display name of the account protection local administrator password solution policy.")] String DisplayName;
[Write, Description("Description of the account protection local administrator password solution policy.")] String Description;
[Write, Description("Assignments of the account protection local administrator password solution policy."), EmbeddedInstance("MSFT_DeviceManagementConfigurationPolicyAssignments")] String Assignments[];
[Write, Description("Assignments of the account protection local administrator password solution policy."), EmbeddedInstance("MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments")] String Assignments[];
[Write, Description("Configures which directory the local admin account password is backed up to. 0 - Disabled, 1 - Azure AD, 2 - AD"), ValueMap{"0", "1", "2"}, Values{"0", "1", "2"}] UInt32 BackupDirectory;
[Write, Description("Configures the maximum password age of the managed local administrator account for Azure AD. Minimum - 7, Maximum - 365")] UInt32 PasswordAgeDays_AAD;
[Write, Description("Configures the maximum password age of the managed local administrator account for Active Directory. Minimum - 1, Maximum - 365")] UInt32 PasswordAgeDays;
Expand Down
Binary file modified ...oupMembershipPolicy/MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicy.schema.mof
View file
Binary file not shown.
Binary file modified ...esources/MSFT_IntuneAccountProtectionPolicy/MSFT_IntuneAccountProtectionPolicy.schema.mof
View file
Binary file not shown.
34 changes: 17 additions & 17 deletions Modules/Microsoft365DSC/Dependencies/Manifest.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,71 +10,71 @@
},
@{
ModuleName = 'Microsoft.Graph.Applications'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Authentication'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.DeviceManagement'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.Devices.CorporateManagement'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.DeviceManagement.Administration'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.DeviceManagement.Enrollment'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.Identity.DirectoryManagement'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.Identity.Governance'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.Identity.SignIns'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.Reports'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.Teams'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.DeviceManagement.Administration'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Beta.DirectoryObjects'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Groups'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Planner'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Users'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.Graph.Users.Actions'
RequiredVersion = '2.8.0'
RequiredVersion = '2.9.0'
},
@{
ModuleName = 'Microsoft.PowerApps.Administration.PowerShell'
Expand Down
2 changes: 1 addition & 1 deletion ...tionPolicy/1-ConfigureIntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Configuration Example
Ensure = "Present";
Credential = $credsGlobalAdmin
Assignments = @(
MSFT_DeviceManagementConfigurationPolicyAssignments{
MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments{
deviceAndAppManagementAssignmentFilterType = 'none'
dataType = '#microsoft.graph.allLicensedUsersAssignmentTarget'
}
Expand Down
2 changes: 1 addition & 1 deletion ...roupMembershipPolicy/1-ConfigureIntuneAccountProtectionLocalUserGroupMembershipPolicy.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Configuration Example
Ensure = "Present";
Credential = $credsGlobalAdmin
Assignments = @(
MSFT_DeviceManagementConfigurationPolicyAssignments{
MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments{
deviceAndAppManagementAssignmentFilterType = 'none'
dataType = '#microsoft.graph.allLicensedUsersAssignmentTarget'
}
Expand Down
8 changes: 4 additions & 4 deletions ...Microsoft365DSC.IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.Tests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = @(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
CollectionId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
} -ClientOnly)
Expand Down Expand Up @@ -121,7 +121,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = [CimInstance[]]@(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
CollectionId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
} -ClientOnly)
Expand Down Expand Up @@ -189,7 +189,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Ensure = 'Present'
Identity = '619bd4a4-3b3b-4441-bd6f-3f4c0c444870'
Assignments = [CimInstance[]]@(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
CollectionId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
} -ClientOnly)
Expand Down Expand Up @@ -236,7 +236,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = @(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
CollectionId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
} -ClientOnly)
Expand Down
8 changes: 4 additions & 4 deletions ...oft365DSC/Microsoft365DSC.IntuneAccountProtectionLocalUserGroupMembershipPolicy.Tests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = @(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
DeviceAndAppManagementAssignmentFilterType = 'none'
GroupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down Expand Up @@ -113,7 +113,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = [CimInstance[]]@(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
DeviceAndAppManagementAssignmentFilterType = 'none'
GroupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down Expand Up @@ -238,7 +238,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Ensure = 'Present'
Identity = '619bd4a4-3b3b-4441-bd6f-3f4c0c444870'
Assignments = [CimInstance[]]@(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
DeviceAndAppManagementAssignmentFilterType = 'none'
GroupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down Expand Up @@ -342,7 +342,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = @(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
DeviceAndAppManagementAssignmentFilterType = 'none'
GroupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down
8 changes: 4 additions & 4 deletions Tests/Unit/Microsoft365DSC/Microsoft365DSC.IntuneAccountProtectionPolicy.Tests.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = @(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
deviceAndAppManagementAssignmentFilterType = 'none'
groupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down Expand Up @@ -131,7 +131,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = [CimInstance[]]@(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
deviceAndAppManagementAssignmentFilterType = 'none'
groupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down Expand Up @@ -194,7 +194,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
Ensure = 'Present'
Identity = '619bd4a4-3b3b-4441-bd6f-3f4c0c444870'
Assignments = [CimInstance[]]@(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
deviceAndAppManagementAssignmentFilterType = 'none'
GroupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down Expand Up @@ -232,7 +232,7 @@ Describe -Name $Global:DscHelper.DescribeHeader -Fixture {
BeforeAll {
$testParams = @{
Assignments = @(
(New-CimInstance -ClassName MSFT_DeviceManagementConfigurationPolicyAssignments -Property @{
(New-CimInstance -ClassName MSFT_IntuneAccountProtectionPolicyAssignments -Property @{
DataType = '#microsoft.graph.exclusionGroupAssignmentTarget'
deviceAndAppManagementAssignmentFilterType = 'none'
GroupId = '26d60dd1-fab6-47bf-8656-358194c1a49d'
Expand Down
6 changes: 3 additions & 3 deletions ...urces/intune/IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicy.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
| **Identity** | Key | String | Identity of the account protection local administrator password solution policy. | |
| **DisplayName** | Required | String | Display name of the account protection local administrator password solution policy. | |
| **Description** | Write | String | Description of the account protection local administrator password solution policy. | |
| **Assignments** | Write | MSFT_DeviceManagementConfigurationPolicyAssignments[] | Assignments of the account protection local administrator password solution policy. | |
| **Assignments** | Write | MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments[] | Assignments of the account protection local administrator password solution policy. | |
| **BackupDirectory** | Write | UInt32 | Configures which directory the local admin account password is backed up to. 0 - Disabled, 1 - Azure AD, 2 - AD | `0`, `1`, `2` |
| **PasswordAgeDays_AAD** | Write | UInt32 | Configures the maximum password age of the managed local administrator account for Azure AD. Minimum - 7, Maximum - 365 | |
| **PasswordAgeDays** | Write | UInt32 | Configures the maximum password age of the managed local administrator account for Active Directory. Minimum - 1, Maximum - 365 | |
Expand All @@ -28,7 +28,7 @@
| **CertificateThumbprint** | Write | String | Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication. | |
| **ManagedIdentity** | Write | Boolean | Managed ID being used for authentication. | |

### MSFT_DeviceManagementConfigurationPolicyAssignments
### MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments

#### Parameters

Expand Down Expand Up @@ -98,7 +98,7 @@ Configuration Example
Ensure = "Present";
Credential = $credsGlobalAdmin
Assignments = @(
MSFT_DeviceManagementConfigurationPolicyAssignments{
MSFT_IntuneAccountProtectionLocalAdministratorPasswordSolutionPolicyAssignments{
deviceAndAppManagementAssignmentFilterType = 'none'
dataType = '#microsoft.graph.allLicensedUsersAssignmentTarget'
}
Expand Down
6 changes: 3 additions & 3 deletions .../docs/resources/intune/IntuneAccountProtectionLocalUserGroupMembershipPolicy.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
| **Identity** | Key | String | Identity of the account protection policy. | |
| **DisplayName** | Required | String | Display name of the account protection rules policy. | |
| **Description** | Write | String | Description of the account protection rules policy. | |
| **Assignments** | Write | MSFT_DeviceManagementConfigurationPolicyAssignments[] | Assignments of the Intune Policy. | |
| **Assignments** | Write | MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments[] | Assignments of the Intune Policy. | |
| **LocalUserGroupCollection** | Write | MSFT_IntuneAccountProtectionLocalUserGroupCollection[] | Local User Group Collections of the Intune Policy. | |
| **Ensure** | Write | String | Present ensures the site collection exists, absent ensures it is removed | `Present`, `Absent` |
| **Credential** | Write | PSCredential | Credentials of the Intune Admin | |
Expand All @@ -17,7 +17,7 @@
| **CertificateThumbprint** | Write | String | Thumbprint of the Azure Active Directory application's authentication certificate to use for authentication. | |
| **ManagedIdentity** | Write | Boolean | Managed ID being used for authentication. | |

### MSFT_DeviceManagementConfigurationPolicyAssignments
### MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments

#### Parameters

Expand Down Expand Up @@ -99,7 +99,7 @@ Configuration Example
Ensure = "Present";
Credential = $credsGlobalAdmin
Assignments = @(
MSFT_DeviceManagementConfigurationPolicyAssignments{
MSFT_IntuneAccountProtectionLocalUserGroupMembershipPolicyAssignments{
deviceAndAppManagementAssignmentFilterType = 'none'
dataType = '#microsoft.graph.allLicensedUsersAssignmentTarget'
}
Expand Down
Loading

0 comments on commit 25033b6

Please sign in to comment.