3.9.2

Micke-K · Oct 17, 2023 · ab7b062 · ab7b062
1 parent ea3af64
commit ab7b062
Show file tree

Hide file tree

Showing 33 changed files with 6,540 additions and 4,697 deletions.
diff --git a/CS/HttpFactoryWithProxy.cs b/CS/HttpFactoryWithProxy.cs
@@ -7,7 +7,7 @@ public class HttpFactoryWithProxy : IMsalHttpClientFactory
 {
     private static HttpClient _httpClient;
 
-    public public HttpFactoryWithProxy(string proxyURI) : this(proxyURI, null, null)
+    public HttpFactoryWithProxy(string proxyURI) : this(proxyURI, null, null)
     {
 
     }

diff --git a/CloudAPIPowerShellManagement.psd1 b/CloudAPIPowerShellManagement.psd1
@@ -12,7 +12,7 @@
 RootModule = 'CloudAPIPowerShellManagement.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.9.1'
+ModuleVersion = '3.9.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/CloudAPIPowerShellManagement.psm1 b/CloudAPIPowerShellManagement.psm1
@@ -93,11 +93,20 @@ function Initialize-CloudAPIManagement
     [void] [System.Reflection.Assembly]::LoadWithPartialName("System.Windows.Forms") 
     Add-Type -AssemblyName PresentationFramework
 
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
     $global:hideUI = ($Silent -eq $true)
     $global:SilentBatchFile = $SilentBatchFile
 
+    if($tenantId)
+    {
+        $global:AzureAppId = $appId 
+        $global:ClientSecret = $secret 
+        $global:ClientCert = $certificate
+    }
+
     if($global:hideUI -ne $true)
-    {        
+    {                
         # Run with UI
         try 
         {
@@ -126,12 +135,11 @@ function Initialize-CloudAPIManagement
             Write-Error "Tenant Id is missing. Use -TenantId <Tenant-guid> on the command line to run silent batch jobs"
             return
         }
-        $global:TenantId = $tenantId 
-        $global:AzureAppId = $appId 
-        $global:ClientSecret = $secret 
-        $global:ClientCert = $certificate        
     }
 
+    $global:TenantId = $tenantId
+
+
     if($ShowConsoleWindow -ne $true)
     {
         Hide-Console

diff --git a/Core.psm1 b/Core.psm1
@@ -11,7 +11,7 @@ This module handles the WPF UI
 
 function Get-ModuleVersion
 {
-    '3.9.1'
+    '3.9.2'
 }
 
 function Initialize-Window
@@ -2770,6 +2770,67 @@ function Get-ProxyURI
     return $script:proxyURI
 }
 
+function Start-DownloadFile
+{
+    param($sourceURL, $targetFile)
+
+    Write-Log "Download file from $sourceURL"
+    if(-not $sourceURL)
+    {
+        return
+    }
+
+    if(-not $targetFile)
+    {
+        Write-Log "Target file is missing"
+        return
+    }    
+
+    [void][System.Reflection.Assembly]::LoadWithPartialName("System.Web.Extensions")
+    $wc = New-Object System.Net.WebClient
+    $wc.Encoding = [System.Text.Encoding]::UTF8
+    $proxyURI = Get-ProxyURI
+    if($proxyURI)
+    {
+        $wc.Proxy = $proxyURI
+    }
+
+    try 
+    {
+        Write-Status "Download file: `n$sourceURL"
+        $wc.DownloadFile($sourceURL, $targetFile)
+        Write-Log "File downloaded to $targetFile"
+    }
+    catch
+    {
+        Write-LogError "Failed to download file" $_.Exception
+    }
+    finally
+    {
+        $wc.Dispose()
+    }
+}
+
+function Get-ASCIIBytes
+{
+    param($String)
+
+    $bytes = [System.Text.Encoding]::ASCII.GetBytes($String)
+
+    if ($bytes[0] -eq 0x2b -and $bytes[1] -eq 0x2f -and $bytes[2] -eq 0x76) 
+    { [Text.Encoding]::UTF7.GetBytes($String) }
+    elseif ($bytes[0] -eq 0xff -and $bytes[1] -eq 0xfe) 
+    { [Text.Encoding]::Unicode.GetBytes($String) }
+    elseif ($bytes[0] -eq 0xfe -and $bytes[1] -eq 0xff) 
+    { [Text.Encoding]::BigEndianUnicode.GetBytes($String) }
+    elseif ($bytes[0] -eq 0x00 -and $bytes[1] -eq 0x00 -and $bytes[2] -eq 0xfe -and $bytes[3] -eq 0xff) 
+    { [Text.Encoding]::UTF32.GetBytes($String) }
+    elseif ($bytes[0] -eq 0xef -and $bytes[1] -eq 0xbb -and $bytes[2] -eq 0xbf) 
+    { [Text.Encoding]::UTF8.GetBytes($String) }
+
+    $bytes
+}
+
 New-Alias -Name ?? -value Invoke-Coalesce
 New-Alias -Name ?: -value Invoke-IfTrue
 Export-ModuleMember -alias * -function *
diff --git a/Documentation/ObjectInfo/#Applications.json b/Documentation/ObjectInfo/#Applications.json
@@ -1099,12 +1099,12 @@
                 "category": "SettingDetails.dependencyCategory"
             },
             {
-                "nameResourceKey":  "supersedenceCategory",
+                "nameResourceKey":  "AppRelationshipStatus.Tabs.supersedence",
                 "descriptionResourceKey":  "",
                 "entityKey":  "supersededApps",
                 "dataType":  20,
                 "booleanActions":  0,
-                "category": "SettingDetails.supersedenceCategory"
+                "category": "AppRelationshipStatus.Tabs.supersedence"
             }
         ]
     }    

