Skip to content

Commit 1baa5c6

Browse files
committed
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.
1 parent 70ffebf commit 1baa5c6

File tree

13 files changed

+20
-28
lines changed

13 files changed

+20
-28
lines changed

nuke/_build.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -11,9 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Build" Version="17.11.48" />
15-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
16-
<PackageReference Include="Nuke.Common" Version="9.0.4" />
14+
<PackageReference Include="Microsoft.Build" Version="18.0.2" />
15+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" />
16+
<PackageReference Include="Nuke.Common" Version="10.1.0" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

src/ElectronNET.API/ElectronNET.API.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
77
<PackageOutputPath>..\..\artifacts</PackageOutputPath>
88
<PackageId>$(PackageNamePrefix).API</PackageId>
99
<Title>$(PackageId)</Title>
@@ -28,8 +28,8 @@
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2929
</PackageReference>
3030
<PackageReference Include="SocketIOClient" Version="3.1.2" />
31-
<PackageReference Include="System.Drawing.Common" Version="8.0.16" />
32-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
31+
<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
32+
<PackageReference Include="System.Text.Json" Version="10.0.1" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

src/ElectronNET.AspNet/ElectronNET.AspNet.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
77
<PackageOutputPath>..\..\artifacts</PackageOutputPath>
88
<PackageId>$(PackageNamePrefix).AspNet</PackageId>
99
<Title>$(PackageId)</Title>
@@ -14,18 +14,12 @@
1414
<Nullable>disable</Nullable>
1515
<RootNamespace>ElectronNET</RootNamespace>
1616
</PropertyGroup>
17-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
18-
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
19-
</PropertyGroup>
2017
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
2118
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
2219
</PropertyGroup>
2320
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0|AnyCPU'">
2421
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
2522
</PropertyGroup>
26-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
27-
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
28-
</PropertyGroup>
2923
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
3024
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
3125
</PropertyGroup>

src/ElectronNET.Build/ElectronNET.Build.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" />
11+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" />
1212
</ItemGroup>
1313

1414

@@ -25,11 +25,9 @@
2525
<OutputFiles Include="$(OutDir)**\*.dll"></OutputFiles>
2626
</ItemGroup>
2727

28-
<Message Text="Copy ElectronNET.Build.dll to destination: $(_DllTargetPath)" Importance="high"/>
28+
<Message Text="Copy ElectronNET.Build.dll to destination: $(_DllTargetPath)" Importance="high" />
2929

30-
<Copy SourceFiles="@(OutputFiles)"
31-
DestinationFolder="$(_DllTargetPath)\%(RecursiveDir)"
32-
OverwriteReadOnlyFiles="true"></Copy>
30+
<Copy SourceFiles="@(OutputFiles)" DestinationFolder="$(_DllTargetPath)\%(RecursiveDir)" OverwriteReadOnlyFiles="true"></Copy>
3331

3432
</Target>
3533

src/ElectronNET.ConsoleApp/ElectronNET.ConsoleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
99

1010
<PropertyGroup>
11-
<TargetFramework>net8.0</TargetFramework>
11+
<TargetFramework>net10.0</TargetFramework>
1212
<OutputType>exe</OutputType>
1313
</PropertyGroup>
1414
<PropertyGroup>

src/ElectronNET.ConsoleApp/Properties/PublishProfiles/linux-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PublishDir>publish\Release\net8.0\linux-x64</PublishDir>
88
<PublishProtocol>FileSystem</PublishProtocol>
99
<_TargetId>Folder</_TargetId>
10-
<TargetFramework>net8.0</TargetFramework>
10+
<TargetFramework>net10.0</TargetFramework>
1111
<RuntimeIdentifier>linux-x64</RuntimeIdentifier>
1212
<SelfContained>false</SelfContained>
1313
<PublishSingleFile>false</PublishSingleFile>

src/ElectronNET.ConsoleApp/Properties/PublishProfiles/publish-win-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
1212
<PublishUrl>publish\Release\net8.0\win-x64\</PublishUrl>
1313
<WebPublishMethod>FileSystem</WebPublishMethod>
1414
<_TargetId>Folder</_TargetId>
15-
<TargetFramework>net8.0</TargetFramework>
15+
<TargetFramework>net10.0</TargetFramework>
1616
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1717
<SelfContained>true</SelfContained>
1818
</PropertyGroup>

src/ElectronNET.ConsoleApp/Properties/PublishProfiles/win-x64.pubxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PublishDir>publish\Release\net8.0\win-x64</PublishDir>
88
<PublishProtocol>FileSystem</PublishProtocol>
99
<_TargetId>Folder</_TargetId>
10-
<TargetFramework>net8.0</TargetFramework>
10+
<TargetFramework>net10.0</TargetFramework>
1111
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
1212
<SelfContained>false</SelfContained>
1313
<PublishSingleFile>false</PublishSingleFile>

src/ElectronNET.Samples.ElectronHostHook/ElectronNET.Samples.ElectronHostHook.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
77

88
<PropertyGroup>
9-
<TargetFramework>net8.0</TargetFramework>
9+
<TargetFramework>net10.0</TargetFramework>
1010
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
1111
<AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName>
1212
<IsPackable>false</IsPackable>

src/ElectronNET.WebApp/ElectronNET.WebApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Import Project="..\ElectronNET\build\ElectronNET.Core.props" Condition="$(ElectronNetDevMode)" />
99

1010
<PropertyGroup>
11-
<TargetFramework>net8.0</TargetFramework>
11+
<TargetFramework>net10.0</TargetFramework>
1212
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
1313
<AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName>
1414
</PropertyGroup>

0 commit comments

Comments
 (0)