Fixed #1105

Updated changelog
Merged
2026-09-22 23:15:25 +00:00 · 2026-09-03 16:25:47 +02:00 · 2026-09-03 16:17:19 +02:00 · 2026-09-03 11:28:37 +02:00 · 2026-09-03 08:54:37 +02:00 · 2026-09-03 00:19:56 +00:00
13 changed files with 76 additions and 24 deletions
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,13 @@
+# 0.6.0
+
+## ElectronNET.Core
+
+- Updated dependencies
+- Fixed socket bridge connection when a system proxy is configured (#1105)
+- Fixed cross-compilation behavior on same platform (#1098) @epsnm
+- Fixed resolution of unrelated target (#1099) @epsnm
+- Added target framework customization (#1095) @epsnm
+
 # 0.5.2

 ## ElectronNET.Core
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,4 +5,11 @@
  <!-- Uncomment to include parent Directory.Build.props file -->
  <!--<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />-->

+  <PropertyGroup>
+    <ElectronNetBuildProps>$([MSBuild]::GetPathOfFileAbove('ElectronNet.Build.props', '$(MSBuildThisFileDirectory)../'))</ElectronNetBuildProps>
+  </PropertyGroup>
+
+  <!-- Only import specific project related MSBuild file -->
+  <Import Project="$(ElectronNetBuildProps)" Condition=" '$(ElectronNetBuildProps)' != '' " />
+
 </Project>
--- a/docs/GettingStarted/Console-App.md
+++ b/docs/GettingStarted/Console-App.md
@@ -54,7 +54,7 @@ Add the Electron.NET configuration to your `.csproj` file:
 </PropertyGroup>

 <ItemGroup>
-  <PackageReference Include="ElectronNET.Core" Version="0.5.2" />
+  <PackageReference Include="ElectronNET.Core" Version="0.6.0" />
 </ItemGroup>
 ```

--- a/src/ElectronNET.API/Bridge/SocketIOConnection.cs
+++ b/src/ElectronNET.API/Bridge/SocketIOConnection.cs
@@ -4,6 +4,7 @@ namespace ElectronNET.API;

 using System;
 using System.Collections.Generic;
+using System.Net;
 using System.Threading.Tasks;
 using ElectronNET.API.Serialization;
 using SocketIO.Serializer.SystemTextJson;
@@ -18,13 +19,21 @@ internal class SocketIOConnection : ISocketConnection

    public SocketIOConnection(string uri, string authorization)
    {
-        var opts = string.IsNullOrEmpty(authorization) ? new SocketIOOptions() : new SocketIOOptions
+        var opts = new SocketIOOptions
        {
-            ExtraHeaders = new Dictionary<string, string>
+            // The bridge is a loopback IPC channel, so it must never go through a
+            // (system) proxy - otherwise the handshake never reaches the socket server.
+            Proxy = DirectProxy.Instance,
+        };
+
+        if (!string.IsNullOrEmpty(authorization))
+        {
+            opts.ExtraHeaders = new Dictionary<string, string>
            {
                ["authorization"] = authorization
-            },
-        };
+            };
+        }
+
        _socket = new SocketIO(uri, opts);
        _socket.Serializer = new SystemTextJsonSerializer(ElectronJson.Options);
        // Use default System.Text.Json serializer from SocketIOClient.
@@ -152,4 +161,15 @@ internal class SocketIOConnection : ISocketConnection
            throw new ObjectDisposedException(nameof(SocketIOConnection));
        }
    }
+
+    private sealed class DirectProxy : IWebProxy
+    {
+        public static readonly DirectProxy Instance = new DirectProxy();
+
+        public ICredentials Credentials { get; set; }
+
+        public Uri GetProxy(Uri destination) => destination;
+
+        public bool IsBypassed(Uri host) => true;
+    }
 }
--- a/src/ElectronNET.API/ElectronNET.API.csproj
+++ b/src/ElectronNET.API/ElectronNET.API.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\common.props" />

  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>$(ElectronNetTargetFrameworks)</TargetFrameworks>
    <PackageOutputPath>..\..\artifacts</PackageOutputPath>
    <PackageId>$(PackageNamePrefix).API</PackageId>
    <Title>$(PackageId)</Title>
@@ -29,7 +29,7 @@
    </PackageReference>
    <PackageReference Include="SocketIOClient" Version="3.1.2" />
    <PackageReference Include="System.Drawing.Common" Version="8.0.22" />
-    <PackageReference Include="System.Text.Json" Version="8.0.6" />
+    <PackageReference Include="System.Text.Json" Version="8.0.6" Condition=" '$(TargetFramework)' == 'net6.0' " />
  </ItemGroup>

  <ItemGroup>
--- a/src/ElectronNET.AspNet/ElectronNET.AspNet.csproj
+++ b/src/ElectronNET.AspNet/ElectronNET.AspNet.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\common.props" />

  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>$(ElectronNetTargetFrameworks)</TargetFrameworks>
    <PackageOutputPath>..\..\artifacts</PackageOutputPath>
    <PackageId>$(PackageNamePrefix).AspNet</PackageId>
    <Title>$(PackageId)</Title>
--- a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
+++ b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj
@@ -70,7 +70,7 @@
    <ProjectReference Include="..\ElectronNET.API\ElectronNET.API.csproj" Condition="$(ElectronNetDevMode)" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="ElectronNET.Core" Version="0.5.2" Condition="'$(ElectronNetDevMode)' != 'true'" />
+    <PackageReference Include="ElectronNET.Core" Version="0.6.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
  </ItemGroup>

  <Import Project="..\ElectronNET\build\ElectronNET.Core.targets" Condition="$(ElectronNetDevMode)" />
--- a/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj
+++ b/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj
@@ -27,8 +27,8 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="ElectronNET.Core" Version="0.5.2" Condition="'$(ElectronNetDevMode)' != 'true'" />
-    <PackageReference Include="ElectronNET.Core.AspNet" Version="0.5.2" Condition="'$(ElectronNetDevMode)' != 'true'" />
+    <PackageReference Include="ElectronNET.Core" Version="0.6.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
+    <PackageReference Include="ElectronNET.Core.AspNet" Version="0.6.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
  </ItemGroup>

--- a/src/ElectronNET.WebApp/ElectronHostHook/package-lock.json
+++ b/src/ElectronNET.WebApp/ElectronHostHook/package-lock.json
@@ -204,29 +204,43 @@
      "license": "MIT"
    },
    "node_modules/@humanfs/core": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
-      "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",
+      "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==",
      "dev": true,
      "license": "Apache-2.0",
+      "dependencies": {
+        "@humanfs/types": "^0.15.0"
+      },
      "engines": {
        "node": ">=18.18.0"
      }
    },
    "node_modules/@humanfs/node": {
-      "version": "0.16.7",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
-      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
+      "version": "0.16.8",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz",
+      "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
-        "@humanfs/core": "^0.19.1",
+        "@humanfs/core": "^0.19.2",
+        "@humanfs/types": "^0.15.0",
        "@humanwhocodes/retry": "^0.4.0"
      },
      "engines": {
        "node": ">=18.18.0"
      }
    },
+    "node_modules/@humanfs/types": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz",
+      "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18.0"
+      }
+    },
    "node_modules/@humanwhocodes/module-importer": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
--- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
+++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj
@@ -75,8 +75,8 @@
    <ProjectReference Include="..\ElectronNET.AspNet\ElectronNET.AspNet.csproj" Condition="$(ElectronNetDevMode)" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="ElectronNET.Core" Version="0.5.2" Condition="'$(ElectronNetDevMode)' != 'true'" />
-    <PackageReference Include="ElectronNET.Core.AspNet" Version="0.5.2" Condition="'$(ElectronNetDevMode)' != 'true'" />
+    <PackageReference Include="ElectronNET.Core" Version="0.6.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
+    <PackageReference Include="ElectronNET.Core.AspNet" Version="0.6.0" Condition="'$(ElectronNetDevMode)' != 'true'" />
    <PackageReference Include="Microsoft.TypeScript.MSBuild" Version="5.9.3" />
  </ItemGroup>

--- a/src/ElectronNET/ElectronNET.csproj
+++ b/src/ElectronNET/ElectronNET.csproj
@@ -3,7 +3,7 @@
  <Import Project="..\common.props" />

  <PropertyGroup>
-    <TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>$(ElectronNetTargetFrameworks)</TargetFrameworks>
    <PackageOutputPath>..\..\artifacts</PackageOutputPath>
    <PackageId>$(PackageNamePrefix)</PackageId>
    <Title>$(PackageId)</Title>
--- a/src/ElectronNET/build/ElectronNET.LateImport.targets
+++ b/src/ElectronNET/build/ElectronNET.LateImport.targets
@@ -52,7 +52,7 @@

  <!-- Targets -->

-  <Target Name="ElectronBeforeClean" AfterTargets="BeforeClean" DependsOnTargets="ElectronResolvePaths">
+  <Target Name="ElectronBeforeClean" AfterTargets="BeforeClean" DependsOnTargets="ElectronSetPaths">
    <ItemGroup>
      <Clean Include="$(ElectronOutDir)**" />
    </ItemGroup>
@@ -60,7 +60,7 @@
    <!--<Message Text="ElectronBeforeClean - Clean Files: @(Clean)" Importance="High" />-->
  </Target>

-  <Target Name="ElectronClean" AfterTargets="CoreClean" DependsOnTargets="ElectronResolvePaths">
+  <Target Name="ElectronClean" AfterTargets="CoreClean" DependsOnTargets="ElectronSetPaths">

    <RemoveDir Directories="$(ElectronOutDir)" />

--- a/src/common.props
+++ b/src/common.props
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <Version>0.5.2</Version>
+    <Version>0.6.0</Version>
    <PackageNamePrefix>ElectronNET.Core</PackageNamePrefix>
    <Authors>Gregor Biswanger, Florian Rappl, softworkz</Authors>
    <Product>Electron.NET</Product>
@@ -18,6 +18,7 @@
    <FileVersion>$(Version)</FileVersion>
    <Version>$(Version)$(VersionPostFix)</Version>
    <InformationalVersion>$(Version)</InformationalVersion>
+    <ElectronNetTargetFrameworks Condition="'$(ElectronNetTargetFrameworks)' == ''">net6.0;net8.0;net10.0</ElectronNetTargetFrameworks>
  </PropertyGroup>
 </Project>
Author	SHA1	Message	Date
Florian Rappl	9cb210040d	Fixed #1105	2026-09-03 16:25:47 +02:00
Florian Rappl	7e8f45b16d	Updated changelog	2026-09-03 16:17:19 +02:00
Florian Rappl	76dc687269	Merged	2026-09-03 11:28:37 +02:00
Florian Rappl	dcf4585510	Merge pull request #1108 from ElectronNET/dependabot/npm_and_yarn/src/ElectronNET.WebApp/ElectronHostHook/humanfs/node-0.16.8 Bump @humanfs/node from 0.16.7 to 0.16.8 in /src/ElectronNET.WebApp/ElectronHostHook	2026-09-03 08:54:37 +02:00
dependabot[bot]	a6d7434adf	Bump @humanfs/node in /src/ElectronNET.WebApp/ElectronHostHook Bumps [@humanfs/node](https://github.com/humanwhocodes/humanfs/tree/HEAD/packages/node) from 0.16.7 to 0.16.8. - [Release notes](https://github.com/humanwhocodes/humanfs/releases) - [Changelog](https://github.com/humanwhocodes/humanfs/blob/main/packages/node/CHANGELOG.md) - [Commits](https://github.com/humanwhocodes/humanfs/commits/node-v0.16.8/packages/node) --- updated-dependencies: - dependency-name: "@humanfs/node" dependency-version: 0.16.8 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2026-09-03 00:19:56 +00:00
Florian Rappl	76ff44f67e	Merge pull request #1104 from epsitec-sa/feat/#1095 chore(build): allow customization of target framwork version in dev mode (#1095)	2026-08-14 13:07:48 +02:00
Samuel Nussbaum	20ab82b16d	chore(build): fix error when props file is missing	2026-08-14 11:25:19 +02:00
Samuel Nussbaum	b27f705a6a	chore(build): Change import barriere	2026-08-14 10:52:10 +02:00
Samuel Nussbaum	8697c4de44	chore(build): passthrough props barriere	2026-08-14 10:07:58 +02:00
Florian Rappl	376a791e48	Merge pull request #1099 from epsitec-sa/bug/#1096 chore(build): fix #1096 by depends on resolve unrelated target	2026-08-11 09:45:16 +02:00
Samuel Nussbaum	26b9d86ee4	chore(build): target frameworks customization	2026-08-10 10:33:00 +02:00
Samuel Nussbaum	1ec1fde3c6	chore(build): fix #1096 by depends on not resolve related target	2026-08-07 14:37:13 +02:00