3.10.1.18

Fixed issues: 402, 403 and 404
Added support for Install/Uninstall Script on Win32 apps
Rebuilt Strings
This commit is contained in:
Mikael Karlsson
2026-03-07 14:01:52 +11:00
parent b6c94e78d5
commit 836c8a0c2e
46 changed files with 5682 additions and 736 deletions
+86 -4
View File
@@ -906,8 +906,29 @@ function Add-CDDocumentCustomProfileProperty
$retValue = $true
}
elseif($obj.'@OData.Type' -like "#microsoft.graph.iosDeviceFeaturesConfiguration")
elseif($obj.'@OData.Type' -like "#microsoft.graph.iosDeviceFeaturesConfiguration")
{
foreach($configuration in $obj.iosSingleSignOnExtension.configurations)
{
$configurationType = "notConfigured"
if($configuration."@OData.Type" -eq "#microsoft.graph.keyStringValuePair")
{
$configurationType = Get-LanguageString "SettingDetails.singleSignOnExtensionConfigurationsTypeColumnOptionString"
}
elseif($configuration."@OData.Type" -eq "#microsoft.graph.keyBooleanValuePair")
{
$configurationType = Get-LanguageString "SettingDetails.singleSignOnExtensionConfigurationsTypeColumnOptionBoolean"
}
elseif($configuration."@OData.Type" -eq "#microsoft.graph.keyIntegerValuePair")
{
$configurationType = Get-LanguageString "SettingDetails.singleSignOnExtensionConfigurationsTypeColumnOptionInteger"
}
$configuration | Add-Member Noteproperty -Name "configurationKey" -Value $configuration.key -Force
$configuration | Add-Member Noteproperty -Name "configurationValue" -Value $configuration.value -Force
$configuration | Add-Member Noteproperty -Name "configurationType" -Value $configurationType -Force
}
#singleSignOnSettings
$obj | Add-Member Noteproperty -Name "kerberosPrincipalName" -Value (?? $obj.singleSignOnSettings.kerberosPrincipalName "notConfigured") -Force
@@ -1218,6 +1239,10 @@ function Add-CDDocumentCustomProfileProperty
$returnCodes = @()
$detectionRules = @()
$requirementRules = @()
$activeScripts = @()
$activeInstallScript = $null
$activeUninstallScript = $null
foreach($rc in $obj.returnCodes)
{
$returnCodes += [PSCustomObject]@{
@@ -1246,6 +1271,46 @@ function Add-CDDocumentCustomProfileProperty
}
}
if($obj.activeInstallScript.'#ScriptInfo')
{
$scriptType = "install"
$obj.installCommandLine = $null
$installType = "Win32Program.installScript"
$activeInstallScript = [PSCustomObject]@{
scriptType = $scriptType
scriptName = $obj.activeInstallScript.'#ScriptInfo'.displayName
scriptContent = $obj.activeInstallScript.'#ScriptInfo'.ScriptContent
enforceSignatureCheck = $obj.activeInstallScript.'#ScriptInfo'.enforceSignatureCheck
runAs32Bit = $obj.activeInstallScript.'#ScriptInfo'.runAs32Bit
}
Add-ObjectScript $header ("{0} - {1}" -f @($obj.displayName,$obj.activeInstallScript.'#ScriptInfo'.displayName)) $obj.activeInstallScript.'#ScriptInfo'.content
}
else
{
$installType = "Win32Program.installCommand"
}
if($obj.activeUninstallScript.'#ScriptInfo')
{
$scriptType = "uninstall"
$obj.uninstallCommandLine = $null
$uninstallType = "Win32Program.uninstallScript"
$activeUninstallScript = [PSCustomObject]@{
scriptType = $scriptType
scriptName = $obj.activeUninstallScript.'#ScriptInfo'.displayName
scriptContent = $obj.activeUninstallScript.'#ScriptInfo'.ScriptContent
enforceSignatureCheck = $obj.activeUninstallScript.'#ScriptInfo'.enforceSignatureCheck
runAs32Bit = $obj.activeUninstallScript.'#ScriptInfo'.runAs32Bit
}
Add-ObjectScript $header ("{0} - {1}" -f @($obj.displayName,$obj.activeUninstallScript.'#ScriptInfo'.displayName)) $obj.activeUninstallScript.'#ScriptInfo'.content
}
else
{
$uninstallType = "Win32Program.uninstallCommand"
}
foreach($rule in $obj.requirementRules)
{
if($rule.'@OData.Type' -eq "#microsoft.graph.win32LobAppFileSystemRequirement")
@@ -1305,7 +1370,7 @@ function Add-CDDocumentCustomProfileProperty
$detectionRules += Add-CDDocumentDetectionRule $rule
}
}
$obj | Add-Member Noteproperty -Name "requirementRulesSummary" -Value ($requirementRulesSummary -join $objSeparator) -Force
$obj | Add-Member Noteproperty -Name "detectionRulesSummary" -Value ($detectionRulesSummary -join $objSeparator) -Force
$obj | Add-Member Noteproperty -Name "dependencyApps" -Value ($dependencyApps -join $objSeparator) -Force
@@ -1313,8 +1378,12 @@ function Add-CDDocumentCustomProfileProperty
$obj | Add-Member Noteproperty -Name "detectionRulesType" -Value $detectionRulesType -Force
$obj | Add-Member Noteproperty -Name "requirementRulesTranslated" -Value $requirementRules -Force
$obj | Add-Member Noteproperty -Name "detectionRulesTranslated" -Value $detectionRules -Force
$obj | Add-Member Noteproperty -Name "returnCodes" -Value $returnCodes -Force
$obj | Add-Member Noteproperty -Name "returnCodes" -Value $returnCodes -Force
$obj | Add-Member Noteproperty -Name "activeInstallScript" -Value $activeInstallScript -Force
$obj | Add-Member Noteproperty -Name "activeUninstallScript" -Value $activeUninstallScript -Force
$obj | Add-Member Noteproperty -Name "win10Release" -Value (Get-LanguageString "MinimumOperatingSystem.Windows.V10Release.release$($obj.minimumSupportedWindowsRelease)") -Force
$obj | Add-Member Noteproperty -Name "installerType" -Value (Get-LanguageString $installType) -Force
$obj | Add-Member Noteproperty -Name "uninstallerType" -Value (Get-LanguageString $uninstallType) -Force
}
elseif($obj.'@OData.Type' -eq "#microsoft.graph.deviceHealthScript")
{
@@ -1869,8 +1938,21 @@ function Invoke-CDDocumentAndroidManagedStoreAppConfiguration
###################################################
# Basic info
###################################################
$profileString = $null
if($obj.profileApplicability -eq "default")
{
$profileString = Get-LanguageString "ProfileType.workProfileAndDeviceOwner"
}
elseif($obj.profileApplicability -eq "androidWorkProfile")
{
$profileString = Get-LanguageString "ProfileType.workProfileOnly"
}
elseif($obj.profileApplicability -eq "androidDeviceOwner")
{
$profileString = Get-LanguageString "ProfileType.deviceOwnerOnly"
}
Add-BasicDefaultValues $obj $objectType
Add-BasicDefaultValues $obj $objectType $profileString
Add-BasicAdditionalValues $obj $objectType
#Add-BasicPropertyValue (Get-LanguageString "TableHeaders.configurationType") (Get-LanguageString "SettingDetails.appConfiguration")
#Add-BasicPropertyValue (Get-LanguageString "Inputs.enrollmentTypeLabel") (Get-LanguageString "EnrollmentType.devicesWithEnrollment")