Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cut 3041 exe build #108

Merged
merged 5 commits into from
Feb 13, 2024
Merged

Cut 3041 exe build #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f30e930
Update Build-Exe.ps1
jworkmanjc Feb 12, 2024
15b17a2
Update Form.ps1
jworkmanjc Feb 12, 2024
4fc9c22
Update Start-Migration.ps1
jworkmanjc Feb 12, 2024
12ef181
Update JumpCloud.ADMU.psd1
jworkmanjc Feb 12, 2024
f82dde1
Update ModuleChangelog.md
jworkmanjc Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Deploy/Build-Exe.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
$_
Expand Down
2 changes: 1 addition & 1 deletion ModuleChangelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## 2.6.1
## 2.6.2

Release Date: February 12, 2024

Expand Down
4 changes: 2 additions & 2 deletions jumpcloud-ADMU/JumpCloud.ADMU.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: JumpCloud Solutions Architect Team
#
# Generated on: 12/18/2023
# Generated on: 2/12/2024
#

@{
Expand All @@ -12,7 +12,7 @@
RootModule = 'JumpCloud.ADMU.psm1'

# Version number of this module.
ModuleVersion = '2.6.1'
ModuleVersion = '2.6.2'

# Supported PSEditions
# CompatiblePSEditions = @()
Expand Down
4 changes: 2 additions & 2 deletions jumpcloud-ADMU/Powershell/Form.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.1"
Title="JumpCloud ADMU 2.6.2"
WindowStyle="SingleBorderWindow"
ResizeMode="NoResize"
Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1000" Height="520">
Expand Down Expand Up @@ -756,4 +756,4 @@ $Form.Showdialog()

If ($bMigrateProfile.IsEnabled -eq $true) {
Return $FormResults
}
}
4 changes: 2 additions & 2 deletions jumpcloud-ADMU/Powershell/Start-Migration.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -2328,4 +2328,4 @@ Function Start-Migration {


}
}
}
Loading