Skip to content

Commit 6638025

Browse files
committed
Merge branch 'dev' into docfx
2 parents 08a019c + 4155918 commit 6638025

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* test: updated functional test in NullValueTests to avoid duplicate error on create
77
* test: updated packages, updated deprecated async void methods
88
* build, test, and target updates
9-
- Set library targets to .NET Standard 2.0 & 2.1, .NET Core 3.1, 6.0-9.0
9+
- Set library targets to .NET Standard 2.0 & 2.1, .NET Core 3.1, .NET 6.0-9.0, .NET Framework 4.6.2, 4.7.2, 4.8
1010
- Tests target .NET Core 6.0-9.0
1111

1212
### 2025-02-24 v5.0.0-Beta

build.props

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,21 @@
2424
</PropertyGroup>
2525

2626
<PropertyGroup>
27-
<LibTargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</LibTargetFrameworks>
27+
<LibTargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net462;net472;net48</LibTargetFrameworks>
2828
<AppTargetFrameworks>net6.0;net7.0;net8.0;net9.0</AppTargetFrameworks>
29-
<TestTargetFrameworks>net6.0;net7.0;net8.0;net9.0</TestTargetFrameworks>
30-
</PropertyGroup>
29+
</PropertyGroup>
30+
31+
<Choose>
32+
<When Condition="$([MSBuild]::IsOSPlatform('OSX')) OR $([MSBuild]::IsOSPlatform('Linux'))">
33+
<PropertyGroup>
34+
<TestTargetFrameworks>net6.0;net7.0;net8.0;net9.0</TestTargetFrameworks>
35+
</PropertyGroup>
36+
</When>
37+
<Otherwise>
38+
<PropertyGroup>
39+
<TestTargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net462;net472;net48</TestTargetFrameworks>
40+
</PropertyGroup>
41+
</Otherwise>
42+
</Choose>
3143

3244
</Project>

src/NetCoreForce.Client/NetCoreForce.Client.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
4848
</ItemGroup>
4949

50+
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
51+
<PackageReference Include="System.Net.Http" Version="4.3.4" />
52+
</ItemGroup>
53+
5054
<Choose>
5155
<When Condition=" $(TargetFramework) == 'netcoreapp3.1' OR $(TargetFramework) == 'net5.0' ">
5256
<ItemGroup>

0 commit comments

Comments
 (0)