Merge dev

microsoftgraph · Sep 10, 2021 · 857f9b4 · 857f9b4
1 parent ded3445
commit 857f9b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Authentication/Authentication/Utilities/Runtime/Cmdlets/GetScriptCmdlet.cs b/src/Authentication/Authentication/Utilities/Runtime/Cmdlets/GetScriptCmdlet.cs
@@ -49,7 +49,8 @@ protected override void ProcessRecord()
                         .Distinct();
 
                     output = aliases.DefaultIfEmpty("''").ToArray();
-                } else
+                }
+                else
                 {
                     var names = functionInfos.Select(fi => fi.Name).Distinct();
                     output = names.DefaultIfEmpty("''").ToArray();

diff --git a/src/Authentication/Authentication/custom/Find-MgGraphPermission.ps1 b/src/Authentication/Authentication/custom/Find-MgGraphPermission.ps1
@@ -2,7 +2,7 @@
 #  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 # ------------------------------------------------------------------------------
 
-Set-StrictMode -Version 6.0
+Set-StrictMode -Version 2
 
 . "$psscriptroot/common/Permissions.ps1"
 

diff --git a/src/Authentication/Authentication/custom/common/Permissions.ps1 b/src/Authentication/Authentication/custom/common/Permissions.ps1
@@ -2,7 +2,7 @@
 #  Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the MIT License.  See License in the project root for license information.
 # ------------------------------------------------------------------------------
 
-Set-StrictMode -Version 6.0
+Set-StrictMode -Version 2
 
 $Permissions_msGraphApplicationId = '00000003-0000-0000-c000-000000000000'
 
@@ -34,7 +34,7 @@ function Permissions_GetPermissionsData([bool] $online) {
     # Make a REST request to MS Graph to get the permissions data from the Microsoft Graph service principal
     if ( $online -or ! $_permissions.msGraphServicePrincipal -or ! $_permissions.isFromInvokeMgGraphRequest ) {
         try {
-            $restResult = Invoke-MgGraphRequest -method GET $_permissions.msGraphPermissionsRequestUri
+            $restResult = Invoke-MgGraphRequest -method GET -OutputType PSObject $_permissions.msGraphPermissionsRequestUri
 
             if ( $restResult ) {
                 $_permissions.msGraphServicePrincipal = $restResult | Select-Object -ExpandProperty value