Skip to content

Commit 377003a

Browse files
authored
Cut 3041 exe build (#108)
* Update Build-Exe.ps1 Replace all instances of return formResults in form.ps1 * Update Form.ps1 version * Update Start-Migration.ps1 version * Update JumpCloud.ADMU.psd1 psd1 version * Update ModuleChangelog.md
1 parent 9af8385 commit 377003a

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Deploy/Build-Exe.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ $NewContent = $NewContent.Replace('# Get script path' + "`n", '')
4848
$NewContent = $NewContent.Replace('$scriptPath = (Split-Path -Path:($MyInvocation.MyCommand.Path))' + "`n", '')
4949
$NewContent = $NewContent.Replace('. ($scriptPath + ''\Start-Migration.ps1'')', $Functions)
5050
$NewContent = $NewContent.Replace('$formResults = Invoke-Expression -Command:(''. "'' + $scriptPath + ''\Form.ps1"'')' + "`n", $Form)
51-
$NewContent = $NewContent.Replace('Return $FormResults' + "`n" + ' }', '')
51+
$NewContent = $NewContent -replace('Return \$FormResults', '')
5252
$NewContent = $NewContent + "`n"
5353
$NewContent = $NewContent -split "`n" | ForEach-Object { If ($_.Trim()) {
5454
$_

ModuleChangelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 2.6.1
1+
## 2.6.2
22

33
Release Date: February 12, 2024
44

jumpcloud-ADMU/JumpCloud.ADMU.psd1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: JumpCloud Solutions Architect Team
55
#
6-
# Generated on: 12/18/2023
6+
# Generated on: 2/12/2024
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
RootModule = 'JumpCloud.ADMU.psm1'
1313

1414
# Version number of this module.
15-
ModuleVersion = '2.6.1'
15+
ModuleVersion = '2.6.2'
1616

1717
# Supported PSEditions
1818
# CompatiblePSEditions = @()

jumpcloud-ADMU/Powershell/Form.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function show-mtpSelection {
143143
<Window
144144
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
145145
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
146-
Title="JumpCloud ADMU 2.6.1"
146+
Title="JumpCloud ADMU 2.6.2"
147147
WindowStyle="SingleBorderWindow"
148148
ResizeMode="NoResize"
149149
Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1000" Height="520">
@@ -756,4 +756,4 @@ $Form.Showdialog()
756756

757757
If ($bMigrateProfile.IsEnabled -eq $true) {
758758
Return $FormResults
759-
}
759+
}

jumpcloud-ADMU/Powershell/Start-Migration.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ Function Start-Migration {
14841484
Begin {
14851485
Write-ToLog -Message:('####################################' + (get-date -format "dd-MMM-yyyy HH:mm") + '####################################')
14861486
# Start script
1487-
$admuVersion = '2.6.1'
1487+
$admuVersion = '2.6.2'
14881488
Write-ToLog -Message:('Running ADMU: ' + 'v' + $admuVersion)
14891489
Write-ToLog -Message:('Script starting; Log file location: ' + $jcAdmuLogFile)
14901490
Write-ToLog -Message:('Gathering system & profile information')
@@ -2328,4 +2328,4 @@ Function Start-Migration {
23282328

23292329

23302330
}
2331-
}
2331+
}

0 commit comments

Comments
 (0)