Fix path for PublishSingleFile

Virenbar · May 28, 2023 · deb32be · deb32be
1 parent 4bcfac9
commit deb32be
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/GDPIControl/Constants.cs b/GDPIControl/Constants.cs
@@ -6,16 +6,26 @@ namespace GDPIControl
 {
     internal static class Constants
     {
-        public const string BlacklistName = "Blacklist.txt";
-        public const string UserlistName = "Userlist.txt";
+        private const string BlacklistName = "Blacklist.txt";
+        private const string BlacklistTempName = "Blacklist.temp.txt";
         private const string ConfigName = "Config.xml";
-        private const string NBLName = "Blacklist.temp.txt";
+        private const string UserlistName = "Userlist.txt";
         private const string x86 = @"GDPI\x86\goodbyedpi.exe";
         private const string x86_64 = @"GDPI\x86_64\goodbyedpi.exe";
-        public static string BlacklistPath => Path.Combine(Application.StartupPath, BlacklistName);
-        public static string BlacklistTempPath => Path.Combine(Application.StartupPath, NBLName);
-        public static string ConfigPath => Path.Combine(Application.StartupPath, ConfigName);
+        public static string BlacklistPath => Path.Combine(StartupPath, BlacklistName);
+        public static string BlacklistTempPath => Path.Combine(StartupPath, BlacklistTempName);
+        public static string ConfigPath => Path.Combine(StartupPath, ConfigName);
+
+        /// <summary>
+        /// .NET 6 uses TEMP directory for GDPI
+        /// </summary>
         public static string GDPIPath => Path.Combine(Application.StartupPath, Environment.Is64BitOperatingSystem ? x86_64 : x86);
-        public static string UserlistPath => Path.Combine(Application.StartupPath, UserlistName);
+
+#if NET6_0_OR_GREATER
+        public static string StartupPath => Path.GetDirectoryName(Environment.ProcessPath);
+#else
+        public static string StartupPath => Application.StartupPath;
+#endif
+        public static string UserlistPath => Path.Combine(StartupPath, UserlistName);
     }
 }
diff --git a/GDPIControl/FormMain.cs b/GDPIControl/FormMain.cs
@@ -63,8 +63,8 @@ private void SetArguments()
             {
                 Arguments = GDPISettings.ModesetArgument(Settings.Modeset);
             }
-            if (Settings.UseBlacklist) { Arguments += $" --blacklist {Constants.BlacklistName}"; }
-            if (Settings.UseUserlist) { Arguments += $" --blacklist {Constants.UserlistName}"; }
+            if (Settings.UseBlacklist) { Arguments += $@" --blacklist ""{Constants.BlacklistPath}"""; }
+            if (Settings.UseUserlist) { Arguments += $@" --blacklist ""{Constants.UserlistPath}"""; }
             Settings.Arguments = Arguments;
 
             B_Copy.Enabled = Settings.Modeset != Modeset.Custom;

diff --git a/GDPIControl/Properties/PublishProfiles/net6.pubxml b/GDPIControl/Properties/PublishProfiles/net6.pubxml
@@ -11,7 +11,7 @@
 	<PropertyGroup>
 		<TargetFramework>net6.0-windows</TargetFramework>
 		<PublishDir>publish\net6.0-windows\</PublishDir>
-		<PublishSingleFile>false</PublishSingleFile>
+		<PublishSingleFile>true</PublishSingleFile>
 		<PublishReadyToRun>false</PublishReadyToRun>
 		<SelfContained>false</SelfContained>
 	</PropertyGroup>