From 4ef9767ad803d79cb67f578fa61a226462d0b974 Mon Sep 17 00:00:00 2001
From: Ryan Casperson <ryan.casperson@jumpcloud.com>
Date: Tue, 20 Aug 2024 14:46:41 -0400
Subject: [PATCH 1/6] Use secure-upload-artifacts

---
 .github/workflows/admu-ci.yml      | 2 +-
 .github/workflows/admu-release.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/admu-ci.yml b/.github/workflows/admu-ci.yml
index d73711bb..b9c6d171 100644
--- a/.github/workflows/admu-ci.yml
+++ b/.github/workflows/admu-ci.yml
@@ -122,7 +122,7 @@ jobs:
         run: |
           . "${{ github.workspace }}/Deploy/build.ps1" -ModuleVersionType $env:RELEASE_TYPE -ModuleName "JumpCloud.ADMU"
       - name: Upload Nuspec
-        uses: actions/upload-artifact@v3
+        uses: PaloAltoNetworks/upload-secure-artifact@b0e2f8dc09b06aa38239ad1b9e5b5b57b4732abc
         with:
           name: jumpcloud-admu-build
           path: |
diff --git a/.github/workflows/admu-release.yml b/.github/workflows/admu-release.yml
index 55153bf4..c99dd746 100644
--- a/.github/workflows/admu-release.yml
+++ b/.github/workflows/admu-release.yml
@@ -169,7 +169,7 @@ jobs:
           region: ${{ secrets.AWS_REGION }}
           version: ${{ env.RELEASE_VERSION }}
       - name: Upload Release Artifacts
-        uses: actions/upload-artifact@v3
+        uses: PaloAltoNetworks/upload-secure-artifact@b0e2f8dc09b06aa38239ad1b9e5b5b57b4732abc
         with:
           name: jumpcloud-admu
           path: |

From f7663ac3d52d76e164f13a93b426aa035cc0b455 Mon Sep 17 00:00:00 2001
From: Ryan Casperson <ryan.casperson@jumpcloud.com>
Date: Tue, 20 Aug 2024 14:49:18 -0400
Subject: [PATCH 2/6] (test): run ci

---
 .github/workflows/admu-ci.yml                 |  25 +--
 .github/workflows/admu-release.yml            |  23 +--
 Deploy/uwp_jcadmu.ps1                         | Bin 65606 -> 60594 bytes
 ModuleChangelog.md                            |  39 +----
 jumpcloud-ADMU/JumpCloud.ADMU.psd1            |   2 +-
 jumpcloud-ADMU/Powershell/Form.ps1            |  50 +++---
 jumpcloud-ADMU/Powershell/ProgressForm.ps1    |   4 +-
 jumpcloud-ADMU/Powershell/Start-Migration.ps1 | 147 +++++++++---------
 8 files changed, 109 insertions(+), 181 deletions(-)

diff --git a/.github/workflows/admu-ci.yml b/.github/workflows/admu-ci.yml
index b9c6d171..e8c121d0 100644
--- a/.github/workflows/admu-ci.yml
+++ b/.github/workflows/admu-ci.yml
@@ -18,33 +18,12 @@ jobs:
     needs: ["Filter-Branch"]
     runs-on: ubuntu-latest
     outputs:
-      RELEASE_TYPE: ${{ steps.validate.outputs.RELEASE_TYPE }}
+      RELEASE_TYPE: patch
     steps:
       - name: Validate-PR-Version-Labels
         id: validate
-        shell: pwsh
         run: |
-          $PR_LABEL_LIST=$(curl -s "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels" | jq -r '.[].name')
-          if ("ADMU" -in $PR_LABEL_LIST) {
-              write-host "Starting Build for PowerShell Module Release"
-          }
-          # validate type from label list:
-          $types = @('major', 'minor', 'patch', 'manual')
-          $typeCount = 0
-          foreach ($item in $PR_LABEL_LIST) {
-              if ($item -in $types) {
-                  write-host "$item"
-                  $typeCount += 1
-                  $RELEASE_TYPE = $item
-              }
-          }
-
-          if ($typeCount -eq 1) {
-              echo "RELEASE_TYPE=$RELEASE_TYPE" >> $env:GITHUB_OUTPUT
-          } else {
-              throw "Multiple or invalid release types were found on PR"
-              exit 1
-          }
+          echo "skipped"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Validate-Env-Variables:
diff --git a/.github/workflows/admu-release.yml b/.github/workflows/admu-release.yml
index c99dd746..db8d3639 100644
--- a/.github/workflows/admu-release.yml
+++ b/.github/workflows/admu-release.yml
@@ -29,29 +29,8 @@ jobs:
     steps:
       - name: Validate-PR-Version-Labels
         id: validate
-        shell: pwsh
         run: |
