Skip to content

Commit

Permalink
3.9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@Micke-K
Micke-K committed Apr 22, 2024
1 parent 47968b4 commit c16f85a
Show file tree
Hide file tree
Showing 57 changed files with 3,788 additions and 2,529 deletions.
2 changes: 1 addition & 1 deletion CloudAPIPowerShellManagement.psd1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
RootModule = 'CloudAPIPowerShellManagement.psm1'

# Version number of this module.
ModuleVersion = '3.9.5'
ModuleVersion = '3.9.6'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
2 changes: 2 additions & 0 deletions CloudAPIPowerShellManagement.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ function Initialize-CloudAPIManagement
$certificate
)

$PSModuleAutoloadingPreference = "none"

$global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"

[void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms")
Expand Down
39 changes: 35 additions & 4 deletions Core.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This module handles the WPF UI

function Get-ModuleVersion
{
'3.9.5'
'3.9.6'
}

function Initialize-Window
Expand Down Expand Up @@ -1535,7 +1535,7 @@ function Add-RegKeyToSettings

try
{
$keyObj = Get-Item -Path $regKey
$keyObj = Get-Item -Path $regKey -ErrorAction SilentlyContinue
foreach($keyValue in ($keyObj.GetValueNames() | Sort))
{
try
Expand Down Expand Up @@ -2463,6 +2463,7 @@ function Get-MainWindow

Add-XamlEvent $script:welcomeForm "gitHubLink" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
Add-XamlEvent $script:welcomeForm "licenseLink" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
Add-XamlEvent $script:welcomeForm "addCustomApp" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })

Add-XamlEvent $script:welcomeForm "chkAcceptConditions" "add_click" {
$global:btnAcceptConditions.IsEnabled = ($this.IsChecked -eq $true)
Expand All @@ -2471,6 +2472,7 @@ function Get-MainWindow
Add-XamlEvent $script:welcomeForm "btnAcceptConditions" "add_click" {
Save-Setting "" "LicenseAccepted" "True"
Save-Setting "" "FirstTimeRunning" "False"
Save-Setting "" "AppChangeInformed" "true"
Show-ModalObject

if($global:currentViewObject.ViewInfo.Authentication.ShowErrors)
Expand All @@ -2484,12 +2486,41 @@ function Get-MainWindow
{
$window.Close()
}
}
}

Show-ModalForm $window.Title $script:welcomeForm -HideButtons
Show-ModalForm $window.Title $script:welcomeForm -HideButtons
}
else
{
if($global:informOldAzureApp -eq $true)
{
$appIdChangeInformed = Get-Setting "" "AppChangeInformed" "false"
if($appIdChangeInformed -ne "true") {
$script:oldAzureAppForm = Get-XamlObject ($global:AppRootFolder + "\Xaml\OldAzureApp.xaml")

Add-XamlEvent $script:oldAzureAppForm "addCustomApp" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })

Add-XamlEvent $script:oldAzureAppForm "btnOK" "add_click" {
if((Get-XamlProperty $script:oldAzureAppForm "chkChangeApp" "IsChecked") -eq $true) {
Write-Log "Set default app ID to $($global:DefaultAzureApp)"
Save-Setting "EndpointManager" "EMAzureApp" $global:DefaultAzureApp
$script:azureAppChanged = $true
}

if((Get-XamlProperty $script:oldAzureAppForm "chkSkippMessage" "IsChecked") -eq $true) {
Save-Setting "" "AppChangeInformed" "true"
}
Show-ModalObject
if($script:azureAppChanged -eq $true -and $global:currentViewObject) {
[System.Windows.Forms.Application]::DoEvents()
& $global:currentViewObject.ViewInfo.Authenticate
}
}

Show-ModalForm $window.Title $script:oldAzureAppForm -HideButtons
}
}

###!!! Force login here
if($global:currentViewObject.ViewInfo.Authenticate)
{
Expand Down
Binary file modified Documentation/AppTypes.json
View file
Binary file not shown.
58 changes: 58 additions & 0 deletions Documentation/ObjectInfo/devicehealth_complianceandroiddeviceowner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,69 @@
{
"nameResourceKey": "androidPlayIntegrityVerdictBasicIntegrity",
"value": "basicIntegrity",
"children": [
{
"dataType": 16,
"category": 39,
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
"descriptionResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
"childSettings": [

],
"options": [
{
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
"value": "basic",
"enabled": true
},
{
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
"value": "hardwareBacked",
"enabled": true
}
],
"entityKey": "securityRequiredAndroidSafetyNetEvaluationType",
"booleanActions": 0,
"defaultValue": "basic",
"unconfiguredValue": "basic",
"policyType": 31,
"enabled": false
}
],
"enabled": true
},
{
"nameResourceKey": "androidPlayIntegrityVerdictBasicAndDeviceIntegrity",
"value": "basicIntegrityAndCertified",
"children": [
{
"dataType": 16,
"category": 39,
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
"descriptionResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
"childSettings": [

],
"options": [
{
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
"value": "basic",
"enabled": true
},
{
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
"value": "hardwareBacked",
"enabled": true
}
],
"entityKey": "securityRequiredAndroidSafetyNetEvaluationType",
"booleanActions": 0,
"defaultValue": "basic",
"unconfiguredValue": "basic",
"policyType": 31,
"enabled": false
}
],
"enabled": true
}
],
Expand Down
17 changes: 17 additions & 0 deletions Documentation/ObjectInfo/deviceproperties_complianceandroiddeviceowner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,23 @@
"booleanActions": 0,
"policyType": 31,
"enabled": true
},
{
"dataType": 0,
"category": 43,
"nameResourceKey": "complianceNoPendingSystemUpdatesName",
"descriptionResourceKey": "complianceNoPendingSystemUpdatesDescription",
"childSettings": [

],
"options": [

],
"entityKey": "requireNoPendingSystemUpdates",
"booleanActions": 1,
"defaultValue": false,
"policyType": 31,
"enabled": false
}
],
"options": [
Expand Down
Loading

0 comments on commit c16f85a

Please sign in to comment.