reduce binary file size by enabling single file mode

atauenis · Mar 11, 2024 · 1d06d8f · 1d06d8f
1 parent 0d1edbc
commit 1d06d8f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/HttpTransit.cs b/HttpTransit.cs
@@ -970,8 +970,8 @@ private void SendInternalPage(string InternalPageId)
 										{
 											if (!File.Exists(Src))
 											{
-												if (File.Exists(new FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).DirectoryName + Path.DirectorySeparatorChar + Src))
-													Src = new FileInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).DirectoryName + Path.DirectorySeparatorChar + Src;
+												if (File.Exists(new FileInfo(AppContext.BaseDirectory).DirectoryName + Path.DirectorySeparatorChar + Src))
+													Src = new FileInfo(AppContext.BaseDirectory).DirectoryName + Path.DirectorySeparatorChar + Src;
 												else
 													throw new FileNotFoundException("No such file: " + Src);
 											}

diff --git a/Program.cs b/Program.cs
@@ -61,7 +61,7 @@ static void Main(string[] args)
 			Assembly.GetExecutingAssembly().GetName().Version.Major + "." +
 			Assembly.GetExecutingAssembly().GetName().Version.Minor + "." +
 			Assembly.GetExecutingAssembly().GetName().Version.Build
-			//+ "-pre"
+			+ "-pre"
 			);
 			Variables.Add("WOSystem", Environment.OSVersion.ToString());
 
@@ -1023,7 +1023,7 @@ public static string GetConfigurationFileName()
 				default:
 				case PlatformID.Unix:
 					CurrentDirConfigFile = "./webone.conf";
-					DefaultConfigFile = new FileInfo(Assembly.GetExecutingAssembly().Location).DirectoryName + "/webone.conf";
+					DefaultConfigFile = new FileInfo(AppContext.BaseDirectory).DirectoryName + "/webone.conf";
 					UserConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + "/.config/webone/webone.conf";
 					CommonConfigFile = "/etc/webone.conf";
 
@@ -1034,7 +1034,7 @@ public static string GetConfigurationFileName()
 					break;
 				case PlatformID.Win32NT:
 					CurrentDirConfigFile = @".\webone.conf";
-					DefaultConfigFile = new FileInfo(Assembly.GetExecutingAssembly().Location).DirectoryName + @"\webone.conf";
+					DefaultConfigFile = new FileInfo(AppContext.BaseDirectory).DirectoryName + @"\webone.conf";
 					UserConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\WebOne\webone.conf";
 					CommonConfigFile = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + @"\WebOne\webone.conf";
 					break;

diff --git a/WebOne.csproj b/WebOne.csproj
@@ -5,8 +5,8 @@
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net6.0</TargetFramework>
 		<Authors>Alexander Tauenis</Authors>
-		<Version>0.16.3</Version>
-		<VersionSuffix></VersionSuffix> <!--<VersionSuffix>-pre</VersionSuffix>-->
+		<Version>0.17.0</Version>
+		<VersionSuffix>-pre</VersionSuffix> <!--<VersionSuffix>-pre</VersionSuffix>-->
 		<PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
 		<Company>World</Company>
 		<Product>WebOne HTTP Proxy Server</Product>
@@ -45,6 +45,15 @@
 		<DebugSymbols>false</DebugSymbols>
 	</PropertyGroup>
 
+	<PropertyGroup>
+		<PublishSingleFile>true</PublishSingleFile>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="$(SelfContained)==true">
+		<PublishTrimmed>true</PublishTrimmed>
+		<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
+	</PropertyGroup>
+
 	<PropertyGroup Condition="$(Configuration)=='Release' AND !$(RuntimeIdentifier.Contains('linux-arm'))">
 		<SelfContained>False</SelfContained>
 	</PropertyGroup>