Skip to content

Commit

Permalink
V2.7.0 (#125)
Browse files Browse the repository at this point in the history 
* Cut 3852 copy backup dat bug (#106)

* sleep before copy

* recovery try catch on backup registry

* attempt to recover after loading process while reg is loaded

* TODOs

* added processLists

* close process in try catch and as a param

* ci install dependencies

* try catch on user hive load/unload

* version + changelog

* cleanup

* Remove "Close-ProcessByOwner" Behavior

---------

Co-authored-by: Ken Maranion <ken.maranion@jumpcloud.com>

* Terminal Progress (#109)

* Terminal Progress

* cleanup

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

---------

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Leave Domain Option Fix on Non-AD Bound Device (#113)

* Leave domain

* modulechangelog

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

---------

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Cut 3870 error mapping (#112)

* Hybrid Unjoin and nuget fix (#110)

* Hybrid Unjoin

* fix non hybrid

* comments

* comments

* removed invoke-assystem

* Update CODEOWNERS

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* release date

---------

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Cut 3892 leave hybrid domain (#111)

* Hybrid Unjoin

* fix non hybrid

* comments

* comments

* removed invoke-assystem

* Update CODEOWNERS

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* release date

* 2.6.4  + fix for releasing powershell module

* set-content

---------

Co-authored-by: Ken Maranion <ken.maranion@jumpcloud.com>
Co-authored-by: Ken Maranion <97972790+kmaranionjc@users.noreply.github.com>

* error mapping

* error map

* rename

* error map

* start-migration conflict fix

* fix start-migration con

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* modulechangelog

---------

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* hostname and JCUsername validation check (#115)

* hostname and local user validation check

* test

* Fix hostname

* Cut 3473 GUI Progress Form (#122)

* add progress ui

* Added form functions

* Progress form gui added

* write-toprogress function

* cleanup

* cleanup

* cleanup

* cleanup

* revamped UI

* Build exe progress form

* Added version test

* Working progress form

* cleanup

* UI Change

* image source removed

* remove show-result

* cleanup

* remove production env from ci (#126) (#127)

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* New uwp logo + test fix

* Fixed error map verb

* Add user agent tracker (#128)

* Add user agent tracker

* userAgent

* Delete Get-JCUserAgent.ps1

Remove get-jcuseragent

* LogTextBlock wrap fix

* fix test issue

* Error hyperlink

* Error map wording

* spelling

* Unload error message fix

* test test fix

* ci Test

* Update ModuleChangelog.md

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* Update jumpcloud-ADMU/Powershell/Start-Migration.ps1

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>

* error messaging

* error messaging

* reorder log messaging

* Form and ProgressForm UI changes and out of function $script vars removal

* Xaml Cleanup

* PSSA ignore event handler warning

* $SenderParam fix

* Skip progress form check

* Form changes

* Switch options

* Fix hostname var

* changelog

* changelog

---------

Co-authored-by: Joe Workman <54448601+jworkmanjc@users.noreply.github.com>
Co-authored-by: Joe Workman <joe.workman@jumpcloud.com>
  • Loading branch information
@kmaranionjc @jworkmanjc
3 people authored Jul 16, 2024
1 parent a2b5783 commit 7b199d7
Show file tree
Hide file tree
Showing 14 changed files with 1,645 additions and 1,311 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/admu-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,13 @@ jobs:
Write-Host "[status] latest module: $RequiredModule; latest version: $($latestModule.Version)"
Write-Host("[status] Installing module: '$RequiredModule'; version: $($PSDependencies[$RequiredModule].RequiredVersion) from $($PSDependencies[$RequiredModule].Repository)")
if ($($PSDependencies[$RequiredModule].RequiredVersion) -eq "latest"){
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository))-Force
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -Force
} else {
if($RequiredModule -eq 'PowerShellGet'){
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force -allowClobber
} else {
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/admu-release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ jobs:
Write-Host "[status] latest module: $RequiredModule; latest version: $($latestModule.Version)"
Write-Host("[status] Installing module: '$RequiredModule'; version: $($PSDependencies[$RequiredModule].RequiredVersion) from $($PSDependencies[$RequiredModule].Repository)")
if ($($PSDependencies[$RequiredModule].RequiredVersion) -eq "latest"){
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository))-Force
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -Force
} else {
if($RequiredModule -eq 'PowerShellGet'){
Install-Module -Name $RequiredModule -Repository:($($PSDependencies[$RequiredModule].Repository)) -RequiredVersion:($($PSDependencies[$RequiredModule].RequiredVersion)) -AllowPrerelease -Force -allowClobber
Expand Down
15 changes: 14 additions & 1 deletion Deploy/Build-Exe.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,25 @@ If (Test-Path -Path:($Output)) {
# Get file contents
$StartJCADMU = (Get-Content -Path:($FolderPath_ModuleRootPath + '\jumpcloud-ADMU\Powershell\Start-JCADMU.ps1') -Raw) -Replace ("`r", "")
$Functions = (Get-Content -Path:($FolderPath_ModuleRootPath + '\jumpcloud-ADMU\Powershell\Start-Migration.ps1') -Raw) -Replace ("`r", "")
$ProgressForm = (Get-Content -Path:($FolderPath_ModuleRootPath + '\jumpcloud-ADMU\Powershell\ProgressForm.ps1') -Raw) -Replace ("`r", "")
$Form = (Get-Content -Path:($FolderPath_ModuleRootPath + '\jumpcloud-ADMU\Powershell\Form.ps1') -Raw) -Replace ("`r", "")

# TODO: Add Private functions to $NewContent. This code is commented out for later use.
# Get file content of /jumpcloud-ADMU/Powershell/Private
#$PrivateFolder = Get-ChildItem -Path:($FolderPath_ModuleRootPath + '\jumpcloud-ADMU\Powershell\Private\')
# String manipulation
# Iterate through each file in the Private folder and append to $Functions
# ForEach ($File in $PrivateFolder) {
# $PrivateFunctions += (Get-Content -Path:($File.FullName) -Raw) -Replace ("`r", "")
# }
#$NewContent = $PrivateFunctions
$NewContent = $StartJCADMU
# Add Private functions to $NewContent

$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('. ($scriptPath + ''\ProgressForm.ps1'')', $ProgressForm)
$NewContent = $NewContent.Replace('$formResults = Invoke-Expression -Command:(''. "'' + $scriptPath + ''\Form.ps1"'')' + "`n", $Form)
$NewContent = $NewContent -replace('Return \$FormResults', '')
$NewContent = $NewContent + "`n"
Expand All @@ -71,7 +84,7 @@ If ($PSVersion.PSEdition -eq "Core") {
Import-Module -Name ps2exe
If (-not [System.String]::IsNullOrEmpty($PSD1Version)) {
$guiOutputPath = ($FolderPath_ModuleRootPath + '\jumpcloud-ADMU\exe\gui_jcadmu.exe')
Invoke-ps2exe -inputFile $Output -outputFile $guiOutputPath -title 'JumpCloud ADMU' -product 'JumpCloud ADMU' -description 'JumpCloud AD Migration Utility' -copyright "(c) $year" -version $Psd1Version -company 'JumpCloud' -requireAdmin -iconfile '.\Deploy\admu.ico'
Invoke-ps2exe -inputFile $Output -outputFile $guiOutputPath -title 'JumpCloud ADMU' -product 'JumpCloud ADMU' -description 'JumpCloud AD Migration Utility' -copyright "(c) $year" -version $Psd1Version -company 'JumpCloud' -requireAdmin -iconfile ($FolderPath_ModuleRootPath + '\Deploy\admu.ico')
$guiExeFile = Get-Item $guiOutputPath
$guiHash = (get-filehash -algorithm SHA256 -path $guiExeFile).Hash
Write-Host "==== GUI_JCADMU.EXE Build Status ===="
Expand Down
Binary file modified Deploy/uwp_jcadmu.ps1
View file
Binary file not shown.
Binary file removed Microsoft Windows ADK EULA.pdf
View file
Binary file not shown.
Loading

0 comments on commit 7b199d7

Please sign in to comment.