Skip to content

Commit f64fef1

Browse files
committed
build: simplified library target to .NET Standard 2.0 for maximum compatibility. Tests target .NET Core 6+
1 parent a5e26e6 commit f64fef1

3 files changed

Lines changed: 11 additions & 13 deletions

File tree

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
## A .NET Standard and .NET Core Salesforce REST API integration library
44
*This project is not offered, sponsored, or endorsed by Salesforce.*
55

6+
Targets .NET Standard 2.0 - this means it will be generally compatible with .NET Framework 4.6.1+ and .NET Core 2.0+
7+
For more info on .NET Standard 2.0 compatiblity [see the Microsoft documentation here](https://learn.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-standard-2-0)
8+
9+
Full tested support is for .NET Core 6.0 - 9.0 as tooling and tests target those.
10+
611
### [CHANGELOG](CHANGELOG.md)
712

813
CI main:
914
[![CI](https://github.com/anthonyreilly/NetCoreForce/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/anthonyreilly/NetCoreForce/actions/workflows/ci.yml)
1015
CI dev:
1116
[![CI](https://github.com/anthonyreilly/NetCoreForce/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/anthonyreilly/NetCoreForce/actions/workflows/ci.yml)
1217

13-
NetCoreForce currently targeting netstandard 2.0 & 2.1, and .NET Core 6.0 - 9.0
18+
1419

1520
### Projects in this solution:
1621
* [NetCoreForce.Client](src/NetCoreForce.Client)

build.props

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,10 @@
2323
<SolutionDir>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), *.sln))</SolutionDir>
2424
</PropertyGroup>
2525

26-
<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('OSX!'))">
27-
<LibTargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0</LibTargetFrameworks>
28-
<AppTargetFrameworks>net6.0;net7.0;net8.0;net9.0</AppTargetFrameworks>
29-
<TestTargetFrameworks>netcoreapp2.1;netcoreapp3.1;net6.0;net7.0;net8.0;net9.0</TestTargetFrameworks>
30-
</PropertyGroup>
31-
32-
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
33-
<LibTargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0;net9.0</LibTargetFrameworks>
26+
<PropertyGroup>
27+
<LibTargetFrameworks>netstandard2.0</LibTargetFrameworks>
3428
<AppTargetFrameworks>net6.0;net7.0;net8.0;net9.0</AppTargetFrameworks>
3529
<TestTargetFrameworks>net6.0;net7.0;net8.0;net9.0</TestTargetFrameworks>
36-
</PropertyGroup>
37-
30+
</PropertyGroup>
3831

3932
</Project>

src/NetCoreForce.Client.Tests/NetCoreForce.Client.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
<Choose>
1313

14-
<When Condition=" '$(TargetFramework)' == 'NET6_0_OR_GREATER'">
14+
<When Condition="'$(TargetFramework)' == 'NET6_0_OR_GREATER'">
1515
<ItemGroup>
1616
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
1717
</ItemGroup>
1818
</When>
1919

20-
<When Condition=" '$(TargetFramework)' == 'NET8_0_OR_GREATER'">
20+
<When Condition="'$(TargetFramework)' == 'NET8_0_OR_GREATER'">
2121
<ItemGroup>
2222
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1" />
2323
</ItemGroup>

0 commit comments

Comments
 (0)