From f30e930dc134979a91eedd873599cf29a31d2c4a Mon Sep 17 00:00:00 2001 From: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:09:33 -0700 Subject: [PATCH 1/5] Update Build-Exe.ps1 Replace all instances of return formResults in form.ps1 --- Deploy/Build-Exe.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Deploy/Build-Exe.ps1 b/Deploy/Build-Exe.ps1 index 92e3031c7..2c337e23b 100644 --- a/Deploy/Build-Exe.ps1 +++ b/Deploy/Build-Exe.ps1 @@ -48,7 +48,7 @@ $NewContent = $NewContent.Replace('# Get script path' + "`n", '') $NewContent = $NewContent.Replace('$scriptPath = (Split-Path -Path:($MyInvocation.MyCommand.Path))' + "`n", '') $NewContent = $NewContent.Replace('. ($scriptPath + ''\Start-Migration.ps1'')', $Functions) $NewContent = $NewContent.Replace('$formResults = Invoke-Expression -Command:(''. "'' + $scriptPath + ''\Form.ps1"'')' + "`n", $Form) -$NewContent = $NewContent.Replace('Return $FormResults' + "`n" + ' }', '') +$NewContent = $NewContent -replace('Return \$FormResults', '') $NewContent = $NewContent + "`n" $NewContent = $NewContent -split "`n" | ForEach-Object { If ($_.Trim()) { $_ From 15b17a26e9e641d5b2276ceaea8978d216c0e134 Mon Sep 17 00:00:00 2001 From: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:10:03 -0700 Subject: [PATCH 2/5] Update Form.ps1 version --- jumpcloud-ADMU/Powershell/Form.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jumpcloud-ADMU/Powershell/Form.ps1 b/jumpcloud-ADMU/Powershell/Form.ps1 index b11b643d7..af5132046 100644 --- a/jumpcloud-ADMU/Powershell/Form.ps1 +++ b/jumpcloud-ADMU/Powershell/Form.ps1 @@ -143,7 +143,7 @@ function show-mtpSelection { @@ -756,4 +756,4 @@ $Form.Showdialog() If ($bMigrateProfile.IsEnabled -eq $true) { Return $FormResults -} \ No newline at end of file +} From 4fc9c22459596b8b33abbecc7f349648decaf705 Mon Sep 17 00:00:00 2001 From: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:10:27 -0700 Subject: [PATCH 3/5] Update Start-Migration.ps1 version --- jumpcloud-ADMU/Powershell/Start-Migration.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 b/jumpcloud-ADMU/Powershell/Start-Migration.ps1 index f9185dcdd..839b1366d 100644 --- a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 +++ b/jumpcloud-ADMU/Powershell/Start-Migration.ps1 @@ -1484,7 +1484,7 @@ Function Start-Migration { Begin { Write-ToLog -Message:('####################################' + (get-date -format "dd-MMM-yyyy HH:mm") + '####################################') # Start script - $admuVersion = '2.6.1' + $admuVersion = '2.6.2' Write-ToLog -Message:('Running ADMU: ' + 'v' + $admuVersion) Write-ToLog -Message:('Script starting; Log file location: ' + $jcAdmuLogFile) Write-ToLog -Message:('Gathering system & profile information') @@ -2328,4 +2328,4 @@ Function Start-Migration { } -} \ No newline at end of file +} From 12ef18135bccbcd6a8094d957891663f2060020a Mon Sep 17 00:00:00 2001 From: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:21:58 -0700 Subject: [PATCH 4/5] Update JumpCloud.ADMU.psd1 psd1 version --- jumpcloud-ADMU/JumpCloud.ADMU.psd1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 b/jumpcloud-ADMU/JumpCloud.ADMU.psd1 index f10477773..fd8e0de17 100644 --- a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 +++ b/jumpcloud-ADMU/JumpCloud.ADMU.psd1 @@ -3,7 +3,7 @@ # # Generated by: JumpCloud Solutions Architect Team # -# Generated on: 12/18/2023 +# Generated on: 2/12/2024 # @{ @@ -12,7 +12,7 @@ RootModule = 'JumpCloud.ADMU.psm1' # Version number of this module. - ModuleVersion = '2.6.1' + ModuleVersion = '2.6.2' # Supported PSEditions # CompatiblePSEditions = @() From f82dde1af1c91e78a0f7d29d21742894887602be Mon Sep 17 00:00:00 2001 From: Joe Workman <54448601+jworkmanjc@users.noreply.github.com> Date: Mon, 12 Feb 2024 16:22:13 -0700 Subject: [PATCH 5/5] Update ModuleChangelog.md --- ModuleChangelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ModuleChangelog.md b/ModuleChangelog.md index ad909047e..ce08cc09b 100644 --- a/ModuleChangelog.md +++ b/ModuleChangelog.md @@ -1,4 +1,4 @@ -## 2.6.1 +## 2.6.2 Release Date: February 12, 2024