Merge pull request #5653 from ykuijs/Dev

[SPOSharingSettings] Fix returned type in Get method
microsoft · Jan 21, 2025 · 3174bc3 · 3174bc3
2 parents a97ee35 + 1c8ec33
commit 3174bc3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,13 +2,6 @@
 
 # UNRELEASED
 
-* M365DSCUtil
-  * In `Test-M365DSCParameterState` try to replace the line endings before
-    making the comparison otherwise it may fail as it did for a few resources
-    FIXES [#5648](https://github.com/microsoft/Microsoft365DSC/issues/5648)
-* IntuneAppProtectionPolicyiOS
-  * FIXES [#5589](https://github.com/microsoft/Microsoft365DSC/issues/5589)
-
 * AADConditionalAccessPolicy
   * Fixed DisableResilienceDefaults result
   * Add DisableResilienceDefaults false szenario
@@ -23,11 +16,23 @@
   * Added support for the AllowGetOneLakeUDK, AllowMountDfCreation, AllowOneLakeUDK,
     ArtifactOrgAppPreview properties.
   * Fix values that have a zero length whitespace character.
+* IntuneAppProtectionPolicyiOS
+  * Fixes [#5589] https://github.com/microsoft/Microsoft365DSC/issues/5589
+* SPOSPOBrowserIdleSignout
+  * Corrected export types where the schema expected a String, but received a different type
+    FIXES [#5648](https://github.com/microsoft/Microsoft365DSC/issues/5648)
+* SPOSharingSettings
+  * Corrected export types where the schema expected a String, but received a different type
+    FIXES [#5648](https://github.com/microsoft/Microsoft365DSC/issues/5648)
 * M365DSCReport
   * Fix missing delimiter when called without the parameter.
     FIXES [#5634](https://github.com/microsoft/Microsoft365DSC/issues/5634)
 * M365DSCTelemetryEngine
   * Report LCM details only if running as administrator.
+* M365DSCUtil
+  * In `Test-M365DSCParameterState` try to replace the line endings before
+    making the comparison otherwise it may fail as it did for a few resources
+    FIXES [#5648](https://github.com/microsoft/Microsoft365DSC/issues/5648)
 * MISC
   * Export Performance Improvements
     Implements the changes described in [#5615](https://github.com/microsoft/Microsoft365DSC/issues/5615)

diff --git a/...s/Microsoft365DSC/DSCResources/MSFT_SPOBrowserIdleSignout/MSFT_SPOBrowserIdleSignout.psm1 b/...s/Microsoft365DSC/DSCResources/MSFT_SPOBrowserIdleSignout/MSFT_SPOBrowserIdleSignout.psm1
@@ -88,8 +88,8 @@ function Get-TargetResource
         return @{
             IsSingleInstance      = 'Yes'
             Enabled               = $BrowserIdleSignout.Enabled
-            SignOutAfter          = $BrowserIdleSignout.SignOutAfter
-            WarnAfter             = $BrowserIdleSignout.WarnAfter
+            SignOutAfter          = $BrowserIdleSignout.SignOutAfter.ToString()
+            WarnAfter             = $BrowserIdleSignout.WarnAfter.ToString()
             Credential            = $Credential
             ApplicationId         = $ApplicationId
             TenantId              = $TenantId

diff --git a/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1 b/Modules/Microsoft365DSC/DSCResources/MSFT_SPOSharingSettings/MSFT_SPOSharingSettings.psm1
@@ -200,7 +200,7 @@ function Get-TargetResource
         }
         $results = @{
             IsSingleInstance                         = 'Yes'
-            SharingCapability                        = $SPOSharingSettings.SharingCapability
+            SharingCapability                        = $SPOSharingSettings.SharingCapability.ToString()
             ShowEveryoneClaim                        = $SPOSharingSettings.ShowEveryoneClaim
             ShowAllUsersClaim                        = $SPOSharingSettings.ShowAllUsersClaim
             ShowEveryoneExceptExternalUsersClaim     = $SPOSharingSettings.ShowEveryoneExceptExternalUsersClaim
@@ -213,12 +213,12 @@ function Get-TargetResource
             ExternalUserExpirationRequired           = $SPOSharingSettings.ExternalUserExpirationRequired
             SharingAllowedDomainList                 = $allowDomains
             SharingBlockedDomainList                 = $blockDomains
-            SharingDomainRestrictionMode             = $SPOSharingSettings.SharingDomainRestrictionMode
-            DefaultSharingLinkType                   = $SPOSharingSettings.DefaultSharingLinkType
+            SharingDomainRestrictionMode             = $SPOSharingSettings.SharingDomainRestrictionMode.ToString()
+            DefaultSharingLinkType                   = $SPOSharingSettings.DefaultSharingLinkType.ToString()
             PreventExternalUsersFromResharing        = $SPOSharingSettings.PreventExternalUsersFromResharing
             ShowPeoplePickerSuggestionsForGuestUsers = $SPOSharingSettings.ShowPeoplePickerSuggestionsForGuestUsers
-            FileAnonymousLinkType                    = $SPOSharingSettings.FileAnonymousLinkType
-            FolderAnonymousLinkType                  = $SPOSharingSettings.FolderAnonymousLinkType
+            FileAnonymousLinkType                    = $SPOSharingSettings.FileAnonymousLinkType.ToString()
+            FolderAnonymousLinkType                  = $SPOSharingSettings.FolderAnonymousLinkType.ToString()
             NotifyOwnersWhenItemsReshared            = $SPOSharingSettings.NotifyOwnersWhenItemsReshared
             DefaultLinkPermission                    = $DefaultLinkPermission