Add .NET 5 target framework

Author: zvirja

CHANGELOG.md

@@ -1,4 +1,5 @@
 ### unreleased
+* [NEW] Add .NET 5 support
 
 ### 4.2.2 (Jun 2020)
 

Directory.Build.props

@@ -1,11 +1,12 @@
 <Project>
 
   <!-- Contains global properties for all projects in the solution.
-  These can be overridden in inner folders, if necessary. 
+  These can be overridden in inner folders, if necessary.
   See more here https://docs.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2019 -->
-  
+
   <PropertyGroup>
     <TargetIsNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</TargetIsNetFx>
+    <TargetIsNet5 Condition="'$(TargetFramework)' == 'net5.0'">true</TargetIsNet5>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

src/NSubstitute/NSubstitute.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net45;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;net45;net46;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -35,19 +35,15 @@
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.4.0-*" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*"
+                      Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0-*" />
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetIsNetFx)' == 'true'">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
- 
   <PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
     <DefineConstants>$(DefineConstants);SYSTEM_REFLECTION_CUSTOMATTRIBUTES_IS_ARRAY</DefineConstants>
   </PropertyGroup>

tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net46;net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net46;net45;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>