Add AOT Compatibility (#44)

* add optional native aot support

* update to dotnet 8 for lts and aot support

Author: rthomasv3

examples/DesktopApp/DesktopApp.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
 

examples/Minimal/Minimal.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
 

src/SharpWebview/Loopback.cs

@@ -40,7 +40,7 @@ private List<FirewallAppContainer> GetAllAppContainers()
         {
             var size = 0u;
             var arrayValue = IntPtr.Zero;
-            var structSize = Marshal.SizeOf(typeof(FirewallAppContainer));
+            var structSize = Marshal.SizeOf<FirewallAppContainer>();
 
             var handle_pdwCntPublicACs = GCHandle.Alloc(size, GCHandleType.Pinned);
             var handle_ppACs = GCHandle.Alloc(arrayValue, GCHandleType.Pinned);
@@ -50,7 +50,7 @@ private List<FirewallAppContainer> GetAllAppContainers()
             var firewallApps = new List<FirewallAppContainer>();
             for (var i = 0; i < size; i++)
             {
-                var cur = (FirewallAppContainer) Marshal.PtrToStructure(arrayValue, typeof(FirewallAppContainer));
+                var cur = (FirewallAppContainer)Marshal.PtrToStructure<FirewallAppContainer>(arrayValue);
                 firewallApps.Add(cur);
                 arrayValue = new IntPtr((long)arrayValue + structSize);
             }
@@ -65,7 +65,7 @@ private List<SidAndAttributes> GetAllAppContainerConfigs()
         {
             var size = 0u;
             var arrayValue = IntPtr.Zero;
-            var structSize = Marshal.SizeOf(typeof(SidAndAttributes));
+            var structSize = Marshal.SizeOf<SidAndAttributes>();
 
             var handle_pdwCntPublicACs = GCHandle.Alloc(size, GCHandleType.Pinned);
             var handle_ppACs = GCHandle.Alloc(arrayValue, GCHandleType.Pinned);
@@ -75,7 +75,7 @@ private List<SidAndAttributes> GetAllAppContainerConfigs()
             var firewallAppConfigs = new List<SidAndAttributes>();
             for (var i = 0; i < size; i++)
             {
-                var currentConfig = (SidAndAttributes)Marshal.PtrToStructure(arrayValue, typeof(SidAndAttributes));
+                var currentConfig = (SidAndAttributes)Marshal.PtrToStructure<SidAndAttributes>(arrayValue);
                 firewallAppConfigs.Add(currentConfig);
                 arrayValue = new IntPtr((long)arrayValue + structSize);
             }

src/SharpWebview/SharpWebview.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>SharpWebview</AssemblyName>
     <Authors>Gerrit 'Geaz' Gazic</Authors>
@@ -35,7 +35,6 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
 </Project>

src/SharpWebview/Webview.cs

@@ -1,5 +1,4 @@
 using System;
-using Newtonsoft.Json;
 using SharpWebview.Content;
 using System.Diagnostics;
 using System.Collections.Generic;
@@ -206,10 +205,11 @@ private void InterceptExternalLinks()
             // This method opens the url parameter in the system browser
             Bind("openExternalLink", (id, req) =>
             {
-                dynamic args = JsonConvert.DeserializeObject(req);
+                string url = ExtractUrlArgument(req);
+
                 ProcessStartInfo psi = new ProcessStartInfo
                 {
-                    FileName = args[0],
+                    FileName = url,
                     UseShellExecute = true
                 };
                 Process.Start (psi);
@@ -248,6 +248,26 @@ function interceptClickEvent(e) {
             ");
         }
 
+        private string ExtractUrlArgument(string jsonArray)
+        {
+            if (string.IsNullOrWhiteSpace(jsonArray))
+                return string.Empty;
+
+            jsonArray = jsonArray.Trim();
+
+            // Expected format: ["http..."]
+            if (!jsonArray.StartsWith("[\"http") || !jsonArray.Contains("\"]"))
+                return string.Empty;
+
+            int startIndex = 2; // After ["
+            int endIndex = jsonArray.IndexOf("\"]", startIndex);
+
+            if (endIndex == -1)
+                return string.Empty;
+
+            return jsonArray.Substring(startIndex, endIndex - startIndex);
+        }
+
         private bool? CheckLoopbackException(string url)
         {
             // https://docs.microsoft.com/de-de/windows/win32/sysinfo/operating-system-version