Skip to content

Commit

Permalink
Added support to .net core 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
amibar committed Jul 16, 2021
1 parent 8c81802 commit 27cb713
Show file tree
Hide file tree
Showing 3 changed files with 1,925 additions and 1,919 deletions.
115 changes: 59 additions & 56 deletions STPTests/STPTests.csproj
Original file line number Diff line number Diff line change
@@ -1,56 +1,59 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
<AssemblyName>STPTests</AssemblyName>
<RootNamespace>STPTests</RootNamespace>
<DefineConstants>TRACE;</DefineConstants>
<Configurations>Debug;Release;Publish</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net46|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Publish|net46|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\publish\Keys\STP.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Publish|netcoreapp3.1|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\publish\Keys\STP.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)|$(Platform)'=='netcoreapp3.1|AnyCPU'">
<Compile Remove="TestCancel.Abort.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartThreadPool\SmartThreadPool.csproj" />
</ItemGroup>

</Project>
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net46;netcoreapp3.1;net5.0</TargetFrameworks>
<AssemblyName>STPTests</AssemblyName>
<RootNamespace>STPTests</RootNamespace>
<DefineConstants>TRACE;</DefineConstants>
<Configurations>Debug;Release;Publish</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net46'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Publish|net46|AnyCPU'">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\publish\Keys\STP.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Publish|netcoreapp3.1|AnyCPU'">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\publish\Keys\STP.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Publish|net5.0|AnyCPU'">
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\publish\Keys\STP.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)|$(Platform)'=='netcoreapp3.1|AnyCPU'">
<Compile Remove="TestCancel.Abort.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)|$(Platform)'=='net5.0|AnyCPU'">
<Compile Remove="TestCancel.Abort.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\SmartThreadPool\SmartThreadPool.csproj" />
</ItemGroup>

</Project>
Loading

0 comments on commit 27cb713

Please sign in to comment.