Skip to content

Commit df9b055

Browse files
NikCharleboisNikCharlebois
authored
Merge pull request #6786 from FabienTschanz/fix/android-assignments
Fix invalid property on Android app assignments
2 parents 56030fd + e5d78e0 commit df9b055

File tree

7 files changed

+39
-9
lines changed

7 files changed

+39
-9
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
due to the object depth exceeding two levels.
3838
* IntuneEpmElevationRulesPolicyWindows10
3939
* Added a throw condition if the reusable certiticate policy setting is not found.
40+
* IntuneMobileAppsManagedGooglePlayApp
41+
* Fixed an issue where `AssignmentSettings` was not a valid property.
42+
FIXES [#6785](https://github.com/microsoft/Microsoft365DSC/issues/6785)
4043
* O365OrgSettings
4144
* Added `CertificatePath` with `CertificatePassword` as an authentication method.
4245
* PPTenantIsolationSettings

‎Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsLobAppWindows10/MSFT_IntuneMobileAppsLobAppWindows10.schema.mof‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class MSFT_DeviceManagementMobileAppAssignment
1010
[Write, Description("Possible values for the install intent chosen by the admin."), ValueMap{"available", "required", "uninstall", "availableWithoutEnrollment"}, Values{"available", "required", "uninstall", "availableWithoutEnrollment"}] String intent;
1111
};
1212

13-
[ClassVersion("1.0.0.2")]
13+
[ClassVersion("1.0.0.3")]
1414
class MSFT_DeviceManagementMobileAppAssignmentSettings
1515
{
16-
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
16+
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
1717
};
1818

1919
[ClassVersion("1.0.0.0")]

‎Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsManagedGooglePlayApp/MSFT_IntuneMobileAppsManagedGooglePlayApp.psm1‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,16 @@ function Export-TargetResource
492492

493493
if ($Results.Assignments)
494494
{
495-
$complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments -CIMInstanceName DeviceManagementMobileAppAssignment
495+
$complexMapping = @(
496+
@{
497+
Name = 'AssignmentSettings'
498+
CIMInstanceName = 'DeviceManagementManagedGooglePlayMobileAppAssignmentSettings'
499+
IsRequired = $false
500+
}
501+
)
502+
$complexTypeStringResult = Get-M365DSCDRGComplexTypeToString -ComplexObject $Results.Assignments `
503+
-CIMInstanceName DeviceManagementManagedGooglePlayMobileAppAssignment `
504+
-ComplexTypeMapping $complexMapping
496505
if ($complexTypeStringResult)
497506
{
498507
$Results.Assignments = $complexTypeStringResult

‎Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsManagedGooglePlayApp/MSFT_IntuneMobileAppsManagedGooglePlayApp.schema.mof‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,24 @@ class MSFT_DeviceManagementMobileAppAssignment
1010
[Write, Description("Possible values for the install intent chosen by the admin."), ValueMap{"available", "required", "uninstall", "availableWithoutEnrollment"}, Values{"available", "required", "uninstall", "availableWithoutEnrollment"}] String intent;
1111
};
1212

13+
[ClassVersion("1.0.0.3")]
14+
class MSFT_DeviceManagementMobileAppAssignmentSettings
15+
{
16+
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
17+
};
18+
19+
[ClassVersion("1.0.0.0")]
20+
class MSFT_DeviceManagementManagedGooglePlayMobileAppAssignmentSettings : MSFT_DeviceManagementMobileAppAssignmentSettings
21+
{
22+
[Write, Description("Priority for automatic udpates for this app assignment. Possible values are: default, postponed, priority."), ValueMap{"default","postponed","priority"}, Values{"default","postponed","priority"}] String autoUpdateMode;
23+
};
24+
25+
[ClassVersion("1.0.0.0")]
26+
class MSFT_DeviceManagementManagedGooglePlayMobileAppAssignment : MSFT_DeviceManagementMobileAppAssignment
27+
{
28+
[Write, Description("The settings of the assignment."), EmbeddedInstance("MSFT_DeviceManagementManagedGooglePlayMobileAppAssignmentSettings")] String assignmentSettings;
29+
};
30+
1331
[ClassVersion("1.0.0.0"), FriendlyName("IntuneMobileAppsManagedGooglePlayApp")]
1432
class MSFT_IntuneMobileAppsManagedGooglePlayApp : OMI_BaseResource
1533
{

‎Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsMicrosoftStoreAppWindows10/MSFT_IntuneMobileAppsMicrosoftStoreAppWindows10.schema.mof‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ class MSFT_DeviceManagementWinGetMobileAppAssignmentSettingsInstallTimeSettings
2626
[Write, Description("The time at which the app should be installed.")] String deadlineDateTime;
2727
};
2828

29-
[ClassVersion("1.0.0.2")]
29+
[ClassVersion("1.0.0.3")]
3030
class MSFT_DeviceManagementMobileAppAssignmentSettings
3131
{
32-
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
32+
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
3333
};
3434

3535
[ClassVersion("1.0.0.0")]

‎Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsStoreApp/MSFT_IntuneMobileAppsStoreApp.schema.mof‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ class MSFT_DeviceManagementMobileAppAssignment
1010
[Write, Description("Possible values for the install intent chosen by the admin."), ValueMap{"available", "required", "uninstall", "availableWithoutEnrollment"}, Values{"available", "required", "uninstall", "availableWithoutEnrollment"}] String intent;
1111
};
1212

13-
[ClassVersion("1.0.0.2")]
13+
[ClassVersion("1.0.0.3")]
1414
class MSFT_DeviceManagementMobileAppAssignmentSettings
1515
{
16-
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
16+
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
1717
};
1818

1919
[ClassVersion("1.0.0.0")]

‎Modules/Microsoft365DSC/DSCResources/MSFT_IntuneMobileAppsWin32AppWindows10/MSFT_IntuneMobileAppsWin32AppWindows10.schema.mof‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class MSFT_DeviceManagementWin32MobileAppAssignmentSettingsInstallTimeSettings
3232
[Write, Description("The time at which the app should be installed.")] String deadlineDateTime;
3333
};
3434

35-
[ClassVersion("1.0.0.2")]
35+
[ClassVersion("1.0.0.3")]
3636
class MSFT_DeviceManagementMobileAppAssignmentSettings
3737
{
38-
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
38+
[Required, Description("The odata type of the assignment type."), ValueMap{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}, Values{"#microsoft.graph.androidManagedStoreAppAssignmentSettings", "#microsoft.graph.iosStoreAppAssignmentSettings", "#microsoft.graph.win32LobAppAssignmentSettings", "#microsoft.graph.winGetAppAssignmentSettings", "#microsoft.graph.windowsUniversalAppXAppAssignmentSettings"}] String odataType;
3939
};
4040

4141
[ClassVersion("1.0.0.0")]

0 commit comments

Comments
 (0)