Skip to content

Commit c16f85a

Browse files
Micke-KMicke-K
committed
3.9.6
1 parent 47968b4 commit c16f85a

File tree

57 files changed

+3788
-2529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3788
-2529
lines changed

‎CloudAPIPowerShellManagement.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
RootModule = 'CloudAPIPowerShellManagement.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '3.9.5'
15+
ModuleVersion = '3.9.6'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()

‎CloudAPIPowerShellManagement.psm1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ function Initialize-CloudAPIManagement
8888
$certificate
8989
)
9090

91+
$PSModuleAutoloadingPreference = "none"
92+
9193
$global:wpfNS = "xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' xmlns:x='http://schemas.microsoft.com/winfx/2006/xaml'"
9294

9395
[void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms")

‎Core.psm1‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This module handles the WPF UI
1111

1212
function Get-ModuleVersion
1313
{
14-
'3.9.5'
14+
'3.9.6'
1515
}
1616

1717
function Initialize-Window
@@ -1535,7 +1535,7 @@ function Add-RegKeyToSettings
15351535

15361536
try
15371537
{
1538-
$keyObj = Get-Item -Path $regKey
1538+
$keyObj = Get-Item -Path $regKey -ErrorAction SilentlyContinue
15391539
foreach($keyValue in ($keyObj.GetValueNames() | Sort))
15401540
{
15411541
try
@@ -2463,6 +2463,7 @@ function Get-MainWindow
24632463

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

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

24762478
if($global:currentViewObject.ViewInfo.Authentication.ShowErrors)
@@ -2484,12 +2486,41 @@ function Get-MainWindow
24842486
{
24852487
$window.Close()
24862488
}
2487-
}
2489+
}
24882490

2489-
Show-ModalForm $window.Title $script:welcomeForm -HideButtons
2491+
Show-ModalForm $window.Title $script:welcomeForm -HideButtons
24902492
}
24912493
else
24922494
{
2495+
if($global:informOldAzureApp -eq $true)
2496+
{
2497+
$appIdChangeInformed = Get-Setting "" "AppChangeInformed" "false"
2498+
if($appIdChangeInformed -ne "true") {
2499+
$script:oldAzureAppForm = Get-XamlObject ($global:AppRootFolder + "\Xaml\OldAzureApp.xaml")
2500+
2501+
Add-XamlEvent $script:oldAzureAppForm "addCustomApp" "Add_RequestNavigate" ({ [System.Diagnostics.Process]::Start($_.Uri.AbsoluteUri); $_.Handled = $true })
2502+
2503+
Add-XamlEvent $script:oldAzureAppForm "btnOK" "add_click" {
2504+
if((Get-XamlProperty $script:oldAzureAppForm "chkChangeApp" "IsChecked") -eq $true) {
2505+
Write-Log "Set default app ID to $($global:DefaultAzureApp)"
2506+
Save-Setting "EndpointManager" "EMAzureApp" $global:DefaultAzureApp
2507+
$script:azureAppChanged = $true
2508+
}
2509+
2510+
if((Get-XamlProperty $script:oldAzureAppForm "chkSkippMessage" "IsChecked") -eq $true) {
2511+
Save-Setting "" "AppChangeInformed" "true"
2512+
}
2513+
Show-ModalObject
2514+
if($script:azureAppChanged -eq $true -and $global:currentViewObject) {
2515+
[System.Windows.Forms.Application]::DoEvents()
2516+
& $global:currentViewObject.ViewInfo.Authenticate
2517+
}
2518+
}
2519+
2520+
Show-ModalForm $window.Title $script:oldAzureAppForm -HideButtons
2521+
}
2522+
}
2523+
24932524
###!!! Force login here
24942525
if($global:currentViewObject.ViewInfo.Authenticate)
24952526
{

‎Documentation/AppTypes.json‎

-6.94 KB
Binary file not shown.

‎Documentation/ObjectInfo/devicehealth_complianceandroiddeviceowner.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,69 @@
6666
{
6767
"nameResourceKey": "androidPlayIntegrityVerdictBasicIntegrity",
6868
"value": "basicIntegrity",
69+
"children": [
70+
{
71+
"dataType": 16,
72+
"category": 39,
73+
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
74+
"descriptionResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
75+
"childSettings": [
76+
77+
],
78+
"options": [
79+
{
80+
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
81+
"value": "basic",
82+
"enabled": true
83+
},
84+
{
85+
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
86+
"value": "hardwareBacked",
87+
"enabled": true
88+
}
89+
],
90+
"entityKey": "securityRequiredAndroidSafetyNetEvaluationType",
91+
"booleanActions": 0,
92+
"defaultValue": "basic",
93+
"unconfiguredValue": "basic",
94+
"policyType": 31,
95+
"enabled": false
96+
}
97+
],
6998
"enabled": true
7099
},
71100
{
72101
"nameResourceKey": "androidPlayIntegrityVerdictBasicAndDeviceIntegrity",
73102
"value": "basicIntegrityAndCertified",
103+
"children": [
104+
{
105+
"dataType": 16,
106+
"category": 39,
107+
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeName",
108+
"descriptionResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeDescription",
109+
"childSettings": [
110+
111+
],
112+
"options": [
113+
{
114+
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeBasic",
115+
"value": "basic",
116+
"enabled": true
117+
},
118+
{
119+
"nameResourceKey": "requiredAndroidPlayIntegrityVerdictEvaluationTypeHardwareBacked",
120+
"value": "hardwareBacked",
121+
"enabled": true
122+
}
123+
],
124+
"entityKey": "securityRequiredAndroidSafetyNetEvaluationType",
125+
"booleanActions": 0,
126+
"defaultValue": "basic",
127+
"unconfiguredValue": "basic",
128+
"policyType": 31,
129+
"enabled": false
130+
}
131+
],
74132
"enabled": true
75133
}
76134
],

‎Documentation/ObjectInfo/deviceproperties_complianceandroiddeviceowner.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,23 @@
5353
"booleanActions": 0,
5454
"policyType": 31,
5555
"enabled": true
56+
},
57+
{
58+
"dataType": 0,
59+
"category": 43,
60+
"nameResourceKey": "complianceNoPendingSystemUpdatesName",
61+
"descriptionResourceKey": "complianceNoPendingSystemUpdatesDescription",
62+
"childSettings": [
63+
64+
],
65+
"options": [
66+
67+
],
68+
"entityKey": "requireNoPendingSystemUpdates",
69+
"booleanActions": 1,
70+
"defaultValue": false,
71+
"policyType": 31,
72+
"enabled": false
5673
}
5774
],
5875
"options": [

0 commit comments

Comments
 (0)