Merge branch 'master' of https://github.com/microsoft/shell-intune-samples

Author: theneiljohnson

Linux/WSL/IntuneWSLPluginInstaller/README.md

@@ -1,5 +1,5 @@
-# WSL Management Custom Compliance 
+# WSL Management Custom Compliance (Preview)
 
 This is the Intune WSL plugin installer and custom compliance script that can be used to manage WSL distros through [Windows Custom Compliance Policies and Settings](https://learn.microsoft.com/en-us/mem/intune/protect/compliance-use-custom-settings).
 
-The scripts are provided as samples and include no warranty, implied or otherwise.
+The scripts are provided as samples and include no warranty, implied or otherwise.

Linux/WSL/WSL Management Example/README.md

@@ -1,4 +1,4 @@
-# WSL Management Custom Compliance - Distro and Version
+# WSL Management Custom Compliance - Distro and Version (Preview)
 
 This script can be used to calculate compliance against a windows device based on WSL distros and distro versions.
 
@@ -9,7 +9,7 @@ This script can be used to calculate compliance against a windows device based o
 
 This is the powershell script that will run during check-in. It is written to look at the WSL distro data and confirm whether or not the registered distros and versions are in compliance based on the provided approved distros and versions.
 
-Inside the shell script, you can see the following on line 41. This is the allowed distro and min and max versions, (Ubuntu 20.04 to 22.04).
+Inside the shell script, you can see the following on line 25. This is the allowed distro and min and max versions, (Ubuntu 20.04 to 22.04).
 
 ```
 [void]$compliantDistroValues.Add([OSCompliance]::new("Ubuntu", "20.04", "22.04"))
@@ -21,7 +21,7 @@ If we run the script interactively with only Ubuntu 20.04 registered in WSL, we
 { "WSLInstancesComplianceStatus" = "Not Compliant" }
 ```
 
-You can modify the script to check allow any distros and versions that you would like as well as a last check in time requirment (Lines 39-44).
+You can modify the script to check allow any distros and versions that you would like as well as a last check in time requirment (Lines 23-28).
 
 
 2. WSLDetectionRule.json

Linux/WSL/WSL Management Example/WSLDistroVersionCompliance.ps1

@@ -5,22 +5,6 @@
 # Output object used for remediation
 $jsonOutput = @{}
 
-# Handle plugin installation 
-try {
-    # Download installer
-    Invoke-WebRequest -Uri https://github.com/befari/shell-intune-samples/raw/master/Linux/WSL/IntuneWSLPluginInstaller/IntuneWSLPluginInstaller.msi -OutFile ( New-Item -Path "C:\temp\IntuneWSLPluginInstaller.msi" -Force )
- 
-    # Install plugin
-    Start-Process -FilePath "msiexec.exe" -ArgumentList "/i C:\temp\IntuneWSLPluginInstaller.msi /quiet"
-
-    # Delete temp file
-    Remove-Item -path "C:\temp\IntuneWSLPluginInstaller.msi" -force
-}  
-catch {
-    $jsonOutput += @{ WSLInstancesComplianceStatus = "Error during plugin installation" }
-    return $jsonOutput | ConvertTo-Json -Compress
-}
-
 # Class used to build compliance check values
 class OSCompliance
 {
@@ -86,7 +70,7 @@ foreach($distroId in $distroIds)
     {
         $min = $compliantDistro.minVersion
         $max = $compliantDistro.maxVersion
-        if ($distroVersion -lt $min -or $disroVersion -gt $max)
+        if ($distroVersion -lt $min -or $distroVersion -gt $max)
         {
             $isCompliant = $false
             break