✨ Add supports for .NET8.0/9.0

XuanchenLin · XuanchenLin · commit 655620b8c518 · 2025-05-09T23:30:32.000+08:00
diff --git a/examples/MinimalWinFormiumApp/MinimalWinFormiumApp.csproj b/examples/MinimalWinFormiumApp/MinimalWinFormiumApp.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net6.0-windows;net481;</TargetFrameworks>
+        <TargetFrameworks>net8.0-windows;</TargetFrameworks>
         <Nullable>enable</Nullable>
         <UseWindowsForms>true</UseWindowsForms>
         <ImplicitUsings>enable</ImplicitUsings>
diff --git a/examples/MinimalWinFormiumApp/MyApp.cs b/examples/MinimalWinFormiumApp/MyApp.cs
@@ -11,7 +11,7 @@
 
 
 namespace MinimalWinFormiumApp;
-internal class MyApp : NanUIAppStartup
+internal class MyApp : AppStartup
 {
     protected override MainWindowCreationAction? UseMainWindow(MainWindowOptions opts)
     {
diff --git a/src/NetDimension.NanUI.csproj b/src/NetDimension.NanUI.csproj
@@ -7,7 +7,7 @@
 
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFrameworks>net8.0-windows;net7.0-windows;net6.0-windows;net481;net48;net472;net471;net47;net462;</TargetFrameworks>
+        <TargetFrameworks>net9.0-windows;net8.0-windows;net7.0-windows;net6.0-windows;net481;net48;net472;net471;net47;net462;</TargetFrameworks>
         <Nullable>enable</Nullable>
         <UseWindowsForms>true</UseWindowsForms>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -37,21 +37,23 @@
 
     <PropertyGroup Condition="'$(Configuration)'=='Release'">
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+        <Version>1.1.$(ChromiumVersion).2</Version>
+
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.3" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.3" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.4" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.4" />
         <PackageReference Include="SharpGen.Runtime" Version="2.0.0-beta.13" />
         <PackageReference Include="SharpGen.Runtime.COM" Version="2.0.0-beta.13" />
-        <PackageReference Include="SkiaSharp" Version="3.116.1" />
+        <PackageReference Include="SkiaSharp" Version="3.119.0" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
-        <PackageReference Include="System.Text.Json" Version="9.0.3" />
-        <PackageReference Include="Vanara.PInvoke.SHCore" Version="4.1.1" />
-        <PackageReference Include="Vanara.PInvoke.User32" Version="4.1.1" />
-        <PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.1" />
-        <PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.1.1" />
-        <PackageReference Include="Vanara.PInvoke.UxTheme" Version="4.1.1" />
+        <PackageReference Include="System.Text.Json" Version="9.0.4" />
+        <PackageReference Include="Vanara.PInvoke.SHCore" Version="4.1.3" />
+        <PackageReference Include="Vanara.PInvoke.User32" Version="4.1.3" />
+        <PackageReference Include="Vanara.PInvoke.Gdi32" Version="4.1.3" />
+        <PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.1.3" />
+        <PackageReference Include="Vanara.PInvoke.UxTheme" Version="4.1.3" />
         <PackageReference Include="Vortice.Direct2D1" Version="2.4.2" />
         <PackageReference Include="Vortice.Direct3D11" Version="2.4.2" />
         <PackageReference Include="Vortice.DirectComposition" Version="2.4.2" />
diff --git a/src/Sources/Bootstrapper/AppBuilder.cs b/src/Sources/Bootstrapper/AppBuilder.cs
@@ -55,7 +55,7 @@ public AppBuilder ConfigureChromium(Action<ChromiumEnvironmentBuiler> configureD
         return this;
     }
 
-    public AppBuilder UseNanUIApp<TApp>() where TApp : notnull, NanUIAppStartup
+    public AppBuilder UseNanUIApp<TApp>() where TApp : notnull, AppStartup
     {
         Services.AddSingleton<INanUIStartup, TApp>();
 
diff --git a/src/Sources/Bootstrapper/AppStartup.cs b/src/Sources/Bootstrapper/AppStartup.cs
@@ -4,7 +4,7 @@
 // GITHUB: https://github.com/XuanchenLin/NanUI
 
 namespace NetDimension.NanUI;
-public abstract class NanUIAppStartup : INanUIStartup
+public abstract class AppStartup : INanUIStartup
 {
     /// <summary>
     /// The main entry point for WinFormium app.
diff --git a/src/Sources/Formium/Formium.Members.cs b/src/Sources/Formium/Formium.Members.cs
@@ -930,19 +930,21 @@ private bool BrowserLButtonDown(ref Message m)
 
         ClientToScreen(WindowHandle, ref point);
 
+        var lparam = Macros.MAKELPARAM((uint)point.X, (uint)point.Y);
+
         if (CurrentFormStyle.Sizable && CurrentFormStyle.UseBrowserHitTest && mode != HitTestValues.HTCLIENT && HostWindow!.WindowState == FormWindowState.Normal)
         {
             ReleaseCapture();
 
-            PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)mode, (IntPtr)((point.X & 0xFFFF) | (point.Y << 16)));
+            PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)mode, lparam);
 
             return true;
         }
         else if (isInDraggableArea)
         {
             ReleaseCapture();
 
-            PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)HitTestValues.HTCAPTION, (IntPtr)((point.X & 0xFFFF) | (point.Y << 16)));
+            PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)HitTestValues.HTCAPTION, lparam);
 
             return true;
         }