-          $PR_LABEL_LIST=$(curl -s "https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels" | jq -r '.[].name')
-          if ("ADMU" -in $PR_LABEL_LIST) {
-              write-host "Starting Build for ADMU Module Release"
-          }
-          # validate type from label list:
-          $types = @('major', 'minor', 'patch', 'manual')
-          $typeCount = 0
-          foreach ($item in $PR_LABEL_LIST) {
-              if ($item -in $types) {
-                  write-host "$item"
-                  $typeCount += 1
-                  $RELEASE_TYPE = $item
-              }
-          }
-
-          if ($typeCount -eq 1) {
-              echo "RELEASE_TYPE=$RELEASE_TYPE" >> $env:GITHUB_OUTPUT
-          } else {
-              throw "Multiple or invalid release types were found on PR"
-              exit 1
-          }
+          echo "skipped"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   Setup-Build-Dependancies:
diff --git a/Deploy/uwp_jcadmu.ps1 b/Deploy/uwp_jcadmu.ps1
index e5874726999b95fe1b7d9730c71baacf6c00d400..82aafd7663876a5de6f1bdfd272a0d8538d6eda3 100644
GIT binary patch
delta 3770
zcmc&%O=w(I82v(9p=lEBA0cY-IWuCWF|Uc*q77Y4Vnd>7$v82BQOY<o$&4nGFf*Mb
zmNG6}xvJc)Aa><SN(OWz6kNCpG~%k_M$u+bq(ZTaisCu<&dd8v(yq$zGH>qv{?GTF
zd-KD`d)IF6xpwu6vhIAN?q6tEYqy_P-`$u>$0Q@GQk9w%WI=3sO)8R=WhqHn<|HOb
z>6CV{^k+uuvWT6$yeBh|E6A+O<8KbyCG3=;pH)BIIMWtW2RD+Pjy5eMn$0VHuRQA-
zOUQ^;q2n?PSaJr>jJmo0YGW87RIz?aUiJl$!CFoFLz?|E35}W*VIiUI)#WsPGo>YY
zS3W?9^YAu@$HuQEyjid_4Xt^(2s!F)#WUIps9(<FEeEB1s~(mNqgpgf^-=6puwT$M
z@}^dT<2jW++uiWj)0T1UWZ}Mm8lJ{y6c!e-HVY4|WiM*}peeAvLmqq*C|XYA!jfiS
z@gw!wdXKU;o_x#p;XIE0Ssgv2anLgnO~L}>&*FPk&Oxe--!(0*ZMylY)bHtd8Iteo
z*ry>^MLAj23^Z2tYE^pGkM`k495pilT3Dw}0pFIc<_i9L>&JRm0Tbm`WeSp%Ff9_3
z*WrV}j$nTg?|JM{-qM~Iu*QD2u+G?t6)>E@YaKr-*fPy+!8Fw?S}~`Az6hxrdL-rx
zhk!GH2`6mz?dCC-wPCw!J8QsZFpY$6t8kjJ0H`7Fu*KFxr0S*H-ML_kwf0&K#sVzs
zwn}MW2~JF2K+Z49fN#1I$S{y6JZ-hnLeP)X45n=yKPO>zK-(YGZ^0Ig^5G6e3elA?
z9%T;Cv7pDT3Dvm|{&F~Ne4m3(9v=?S2p(ccr2WGY<$0==@k9C@H-4vp0^9ImJWfC-
zhdyczT_j0NLWVtB3t-p_93zGt{%uX!d1#OW`|(7hNn$rrNywbgU67pDaP4Hg2p5E<
z2nRcv_sV%3K&MZ;LTiu<_Q&x{bAft%^XUGB!$qF4GTgf08!CsfI7%!$xyejAj}BU4
zbMxTva*3<u*c^sl1!Z81xIEQ5fUvTvzF0rN@lM;|`zToh|9R}O?fq@$`g>c0NETYw
zegL||$5}JN74TSu6l^+;odxlbjltzu&2Q_AM`lhw)Q1>Zu@c!>93Z{hvcC*O$?e<c
z;EWtksd-(E71Y|)dvuq2XC5<Qt4pJOp@Yz2k6sO3=-@&~wl0n7R`S($oj(Ryr#a1a
z#f6`Z#)hb!!pjoGcvm6i7jXV8qPDJRBCt>7S3Dg#>C@J`yJ`DUaH>W$=K=$J9MKJ8
z?c{bAIatP}E#7>CM*Vxcn)O&sp_Ow|RF`k{sez65Zd+O_D1&EA)b(3Woro+I!Vhp8
zl47HrSJyY=A^csABk_>e{Db3gS&O4!hpa|9Ka5UQI7UI8q)TiKk9mKQ9@Ig!Rx)se
zMhBOX17?6pS$T&9aC?YqDrYjZED$nO@D4P2QQW0rfr5LQ`n$u>l&c?q0tMwULk8gO
zGpqi*6K}XM;MSxMAv60`m`<U@c@0ANF!lbY-~}^mCA(!MqFRkWLEUhS^9!KTA_7}R
zXylGdc)adXdc;e(>+y``g_;M^Wjxyj=-8uVr>L*)b~MNSI<imIk90L>|32P!FqEsx
z{PBibyLV{cbGS+ksV|>7s;>RISAG6lR}T+h-Z;ZLsfF(6L#wFin~<N?j8ug#gBVhf
qZT@_3Y|kTb&1Alw?r7HUUwstrv;X#}PwyU59shJSKl$(bw*LW)RL$D}

delta 7387
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

diff --git a/ModuleChangelog.md b/ModuleChangelog.md
index c4197d9d..023e4ddf 100644
--- a/ModuleChangelog.md
+++ b/ModuleChangelog.md
@@ -1,44 +1,9 @@
-## 2.7.4
-
-Release Date: August 14, 2024
-
-#### RELEASE NOTES
-
-#### Bug Fixes:
-
-```
-* Fixed an freezing issue with UWP app/form when interacted
-* Updated useragent text
-```
-## 2.7.3
-
-Release Date: July 25, 2024
-
-#### RELEASE NOTES
-
-#### Bug Fixes:
-
-```
-* Fixed an issue with leave local AD
-```
-## 2.7.2
+## 2.7.0
 
 Release Date: July 16, 2024
 
-#### RELEASE NOTES
-
-#### Bug Fixes:
-
-```
-* When a system had more than 5 local user accounts, the GUI window would stretch to show multiple accounts and the Migrate button would become hidden. The window size is set to a static value in this release.
-```
-
-## 2.7.1
-
-Release Date: July 16, 2024
 
 #### RELEASE NOTES
-
 ```
 * UI improvements for Form
 * While migrating with the exe application, the ADMU will now show the progress of the migration within a GUI window. Migration logs can be viewed in this window, new migrations can be triggered after a successful or failed migration.
@@ -46,7 +11,6 @@ Release Date: July 16, 2024
 * Added an optional param -AdminDebug for showing verbose log messages
 * An error mapping function was added to the tool to provide better feedback when the tool encounters an issue with a migration.
 ```
-
 #### Bug Fixes:
 
 ```
@@ -55,6 +19,7 @@ Release Date: July 16, 2024
 * UWP wording change
 ```
 
+
 ## 2.6.8
 
 Release Date: May 14, 2024
diff --git a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 b/jumpcloud-ADMU/JumpCloud.ADMU.psd1
index 0f599922..97bf7c9a 100644
--- a/jumpcloud-ADMU/JumpCloud.ADMU.psd1
+++ b/jumpcloud-ADMU/JumpCloud.ADMU.psd1
@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.7.4'
+    ModuleVersion     = '2.7.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/jumpcloud-ADMU/Powershell/Form.ps1 b/jumpcloud-ADMU/Powershell/Form.ps1
index c8d33139..a3afe987 100644
--- a/jumpcloud-ADMU/Powershell/Form.ps1
+++ b/jumpcloud-ADMU/Powershell/Form.ps1
@@ -153,10 +153,10 @@ 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.7.4"
+        Title="JumpCloud ADMU 2.7.1"
         WindowStyle="SingleBorderWindow"
         ResizeMode="NoResize"
-        Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1020" Height="590">
+        Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1010" Height="580">
     <Window.Resources>
         <Style TargetType="PasswordBox">
             <Setter Property="Template">
@@ -242,20 +242,21 @@ function show-mtpSelection {
             <GroupBox Header="" Style="{StaticResource NoHeaderGroupBoxStyle}" Height="186" Margin="0,47,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="295" Grid.Row="0" Grid.Column="0">
                 <Grid HorizontalAlignment="Center" VerticalAlignment="Top" Width="270" MinWidth="245" Margin="0,0,0,0">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="160"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
-                    <Label Content="System Information" Foreground="#202D38" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="SemiBold" Margin="0,5,0,0" Grid.RowSpan="2" Height="26"/>
-                    <Grid Grid.Row="1" Margin="0,36,0,0">
+                    <Label Content="System Information" Foreground="#202D38" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="SemiBold" Grid.ColumnSpan="2" Margin="0,3,0,0"/>
+                    <Grid Grid.Row="1" Margin="0,0,0,0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="125"/>
                             <ColumnDefinition Width="125"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="25"/>
-                            <RowDefinition Height="25"/>
-                            <RowDefinition Height="25"/>
-                            <RowDefinition Height="25"/>
-                            <RowDefinition Height="25"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="30"/>
                         </Grid.RowDefinitions>
                         <Label Content="Computer Name:" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" FontWeight="Normal" Grid.Column="0" Grid.ColumnSpan="1" Grid.Row="0" />
                         <Label Content="Domain Name:" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" FontWeight="Normal" Grid.Column="0" Grid.ColumnSpan="1" Grid.Row="1" />
@@ -279,11 +280,12 @@ function show-mtpSelection {
                         <ColumnDefinition Width="0*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="180"/>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
                     </Grid.RowDefinitions>
                     <Label HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="SemiBold" Foreground="#202D38" Content="Select a domain or Entra ID account to be migrated" Margin="0,5,0,0" Grid.RowSpan="2" Height="26" Width="297"/>
                     <!-- ListView -->
-                    <ListView Name="lvProfileList" Grid.Row="1" BorderBrush="White" MinWidth="670" HorizontalAlignment="Left" Margin="0,36,0,0" Grid.ColumnSpan="2">
+                    <ListView Name="lvProfileList" Grid.Row="1" BorderBrush="White" Width="Auto" HorizontalAlignment="Left" Margin="0,36,0,0" Grid.ColumnSpan="2">
                         <ListView.View>
                             <GridView AllowsColumnReorder="True">
                                 <GridView.ColumnHeaderContainerStyle>
@@ -295,7 +297,7 @@ function show-mtpSelection {
                                         <Setter Property="FontFamily" Value="Segoe UI"/>
                                         <Setter Property="FontWeight" Value="SemiBold"/>
                                         <Setter Property="Foreground" Value="#202D38"/>
-                                        <Setter Property="Margin" Value="5,0,0,0"/>
+                                        <Setter Property="Padding" Value="1"/>
                                     </Style>
                                 </GridView.ColumnHeaderContainerStyle>
                                 <GridViewColumn Header="System Accounts" DisplayMemberBinding="{Binding UserName}" Width="auto" />
@@ -332,24 +334,24 @@ function show-mtpSelection {
             </GroupBox>
 
             <!-- System Migration Information -->
-            <GroupBox Header="" Style="{StaticResource NoHeaderGroupBoxStyle}" MinHeight="145" Margin="0,10,0,0" Grid.Row="1" Grid.Column="0">
+            <GroupBox Header="" Style="{StaticResource NoHeaderGroupBoxStyle}" MinHeight="165" Margin="0,10,0,0" Grid.Row="1" Grid.Column="0">
                 <Grid HorizontalAlignment="Left" Width="Auto" Height="Auto">
                     <Label FontWeight="SemiBold" Foreground="#202D38" Content="System Migration Options" Margin="5,0,328,211"/>
-                    <TextBlock Name="lbl_connectkey" HorizontalAlignment="Left" Margin="10,111,0,0" Text="JumpCloud Connect Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
-                    <PasswordBox Name="tbJumpCloudConnectKey" HorizontalAlignment="Left" Height="23" Margin="10,132,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False"/>
-                    <TextBlock Name="lbl_apikey" HorizontalAlignment="Left" Margin="10,164,0,0" Text="JumpCloud API Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
-                    <PasswordBox Name="tbJumpCloudAPIKey" HorizontalAlignment="Left" Height="23" Margin="10,185,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False" />
-                    <TextBlock Name="lbl_orgNameTitle" HorizontalAlignment="Left" Margin="10,219,0,0" Text="Organization Name:" VerticalAlignment="Top" FontWeight="Normal"/>
-                    <TextBlock Name="lbl_orgName" HorizontalAlignment="Left" Margin="124,219,0,0" Text="Not Currently Connected To A JumpCloud Organization" VerticalAlignment="Top" FontWeight="Normal"/>
+                    <TextBlock Name="lbl_connectkey" HorizontalAlignment="Left" Margin="10,121,0,0" Text="JumpCloud Connect Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
+                    <PasswordBox Name="tbJumpCloudConnectKey" HorizontalAlignment="Left" Height="23" Margin="10,142,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False"/>
+                    <TextBlock Name="lbl_apikey" HorizontalAlignment="Left" Margin="10,174,0,0" Text="JumpCloud API Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
+                    <PasswordBox Name="tbJumpCloudAPIKey" HorizontalAlignment="Left" Height="23" Margin="10,195,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False" />
+                    <TextBlock Name="lbl_orgNameTitle" HorizontalAlignment="Left" Margin="10,229,0,0" Text="Organization Name:" VerticalAlignment="Top" FontWeight="Normal"/>
+                    <TextBlock Name="lbl_orgName" HorizontalAlignment="Left" Margin="124,229,0,0" Text="Not Currently Connected To A JumpCloud Organization" VerticalAlignment="Top" FontWeight="Normal"/>
                     <CheckBox Name="cb_forcereboot" Content="Force Reboot" HorizontalAlignment="Left" Margin="10,76,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False"/>
                     <CheckBox Name="cb_installjcagent" Content="Install JCAgent" HorizontalAlignment="Left" Margin="10,36,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False"/>
                     <CheckBox Name="cb_bindAsAdmin" Content="Bind As Admin" HorizontalAlignment="Left" Margin="118,56,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False" IsEnabled="False"/>
                     <CheckBox Name="cb_leavedomain" ToolTipService.ShowOnDisabled="True" Content="Leave Domain" HorizontalAlignment="Left" Margin="10,56,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False"/>
                     <CheckBox Name="cb_autobindjcuser" Content="Autobind JC User" HorizontalAlignment="Left" Margin="118,36,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False" />
-                    <Image Name="img_ckey_valid" HorizontalAlignment="Left" Height="23" Margin="446,135,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Connect Key must be 40chars &amp; not contain spaces" />
-                    <Image Name="img_ckey_info" HorizontalAlignment="Left" Height="14" Margin="152,114,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="The Connect Key provides you with a means of associating this system with your JumpCloud organization. The Key is used to deploy the agent to this system." />
-                    <Image Name="img_apikey_info" HorizontalAlignment="Left" Height="14" Margin="124,167,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Click the link for more info on how to obtain the api key. The API key must be from a user with at least 'Manager' or 'Administrator' privileges." />
-                    <Image Name="img_apikey_valid" HorizontalAlignment="Left" Height="23" Margin="446,188,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Correct error" />
+                    <Image Name="img_ckey_valid" HorizontalAlignment="Left" Height="23" Margin="446,145,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Connect Key must be 40chars &amp; not contain spaces" />
+                    <Image Name="img_ckey_info" HorizontalAlignment="Left" Height="14" Margin="152,124,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="The Connect Key provides you with a means of associating this system with your JumpCloud organization. The Key is used to deploy the agent to this system." />
+                    <Image Name="img_apikey_info" HorizontalAlignment="Left" Height="14" Margin="124,177,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Click the link for more info on how to obtain the api key. The API key must be from a user with at least 'Manager' or 'Administrator' privileges." />
+                    <Image Name="img_apikey_valid" HorizontalAlignment="Left" Height="23" Margin="446,198,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Correct error" />
                 </Grid>
             </GroupBox>
 
diff --git a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 b/jumpcloud-ADMU/Powershell/ProgressForm.ps1
index fc391f89..d6aa5473 100644
--- a/jumpcloud-ADMU/Powershell/ProgressForm.ps1
+++ b/jumpcloud-ADMU/Powershell/ProgressForm.ps1
@@ -37,10 +37,10 @@ function New-ProgressForm {
     <Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Name="Window" Title="JumpCloud ADMU 2.7.4"
+    Name="Window" Title="JumpCloud ADMU 2.7.1"
     WindowStyle="SingleBorderWindow"
     ResizeMode="NoResize"
-    Background="White" Width="720" Height="550  ">
+    Background="White" Width="720" Height="540">
     <Window.Resources>
         <Style x:Key="NoHeaderGroupBoxStyle" TargetType="{x:Type GroupBox}">
             <Setter Property="Template">
diff --git a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 b/jumpcloud-ADMU/Powershell/Start-Migration.ps1
index c8f4bff7..37d39ca8 100644
--- a/jumpcloud-ADMU/Powershell/Start-Migration.ps1
+++ b/jumpcloud-ADMU/Powershell/Start-Migration.ps1
@@ -1833,20 +1833,6 @@ function Get-ProfileSize {
     Write-ToLog -Message:("Profile Size: $totalSizeGB GB")
     return $totalSizeGB
 }
-
-function Get-DomainStatus {
-    $ADStatus = dsregcmd.exe /status
-    foreach ($line in $ADStatus) {
-        if ($line -match "AzureADJoined : ") {
-            $AzureADStatus = ($line.trimstart('AzureADJoined : '))
-        }
-        if ($line -match "DomainJoined : ") {
-            $LocalDomainStatus = ($line.trimstart('DomainJoined : '))
-        }
-    }
-    # Return both statuses
-    return $AzureADStatus, $LocalDomainStatus
-}
 Function Start-Migration {
     [CmdletBinding(HelpURI = "https://github.com/TheJumpCloud/jumpcloud-ADMU/wiki/Start-Migration")]
     Param (
@@ -1883,12 +1869,12 @@ Function Start-Migration {
         $AGENT_INSTALLER_URL = "https://cdn02.jumpcloud.com/production/jcagent-msi-signed.msi"
         $AGENT_INSTALLER_PATH = "$windowsDrive\windows\Temp\JCADMU\jcagent-msi-signed.msi"
         $AGENT_CONF_PATH = "$($AGENT_PATH)\Plugins\Contrib\jcagent.conf"
-        $admuVersion = '2.7.4'
+        $admuVersion = '2.7.1'
 
         $script:AdminDebug = $AdminDebug
         $isForm = $PSCmdlet.ParameterSetName -eq "form"
         If ($isForm) {
-            $useragent = "JumpCloud_ADMU.Application/$($admuVersion)"
+            $useragent = "JumpCloud.ADMU_Application/$($admuVersion)"
             Write-ToLog -Message:("UserAgent: $useragent")
             $SelectedUserName = $inputObject.SelectedUserName
             $SelectedUserSid = Test-UsernameOrSID $SelectedUserName
@@ -1940,7 +1926,7 @@ Function Start-Migration {
             $ForceReboot = $InputObject.ForceReboot
             $UpdateHomePath = $inputObject.UpdateHomePath
         } else {
-            $useragent = "JumpCloud_ADMU.Powershell/$($admuVersion)"
+            $useragent = "JumpCloud_ADMU.PowershellModule/$($admuVersion)"
             Write-ToLog -Message:("UserAgent: $useragent")
             $SelectedUserSid = Test-UsernameOrSID $SelectedUserName
         }
@@ -2772,9 +2758,21 @@ Function Start-Migration {
             }
             $appxList = @()
 
-            Write-ToProgress -ProgressBar $Progressbar -Status "CheckADStatus" -form $isForm
             # Get Azure AD Status
-            $AzureADStatus, $LocalDomainStatus = Get-DomainStatus
+
+            $ADStatus = dsregcmd.exe /status
+            foreach ($line in $ADStatus) {
+                if ($line -match "AzureADJoined : ") {
+                    $AzureADStatus = ($line.trimstart('AzureADJoined : '))
+                }
+                if ($line -match "DomainJoined : ") {
+
+                    $AzureDomainStatus = ($line.trimstart('DomainJoined : '))
+                }
+            }
+            Write-ToProgress -ProgressBar $Progressbar -Status "CheckADStatus" -form $isForm
+
+            Write-ToLog "AzureAD Status: $AzureADStatus" -Level Verbose
 
             if ($AzureADStatus -eq 'YES' -or $netBiosName -match 'AzureAD') {
                 # Find Appx User Apps by Username
@@ -2844,66 +2842,71 @@ Function Start-Migration {
 
             $WmiComputerSystem = Get-WmiObject -Class:('Win32_ComputerSystem')
             if ($LeaveDomain -eq $true) {
-                if ($AzureADStatus -match 'YES' -and $LocalDomainStatus -match 'YES') {
-                    Write-ToLog -Message:('Device is HYBRID joined')
-                    $ADJoined = "Hybrid"
-                } elseif ($AzureADStatus -match 'NO' -and $LocalDomainStatus -match 'Yes') {
-                    Write-ToLog -Message:('Device is Local Domain joined')
-                    $ADJoined = "LocalJoined"
-                } elseif ($AzureADStatus -match 'YES' -and $LocalDomainStatus -match 'NO') {
-                    Write-ToLog -Message:('Device is Azure AD joined')
-                    $ADJoined = "AzureADJoined"
-                }
-                if ($ADJoined) {
-                    switch ($ADJoined) {
-                        "Hybrid" {
-                            Remove-Computer -force #LeaveHybrid
-                            $AzureADStatus, $LocalDomainStatus = Get-DomainStatus
-                            if ($AzureADStatus -match 'NO' -and $LocalDomainStatus -match 'NO') {
-                                Write-ToLog -Message:('Left Hybrid Domain successfully') -Level:('Info')
-                                $admuTracker.leaveDomain.pass = $true
-                            } else {
-                                Write-ToLog -Message:('Unable to leave Hybrid Domain') -Level:('Warn')
-                                $admuTracker.leaveDomain.fail = $true
-                            }
+                if ($AzureADStatus -match 'YES' -or $LocalDomainStatus -match 'YES') {
+                    try {
+                        if ($LocalDomainStatus -match 'NO') {
+                            dsregcmd.exe /leave # Leave Azure AD
+                        } else {
+                            Remove-Computer -force #Leave local AD or Hybrid
                         }
-                        "LocalJoined" {
-                            $WmiComputerSystem.UnJoinDomainOrWorkGroup($null, $null, 0)
-                            $AzureADStatus, $LocalDomainStatus = Get-DomainStatus
-                            if ($AzureADStatus -match 'NO' -and $LocalDomainStatus -match 'NO') {
-                                Write-ToLog -Message:('Left local domain successfully') -Level:('Info')
-                                $admuTracker.leaveDomain.pass = $true
-                            } else {
-                                Write-ToLog -Message:('Unable to leave local domain') -Level:('Warn')
-                                $admuTracker.leaveDomain.fail = $true
+                    } catch {
+                        Write-ToLog -Message:('Unable to leave domain, JumpCloud agent will not start until resolved') -Level:('Warn')
+                    }
+                    # Get Azure AD Status
+                    $ADStatus = dsregcmd.exe /status
+                    foreach ($line in $ADStatus) {
+                        if ($line -match "AzureADJoined : ") {
+                            $AzureADStatus = ($line.trimstart('AzureADJoined : '))
+                        }
+                        if ($line -match "DomainJoined : ") {
+                            $LocalDomainStatus = ($line.trimstart('DomainJoined : '))
+                        }
+                    }
+                    # Check Azure AD status after running dsregcmd.exe /leave as NTAUTHORITY\SYSTEM
+                    if ($AzureADStatus -match 'NO') {
+                        Write-toLog -message "Left Azure AD domain successfully. Device Domain State, AzureADJoined : $AzureADStatus"
+                        $admuTracker.leaveDomain.pass = $true
+                    } else {
+                        Write-ToLog -Message:('Unable to leave Azure Domain. Re-running dsregcmd.exe /leave') -Level:('Warn')
+                        dsregcmd.exe /leave # Leave Azure AD
+
+                        $ADStatus = dsregcmd.exe /status
+                        foreach ($line in $ADStatus) {
+                            if ($line -match "AzureADJoined : ") {
+                                $AzureADStatus = ($line.trimstart('AzureADJoined : '))
                             }
                         }
-                        "AzureADJoined" {
-                            dsregcmd.exe /leave # Leave Azure AD
-                            # Get Azure AD Status after running dsregcmd.exe /leave
-                            $AzureADStatus = Get-DomainStatus
-                            # Check Azure AD status after running dsregcmd.exe /leave as NTAUTHORITY\SYSTEM
-                            if ($AzureADStatus -match 'NO') {
-                                Write-toLog -message "Left Azure AD domain successfully. Device Domain State, AzureADJoined : $AzureADStatus"
-                                $admuTracker.leaveDomain.pass = $true
-                            } else {
-                                Write-ToLog -Message:('Unable to leave Azure Domain. Re-running dsregcmd.exe /leave') -Level:('Warn')
-                                dsregcmd.exe /leave # Leave Azure AD
-
-                                $AzureADStatus = Get-DomainStatus
-                                if ($AzureADStatus -match 'NO') {
-                                    Write-ToLog -Message:('Left Azure AD domain successfully') -Level:('Info')
-                                    $admuTracker.leaveDomain.pass = $true
-                                } else {
-                                    Write-ToLog -Message:('Unable to leave Azure AD domain') -Level:('Warn')
-                                    $admuTracker.leaveDomain.fail = $true
-                                }
+                        if ($AzureADStatus -match 'NO') {
+                            Write-ToLog -Message:('Left Azure AD domain successfully') -Level:('Info')
+                            $admuTracker.leaveDomain.pass = $true
+                        } else {
+                            Write-ToLog -Message:('Unable to leave Azure AD domain') -Level:('Warn')
+                            $admuTracker.leaveDomain.fail = $true
+                        }
 
+                    }
+
+                    if ($LocalDomainStatus -match 'NO') {
+                        Write-toLog -message "Local Domain State, Local Domain Joined : $LocalDomainStatus"
+                        $admuTracker.leaveDomain.pass = $true
+                    } else {
+                        Write-ToLog -Message:('Unable to leave local domain using remove-computer...Running UnJoinDomainOrWorkGroup') -Level:('Warn')
+                        $WmiComputerSystem.UnJoinDomainOrWorkGroup($null, $null, 0)
+
+                        $ADStatus = dsregcmd.exe /status
+                        foreach ($line in $ADStatus) {
+                            if ($line -match "DomainJoined : ") {
+                                $LocalDomainStatus = ($line.trimstart('DomainJoined : '))
                             }
                         }
+                        if ($LocalDomainStatus -match 'NO') {
+                            Write-ToLog -Message:('Left local domain successfully') -Level:('Info')
+                            $admuTracker.leaveDomain.pass = $true
+                        } else {
+                            Write-ToLog -Message:('Unable to leave local domain') -Level:('Warn')
+                            $admuTracker.leaveDomain.fail = $true
+                        }
                     }
-                } else {
-                    Write-ToLog -Message:('Device is not joined to a domain, skipping leave domain step')
                 }
             }
 

From 5d5c357ce74b954e488caf7b580f74daeded9c62 Mon Sep 17 00:00:00 2001
From: Ryan Casperson <ryan.casperson@jumpcloud.com>
Date: Tue, 20 Aug 2024 15:13:31 -0400
Subject: [PATCH 3/6] back to master

---
 Deploy/uwp_jcadmu.ps1                         | Bin 60594 -> 65606 bytes
 ModuleChangelog.md                            |  39 ++++-
 jumpcloud-ADMU/JumpCloud.ADMU.psd1            |   2 +-
 jumpcloud-ADMU/Powershell/Form.ps1            |  50 +++---
 jumpcloud-ADMU/Powershell/ProgressForm.ps1    |   4 +-
 jumpcloud-ADMU/Powershell/Start-Migration.ps1 | 147 +++++++++---------
 6 files changed, 136 insertions(+), 106 deletions(-)

diff --git a/Deploy/uwp_jcadmu.ps1 b/Deploy/uwp_jcadmu.ps1
index 82aafd7663876a5de6f1bdfd272a0d8538d6eda3..e5874726999b95fe1b7d9730c71baacf6c00d400 100644
GIT binary patch
delta 7387
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

delta 3770
zcmc&%O=w(I82v(9p=lEBA0cY-IWuCWF|Uc*q77Y4Vnd>7$v82BQOY<o$&4nGFf*Mb
zmNG6}xvJc)Aa><SN(OWz6kNCpG~%k_M$u+bq(ZTaisCu<&dd8v(yq$zGH>qv{?GTF
zd-KD`d)IF6xpwu6vhIAN?q6tEYqy_P-`$u>$0Q@GQk9w%WI=3sO)8R=WhqHn<|HOb
z>6CV{^k+uuvWT6$yeBh|E6A+O<8KbyCG3=;pH)BIIMWtW2RD+Pjy5eMn$0VHuRQA-
zOUQ^;q2n?PSaJr>jJmo0YGW87RIz?aUiJl$!CFoFLz?|E35}W*VIiUI)#WsPGo>YY
zS3W?9^YAu@$HuQEyjid_4Xt^(2s!F)#WUIps9(<FEeEB1s~(mNqgpgf^-=6puwT$M
z@}^dT<2jW++uiWj)0T1UWZ}Mm8lJ{y6c!e-HVY4|WiM*}peeAvLmqq*C|XYA!jfiS
z@gw!wdXKU;o_x#p;XIE0Ssgv2anLgnO~L}>&*FPk&Oxe--!(0*ZMylY)bHtd8Iteo
z*ry>^MLAj23^Z2tYE^pGkM`k495pilT3Dw}0pFIc<_i9L>&JRm0Tbm`WeSp%Ff9_3
z*WrV}j$nTg?|JM{-qM~Iu*QD2u+G?t6)>E@YaKr-*fPy+!8Fw?S}~`Az6hxrdL-rx
zhk!GH2`6mz?dCC-wPCw!J8QsZFpY$6t8kjJ0H`7Fu*KFxr0S*H-ML_kwf0&K#sVzs
zwn}MW2~JF2K+Z49fN#1I$S{y6JZ-hnLeP)X45n=yKPO>zK-(YGZ^0Ig^5G6e3elA?
z9%T;Cv7pDT3Dvm|{&F~Ne4m3(9v=?S2p(ccr2WGY<$0==@k9C@H-4vp0^9ImJWfC-
zhdyczT_j0NLWVtB3t-p_93zGt{%uX!d1#OW`|(7hNn$rrNywbgU67pDaP4Hg2p5E<
z2nRcv_sV%3K&MZ;LTiu<_Q&x{bAft%^XUGB!$qF4GTgf08!CsfI7%!$xyejAj}BU4
zbMxTva*3<u*c^sl1!Z81xIEQ5fUvTvzF0rN@lM;|`zToh|9R}O?fq@$`g>c0NETYw
zegL||$5}JN74TSu6l^+;odxlbjltzu&2Q_AM`lhw)Q1>Zu@c!>93Z{hvcC*O$?e<c
z;EWtksd-(E71Y|)dvuq2XC5<Qt4pJOp@Yz2k6sO3=-@&~wl0n7R`S($oj(Ryr#a1a
z#f6`Z#)hb!!pjoGcvm6i7jXV8qPDJRBCt>7S3Dg#>C@J`yJ`DUaH>W$=K=$J9MKJ8
z?c{bAIatP}E#7>CM*Vxcn)O&sp_Ow|RF`k{sez65Zd+O_D1&EA)b(3Woro+I!Vhp8
zl47HrSJyY=A^csABk_>e{Db3gS&O4!hpa|9Ka5UQI7UI8q)TiKk9mKQ9@Ig!Rx)se
zMhBOX17?6pS$T&9aC?YqDrYjZED$nO@D4P2QQW0rfr5LQ`n$u>l&c?q0tMwULk8gO
zGpqi*6K}XM;MSxMAv60`m`<U@c@0ANF!lbY-~}^mCA(!MqFRkWLEUhS^9!KTA_7}R
zXylGdc)adXdc;e(>+y``g_;M^Wjxyj=-8uVr>L*)b~MNSI<imIk90L>|32P!FqEsx
z{PBibyLV{cbGS+ksV|>7s;>RISAG6lR}T+h-Z;ZLsfF(6L#wFin~<N?j8ug#gBVhf
qZT@_3Y|kTb&1Alw?r7HUUwstrv;X#}PwyU59shJSKl$(bw*LW)RL$D}

diff --git a/ModuleChangelog.md b/ModuleChangelog.md
index 023e4ddf..c4197d9d 100644
--- a/ModuleChangelog.md
+++ b/ModuleChangelog.md
@@ -1,9 +1,44 @@
-## 2.7.0
+## 2.7.4
+
+Release Date: August 14, 2024
+
+#### RELEASE NOTES
+
+#### Bug Fixes:
+
+```
+* Fixed an freezing issue with UWP app/form when interacted
+* Updated useragent text
+```
+## 2.7.3
+
+Release Date: July 25, 2024
+
+#### RELEASE NOTES
+
+#### Bug Fixes:
+
+```
+* Fixed an issue with leave local AD
+```
+## 2.7.2
 
 Release Date: July 16, 2024
 
+#### RELEASE NOTES
+
+#### Bug Fixes:
+
+```
+* When a system had more than 5 local user accounts, the GUI window would stretch to show multiple accounts and the Migrate button would become hidden. The window size is set to a static value in this release.
+```
+
+## 2.7.1
+
+Release Date: July 16, 2024
 
 #### RELEASE NOTES
+
 ```
 * UI improvements for Form
 * While migrating with the exe application, the ADMU will now show the progress of the migration within a GUI window. Migration logs can be viewed in this window, new migrations can be triggered after a successful or failed migration.
@@ -11,6 +46,7 @@ Release Date: July 16, 2024
 * Added an optional param -AdminDebug for showing verbose log messages
 * An error mapping function was added to the tool to provide better feedback when the tool encounters an issue with a migration.
 ```
+
 #### Bug Fixes:
 
 ```
@@ -19,7 +55,6 @@ Release Date: July 16, 2024
 * UWP wording change
 ```
 
-
 ## 2.6.8
 
 Release Date: May 14, 2024
diff --git a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 b/jumpcloud-ADMU/JumpCloud.ADMU.psd1
index 97bf7c9a..0f599922 100644
--- a/jumpcloud-ADMU/JumpCloud.ADMU.psd1
+++ b/jumpcloud-ADMU/JumpCloud.ADMU.psd1
@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.7.1'
+    ModuleVersion     = '2.7.4'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/jumpcloud-ADMU/Powershell/Form.ps1 b/jumpcloud-ADMU/Powershell/Form.ps1
index a3afe987..c8d33139 100644
--- a/jumpcloud-ADMU/Powershell/Form.ps1
+++ b/jumpcloud-ADMU/Powershell/Form.ps1
@@ -153,10 +153,10 @@ 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.7.1"
+        Title="JumpCloud ADMU 2.7.4"
         WindowStyle="SingleBorderWindow"
         ResizeMode="NoResize"
-        Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1010" Height="580">
+        Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1020" Height="590">
     <Window.Resources>
         <Style TargetType="PasswordBox">
             <Setter Property="Template">
@@ -242,21 +242,20 @@ function show-mtpSelection {
             <GroupBox Header="" Style="{StaticResource NoHeaderGroupBoxStyle}" Height="186" Margin="0,47,0,0" HorizontalAlignment="Left" VerticalAlignment="Top" Width="295" Grid.Row="0" Grid.Column="0">
                 <Grid HorizontalAlignment="Center" VerticalAlignment="Top" Width="270" MinWidth="245" Margin="0,0,0,0">
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="160"/>
                     </Grid.RowDefinitions>
-                    <Label Content="System Information" Foreground="#202D38" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="SemiBold" Grid.ColumnSpan="2" Margin="0,3,0,0"/>
-                    <Grid Grid.Row="1" Margin="0,0,0,0">
+                    <Label Content="System Information" Foreground="#202D38" HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="SemiBold" Margin="0,5,0,0" Grid.RowSpan="2" Height="26"/>
+                    <Grid Grid.Row="1" Margin="0,36,0,0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="125"/>
                             <ColumnDefinition Width="125"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="30"/>
-                            <RowDefinition Height="30"/>
-                            <RowDefinition Height="30"/>
-                            <RowDefinition Height="30"/>
-                            <RowDefinition Height="30"/>
+                            <RowDefinition Height="25"/>
+                            <RowDefinition Height="25"/>
+                            <RowDefinition Height="25"/>
+                            <RowDefinition Height="25"/>
+                            <RowDefinition Height="25"/>
                         </Grid.RowDefinitions>
                         <Label Content="Computer Name:" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" FontWeight="Normal" Grid.Column="0" Grid.ColumnSpan="1" Grid.Row="0" />
                         <Label Content="Domain Name:" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" FontWeight="Normal" Grid.Column="0" Grid.ColumnSpan="1" Grid.Row="1" />
@@ -280,12 +279,11 @@ function show-mtpSelection {
                         <ColumnDefinition Width="0*"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="180"/>
                     </Grid.RowDefinitions>
                     <Label HorizontalAlignment="Left" VerticalAlignment="Top" FontWeight="SemiBold" Foreground="#202D38" Content="Select a domain or Entra ID account to be migrated" Margin="0,5,0,0" Grid.RowSpan="2" Height="26" Width="297"/>
                     <!-- ListView -->
-                    <ListView Name="lvProfileList" Grid.Row="1" BorderBrush="White" Width="Auto" HorizontalAlignment="Left" Margin="0,36,0,0" Grid.ColumnSpan="2">
+                    <ListView Name="lvProfileList" Grid.Row="1" BorderBrush="White" MinWidth="670" HorizontalAlignment="Left" Margin="0,36,0,0" Grid.ColumnSpan="2">
                         <ListView.View>
                             <GridView AllowsColumnReorder="True">
                                 <GridView.ColumnHeaderContainerStyle>
@@ -297,7 +295,7 @@ function show-mtpSelection {
                                         <Setter Property="FontFamily" Value="Segoe UI"/>
                                         <Setter Property="FontWeight" Value="SemiBold"/>
                                         <Setter Property="Foreground" Value="#202D38"/>
-                                        <Setter Property="Padding" Value="1"/>
+                                        <Setter Property="Margin" Value="5,0,0,0"/>
                                     </Style>
                                 </GridView.ColumnHeaderContainerStyle>
                                 <GridViewColumn Header="System Accounts" DisplayMemberBinding="{Binding UserName}" Width="auto" />
@@ -334,24 +332,24 @@ function show-mtpSelection {
             </GroupBox>
 
             <!-- System Migration Information -->
-            <GroupBox Header="" Style="{StaticResource NoHeaderGroupBoxStyle}" MinHeight="165" Margin="0,10,0,0" Grid.Row="1" Grid.Column="0">
+            <GroupBox Header="" Style="{StaticResource NoHeaderGroupBoxStyle}" MinHeight="145" Margin="0,10,0,0" Grid.Row="1" Grid.Column="0">
                 <Grid HorizontalAlignment="Left" Width="Auto" Height="Auto">
                     <Label FontWeight="SemiBold" Foreground="#202D38" Content="System Migration Options" Margin="5,0,328,211"/>
-                    <TextBlock Name="lbl_connectkey" HorizontalAlignment="Left" Margin="10,121,0,0" Text="JumpCloud Connect Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
-                    <PasswordBox Name="tbJumpCloudConnectKey" HorizontalAlignment="Left" Height="23" Margin="10,142,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False"/>
-                    <TextBlock Name="lbl_apikey" HorizontalAlignment="Left" Margin="10,174,0,0" Text="JumpCloud API Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
-                    <PasswordBox Name="tbJumpCloudAPIKey" HorizontalAlignment="Left" Height="23" Margin="10,195,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False" />
-                    <TextBlock Name="lbl_orgNameTitle" HorizontalAlignment="Left" Margin="10,229,0,0" Text="Organization Name:" VerticalAlignment="Top" FontWeight="Normal"/>
-                    <TextBlock Name="lbl_orgName" HorizontalAlignment="Left" Margin="124,229,0,0" Text="Not Currently Connected To A JumpCloud Organization" VerticalAlignment="Top" FontWeight="Normal"/>
+                    <TextBlock Name="lbl_connectkey" HorizontalAlignment="Left" Margin="10,111,0,0" Text="JumpCloud Connect Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
+                    <PasswordBox Name="tbJumpCloudConnectKey" HorizontalAlignment="Left" Height="23" Margin="10,132,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False"/>
+                    <TextBlock Name="lbl_apikey" HorizontalAlignment="Left" Margin="10,164,0,0" Text="JumpCloud API Key :" VerticalAlignment="Top" TextDecorations="Underline" Foreground="#FF000CFF"/>
+                    <PasswordBox Name="tbJumpCloudAPIKey" HorizontalAlignment="Left" Height="23" Margin="10,185,0,0" VerticalAlignment="Top" Width="432"  Background="#FFC6CBCF" FontWeight="Bold" IsEnabled="False" />
+                    <TextBlock Name="lbl_orgNameTitle" HorizontalAlignment="Left" Margin="10,219,0,0" Text="Organization Name:" VerticalAlignment="Top" FontWeight="Normal"/>
+                    <TextBlock Name="lbl_orgName" HorizontalAlignment="Left" Margin="124,219,0,0" Text="Not Currently Connected To A JumpCloud Organization" VerticalAlignment="Top" FontWeight="Normal"/>
                     <CheckBox Name="cb_forcereboot" Content="Force Reboot" HorizontalAlignment="Left" Margin="10,76,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False"/>
                     <CheckBox Name="cb_installjcagent" Content="Install JCAgent" HorizontalAlignment="Left" Margin="10,36,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False"/>
                     <CheckBox Name="cb_bindAsAdmin" Content="Bind As Admin" HorizontalAlignment="Left" Margin="118,56,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False" IsEnabled="False"/>
                     <CheckBox Name="cb_leavedomain" ToolTipService.ShowOnDisabled="True" Content="Leave Domain" HorizontalAlignment="Left" Margin="10,56,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False"/>
                     <CheckBox Name="cb_autobindjcuser" Content="Autobind JC User" HorizontalAlignment="Left" Margin="118,36,0,0" VerticalAlignment="Top" FontWeight="Normal" IsChecked="False" />
-                    <Image Name="img_ckey_valid" HorizontalAlignment="Left" Height="23" Margin="446,145,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Connect Key must be 40chars &amp; not contain spaces" />
-                    <Image Name="img_ckey_info" HorizontalAlignment="Left" Height="14" Margin="152,124,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="The Connect Key provides you with a means of associating this system with your JumpCloud organization. The Key is used to deploy the agent to this system." />
-                    <Image Name="img_apikey_info" HorizontalAlignment="Left" Height="14" Margin="124,177,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Click the link for more info on how to obtain the api key. The API key must be from a user with at least 'Manager' or 'Administrator' privileges." />
-                    <Image Name="img_apikey_valid" HorizontalAlignment="Left" Height="23" Margin="446,198,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Correct error" />
+                    <Image Name="img_ckey_valid" HorizontalAlignment="Left" Height="23" Margin="446,135,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Connect Key must be 40chars &amp; not contain spaces" />
+                    <Image Name="img_ckey_info" HorizontalAlignment="Left" Height="14" Margin="152,114,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="The Connect Key provides you with a means of associating this system with your JumpCloud organization. The Key is used to deploy the agent to this system." />
+                    <Image Name="img_apikey_info" HorizontalAlignment="Left" Height="14" Margin="124,167,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Click the link for more info on how to obtain the api key. The API key must be from a user with at least 'Manager' or 'Administrator' privileges." />
+                    <Image Name="img_apikey_valid" HorizontalAlignment="Left" Height="23" Margin="446,188,0,0" VerticalAlignment="Top" Width="14" Visibility="Hidden" ToolTip="Correct error" />
                 </Grid>
             </GroupBox>
 
diff --git a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 b/jumpcloud-ADMU/Powershell/ProgressForm.ps1
index d6aa5473..fc391f89 100644
--- a/jumpcloud-ADMU/Powershell/ProgressForm.ps1
+++ b/jumpcloud-ADMU/Powershell/ProgressForm.ps1
@@ -37,10 +37,10 @@ function New-ProgressForm {
     <Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Name="Window" Title="JumpCloud ADMU 2.7.1"
+    Name="Window" Title="JumpCloud ADMU 2.7.4"
     WindowStyle="SingleBorderWindow"
     ResizeMode="NoResize"
-    Background="White" Width="720" Height="540">
+    Background="White" Width="720" Height="550  ">
     <Window.Resources>
         <Style x:Key="NoHeaderGroupBoxStyle" TargetType="{x:Type GroupBox}">
             <Setter Property="Template">
diff --git a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 b/jumpcloud-ADMU/Powershell/Start-Migration.ps1
index 37d39ca8..c8f4bff7 100644
--- a/jumpcloud-ADMU/Powershell/Start-Migration.ps1
+++ b/jumpcloud-ADMU/Powershell/Start-Migration.ps1
@@ -1833,6 +1833,20 @@ function Get-ProfileSize {
     Write-ToLog -Message:("Profile Size: $totalSizeGB GB")
     return $totalSizeGB
 }
+
+function Get-DomainStatus {
+    $ADStatus = dsregcmd.exe /status
+    foreach ($line in $ADStatus) {
+        if ($line -match "AzureADJoined : ") {
+            $AzureADStatus = ($line.trimstart('AzureADJoined : '))
+        }
+        if ($line -match "DomainJoined : ") {
+            $LocalDomainStatus = ($line.trimstart('DomainJoined : '))
+        }
+    }
+    # Return both statuses
+    return $AzureADStatus, $LocalDomainStatus
+}
 Function Start-Migration {
     [CmdletBinding(HelpURI = "https://github.com/TheJumpCloud/jumpcloud-ADMU/wiki/Start-Migration")]
     Param (
@@ -1869,12 +1883,12 @@ Function Start-Migration {
         $AGENT_INSTALLER_URL = "https://cdn02.jumpcloud.com/production/jcagent-msi-signed.msi"
         $AGENT_INSTALLER_PATH = "$windowsDrive\windows\Temp\JCADMU\jcagent-msi-signed.msi"
         $AGENT_CONF_PATH = "$($AGENT_PATH)\Plugins\Contrib\jcagent.conf"
-        $admuVersion = '2.7.1'
+        $admuVersion = '2.7.4'
 
         $script:AdminDebug = $AdminDebug
         $isForm = $PSCmdlet.ParameterSetName -eq "form"
         If ($isForm) {
-            $useragent = "JumpCloud.ADMU_Application/$($admuVersion)"
+            $useragent = "JumpCloud_ADMU.Application/$($admuVersion)"
             Write-ToLog -Message:("UserAgent: $useragent")
             $SelectedUserName = $inputObject.SelectedUserName
             $SelectedUserSid = Test-UsernameOrSID $SelectedUserName
@@ -1926,7 +1940,7 @@ Function Start-Migration {
             $ForceReboot = $InputObject.ForceReboot
             $UpdateHomePath = $inputObject.UpdateHomePath
         } else {
-            $useragent = "JumpCloud_ADMU.PowershellModule/$($admuVersion)"
+            $useragent = "JumpCloud_ADMU.Powershell/$($admuVersion)"
             Write-ToLog -Message:("UserAgent: $useragent")
             $SelectedUserSid = Test-UsernameOrSID $SelectedUserName
         }
@@ -2758,21 +2772,9 @@ Function Start-Migration {
             }
             $appxList = @()
 
-            # Get Azure AD Status
-
-            $ADStatus = dsregcmd.exe /status
-            foreach ($line in $ADStatus) {
-                if ($line -match "AzureADJoined : ") {
-                    $AzureADStatus = ($line.trimstart('AzureADJoined : '))
-                }
-                if ($line -match "DomainJoined : ") {
-
-                    $AzureDomainStatus = ($line.trimstart('DomainJoined : '))
-                }
-            }
             Write-ToProgress -ProgressBar $Progressbar -Status "CheckADStatus" -form $isForm
-
-            Write-ToLog "AzureAD Status: $AzureADStatus" -Level Verbose
+            # Get Azure AD Status
+            $AzureADStatus, $LocalDomainStatus = Get-DomainStatus
 
             if ($AzureADStatus -eq 'YES' -or $netBiosName -match 'AzureAD') {
                 # Find Appx User Apps by Username
@@ -2842,71 +2844,66 @@ Function Start-Migration {
 
             $WmiComputerSystem = Get-WmiObject -Class:('Win32_ComputerSystem')
             if ($LeaveDomain -eq $true) {
-                if ($AzureADStatus -match 'YES' -or $LocalDomainStatus -match 'YES') {
-                    try {
-                        if ($LocalDomainStatus -match 'NO') {
-                            dsregcmd.exe /leave # Leave Azure AD
-                        } else {
-                            Remove-Computer -force #Leave local AD or Hybrid
-                        }
-                    } catch {
-                        Write-ToLog -Message:('Unable to leave domain, JumpCloud agent will not start until resolved') -Level:('Warn')
-                    }
-                    # Get Azure AD Status
-                    $ADStatus = dsregcmd.exe /status
-                    foreach ($line in $ADStatus) {
-                        if ($line -match "AzureADJoined : ") {
-                            $AzureADStatus = ($line.trimstart('AzureADJoined : '))
-                        }
-                        if ($line -match "DomainJoined : ") {
-                            $LocalDomainStatus = ($line.trimstart('DomainJoined : '))
-                        }
-                    }
-                    # Check Azure AD status after running dsregcmd.exe /leave as NTAUTHORITY\SYSTEM
-                    if ($AzureADStatus -match 'NO') {
-                        Write-toLog -message "Left Azure AD domain successfully. Device Domain State, AzureADJoined : $AzureADStatus"
-                        $admuTracker.leaveDomain.pass = $true
-                    } else {
-                        Write-ToLog -Message:('Unable to leave Azure Domain. Re-running dsregcmd.exe /leave') -Level:('Warn')
-                        dsregcmd.exe /leave # Leave Azure AD
-
-                        $ADStatus = dsregcmd.exe /status
-                        foreach ($line in $ADStatus) {
-                            if ($line -match "AzureADJoined : ") {
-                                $AzureADStatus = ($line.trimstart('AzureADJoined : '))
+                if ($AzureADStatus -match 'YES' -and $LocalDomainStatus -match 'YES') {
+                    Write-ToLog -Message:('Device is HYBRID joined')
+                    $ADJoined = "Hybrid"
+                } elseif ($AzureADStatus -match 'NO' -and $LocalDomainStatus -match 'Yes') {
+                    Write-ToLog -Message:('Device is Local Domain joined')
+                    $ADJoined = "LocalJoined"
+                } elseif ($AzureADStatus -match 'YES' -and $LocalDomainStatus -match 'NO') {
+                    Write-ToLog -Message:('Device is Azure AD joined')
+                    $ADJoined = "AzureADJoined"
+                }
+                if ($ADJoined) {
+                    switch ($ADJoined) {
+                        "Hybrid" {
+                            Remove-Computer -force #LeaveHybrid
+                            $AzureADStatus, $LocalDomainStatus = Get-DomainStatus
+                            if ($AzureADStatus -match 'NO' -and $LocalDomainStatus -match 'NO') {
+                                Write-ToLog -Message:('Left Hybrid Domain successfully') -Level:('Info')
+                                $admuTracker.leaveDomain.pass = $true
+                            } else {
+                                Write-ToLog -Message:('Unable to leave Hybrid Domain') -Level:('Warn')
+                                $admuTracker.leaveDomain.fail = $true
                             }
                         }
-                        if ($AzureADStatus -match 'NO') {
-                            Write-ToLog -Message:('Left Azure AD domain successfully') -Level:('Info')
-                            $admuTracker.leaveDomain.pass = $true
-                        } else {
-                            Write-ToLog -Message:('Unable to leave Azure AD domain') -Level:('Warn')
-                            $admuTracker.leaveDomain.fail = $true
+                        "LocalJoined" {
+                            $WmiComputerSystem.UnJoinDomainOrWorkGroup($null, $null, 0)
+                            $AzureADStatus, $LocalDomainStatus = Get-DomainStatus
+                            if ($AzureADStatus -match 'NO' -and $LocalDomainStatus -match 'NO') {
+                                Write-ToLog -Message:('Left local domain successfully') -Level:('Info')
+                                $admuTracker.leaveDomain.pass = $true
+                            } else {
+                                Write-ToLog -Message:('Unable to leave local domain') -Level:('Warn')
+                                $admuTracker.leaveDomain.fail = $true
+                            }
                         }
+                        "AzureADJoined" {
+                            dsregcmd.exe /leave # Leave Azure AD
+                            # Get Azure AD Status after running dsregcmd.exe /leave
+                            $AzureADStatus = Get-DomainStatus
+                            # Check Azure AD status after running dsregcmd.exe /leave as NTAUTHORITY\SYSTEM
+                            if ($AzureADStatus -match 'NO') {
+                                Write-toLog -message "Left Azure AD domain successfully. Device Domain State, AzureADJoined : $AzureADStatus"
+                                $admuTracker.leaveDomain.pass = $true
+                            } else {
+                                Write-ToLog -Message:('Unable to leave Azure Domain. Re-running dsregcmd.exe /leave') -Level:('Warn')
+                                dsregcmd.exe /leave # Leave Azure AD
+
+                                $AzureADStatus = Get-DomainStatus
+                                if ($AzureADStatus -match 'NO') {
+                                    Write-ToLog -Message:('Left Azure AD domain successfully') -Level:('Info')
+                                    $admuTracker.leaveDomain.pass = $true
+                                } else {
+                                    Write-ToLog -Message:('Unable to leave Azure AD domain') -Level:('Warn')
+                                    $admuTracker.leaveDomain.fail = $true
+                                }
 
-                    }
-
-                    if ($LocalDomainStatus -match 'NO') {
-                        Write-toLog -message "Local Domain State, Local Domain Joined : $LocalDomainStatus"
-                        $admuTracker.leaveDomain.pass = $true
-                    } else {
-                        Write-ToLog -Message:('Unable to leave local domain using remove-computer...Running UnJoinDomainOrWorkGroup') -Level:('Warn')
-                        $WmiComputerSystem.UnJoinDomainOrWorkGroup($null, $null, 0)
-
-                        $ADStatus = dsregcmd.exe /status
-                        foreach ($line in $ADStatus) {
-                            if ($line -match "DomainJoined : ") {
-                                $LocalDomainStatus = ($line.trimstart('DomainJoined : '))
                             }
                         }
-                        if ($LocalDomainStatus -match 'NO') {
-                            Write-ToLog -Message:('Left local domain successfully') -Level:('Info')
-                            $admuTracker.leaveDomain.pass = $true
-                        } else {
-                            Write-ToLog -Message:('Unable to leave local domain') -Level:('Warn')
-                            $admuTracker.leaveDomain.fail = $true
-                        }
                     }
+                } else {
+                    Write-ToLog -Message:('Device is not joined to a domain, skipping leave domain step')
                 }
             }
 

From 72e822789ebda4e888a62b0751adc0f5eaaa78f2 Mon Sep 17 00:00:00 2001
From: Ryan Casperson <ryan.casperson@jumpcloud.com>
Date: Tue, 20 Aug 2024 15:14:27 -0400
Subject: [PATCH 4/6] Emulate a real release

---
 ModuleChangelog.md                            | 12 ++++++++++++
 jumpcloud-ADMU/JumpCloud.ADMU.psd1            |  2 +-
 jumpcloud-ADMU/Powershell/Form.ps1            |  2 +-
 jumpcloud-ADMU/Powershell/ProgressForm.ps1    |  2 +-
 jumpcloud-ADMU/Powershell/Start-Migration.ps1 |  2 +-
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ModuleChangelog.md b/ModuleChangelog.md
index c4197d9d..b8c0a8ec 100644
--- a/ModuleChangelog.md
+++ b/ModuleChangelog.md
@@ -1,3 +1,15 @@
+## 2.7.5
+
+Release Date: August 20, 2024
+
+#### RELEASE NOTES
+
+#### Bug Fixes:
+
+```
+* Testing - DO NOT MERGE
+```
+
 ## 2.7.4
 
 Release Date: August 14, 2024
diff --git a/jumpcloud-ADMU/JumpCloud.ADMU.psd1 b/jumpcloud-ADMU/JumpCloud.ADMU.psd1
index 0f599922..9b0eb181 100644
--- a/jumpcloud-ADMU/JumpCloud.ADMU.psd1
+++ b/jumpcloud-ADMU/JumpCloud.ADMU.psd1
@@ -13,7 +13,7 @@
 
     # Version number of this module.
 
-    ModuleVersion     = '2.7.4'
+    ModuleVersion     = '2.7.5'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/jumpcloud-ADMU/Powershell/Form.ps1 b/jumpcloud-ADMU/Powershell/Form.ps1
index c8d33139..0b7c289c 100644
--- a/jumpcloud-ADMU/Powershell/Form.ps1
+++ b/jumpcloud-ADMU/Powershell/Form.ps1
@@ -153,7 +153,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.7.4"
+        Title="JumpCloud ADMU 2.7.5"
         WindowStyle="SingleBorderWindow"
         ResizeMode="NoResize"
         Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" ScrollViewer.HorizontalScrollBarVisibility="Visible" Width="1020" Height="590">
diff --git a/jumpcloud-ADMU/Powershell/ProgressForm.ps1 b/jumpcloud-ADMU/Powershell/ProgressForm.ps1
index fc391f89..7674ce86 100644
--- a/jumpcloud-ADMU/Powershell/ProgressForm.ps1
+++ b/jumpcloud-ADMU/Powershell/ProgressForm.ps1
@@ -37,7 +37,7 @@ function New-ProgressForm {
     <Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    Name="Window" Title="JumpCloud ADMU 2.7.4"
+    Name="Window" Title="JumpCloud ADMU 2.7.5"
     WindowStyle="SingleBorderWindow"
     ResizeMode="NoResize"
     Background="White" Width="720" Height="550  ">
diff --git a/jumpcloud-ADMU/Powershell/Start-Migration.ps1 b/jumpcloud-ADMU/Powershell/Start-Migration.ps1
index c8f4bff7..d94aa9f3 100644
--- a/jumpcloud-ADMU/Powershell/Start-Migration.ps1
+++ b/jumpcloud-ADMU/Powershell/Start-Migration.ps1
@@ -1883,7 +1883,7 @@ Function Start-Migration {
         $AGENT_INSTALLER_URL = "https://cdn02.jumpcloud.com/production/jcagent-msi-signed.msi"
         $AGENT_INSTALLER_PATH = "$windowsDrive\windows\Temp\JCADMU\jcagent-msi-signed.msi"
         $AGENT_CONF_PATH = "$($AGENT_PATH)\Plugins\Contrib\jcagent.conf"
-        $admuVersion = '2.7.4'
+        $admuVersion = '2.7.5'
 
         $script:AdminDebug = $AdminDebug
         $isForm = $PSCmdlet.ParameterSetName -eq "form"

From c6b59798693d3fce82e60334d2f693a33229cd91 Mon Sep 17 00:00:00 2001
From: Ryan Casperson <ryan.casperson@jumpcloud.com>
Date: Tue, 20 Aug 2024 15:21:13 -0400
Subject: [PATCH 5/6] Try combined

---
 .github/workflows/admu-ci.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/admu-ci.yml b/.github/workflows/admu-ci.yml
index e8c121d0..c5834ea9 100644
--- a/.github/workflows/admu-ci.yml
+++ b/.github/workflows/admu-ci.yml
@@ -100,16 +100,25 @@ jobs:
           RELEASE_TYPE: ${{ needs.Check-PR-Labels.outputs.RELEASE_TYPE }}
         run: |
           . "${{ github.workspace }}/Deploy/build.ps1" -ModuleVersionType $env:RELEASE_TYPE -ModuleName "JumpCloud.ADMU"
+      - name: Prepare Upload
+        shell: powershell
+        run: |
+          - name: Prepare Upload
+            shell: powershell
+            run: |
+              $destinationFolder = "${{ github.workspace }}/Jumpcloud-ADMU/Combined"
+              New-Item -ItemType Directory -Path $destinationFolder -Force
+
+              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.nuspec" -Destination $destinationFolder -Force
+              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Docs/*.md" -Destination $destinationFolder -Force
+              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Exe/*.exe" -Destination $destinationFolder -Force
+              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Powershell/Form.ps1" -Destination $destinationFolder -Force
+              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psd1" -Destination $destinationFolder -Force
       - name: Upload Nuspec
         uses: PaloAltoNetworks/upload-secure-artifact@b0e2f8dc09b06aa38239ad1b9e5b5b57b4732abc
         with:
           name: jumpcloud-admu-build
-          path: |
-            ${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.nuspec
-            ${{ github.workspace }}/Jumpcloud-ADMU/Docs/*.md
-            ${{ github.workspace }}/Jumpcloud-ADMU/Exe/*.exe
-            ${{ github.workspace }}/Jumpcloud-ADMU/Powershell/Form.ps1
-            ${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psd1
+          path: ${{ github.workspace }}/Jumpcloud-ADMU/Combined
           retention-days: 1
   Test-Module:
     needs: ["Setup-Build-Dependancies", "Check-PR-Labels", "Build-Module"]

From 028db6029952593310febb68feb6c274388cae60 Mon Sep 17 00:00:00 2001
From: Ryan Casperson <ryan.casperson@jumpcloud.com>
Date: Tue, 20 Aug 2024 15:30:04 -0400
Subject: [PATCH 6/6] Try combined

---
 .github/workflows/admu-ci.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/admu-ci.yml b/.github/workflows/admu-ci.yml
index c5834ea9..88eadb42 100644
--- a/.github/workflows/admu-ci.yml
+++ b/.github/workflows/admu-ci.yml
@@ -103,17 +103,14 @@ jobs:
       - name: Prepare Upload
         shell: powershell
         run: |
-          - name: Prepare Upload
-            shell: powershell
-            run: |
-              $destinationFolder = "${{ github.workspace }}/Jumpcloud-ADMU/Combined"
-              New-Item -ItemType Directory -Path $destinationFolder -Force
+          $destinationFolder = "${{ github.workspace }}/Jumpcloud-ADMU/Combined"
+          New-Item -ItemType Directory -Path $destinationFolder -Force
 
-              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.nuspec" -Destination $destinationFolder -Force
-              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Docs/*.md" -Destination $destinationFolder -Force
-              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Exe/*.exe" -Destination $destinationFolder -Force
-              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Powershell/Form.ps1" -Destination $destinationFolder -Force
-              Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psd1" -Destination $destinationFolder -Force
+          Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.nuspec" -Destination $destinationFolder -Force
+          Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Docs/*.md" -Destination $destinationFolder -Force
+          Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Exe/*.exe" -Destination $destinationFolder -Force
+          Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/Powershell/Form.ps1" -Destination $destinationFolder -Force
+          Copy-Item -Path "${{ github.workspace }}/Jumpcloud-ADMU/JumpCloud.ADMU.psd1" -Destination $destinationFolder -Force
       - name: Upload Nuspec
         uses: PaloAltoNetworks/upload-secure-artifact@b0e2f8dc09b06aa38239ad1b9e5b5b57b4732abc
         with: