Improved legacy OS compatibility

akunzai · Feb 1, 2023 · f466495 · f466495
1 parent f754062
commit f466495
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ git pull
 Sample output
 
 ````markdown
-# Windows Secure Auditor: 0.13.4
+# Windows Secure Auditor: 0.13.5
 
 ## System Information
 

diff --git a/README.zh-TW.md b/README.zh-TW.md
@@ -50,7 +50,7 @@ git pull
 範例輸出
 
 ````markdown
-# Windows Secure Auditor: 0.13.4
+# Windows Secure Auditor: 0.13.5
 
 ## 系統資訊
 

diff --git a/SecureAuditor.psd1 b/SecureAuditor.psd1
@@ -6,7 +6,7 @@
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion          = '0.13.4'
+    ModuleVersion          = '0.13.5'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

diff --git a/rules/DiskSpace.psm1 b/rules/DiskSpace.psm1
@@ -13,6 +13,11 @@ if ($PSUICulture -ne 'en-US') {
 }
 
 function Test($config) {
+    if (-not (Get-Command 'Get-PSDrive' -ErrorAction SilentlyContinue)) {
+        $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
+        Write-UnsupportedPlatform($ruleName)
+        return
+    }
     # https://learn.microsoft.com/powershell/module/microsoft.powershell.management/get-psdrive
     $drives = Get-PSDrive -PSProvider FileSystem | Where-Object { $null -ne $_.Used -and $_.Used -gt 0 }
     $exclude = $config.DiskSpace.Exclude

diff --git a/rules/LocalUser/DefaultAccount.psm1 b/rules/LocalUser/DefaultAccount.psm1
@@ -12,7 +12,7 @@ if ($PSUICulture -ne 'en-US') {
 }
 
 function Test($config) {
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-LocalUser' -ErrorAction SilentlyContinue)) {
         $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
         Write-UnsupportedPlatform($ruleName)
         return

diff --git a/rules/LocalUser/IdleAccount.psm1 b/rules/LocalUser/IdleAccount.psm1
@@ -11,7 +11,7 @@ if ($PSUICulture -ne 'en-US') {
 }
 
 function Test($config) {
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-LocalUser' -ErrorAction SilentlyContinue)) {
         $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
         Write-UnsupportedPlatform($ruleName)
         return

diff --git a/rules/LocalUser/PasswordExpires.psm1 b/rules/LocalUser/PasswordExpires.psm1
@@ -11,7 +11,7 @@ if ($PSUICulture -ne 'en-US') {
 }
 
 function Test($config) {
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-LocalUser' -ErrorAction SilentlyContinue)) {
         $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
         Write-UnsupportedPlatform($ruleName)
         return

diff --git a/rules/WinEvent/EventLogs.psm1 b/rules/WinEvent/EventLogs.psm1
@@ -17,7 +17,7 @@ if ($PSUICulture -ne 'en-US') {
 
 function Test($config) {
     $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-WinEvent' -ErrorAction SilentlyContinue)) {
         Write-UnsupportedPlatform($ruleName)
         return
     }

diff --git a/rules/WinEvent/Login.psm1 b/rules/WinEvent/Login.psm1
@@ -14,7 +14,7 @@ if ($PSUICulture -ne 'en-US') {
 
 function Test($config) {
     $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-WinEvent' -ErrorAction SilentlyContinue)) {
         Write-UnsupportedPlatform($ruleName)
         return
     }

diff --git a/rules/WinEvent/Shutdown.psm1 b/rules/WinEvent/Shutdown.psm1
@@ -11,7 +11,7 @@ if ($PSUICulture -ne 'en-US') {
 
 function Test($config) {
     $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-WinEvent' -ErrorAction SilentlyContinue)) {
         Write-UnsupportedPlatform($ruleName)
         return
     }

diff --git a/rules/WinEvent/SoftwareInstallation.psm1 b/rules/WinEvent/SoftwareInstallation.psm1
@@ -11,7 +11,7 @@ if ($PSUICulture -ne 'en-US') {
 
 function Test($config) {
     $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-WinEvent' -ErrorAction SilentlyContinue)) {
         Write-UnsupportedPlatform($ruleName)
         return
     }

diff --git a/rules/WinEvent/UserAccountManagement.psm1 b/rules/WinEvent/UserAccountManagement.psm1
@@ -13,7 +13,7 @@ if ($PSUICulture -ne 'en-US') {
 
 function Test($config) {
     $ruleName = [System.IO.Path]::GetFileNameWithoutExtension($PSCommandPath)
-    if ($PSVersionTable.PSEdition -eq 'Core' -and $PSVersionTable.Platform -ne 'Win32NT') {
+    if (-not (Get-Command 'Get-WinEvent' -ErrorAction SilentlyContinue)) {
         Write-UnsupportedPlatform($ruleName)
         return
     }