diff --git a/src/Sources/Formium/Forms/base/Forms/WindowBase/FramelessWindowBase.cs b/src/Sources/Formium/Forms/base/Forms/WindowBase/FramelessWindowBase.cs
@@ -60,11 +60,11 @@ Color ChangeColor(Color color, float correctionFactor)
 
         return Color.FromArgb(color.A, (int)red, (int)green, (int)blue);
     }
-
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     internal protected Color BorderColor { get; set; } = Color.FromArgb(0xB2, 0xB2, blue: 0xB2);
 
     private Color? _inactiveBorderColor = null;
-
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     internal protected Color InactiveBorderColor
     {
         get => _inactiveBorderColor ?? ChangeColor(BorderColor,-0.1f);
@@ -87,7 +87,7 @@ internal protected Color InactiveBorderColor
     private readonly IntPtr FALSE = new IntPtr(0);
 
     protected abstract bool EnableHitTest { get; }
-
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     internal protected bool ShowBorder
     {
         get => _showBorder;
diff --git a/src/Sources/Formium/Forms/base/Forms/WindowBase/StandardWindowBase.cs b/src/Sources/Formium/Forms/base/Forms/WindowBase/StandardWindowBase.cs
@@ -5,6 +5,8 @@
 
 
 
+using System.ComponentModel;
+
 using static Vanara.PInvoke.User32;
 
 namespace NetDimension.NanUI.Forms;
@@ -16,6 +18,7 @@ partial class _FackUnusedClass
 
 public abstract class StandardWindowBase : Form
 {
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     internal protected HWND WND { get; protected set; }
     internal protected WindowDpiAdapter WindowDpiAdapter { get; }
 
@@ -42,6 +45,8 @@ internal protected virtual HitTestValues HitTest(Point pos)
 
     public StandardWindowBase()
     {
+        AutoScaleMode = AutoScaleMode.Dpi;
+
         WindowDpiAdapter = new WindowDpiAdapter(this);
 
         BackColor = Color.White;
@@ -248,7 +253,7 @@ private void WmSize(ref Message m)
 
 
     private bool _isWindowActivated = false;
-
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     internal protected bool IsWindowActivated
     {
         get => _isWindowActivated;
diff --git a/src/Sources/Formium/Forms/base/Forms/WindowBase/WindowDpiAdapter.cs b/src/Sources/Formium/Forms/base/Forms/WindowBase/WindowDpiAdapter.cs
@@ -40,14 +40,15 @@ public WindowDpiAdapter(Form form)
 
     protected override void WndProc(ref Message m)
     {
+#if !NET8_0_OR_GREATER
         if (m.Msg == (int)WindowMessage.WM_DPICHANGED)
         {
             if (WmDpiChanged(ref m))
             {
                 return;
             }
         }
-
+#endif
 
 
         base.WndProc(ref m);

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`
`13`	`13`	`namespace MinimalWinFormiumApp;`
`14`		`-internal class MyApp : NanUIAppStartup`
	`14`	`+internal class MyApp : AppStartup`
`15`	`15`	`{`
`16`	`16`	`protected override MainWindowCreationAction? UseMainWindow(MainWindowOptions opts)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public AppBuilder ConfigureChromium(Action<ChromiumEnvironmentBuiler> configureD`
`55`	`55`	`return this;`
`56`	`56`	`}`
`57`	`57`
`58`		`- public AppBuilder UseNanUIApp<TApp>() where TApp : notnull, NanUIAppStartup`
	`58`	`+ public AppBuilder UseNanUIApp<TApp>() where TApp : notnull, AppStartup`
`59`	`59`	`{`
`60`	`60`	`Services.AddSingleton<INanUIStartup, TApp>();`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`// GITHUB: https://github.com/XuanchenLin/NanUI`
`5`	`5`
`6`	`6`	`namespace NetDimension.NanUI;`
`7`		`-public abstract class NanUIAppStartup : INanUIStartup`
	`7`	`+public abstract class AppStartup : INanUIStartup`
`8`	`8`	`{`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// The main entry point for WinFormium app.`
Original file line number	Diff line number	Diff line change
`@@ -930,19 +930,21 @@ private bool BrowserLButtonDown(ref Message m)`
`930`	`930`
`931`	`931`	`ClientToScreen(WindowHandle, ref point);`
`932`	`932`
	`933`	`+ var lparam = Macros.MAKELPARAM((uint)point.X, (uint)point.Y);`
	`934`	`+`
`933`	`935`	`if (CurrentFormStyle.Sizable && CurrentFormStyle.UseBrowserHitTest && mode != HitTestValues.HTCLIENT && HostWindow!.WindowState == FormWindowState.Normal)`
`934`	`936`	`{`
`935`	`937`	`ReleaseCapture();`
`936`	`938`
`937`		`- PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)mode, (IntPtr)((point.X & 0xFFFF) \| (point.Y << 16)));`
	`939`	`+ PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)mode, lparam);`
`938`	`940`
`939`	`941`	`return true;`
`940`	`942`	`}`
`941`	`943`	`else if (isInDraggableArea)`
`942`	`944`	`{`
`943`	`945`	`ReleaseCapture();`
`944`	`946`
`945`		`- PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)HitTestValues.HTCAPTION, (IntPtr)((point.X & 0xFFFF) \| (point.Y << 16)));`
	`947`	`+ PostMessage(WindowHandle, (uint)WindowMessage.WM_NCLBUTTONDOWN, (IntPtr)HitTestValues.HTCAPTION, lparam);`
`946`	`948`
`947`	`949`	`return true;`
`948`	`950`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,11 @@ Color ChangeColor(Color color, float correctionFactor)`
`60`	`60`
`61`	`61`	`return Color.FromArgb(color.A, (int)red, (int)green, (int)blue);`
`62`	`62`	`}`
`63`		`-`
	`63`	`+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]`
`64`	`64`	`internal protected Color BorderColor { get; set; } = Color.FromArgb(0xB2, 0xB2, blue: 0xB2);`
`65`	`65`
`66`	`66`	`private Color? _inactiveBorderColor = null;`
`67`		`-`
	`67`	`+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]`
`68`	`68`	`internal protected Color InactiveBorderColor`
`69`	`69`	`{`
`70`	`70`	`get => _inactiveBorderColor ?? ChangeColor(BorderColor,-0.1f);`
`@@ -87,7 +87,7 @@ internal protected Color InactiveBorderColor`
`87`	`87`	`private readonly IntPtr FALSE = new IntPtr(0);`
`88`	`88`
`89`	`89`	`protected abstract bool EnableHitTest { get; }`
`90`		`-`
	`90`	`+ [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]`
`91`	`91`	`internal protected bool ShowBorder`
`92`	`92`	`{`
`93`	`93`	`get => _showBorder;`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,15 @@ public WindowDpiAdapter(Form form)`
`40`	`40`
`41`	`41`	`protected override void WndProc(ref Message m)`
`42`	`42`	`{`
	`43`	`+#if !NET8_0_OR_GREATER`
`43`	`44`	`if (m.Msg == (int)WindowMessage.WM_DPICHANGED)`
`44`	`45`	`{`
`45`	`46`	`if (WmDpiChanged(ref m))`
`46`	`47`	`{`
`47`	`48`	`return;`
`48`	`49`	`}`
`49`	`50`	`}`
`50`		`-`
	`51`	`+#endif`
`51`	`52`
`52`	`53`
`53`	`54`	`base.WndProc(ref m);`