From 1e093b69c587b27af8ed84d3259ed16bcd4ee2fc Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Mon, 20 Nov 2023 18:16:39 +0100
Subject: [PATCH] UpdateClient: get real executable path

---
 Pilz.Updating.Client/Pilz.Updating.Client.csproj | 1 +
 Pilz.Updating.Client/UpdateClient.cs             | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Pilz.Updating.Client/Pilz.Updating.Client.csproj b/Pilz.Updating.Client/Pilz.Updating.Client.csproj
index b70039a..2c4e558 100644
--- a/Pilz.Updating.Client/Pilz.Updating.Client.csproj
+++ b/Pilz.Updating.Client/Pilz.Updating.Client.csproj
@@ -44,6 +44,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
+    <PackageReference Include="Pilz.IO" Version="1.2023.914.856" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
diff --git a/Pilz.Updating.Client/UpdateClient.cs b/Pilz.Updating.Client/UpdateClient.cs
index f86fb5a..782e2d0 100644
--- a/Pilz.Updating.Client/UpdateClient.cs
+++ b/Pilz.Updating.Client/UpdateClient.cs
@@ -218,21 +218,22 @@ namespace Pilz.Updating
             RaiseUpdateStatusChanged(UpdateStatus.StartingInstaller);
 
             // Create update settings
-            var updateConfig = new UpdateInstallerConfig()
+            var myAppPath = IO.Extensions.GetExecutablePath();
+            var updateConfig = new UpdateInstallerConfig
             {
                 PackagePath = packagePath,
                 RestartHostApplication = AutoRestartHostApplication,
                 RestartHostApplicationArguments = AutoRestartHostApplication ? RestartHostApplicationArguments : string.Empty,
                 ApplicationName = ApplicationName,
-                HostApplicationPath = string.IsNullOrEmpty(HostApplicationPath) ? Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) : HostApplicationPath,
-                HostApplicationProcessPath = Assembly.GetEntryAssembly().Location,
+                HostApplicationPath = string.IsNullOrEmpty(HostApplicationPath) ? Path.GetDirectoryName(myAppPath) : HostApplicationPath,
+                HostApplicationProcessPath = myAppPath,
                 MillisecondsToWaitForHostApplicationToClose = MillisecondsToWaitForHostApplicationToClose,
                 ForceClosingHostApplication = ForceClosingHostApplication,
                 UIDarkMode = UIDarkMode
             };
 
             // Start UpdateInstaller
-            var procStartInfo = new ProcessStartInfo()
+            var procStartInfo = new ProcessStartInfo
             {
                 FileName = installerPath,
                 Arguments = updateConfig.ToString(),