WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit b3f5a3c

Browse files
authored
Merge pull request #976 from softworkz/submit_revertnet6
Partially revert "Drop .NET 6.0, default to .NET 10.0 and update dependencies"
2 parents 7f507a6 + 0d732ce commit b3f5a3c

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

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>net8.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;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="10.0.1" />
32-
<PackageReference Include="System.Text.Json" Version="10.0.1" />
31+
<PackageReference Include="System.Drawing.Common" Version="8.0.22" />
32+
<PackageReference Include="System.Text.Json" Version="8.0.6" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

src/ElectronNET.AspNet/ElectronNET.AspNet.csproj

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

55
<PropertyGroup>
6-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
77
<PackageOutputPath>..\..\artifacts</PackageOutputPath>
88
<PackageId>$(PackageNamePrefix).AspNet</PackageId>
99
<Title>$(PackageId)</Title>
@@ -14,12 +14,18 @@
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>
1720
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
1821
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
1922
</PropertyGroup>
2023
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0|AnyCPU'">
2124
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
2225
</PropertyGroup>
26+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net6.0|AnyCPU'">
27+
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
28+
</PropertyGroup>
2329
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
2430
<NoWarn>1701;1702;4014;CS4014;CA1416;CS1591</NoWarn>
2531
</PropertyGroup>

src/ElectronNET.Build/ElectronNET.Build.csproj

Lines changed: 5 additions & 3 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="18.0.2" />
11+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.2" />
1212
</ItemGroup>
1313

1414

@@ -25,9 +25,11 @@
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)" DestinationFolder="$(_DllTargetPath)\%(RecursiveDir)" OverwriteReadOnlyFiles="true"></Copy>
30+
<Copy SourceFiles="@(OutputFiles)"
31+
DestinationFolder="$(_DllTargetPath)\%(RecursiveDir)"
32+
OverwriteReadOnlyFiles="true"></Copy>
3133

3234
</Target>
3335

src/ElectronNET/ElectronNET.csproj

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

55
<PropertyGroup>
6-
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net6.0;net8.0;net10.0</TargetFrameworks>
77
<PackageOutputPath>..\..\artifacts</PackageOutputPath>
88
<PackageId>$(PackageNamePrefix)</PackageId>
99
<Title>$(PackageId)</Title>

0 commit comments

Comments
 (0)