Merge branch 'Dev' into Fix-for-issue-microsoft#5589

dannyKBjj · Jan 9, 2025 · d365aca · d365aca
2 parents 29bb9f6 + b51f980
commit d365aca
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change log for Microsoft365DSC
 
 # UNRELEASED
+* IntuneAppProtectionPolicyiOS
+  * Fixes [#5589] https://github.com/microsoft/Microsoft365DSC/issues/5589
+
+# 1.25.108.1
 
 * AADAuthenticationRequirement
   * Changed Export logic to extract instances from all users.
@@ -14,6 +18,13 @@
 * MISC
   * DEFENDER
     * Added support for the UseBasicParsing paramter for REST calls.
+  * Added check to `New-M365DSCReportFromConfiguration` to make sure Windows
+    Remoting is enabled, which is required to convert the DSC config.
+  * Defender
+    * Added support for the UseBasicParsing parameter for REST calls.
+
+# 1.24.1218.1
+
 * AADApplication
   * Added support for Oauth2PermissionScopes.
   * Fixes comparison issue for permissions.

diff --git a/Modules/Microsoft365DSC/Microsoft365DSC.psd1 b/Modules/Microsoft365DSC/Microsoft365DSC.psd1
@@ -3,15 +3,15 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 2024-12-18
+# Generated on: 2025-01-08
 
 @{
 
   # Script module or binary module file associated with this manifest.
   # RootModule = ''
 
   # Version number of this module.
-  ModuleVersion     = '1.24.1218.1'
+  ModuleVersion     = '1.25.108.1'
 
   # Supported PSEditions
   # CompatiblePSEditions = @()
@@ -147,25 +147,20 @@
       IconUri      = 'https://github.com/microsoft/Microsoft365DSC/blob/Dev/Modules/Microsoft365DSC/Dependencies/Images/Logo.png?raw=true'
 
       # ReleaseNotes of this module
-      ReleaseNotes = '* AADApplication
-  * Added support for Oauth2PermissionScopes.
-  * Fixes comparison issue for permissions.
-* EXOTransportRule
-  * Fixes issue extracting arrays in Get-TargetResource.
-    * FIXES [#5575](https://github.com/microsoft/Microsoft365DSC/issues/5575)
-* TeamsMeetingPolicy
-  * Adds support for additional Copilot setting value.
-    * FIXES [#5573](https://github.com/microsoft/Microsoft365DSC/issues/5573)
-  * FIXES [#5550](https://github.com/microsoft/Microsoft365DSC/issues/5550)
+      ReleaseNotes = '* AADAuthenticationRequirement
+  * Changed Export logic to extract instances from all users.
+* AADOrganizationCertificateBasedAuthConfiguration
+  * Fixed the primary key of the resource.
+    FIXES [#5523](https://github.com/microsoft/Microsoft365DSC/issues/5523)
+* AADRoleEligibilityScheduleRequest
+  * Fixed error when extracting an entry with a deleted principal.
+* DefenderDeviceAuthenticatedScanDefinition
+  * Fixed the Data Type export.
 * MISC
-  * Fixed the Fabric web request to use basic parsing.
-  * Reset only necessary authentication context.
-* M365DSCUtil
-  * Update `Get-M365DSCWorkloadsListFromResourceNames` function for more input types.
-    FIXES [#5525](https://github.com/microsoft/Microsoft365DSC/issues/5525)
-* DEPENDENCIES
-  * Updated Microsoft.PowerApps.Administration.PowerShell to version 2.0.202.
-  * Updated MSCloudLoginAssistant to version 1.1.31.'
+  * Added check to `New-M365DSCReportFromConfiguration` to make sure Windows
+    Remoting is enabled, which is required to convert the DSC config.
+  * Defender
+    * Added support for the UseBasicParsing parameter for REST calls.'
 
       # Flag to indicate whether the module requires explicit user acceptance for install/update
       # RequireLicenseAcceptance = $false

diff --git a/Modules/Microsoft365DSC/Modules/M365DSCReport.psm1 b/Modules/Microsoft365DSC/Modules/M365DSCReport.psm1
@@ -722,22 +722,29 @@ function New-M365DSCReportFromConfiguration
     }
     process # required with DynamicParam
     {
-
+        # Test if Windows Remoting is enabled, which is needed to run this function.
+        $result = Test-WSMan -ErrorAction SilentlyContinue
+        if ($null -eq $result)
+        {
+            Write-Error -Message 'Windows Remoting is NOT configured yet. Please configure Windows Remoting (by running `Enable-PSRemoting -SkipNetworkProfileCheck`) before running this function.'
+            return
+        }
+
         # Validate that the latest version of the module is installed.
         Test-M365DSCModuleValidity
-    
+
         #Ensure the proper dependencies are installed in the current environment.
         Confirm-M365DSCDependencies
-    
+
         #region Telemetry
         $data = [System.Collections.Generic.Dictionary[[String], [String]]]::new()
         $data.Add('Event', 'Report')
         $data.Add('Type', $Type)
         Add-M365DSCTelemetryEvent -Data $data -Type 'NewReport'
         #endregion
-    
+
         [Array] $parsedContent = Initialize-M365DSCReporting -ConfigurationPath $ConfigurationPath
-    
+
         if ($null -ne $parsedContent)
         {
             switch ($Type)