diff --git a/Documentation/Strings-cs.json b/Documentation/Strings-cs.json
diff --git a/Documentation/Strings-de.json b/Documentation/Strings-de.json
diff --git a/Documentation/Strings-en.json b/Documentation/Strings-en.json
diff --git a/Documentation/Strings-es.json b/Documentation/Strings-es.json
diff --git a/Documentation/Strings-fr.json b/Documentation/Strings-fr.json
diff --git a/Documentation/Strings-hu.json b/Documentation/Strings-hu.json
diff --git a/Documentation/Strings-it.json b/Documentation/Strings-it.json
diff --git a/Documentation/Strings-ja.json b/Documentation/Strings-ja.json
diff --git a/Documentation/Strings-ko.json b/Documentation/Strings-ko.json
diff --git a/Documentation/Strings-nl.json b/Documentation/Strings-nl.json
diff --git a/Documentation/Strings-pl.json b/Documentation/Strings-pl.json
diff --git a/Documentation/Strings-pt.json b/Documentation/Strings-pt.json
diff --git a/Documentation/Strings-ru.json b/Documentation/Strings-ru.json
diff --git a/Documentation/Strings-sv.json b/Documentation/Strings-sv.json
diff --git a/Documentation/Strings-tr.json b/Documentation/Strings-tr.json
diff --git a/Documentation/Strings-zh-chs.json b/Documentation/Strings-zh-chs.json
diff --git a/Documentation/Strings-zh-cht.json b/Documentation/Strings-zh-cht.json
diff --git a/Documentation/Strings-zh-hans.json b/Documentation/Strings-zh-hans.json
diff --git a/Documentation/Strings-zh-hant.json b/Documentation/Strings-zh-hant.json
diff --git a/Documentation/Strings-zh.json b/Documentation/Strings-zh.json
diff --git a/Extensions/DocumentationCustom.psm1 b/Extensions/DocumentationCustom.psm1
@@ -10,7 +10,7 @@ This module will also document some objects based on PowerShell functions
 
 function Get-ModuleVersion
 {
-    '1.6.1'
+    '1.6.2'
 }
 
 function Invoke-InitializeModule
@@ -2744,6 +2744,28 @@ function Invoke-CDDocumentConditionalAccess
             EntityKey = "excludeDevices"
         })           
     }
+
+    if($obj.conditions.devices.deviceFilter)
+    {
+        if($obj.conditions.devices.deviceFilter.mode -eq "include") 
+        {
+            $filterMode = "included"
+        }
+        else
+        {
+            $filterMode = "included"
+        }
+
+        #AzureCA.PolicyBlade.Conditions.DeviceAttributes.AssignmentFilter.Blade
+        #AzureCA.PolicyBlade.Conditions.DeviceAttributes.Blade.title
+        Add-CustomSettingObject ([PSCustomObject]@{
+            Name = Get-LanguageString "AzureCA.PolicyBlade.Conditions.DeviceAttributes.Blade.AppliesTo.$filterMode"
+            Value = $obj.conditions.devices.deviceFilter.rule
+            Category = $category
+            SubCategory = Get-LanguageString "AzureCA.PolicyBlade.Conditions.DeviceAttributes.Blade.title"
+            EntityKey = "includeDevices"
+        })           
+    }    
 
     ###################################################
     # Grant