From 1baa5c62006a476fa093a3b54ad62a6bc21ffaf5 Mon Sep 17 00:00:00 2001 From: David Roth Date: Wed, 10 Dec 2025 21:43:10 +0100 Subject: [PATCH] Drop .NET 6.0, default to .NET 10.0 and update dependencies Updated all projects to target .NET 10.0, removing support for .NET 6.0. Upgraded key dependencies, including: - `Microsoft.Build` and `Microsoft.Build.Tasks.Core` to 18.0.2. - `Nuke.Common` to 10.1.0. - `System.Drawing.Common` to 10.0.1. - `System.Text.Json` to 10.0.1. Removed `NoWarn` configurations for .NET 6.0 in `ElectronNET.AspNet.csproj`. Reformatted the `Copy` task in `ElectronNET.Build.csproj` for readability. Updated `.pubxml` files and other project files to reflect the framework upgrade. --- nuke/_build.csproj | 8 ++++---- src/ElectronNET.API/ElectronNET.API.csproj | 6 +++--- src/ElectronNET.AspNet/ElectronNET.AspNet.csproj | 8 +------- src/ElectronNET.Build/ElectronNET.Build.csproj | 8 +++----- src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj | 2 +- .../Properties/PublishProfiles/linux-x64.pubxml | 2 +- .../Properties/PublishProfiles/publish-win-x64.pubxml | 2 +- .../Properties/PublishProfiles/win-x64.pubxml | 2 +- .../ElectronNET.Samples.ElectronHostHook.csproj | 2 +- src/ElectronNET.WebApp/ElectronNET.WebApp.csproj | 2 +- .../Properties/PublishProfiles/linux-x64.pubxml | 2 +- .../Properties/PublishProfiles/win-x64.pubxml | 2 +- src/ElectronNET/ElectronNET.csproj | 2 +- 13 files changed, 20 insertions(+), 28 deletions(-) diff --git a/nuke/_build.csproj b/nuke/_build.csproj index 78e4653a..47ebb0a1 100644 --- a/nuke/_build.csproj +++ b/nuke/_build.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 CS0649;CS0169 .. @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/ElectronNET.API/ElectronNET.API.csproj b/src/ElectronNET.API/ElectronNET.API.csproj index b5d97f77..a6b0123d 100644 --- a/src/ElectronNET.API/ElectronNET.API.csproj +++ b/src/ElectronNET.API/ElectronNET.API.csproj @@ -3,7 +3,7 @@ - net6.0;net8.0;net10.0 + net8.0;net10.0 ..\..\artifacts $(PackageNamePrefix).API $(PackageId) @@ -28,8 +28,8 @@ runtime; build; native; contentfiles; analyzers - - + + diff --git a/src/ElectronNET.AspNet/ElectronNET.AspNet.csproj b/src/ElectronNET.AspNet/ElectronNET.AspNet.csproj index 1c098ca2..e4e2a98f 100644 --- a/src/ElectronNET.AspNet/ElectronNET.AspNet.csproj +++ b/src/ElectronNET.AspNet/ElectronNET.AspNet.csproj @@ -3,7 +3,7 @@ - net6.0;net8.0;net10.0 + net8.0;net10.0 ..\..\artifacts $(PackageNamePrefix).AspNet $(PackageId) @@ -14,18 +14,12 @@ disable ElectronNET - - 1701;1702;4014;CS4014;CA1416;CS1591 - 1701;1702;4014;CS4014;CA1416;CS1591 1701;1702;4014;CS4014;CA1416;CS1591 - - 1701;1702;4014;CS4014;CA1416;CS1591 - 1701;1702;4014;CS4014;CA1416;CS1591 diff --git a/src/ElectronNET.Build/ElectronNET.Build.csproj b/src/ElectronNET.Build/ElectronNET.Build.csproj index e7cb1b9e..cd1541c5 100644 --- a/src/ElectronNET.Build/ElectronNET.Build.csproj +++ b/src/ElectronNET.Build/ElectronNET.Build.csproj @@ -8,7 +8,7 @@ - + @@ -25,11 +25,9 @@ - + - + diff --git a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj index 17d12aed..caf726c6 100644 --- a/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj +++ b/src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj @@ -8,7 +8,7 @@ - net8.0 + net10.0 exe diff --git a/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/linux-x64.pubxml b/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/linux-x64.pubxml index c92d1b50..2c9cd897 100644 --- a/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/linux-x64.pubxml +++ b/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/linux-x64.pubxml @@ -7,7 +7,7 @@ publish\Release\net8.0\linux-x64 FileSystem <_TargetId>Folder - net8.0 + net10.0 linux-x64 false false diff --git a/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/publish-win-x64.pubxml b/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/publish-win-x64.pubxml index 01940b38..cf6e6e09 100644 --- a/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/publish-win-x64.pubxml +++ b/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/publish-win-x64.pubxml @@ -12,7 +12,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. publish\Release\net8.0\win-x64\ FileSystem <_TargetId>Folder - net8.0 + net10.0 win-x64 true diff --git a/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/win-x64.pubxml b/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/win-x64.pubxml index fbd20075..bda8dcc7 100644 --- a/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/win-x64.pubxml +++ b/src/ElectronNET.ConsoleApp/Properties/PublishProfiles/win-x64.pubxml @@ -7,7 +7,7 @@ publish\Release\net8.0\win-x64 FileSystem <_TargetId>Folder - net8.0 + net10.0 win-x64 false false diff --git a/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj b/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj index 70eb4366..802cdab6 100644 --- a/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj +++ b/src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj @@ -6,7 +6,7 @@ - net8.0 + net10.0 OutOfProcess AspNetCoreModule false diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj index ed50f8d9..65a7cbb5 100644 --- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj +++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj @@ -8,7 +8,7 @@ - net8.0 + net10.0 OutOfProcess AspNetCoreModule diff --git a/src/ElectronNET.WebApp/Properties/PublishProfiles/linux-x64.pubxml b/src/ElectronNET.WebApp/Properties/PublishProfiles/linux-x64.pubxml index 3c9c8310..770648d1 100644 --- a/src/ElectronNET.WebApp/Properties/PublishProfiles/linux-x64.pubxml +++ b/src/ElectronNET.WebApp/Properties/PublishProfiles/linux-x64.pubxml @@ -11,7 +11,7 @@ FileSystem <_TargetId>Folder - net8.0 + net10.0 linux-x64 6ea447d9-343f-46b8-b456-66557bddbb9f true diff --git a/src/ElectronNET.WebApp/Properties/PublishProfiles/win-x64.pubxml b/src/ElectronNET.WebApp/Properties/PublishProfiles/win-x64.pubxml index 04d7a390..874b3803 100644 --- a/src/ElectronNET.WebApp/Properties/PublishProfiles/win-x64.pubxml +++ b/src/ElectronNET.WebApp/Properties/PublishProfiles/win-x64.pubxml @@ -11,7 +11,7 @@ FileSystem <_TargetId>Folder - net8.0 + net10.0 win-x64 6ea447d9-343f-46b8-b456-66557bddbb9f true diff --git a/src/ElectronNET/ElectronNET.csproj b/src/ElectronNET/ElectronNET.csproj index 2298cd7e..157b54c7 100644 --- a/src/ElectronNET/ElectronNET.csproj +++ b/src/ElectronNET/ElectronNET.csproj @@ -3,7 +3,7 @@ - net6.0;net8.0;net10.0 + net8.0;net10.0 ..\..\artifacts $(PackageNamePrefix) $(PackageId)