Merge pull request #1571 from microsoft/Dev

microsoft · Nov 18, 2021 · 5768de4 · 5768de4
2 parents 8b73ecf + 7e40721
commit 5768de4
Show file tree

Hide file tree

Showing 68 changed files with 141 additions and 145 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change log for Microsoft365DSC
 
+# 1.21.1117.2
+
+* MISC
+  * Fixes old Intune Graph Request cmdlet name;
+
 # 1.21.1117.1
 
 * EXOTransportRule

diff --git a/...DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1 b/...DSC/DSCResources/MSFT_IntuneAppProtectionPolicyiOS/MSFT_IntuneAppProtectionPolicyiOS.psm1
@@ -721,7 +721,7 @@ function Get-M365DSCIntuneAppProtectionPolicyiOS
     try
     {
         $Url = "https://graph.microsoft.com/beta/deviceAppManagement/iosManagedAppProtections('$PolicyId')/`?expand=apps,assignments"
-        $response = Invoke-MSGraphRequest -HttpMethod Get `
+        $response = Invoke-MgGraphRequest -HttpMethod Get `
             -Url $Url
         return $response
     }
@@ -915,7 +915,7 @@ function New-M365DSCIntuneAppProtectionPolicyiOS
     {
         $Url = 'https://graph.microsoft.com/beta/deviceAppManagement/managedAppPolicies'
         Write-Verbose -Message "Creating new iOS App Protection policy with JSON payload: `r`n$JSONContent"
-        Invoke-MSGraphRequest -HttpMethod POST `
+        Invoke-MgGraphRequest -HttpMethod POST `
             -Url $Url `
             -Content $JSONContent `
             -Headers @{"Content-Type" = "application/json" } | Out-Null
@@ -946,7 +946,7 @@ function Set-M365DSCIntuneAppProtectionPolicyiOS
     {
         $Url = "https://graph.microsoft.com/beta/deviceAppManagement/iosManagedAppProtections('$PolicyId')/"
         Write-Verbose -Message "Creating new iOS App Protection policy with JSON payload: `r`n$JSONContent"
-        Invoke-MSGraphRequest -HttpMethod PATCH `
+        Invoke-MgGraphRequest -HttpMethod PATCH `
             -Url $Url `
             -Content $JSONContent `
             -Headers @{"Content-Type" = "application/json" } | Out-Null
@@ -977,7 +977,7 @@ function Set-M365DSCIntuneAppProtectionPolicyiOSApps
     {
         $Url = "https://graph.microsoft.com/beta/deviceAppManagement/managedAppPolicies/$PolicyId/targetApps"
         Write-Verbose -Message "Updating Apps for iOS App Protection policy with JSON payload: `r`n$JSONContent"
-        Invoke-MSGraphRequest -HttpMethod POST `
+        Invoke-MgGraphRequest -HttpMethod POST `
             -Url $Url `
             -Content $JSONContent `
             -Headers @{"Content-Type" = "application/json" } | Out-Null
@@ -1008,7 +1008,7 @@ function Set-M365DSCIntuneAppProtectionPolicyiOSAssignment
     {
         $Url = "https://graph.microsoft.com/beta/deviceAppManagement/iosManagedAppProtections('$PolicyId')/assign"
         Write-Verbose -Message "Group Assignment for iOS App Protection policy with JSON payload: `r`n$JSONContent"
-        Invoke-MSGraphRequest -HttpMethod POST `
+        Invoke-MgGraphRequest -HttpMethod POST `
             -Url $Url `
             -Content $JSONContent `
             -Headers @{"Content-Type" = "application/json" } | Out-Null

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2021-11-17
+# Generated on: 2021-11-18
 
 @{
 
     # Script module or binary module file associated with this manifest.
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion     = '1.21.1117.1'
+    ModuleVersion     = '1.21.1117.2'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -203,14 +203,17 @@
             IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
             # ReleaseNotes of this module
-            ReleaseNotes = "* EXOTransportRule
+            ReleaseNotes = "
+            * EXOTransportRule
             * Fixed issues with invalid State property and missing Enabled one;
               ISSUE #1554;
           * IntuneDeviceCompliancePolicyAndroidDeviceOwner
             * Initial release;
           * DEPENDENCIES
             * Updated DSCParser to version 1.3.0.2;
-            * Updated MSCloudLoginAssistant to version 1.0.78;"
+            * Updated MSCloudLoginAssistant to version 1.0.78;
+          * MISC
+            * Fixes old Intune Graph Request cmdlet name;"
 
             # Flag to indicate whether the module requires explicit user acceptance for install/update
             # RequireLicenseAcceptance = $false

diff --git a/Tests/Unit/Stubs/Microsoft365.psm1 b/Tests/Unit/Stubs/Microsoft365.psm1
@@ -9535,25 +9535,25 @@ function Get-Organization
         $organizationId
     )
 }
-function Invoke-MSGraphRequest
+function Invoke-MgGraphRequest
 {
     [CmdletBinding()]
     param(
         [Parameter()]
         [System.String]
-        $HttpMethod,
+        $Method,
 
         [Parameter()]
         [System.Object]
-        $Content,
+        $Body,
 
         [Parameter()]
         [System.Object]
         $Headers,
 
         [Parameter()]
         [System.String]
-        $Url
+        $Uri
     )
 }
 function New-Organization

diff --git a/docs/docs/images/Assess.png → docs/docs/Images/Assess.png b/docs/docs/images/Assess.png → docs/docs/Images/Assess.png
diff --git a/docs/docs/images/AssessFlowBlueprint.png → docs/docs/Images/AssessFlowBlueprint.png b/docs/docs/images/AssessFlowBlueprint.png → docs/docs/Images/AssessFlowBlueprint.png
diff --git a/docs/docs/images/AssessFlowTenant.png → docs/docs/Images/AssessFlowTenant.png b/docs/docs/images/AssessFlowTenant.png → docs/docs/Images/AssessFlowTenant.png
diff --git a/docs/docs/images/Automate.png → docs/docs/Images/Automate.png b/docs/docs/images/Automate.png → docs/docs/Images/Automate.png
diff --git a/docs/docs/Images/AzureAD.jpg b/docs/docs/Images/AzureAD.jpg
diff --git a/...mages/AzureAutomationTenantCompliance.jpg → ...mages/AzureAutomationTenantCompliance.jpg b/...mages/AzureAutomationTenantCompliance.jpg → ...mages/AzureAutomationTenantCompliance.jpg
diff --git a/docs/docs/images/BranchSelection.png → docs/docs/Images/BranchSelection.png b/docs/docs/images/BranchSelection.png → docs/docs/Images/BranchSelection.png
diff --git a/docs/docs/images/CloneByURL.png → docs/docs/Images/CloneByURL.png b/docs/docs/images/CloneByURL.png → docs/docs/Images/CloneByURL.png
diff --git a/docs/docs/images/CloneRepo.png → docs/docs/Images/CloneRepo.png b/docs/docs/images/CloneRepo.png → docs/docs/Images/CloneRepo.png
diff --git a/docs/docs/images/ConfirmMerge.png → docs/docs/Images/ConfirmMerge.png b/docs/docs/images/ConfirmMerge.png → docs/docs/Images/ConfirmMerge.png
diff --git a/docs/docs/images/CreateBranch.png → docs/docs/Images/CreateBranch.png b/docs/docs/images/CreateBranch.png → docs/docs/Images/CreateBranch.png
diff --git a/docs/docs/images/CreateFork.jpg → docs/docs/Images/CreateFork.jpg b/docs/docs/images/CreateFork.jpg → docs/docs/Images/CreateFork.jpg
diff --git a/docs/docs/images/CreatePRtoMainRepo.png → docs/docs/Images/CreatePRtoMainRepo.png b/docs/docs/images/CreatePRtoMainRepo.png → docs/docs/Images/CreatePRtoMainRepo.png
diff --git a/docs/docs/images/CreatingACommit.png → docs/docs/Images/CreatingACommit.png b/docs/docs/images/CreatingACommit.png → docs/docs/Images/CreatingACommit.png
diff --git a/docs/docs/images/DSCEventlog.png → docs/docs/Images/DSCEventlog.png b/docs/docs/images/DSCEventlog.png → docs/docs/Images/DSCEventlog.png
diff --git a/docs/docs/images/DeleteBranch.png → docs/docs/Images/DeleteBranch.png b/docs/docs/images/DeleteBranch.png → docs/docs/Images/DeleteBranch.png
diff --git a/docs/docs/images/DevBranch.png → docs/docs/Images/DevBranch.png b/docs/docs/images/DevBranch.png → docs/docs/Images/DevBranch.png
diff --git a/docs/docs/images/ExportUI.png → docs/docs/Images/ExportUI.png b/docs/docs/images/ExportUI.png → docs/docs/Images/ExportUI.png
diff --git a/docs/docs/images/ForkLocation.jpg → docs/docs/Images/ForkLocation.jpg b/docs/docs/images/ForkLocation.jpg → docs/docs/Images/ForkLocation.jpg
diff --git a/docs/docs/images/Forking.png → docs/docs/Images/Forking.png b/docs/docs/images/Forking.png → docs/docs/Images/Forking.png
diff --git a/docs/docs/images/GUI.png → docs/docs/Images/GUI.png b/docs/docs/images/GUI.png → docs/docs/Images/GUI.png
diff --git a/docs/docs/images/ImportModule.png → docs/docs/Images/ImportModule.png b/docs/docs/images/ImportModule.png → docs/docs/Images/ImportModule.png
diff --git a/docs/docs/Images/Intune.jpg b/docs/docs/Images/Intune.jpg
diff --git a/docs/docs/images/M365DSC-InfoGraphic.png → docs/docs/Images/M365DSC-InfoGraphic.png b/docs/docs/images/M365DSC-InfoGraphic.png → docs/docs/Images/M365DSC-InfoGraphic.png
diff --git a/docs/docs/images/M365DSCEventViewer.png → docs/docs/Images/M365DSCEventViewer.png b/docs/docs/images/M365DSCEventViewer.png → docs/docs/Images/M365DSCEventViewer.png
diff --git a/docs/docs/images/MergePR.png → docs/docs/Images/MergePR.png b/docs/docs/images/MergePR.png → docs/docs/Images/MergePR.png
diff --git a/docs/docs/images/Monitor.png → docs/docs/Images/Monitor.png b/docs/docs/images/Monitor.png → docs/docs/Images/Monitor.png
diff --git a/docs/docs/images/MonitorFlow.png → docs/docs/Images/MonitorFlow.png b/docs/docs/images/MonitorFlow.png → docs/docs/Images/MonitorFlow.png
diff --git a/docs/docs/images/NewBranchCreated.png → docs/docs/Images/NewBranchCreated.png b/docs/docs/images/NewBranchCreated.png → docs/docs/Images/NewBranchCreated.png
diff --git a/docs/docs/Images/Office365.jpg b/docs/docs/Images/Office365.jpg
diff --git a/docs/docs/Images/OneDrive.jpg b/docs/docs/Images/OneDrive.jpg
diff --git a/docs/docs/images/PRDetails.png → docs/docs/Images/PRDetails.png b/docs/docs/images/PRDetails.png → docs/docs/Images/PRDetails.png
diff --git a/docs/docs/images/PRDetailsToMainRepo.png → docs/docs/Images/PRDetailsToMainRepo.png b/docs/docs/images/PRDetailsToMainRepo.png → docs/docs/Images/PRDetailsToMainRepo.png
diff --git a/docs/docs/images/PRinGHDesktop.png → docs/docs/Images/PRinGHDesktop.png b/docs/docs/images/PRinGHDesktop.png → docs/docs/Images/PRinGHDesktop.png
diff --git a/docs/docs/Images/Planner.png b/docs/docs/Images/Planner.png
diff --git a/docs/docs/Images/PowerApps.png b/docs/docs/Images/PowerApps.png
diff --git a/docs/docs/images/Promo.png → docs/docs/Images/Promo.png b/docs/docs/images/Promo.png → docs/docs/Images/Promo.png
diff --git a/docs/docs/images/PushingChanges.png → docs/docs/Images/PushingChanges.png b/docs/docs/images/PushingChanges.png → docs/docs/Images/PushingChanges.png
diff --git a/docs/docs/images/RepoChangedFile.png → docs/docs/Images/RepoChangedFile.png b/docs/docs/images/RepoChangedFile.png → docs/docs/Images/RepoChangedFile.png
diff --git a/docs/docs/images/ReportFlow.png → docs/docs/Images/ReportFlow.png b/docs/docs/images/ReportFlow.png → docs/docs/Images/ReportFlow.png
diff --git a/docs/docs/Images/SecurityAndCompliance.png b/docs/docs/Images/SecurityAndCompliance.png
diff --git a/docs/docs/images/SelectSourceBranch.png → docs/docs/Images/SelectSourceBranch.png b/docs/docs/images/SelectSourceBranch.png → docs/docs/Images/SelectSourceBranch.png
diff --git a/docs/docs/images/SelectTargetBranch.png → docs/docs/Images/SelectTargetBranch.png b/docs/docs/images/SelectTargetBranch.png → docs/docs/Images/SelectTargetBranch.png
diff --git a/docs/docs/Images/SharePoint.jpg b/docs/docs/Images/SharePoint.jpg
diff --git a/docs/docs/images/SmallLogo.png → docs/docs/Images/SmallLogo.png b/docs/docs/images/SmallLogo.png → docs/docs/Images/SmallLogo.png
diff --git a/docs/docs/images/SuccessfulCommit.png → docs/docs/Images/SuccessfulCommit.png b/docs/docs/images/SuccessfulCommit.png → docs/docs/Images/SuccessfulCommit.png
diff --git a/docs/docs/images/SyncFlow.png → docs/docs/Images/SyncFlow.png b/docs/docs/images/SyncFlow.png → docs/docs/Images/SyncFlow.png
diff --git a/docs/docs/images/Synchronize.png → docs/docs/Images/Synchronize.png b/docs/docs/images/Synchronize.png → docs/docs/Images/Synchronize.png
diff --git a/docs/docs/Images/Teams.jpg b/docs/docs/Images/Teams.jpg
diff --git a/docs/docs/images/analyse.PNG → docs/docs/Images/analyse.PNG b/docs/docs/images/analyse.PNG → docs/docs/Images/analyse.PNG
diff --git a/docs/docs/images/blueprint.PNG → docs/docs/Images/blueprint.PNG b/docs/docs/images/blueprint.PNG → docs/docs/Images/blueprint.PNG
diff --git a/docs/docs/images/export.PNG → docs/docs/Images/export.PNG b/docs/docs/images/export.PNG → docs/docs/Images/export.PNG
diff --git a/docs/docs/images/favicon.ico → docs/docs/Images/favicon.ico b/docs/docs/images/favicon.ico → docs/docs/Images/favicon.ico
diff --git a/docs/docs/images/home_assess.png → docs/docs/Images/home_assess.png b/docs/docs/images/home_assess.png → docs/docs/Images/home_assess.png
diff --git a/docs/docs/images/home_export.png → docs/docs/Images/home_export.png b/docs/docs/images/home_export.png → docs/docs/Images/home_export.png
diff --git a/docs/docs/images/home_monitor.png → docs/docs/Images/home_monitor.png b/docs/docs/images/home_monitor.png → docs/docs/Images/home_monitor.png
diff --git a/docs/docs/images/icon.png → docs/docs/Images/icon.png b/docs/docs/images/icon.png → docs/docs/Images/icon.png
diff --git a/docs/docs/images/report.PNG → docs/docs/Images/report.PNG b/docs/docs/images/report.PNG → docs/docs/Images/report.PNG
diff --git a/docs/docs/concepts/odsp-permissions.md b/docs/docs/concepts/odsp-permissions.md
@@ -24,13 +24,13 @@ All SharePoint and OneDrive resources work with the SharePoint Admin role assign
 
 When executing the Export-M365DSCConfiguration cmdlet user name and password should be filled in the following fields:
 
-![User name and Password](../images/userpwdpng.png "Username and Password")
+![User name and Password](../Images/userpwdpng.png 'Username and Password')
 
 ## Azure AD app permissions
 
 The best option when using Microsoft365DSC with SharePoint and OneDrive is to use an Azure AD app principal. When using AAD App permission Microsoft365DSC supports 2 different scenarios, certificate path option or installing certificate and using the thumbprint. The permissions required for Azure AD applications are SharePoint Site.FullControl.All scope.
 
-![API Permissions](../images/APIPermissions.png "SharePoint Permissions")
+![API Permissions](../Images/APIPermissions.png 'SharePoint Permissions')
 
 ### Configure AzureAD app for Microsoft365DSC
 
@@ -42,7 +42,7 @@ Initialize-PnPPowerShellAuthentication -ApplicationName TestApp2 -Tenant contoso
 
 This cmdlet will open a dialog box to authenticate to Azure AD and grant admin consent once its created the AzureAD app. It will also install
 the certificate in current user store and output a PFX file in the c:\dsc directory. If you plan to use the certificate thumbprint option when using
-DSC by default the LCM runs under the system account so easiest option to install in cert store is by using [PSExec](https://docs.microsoft.com/en-us/sysinternals/downloads/psexec).  To install certificate under system account using PSExec run the following:
+DSC by default the LCM runs under the system account so easiest option to install in cert store is by using [PSExec](https://docs.microsoft.com/en-us/sysinternals/downloads/psexec). To install certificate under system account using PSExec run the following:
 
     1. .\PsExec.exe -s -i mmc.exe
     2. File add / remove snapin > Select certificates > MyUser account
@@ -52,9 +52,9 @@ DSC by default the LCM runs under the system account so easiest option to instal
 After AzureAD app is created and certificate is installed you need some additional properties before you can use with Microsoft365DSC. Login to
 Azure Active Directory and browse to the App registrations page you should see the TestApp2 app created from the script above. We need to copy the following properties:
 
-![Application Id](../images/AppId.png "Application ID")
+![Application Id](../Images/AppId.png 'Application ID')
 
-![Certificate Thumbprint](../images/CertificateThump.png "Certificate Thumbprint")
+![Certificate Thumbprint](../Images/CertificateThump.png 'Certificate Thumbprint')
 
 ### Using Certificate Thumbprint option
 
@@ -67,7 +67,7 @@ when using certificate thumbprint.
 
 From the Export-M365DSCConfiguration GUI the following fields should be used:
 
-![ExportThumprint](../images/ExportCertThumb.png "Export using thumbprint")
+![ExportThumprint](../Images/ExportCertThumb.png 'Export using thumbprint')
 
 ### Using Certificate Path option
 
@@ -81,4 +81,4 @@ would be the best solution. The following parameters are required when using cer
 
 From the Export-M365DSCConfiguration GUI the following fields should be used:
 
-![Export using Certificate Path](../images/CertPath.png){ align=center width=500 }
+![Export using Certificate Path](../Images/CertPath.png){ align=center width=500 }