Merge branch 'v2.4.3' into SA-3525-fix-azure-status-condition

Author: kmaranionjc

Deploy/ADMU.ps1

@@ -1,3 +1,18 @@
+## 2.4.3
+
+Release Date: Aug 23,2023
+
+#### RELEASE NOTES
+
+```
+* Fixed an issue with Windows 10 devices, where migrated users would no longer be able to access their start menu and search bars.
+* Remove Microsoft Visual C++ 2013 dependencies that are not needed for JCAgent installation.
+* Fixed incorrect agent binary name causing incorrect installation checks.
+* Add validation of JCAgent using Service instead of file path for installation.
+* Fixed an issue when Migrating from AzureAD users where their AppxPackages were not properly identified.
+* Fixed an issue when leaving an AzureAD domain where the tool would not leave the domain.
+```
+
 ## 2.4.2
 
 Release Date: Aug 4,2023

ModuleChangelog.md

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>JumpCloud.ADMU</id>
-    <version>2.4.2</version>
+    <version>2.4.3.3100</version>
     <description>Powershell Module to run JumpCloud Active Directory Migration Utility.</description>
     <authors>JumpCloud Solutions Architect Team</authors>
     <owners>JumpCloud</owners>

jumpcloud-ADMU/Exe/gui_jcadmu.exe

@@ -3,7 +3,7 @@
 #
 # Generated by: JumpCloud Solutions Architect Team
 #
-# Generated on: 8/4/2023
+# Generated on: 8/22/2023
 #
 
 @{
@@ -12,13 +12,13 @@
 RootModule = 'JumpCloud.ADMU.psm1'
 
 # Version number of this module.
-ModuleVersion = '2.4.2'
+ModuleVersion = '2.4.3'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
 
 # ID used to uniquely identify this module
-GUID = '7aac8ab6-9543-4dab-ab4d-a956e7d31588'
+GUID = '1fbab859-7a05-43c5-9cc8-6400ca9c5c12'
 
 # Author of this module
 Author = 'JumpCloud Solutions Architect Team'

jumpcloud-ADMU/Exe/uwp_jcadmu.exe

@@ -143,7 +143,7 @@ function show-mtpSelection {
 <Window
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="JumpCloud ADMU 2.4.2"
+        Title="JumpCloud ADMU 2.4.3"
         WindowStyle="SingleBorderWindow"
         ResizeMode="NoResize"
         Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1000" Height="520">

jumpcloud-ADMU/JumpCloud.ADMU.nuspec

@@ -1401,7 +1401,7 @@ Function Start-Migration {
     Begin {
         Write-ToLog -Message:('####################################' + (get-date -format "dd-MMM-yyyy HH:mm") + '####################################')
         # Start script
-        $admuVersion = '2.4.2'
+        $admuVersion = '2.4.3'
         Write-ToLog -Message:('Running ADMU: ' + 'v' + $admuVersion)
         Write-ToLog -Message:('Script starting; Log file location: ' + $jcAdmuLogFile)
         Write-ToLog -Message:('Gathering system & profile information')
@@ -1499,6 +1499,7 @@ Function Start-Migration {
         $netBiosName = Get-NetBiosName
         $WmiComputerSystem = Get-WmiObject -Class:('Win32_ComputerSystem')
         $localComputerName = $WmiComputerSystem.Name
+        $systemVersion = Get-ComputerInfo | Select-Object OSName, OSVersion, OsHardwareAbstractionLayer
         $windowsDrive = Get-WindowsDrive
         $jcAdmuTempPath = "$windowsDrive\Windows\Temp\JCADMU\"
         $jcAdmuLogFile = "$windowsDrive\Windows\Temp\jcAdmu.log"
@@ -1704,6 +1705,27 @@ Function Start-Migration {
                 $admuTracker.copyRegistry.fail = $true
                 break
             }
+
+            # for Windows 10 devices, force refresh of start/ search app:
+            If ($systemVersion.OSName -Match "Windows 10") {
+                Write-ToLog -Message:('Windows 10 System, removing start and search reg keys to force refresh of those apps')
+                $regKeyClear = @(
+                    "SOFTWARE\Microsoft\Windows\CurrentVersion\StartLayout",
+                    "SOFTWARE\Microsoft\Windows\CurrentVersion\Start",
+                    "SOFTWARE\Microsoft\Windows\CurrentVersion\SearchSettings",
+                    "SOFTWARE\Microsoft\Windows\CurrentVersion\Search"
+                )
+
+                foreach ($key in $regKeyClear) {
+                    if (reg query "HKU\$($NewUserSID)_admu\$($key)") {
+                        write-ToLog -Message:("removing key: $key")
+                        reg delete "HKU\$($NewUserSID)_admu\$($key)" /f
+                    } else {
+                        write-ToLog -Message:("key not found $key")
+                    }
+                }
+            }
+
             reg copy HKU\$($SelectedUserSID)_Classes_admu HKU\$($NewUserSID)_Classes_admu /s /f
             if ($?) {
                 Write-ToLog -Message:('Copy Profile: ' + "$newUserProfileImagePath/AppData/Local/Microsoft/Windows/UsrClass.dat" + ' To: ' + "$oldUserProfileImagePath/AppData/Local/Microsoft/Windows/UsrClass.dat")
@@ -1955,14 +1977,19 @@ Function Start-Migration {
                 New-Item -ItemType Directory -Force -Path $path
             }
             $appxList = @()
+
+            # Get Azure AD Status
+
             $ADStatus = dsregcmd.exe /status
             foreach ($line in $ADStatus) {
                 if ($line -match "AzureADJoined : ") {
                     $AzureADStatus = ($line.trimstart('AzureADJoined : '))
                 }
             }
+            
             Write-ToLog "AzureAD Status: $AzureADStatus"
             if ($AzureADStatus -eq 'YES' -or $netBiosName -match 'AzureAD') {
+
                 # Find Appx User Apps by Username
                 try {
                     $appxList = Get-AppXpackage -user (Convert-Sid $SelectedUserSID) | Select-Object InstallLocation
@@ -1971,7 +1998,7 @@ Function Start-Migration {
                 }
             } else {
                 try {
-                    $appxList = Get-AppXpackage -user $SelectedUserSID | Select-Object InstallLocation
+                    $appxList = Get-AppXpackage -user (Convert-Sid $SelectedUserSID) | Select-Object InstallLocation
                 } catch {
                     Write-ToLog -Message "Could not determine AppXPackages for selected user, this is okay. Rebuilding UWP Apps from AllUsers list"
                 }
@@ -2027,12 +2054,6 @@ Function Start-Migration {
             #region Leave Domain or AzureAD
 
             if ($LeaveDomain -eq $true) {
-                # Get Azure AD Status
-                foreach ($line in $AzureADInfo) {
-                    if ($line -match "AzureADJoined : ") {
-                        $AzureADStatus = ($line.trimstart('AzureADJoined : '))
-                    }
-                }
                 if ($AzureADStatus -match 'YES') {
                     # Check if user is not NTAUTHORITY\SYSTEM
                     if (([bool](([System.Security.Principal.WindowsIdentity]::GetCurrent()).user.Value -match "S-1-5-18")) -eq $false) {