Merge branch 'main' into format-function

Author: SteveL-MSFT

powershell-adapter/psDscAdapter/powershell.resource.ps1

@@ -45,6 +45,11 @@ if ($Operation -eq 'ClearCache') {
     exit 0
 }
 
+if ($PSVersionTable.PSVersion.Major -le 5) {
+    # For Windows PowerShell, we want to remove any PowerShell 7 paths from PSModulePath
+    $env:PSModulePath = ($env:PSModulePath -split ';' | Where-Object { $_ -notlike '*\powershell\*' }) -join ';'
+}
+
 if ('Validate' -ne $Operation) {
     Write-DscTrace -Operation Debug -Message "jsonInput=$jsonInput"
 

powershell-adapter/psDscAdapter/win_psDscAdapter.psm1

@@ -54,19 +54,7 @@ function Invoke-DscCacheRefresh {
 
     $refreshCache = $false
 
-    $cacheFilePath = if ($IsWindows) {
-        # PS 6+ on Windows
-        Join-Path $env:LocalAppData "dsc\PSAdapterCache.json"
-    }
-    else {
-        # either WinPS or PS 6+ on Linux/Mac
-        if ($PSVersionTable.PSVersion.Major -le 5) {
-            Join-Path $env:LocalAppData "dsc\WindowsPSAdapterCache.json"
-        }
-        else {
-            Join-Path $env:HOME ".dsc" "PSAdapterCache.json"
-        }
-    }
+    $cacheFilePath = Join-Path $env:LocalAppData "dsc\WindowsPSAdapterCache.json"
 
     if (Test-Path $cacheFilePath) {
         "Reading from Get-DscResource cache file $cacheFilePath" | Write-DscTrace