Fixing CI issues

Author: pacmancoder

.github/workflows/ci.yml

@@ -816,7 +816,7 @@ jobs:
             $DAgentSessionExecutable = Join-Path $TargetOutputPath "DevolutionsSession.exe"
             echo "dagent-session-executable=$DAgentSessionExecutable" >> $Env:GITHUB_OUTPUT
 
-            $DAgentUpdaterExecutable = Join-Path $TargetOutputPath "devolutions-agent-updater.exe"
+            $DAgentUpdaterExecutable = Join-Path $TargetOutputPath "DevolutionsAgentUpdater.exe"
             echo "dagent-updater-executable=$DAgentUpdaterExecutable" >> $Env:GITHUB_OUTPUT
           }
 

.github/workflows/package.yml

@@ -319,7 +319,7 @@ jobs:
         run: |
           $IncludePattern = @(switch ('${{ matrix.project }}') {
             'devolutions-gateway' { @('DevolutionsGateway_*.exe') }
-            'devolutions-agent' { @('DevolutionsAgent_*.exe', 'devolutions-agent-updater.exe', 'DevolutionsPedmShellExt.dll', 'DevolutionsPedmShellExt.msix', 'DevolutionsDesktopAgent.exe') }
+            'devolutions-agent' { @('DevolutionsAgent_*.exe', 'DevolutionsAgentUpdater.exe', 'DevolutionsPedmShellExt.dll', 'DevolutionsPedmShellExt.msix', 'DevolutionsDesktopAgent.exe') }
             'jetsocat' { @('jetsocat_*') }
           })
           $ExcludePattern = "*.pdb"
@@ -474,7 +474,7 @@ jobs:
           $PackageRoot = Join-Path ${{ runner.temp }} ${{ matrix.project}}
 
           $Env:DAGENT_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include '*DevolutionsAgent_*.exe' | Select -First 1
-          $Env:DAGENT_UPDATER_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include 'devolutions-agent-updater.exe' | Select -First 1
+          $Env:DAGENT_UPDATER_EXECUTABLE = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsAgentUpdater.exe' | Select -First 1
           $Env:DAGENT_DESKTOP_AGENT_PATH = Resolve-Path -Path "devolutions-pedm-desktop"
           $Env:DAGENT_PEDM_SHELL_EXT_DLL = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmShellExt.dll' | Select -First 1
           $Env:DAGENT_PEDM_SHELL_EXT_MSIX = Get-ChildItem -Path $PackageRoot -Recurse -Include 'DevolutionsPedmShellExt.msix' | Select -First 1

ci/package-agent-windows.ps1

@@ -134,7 +134,7 @@ function New-AgentMsi() {
     # The Agent exe will get copied to `C:\Program Files\Devolutions\Agent\DevolutionsAgent.exe` after install.
     $myExe = Set-FileNameAndCopy -Path $Exe -NewName 'DevolutionsAgent.exe'
     # The updater shim is a detached helper for installing MSI updates.
-    $myUpdaterExe = Set-FileNameAndCopy -Path $UpdaterExe -NewName 'devolutions-agent-updater.exe'
+    $myUpdaterExe = Set-FileNameAndCopy -Path $UpdaterExe -NewName 'DevolutionsAgentUpdater.exe'
     # The session is a service that gets launched on demand.
     $mySessionExe = Set-FileNameAndCopy -Path $SessionExe -NewName 'DevolutionsSession.exe'
 

ci/tlk.ps1

@@ -303,7 +303,7 @@ class TlkRecipe
                 $agentPackages = @([TlkPackage]::new("devolutions-agent", "devolutions-agent", $false))
 
                 if ($this.Target.IsWindows()) {
-                    $agentPackages += [TlkPackage]::new("devolutions-agent-updater", "devolutions-agent", $false)
+                    $agentPackages += [TlkPackage]::new("devolutions-agent-updater", "devolutions-agent-updater", $false)
                     $agentPackages += [TlkPackage]::new("devolutions-pedm-shell-ext", "crates/devolutions-pedm-shell-ext", $true)
                     $agentPackages += [TlkPackage]::new("devolutions-session", "devolutions-session", $false)
                 }