Resolve remark

Author: Gijsreyn

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

@@ -60,8 +60,8 @@ function Invoke-DscCacheRefresh {
     $namedModules = [System.Collections.Generic.List[Object]]::new()
     $cacheFilePath = Join-Path $env:LocalAppData "dsc\WindowsPSAdapterCache.json"
 
-    # Reset PSModulePath to not contain empty entries
-    Set-ValidPSModulePath
+    # Repair PSModulePath to not contain empty entries
+    Repair-ValidPSModulePath
 
     if (Test-Path $cacheFilePath) {
         "Reading from Get-DscResource cache file $cacheFilePath" | Write-DscTrace
@@ -247,10 +247,10 @@ function Invoke-DscCacheRefresh {
             }
 
             $dscResourceCacheEntries.Add([dscResourceCacheEntry]@{
-                    Type            = "$moduleName/$($dscResource.Name)"
-                    DscResourceInfo = $DscResourceInfo
-                    LastWriteTimes  = $lastWriteTimes
-                })
+                Type            = "$moduleName/$($dscResource.Name)"
+                DscResourceInfo = $DscResourceInfo
+                LastWriteTimes  = $lastWriteTimes
+            })
         }
 
         if ($namedModules.Count -gt 0) {
@@ -704,15 +704,14 @@ function GetClassBasedCapabilities {
     }
 }
 
-function Set-ValidPSModulePath {
+function Repair-ValidPSModulePath {
     [CmdletBinding()]
     param()
 
     end {
         if (($env:PSModulePath -split [System.IO.Path]::PathSeparator) -contains '') {
             "Removing empty entry from PSModulePath: '$env:PSModulePath'" | Write-DscTrace -Operation Debug
-            $env:PSModulePath = ($env:PSModulePath -split [System.IO.Path]::PathSeparator | 
-                Where-Object { $_ -ne '' }) -join [System.IO.Path]::PathSeparator
+            $env:PSModulePath = [String]::Join([System.IO.Path]::PathSeparator, ($env:PSModulePath.Split([System.IO.Path]::PathSeparator, [System.StringSplitOptions]::RemoveEmptyEntries)))
         }
     }
 }