PortProxyGUI.1.4.2

zmjack · Jun 13, 2024 · ffeffca · ffeffca
1 parent eb0d604
commit ffeffca
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 28 deletions.
diff --git a/PortProxyGUI/About.cs b/PortProxyGUI/About.cs
@@ -1,5 +1,4 @@
-using PortProxyGUI.Utils;
-using System;
+using System;
 using System.Diagnostics;
 using System.Windows.Forms;
 
@@ -14,8 +13,6 @@ public About(PortProxyGUI portProxyGUI)
             PortProxyGUI = portProxyGUI;
 
             InitializeComponent();
-            Font = InterfaceUtil.UiFont;
-
             label_version.Text = label_version.Text + "  v" + Application.ProductVersion;
         }
 

diff --git a/PortProxyGUI/Data/Rule.cs b/PortProxyGUI/Data/Rule.cs
@@ -36,6 +36,11 @@ public string RealConnectPort
             set => _realConnectPort = value;
         }
 
+        public override int GetHashCode()
+        {
+            return base.GetHashCode();
+        }
+
         public bool Equals(Rule other)
         {
             return Id == other.Id

diff --git a/PortProxyGUI/PortProxyGUI.cs b/PortProxyGUI/PortProxyGUI.cs
@@ -22,8 +22,6 @@ public partial class PortProxyGUI : Form
         public PortProxyGUI()
         {
             InitializeComponent();
-            Font = InterfaceUtil.UiFont;
-
             listViewProxies.ListViewItemSorter = lvwColumnSorter;
         }
 

diff --git a/PortProxyGUI/PortProxyGUI.csproj b/PortProxyGUI/PortProxyGUI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net6.0-windows;net35;net451</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows;net6.0-windows;net35;net451</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Authors>zmjack</Authors>
@@ -14,9 +14,9 @@
     <PackageTags>portproxy TCP/IP redirector</PackageTags>
     <PackageLicenseFile>LICENSE.md</PackageLicenseFile>
     <Copyright>Copyright © nstandard.net 2020</Copyright>
-    <Version>1.4.1</Version>
+    <Version>1.4.2</Version>
     <ApplicationIcon>icon.ico</ApplicationIcon>
-    <ApplicationDefaultFont>Microsoft Sans Serif, 8pt</ApplicationDefaultFont>
+    <ApplicationDefaultFont>Arial, 8.25pt</ApplicationDefaultFont>
     <AssemblyName>PPGUI</AssemblyName>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>

diff --git a/PortProxyGUI/Program.cs b/PortProxyGUI/Program.cs
@@ -23,16 +23,18 @@ static void Main()
         {
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
+
 #if NET6_0_OR_GREATER
             ApplicationConfiguration.Initialize();
-#elif NETCOREAPP3_1_OR_GREATER    
+#elif NETCOREAPP3_1_OR_GREATER
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 #else
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
 #endif
+
             Application.Run(new PortProxyGUI());
         }
     }

diff --git a/PortProxyGUI/SetProxy.cs b/PortProxyGUI/SetProxy.cs
@@ -22,7 +22,6 @@ public SetProxy(PortProxyGUI parent)
             ParentWindow = parent;
 
             InitializeComponent();
-            Font = InterfaceUtil.UiFont;
 
             AutoTypeString = comboBox_Type.Text = comboBox_Type.Items.OfType<string>().First();
             var groupNames = (

diff --git a/PortProxyGUI/Utils/InterfaceUtil.cs b/PortProxyGUI/Utils/InterfaceUtil.cs
diff --git a/PortProxyGUI/publish.ps1 b/PortProxyGUI/publish.ps1
@@ -0,0 +1,21 @@
+Remove-Item -Path ".\bin\publish" -Recurse
+
+dotnet publish -c Release -f "net8.0-windows" /p:PublishProfile="net8-x64"
+dotnet publish -c Release -f "net8.0-windows" /p:PublishProfile="net8-x86"
+
+dotnet publish -c Release -f "net6.0-windows" /p:PublishProfile="net6-x64"
+dotnet publish -c Release -f "net6.0-windows" /p:PublishProfile="net6-x86"
+
+Copy-Item -Path ".\bin\Release\net451\" ".\bin\Publish\" -Recurse -Force
+Copy-Item -Path ".\bin\Release\net35\" ".\bin\Publish\" -Recurse -Force
+
+$ver = "1.4.2"
+
+Compress-Archive -Path ".\bin\publish\net8-x64\*" -DestinationPath ".\bin\publish\ppgui-net8-x64-$ver.zip" -Force
+Compress-Archive -Path ".\bin\publish\net8-x86\*" -DestinationPath ".\bin\publish\ppgui-net8-x86-$ver.zip" -Force
+
+Compress-Archive -Path ".\bin\publish\net6-x64\*" -DestinationPath ".\bin\publish\ppgui-net6-x64-$ver.zip" -Force
+Compress-Archive -Path ".\bin\publish\net6-x86\*" -DestinationPath ".\bin\publish\ppgui-net6-x86-$ver.zip" -Force
+
+Compress-Archive -Path ".\bin\publish\net451\*" -DestinationPath ".\bin\publish\ppgui-net451-$ver.zip" -Force
+Compress-Archive -Path ".\bin\publish\net35\*" -DestinationPath ".\bin\publish\ppgui-net35-$ver.zip" -Force
diff --git a/README.md b/README.md
@@ -14,9 +14,12 @@ A manager for netsh interface portproxy, which is to evaluate TCP/IP port redire
 
 ## Upgrade
 
+- **v1.4.2**
+  - Change the default font from ~~`Microsoft Sans Serif`~~ to **`Arial`**.
+    - This setting provides better compatibility on operating systems with fewer fonts.
 - **v1.4.1**
-  - Added a status strip at the bottom of the window.
-  - Added a check of the IP Helper service status, if the service is not running, a prompt will be displayed on the bottom status bar.
+  - Add a status strip at the bottom of the window.
+  - Add a check of the IP Helper service status, if the service is not running, a prompt will be displayed on the bottom status bar.
 - **v1.4.0**
   - Command line calls have been removed to provide better performance.
   - New Feature Added: **Remember Window/Column Size**.