update version 0.12.2pre -> 0.12.2; fix ARM builds dependencies

atauenis · Sep 2, 2022 · d30dabd · d30dabd
1 parent a0b09cc
commit d30dabd
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Program.cs b/Program.cs
@@ -35,11 +35,15 @@ public static class Program
 
 		static void Main(string[] args)
 		{
-			Variables.Add("WOVer", Assembly.GetExecutingAssembly().GetName().Version.ToString() + "-pre");
+			Variables.Add("WOVer",
+			Assembly.GetExecutingAssembly().GetName().Version.Major + "." +
+			Assembly.GetExecutingAssembly().GetName().Version.Minor + "." +
+			Assembly.GetExecutingAssembly().GetName().Version.Build
+			/*+ "-pre"*/);
 			Variables.Add("WOSystem", Environment.OSVersion.ToString());
 
 			Console.Title = "WebOne";
-			Console.WriteLine("WebOne HTTP Proxy Server {0}\n(C) https://github.com/atauenis/webone\n\n", Variables["WOVer"]);
+			Console.WriteLine("WebOne HTTP Proxy Server {0}\nhttps://github.com/atauenis/webone\n\n", Variables["WOVer"]);
 
 			//process command line arguments
 			ProcessCommandLine(args);

diff --git a/Transit.cs b/Transit.cs
@@ -912,11 +912,8 @@ public Transit(HttpListenerRequest ClientRequest, HttpListenerResponse ClientRes
 			{
 				Log.WriteLine(" A error has been catched: {1}\n{0}\t Please report to author.", null, E.ToString().Replace("\n", "\n{0}\t "));
 				SendError(500, "An error occured: " + E.ToString().Replace("\n", "\n<BR>"));
-				//if (operation != null) operation.Dispose();
-				//UNDONE: think about disposing if need (or now it is not need?...)
 			}
 			SaveHeaderDump();
-			//if (operation != null) operation.Dispose();
 #if DEBUG
 			Log.WriteLine(" End process.");
 #endif

diff --git a/WebOne.csproj b/WebOne.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <Authors>Alexander Tauenis</Authors>
     <Version>0.12.2</Version>
-    <VersionSuffix>-pre</VersionSuffix> <!--<VersionSuffix>-pre</VersionSuffix>-->
+    <VersionSuffix></VersionSuffix> <!--<VersionSuffix>-pre</VersionSuffix>-->
     <PackageVersion>$(Version)$(VersionSuffix)</PackageVersion>
     <Company>World</Company>
     <Product>WebOne HTTP Proxy Server</Product>
@@ -65,6 +65,15 @@
     <RpmDependency Include="ImageMagick" />
   </ItemGroup>
 
+	<ItemGroup Condition="$(SelfContained)==true">
+		<!--
+    Fix for self-contained debs on Ubuntu 20.xx
+    https://github.com/quamotion/dotnet-packaging/issues/222
+    -->
+		<DebDotNetDependencies Remove=" libc6, libgcc1, libgssapi-krb5-2, libstdc++6, zlib1g, libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8, libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu64 | libicu63 | libicu62 | libicu61 | libicu60 | libicu59 | libicu58 | libicu57 | libicu56 | libicu55 | libicu54 | libicu53 | libicu52" />
+		<DebDotNetDependencies Include="libc6, libgcc1, libgssapi-krb5-2, libstdc++6, zlib1g, libssl3 | libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8, libicu70 | libicu69 | libicu68 | libicu67 | libicu66 | libicu65 | libicu64 | libicu63 | libicu62 | libicu61 | libicu60 | libicu59 | libicu58 | libicu57 | libicu56 | libicu55 | libicu54 | libicu53 | libicu52" />
+	</ItemGroup>
+
   <PropertyGroup>
     <PostInstallScript>
       <![CDATA[