From fe2de6ecf725c00576688e27daa11c7d9828aa3f Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Tue, 2 Aug 2022 07:58:42 -0400 Subject: [PATCH] recommended: System.Environment.ProcessPath --- Source/AppScaffolding/UNSAFE_MigrationHelper.cs | 2 +- Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/AppScaffolding/UNSAFE_MigrationHelper.cs b/Source/AppScaffolding/UNSAFE_MigrationHelper.cs index fbfe6bb2..4a63c1ff 100644 --- a/Source/AppScaffolding/UNSAFE_MigrationHelper.cs +++ b/Source/AppScaffolding/UNSAFE_MigrationHelper.cs @@ -25,7 +25,7 @@ namespace AppScaffolding : value; #region appsettings.json - private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName), "appsettings.json"); + private static string APPSETTINGS_JSON { get; } = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), "appsettings.json"); public static bool APPSETTINGS_Json_Exists => File.Exists(APPSETTINGS_JSON); diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs index e6e747ff..19ece7c0 100644 --- a/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs +++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.axaml.cs @@ -149,8 +149,7 @@ namespace LibationAvalonia.Views private void runWindowsUpgrader(string zipFile) { - - var thisExe = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName; + var thisExe = Environment.ProcessPath; var thisDir = System.IO.Path.GetDirectoryName(thisExe); var args = $"--input {zipFile} --output {thisDir} --executable {thisExe}";