Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 42374e5

Browse files
committed
Upgrade Tests to net472;net6.0
1 parent f1d9923 commit 42374e5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/ServiceStack.Redis/ServiceStack.Redis.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414
<!-- TODO: talk about TFMs; Microsoft.Bcl.AsyncInterfaces starts at net461 -->
1515
<PropertyGroup Condition="'$(TargetFramework)' == 'net472'">
16-
<DefineConstants>$(DefineConstants);ASYNC_MEMORY;NET472</DefineConstants>
16+
<DefineConstants>$(DefineConstants);NET472</DefineConstants>
1717
</PropertyGroup>
1818
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
1919
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>

tests/ServiceStack.Redis.Tests/ServiceStack.Redis.Tests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<PropertyGroup>
33
<!--
44
TFM choice reasons:
5-
- net46 is .NET Framework without async
5+
- net472 is .NET Framework without async
66
- net472 is .NET Framework with async
77
- netcoreapp2.1 is .NET Core with async, but without some features like memory/stream APIs
88
- net5.0 is .NET Core with all the bells and whistles
99
-->
10-
<TargetFrameworks>net46;net472;netcoreapp2.1;net5.0</TargetFrameworks>
10+
<TargetFrameworks>net472;net6.0</TargetFrameworks>
1111
<DebugType>portable</DebugType>
1212
<AssemblyName>ServiceStack.Redis.Tests</AssemblyName>
1313
<OutputType>Library</OutputType>
@@ -29,17 +29,17 @@
2929
<PackageReference Include="System.Memory" Version="4.5.4" />
3030
<PackageReference Include="ServiceStack" Version="$(Version)" />
3131
</ItemGroup>
32-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
32+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
3333
<DefineConstants>$(DefineConstants);NET45</DefineConstants>
3434
</PropertyGroup>
35-
<ItemGroup Condition="'$(TargetFramework)'=='net46'">
35+
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
3636
<Compile Remove="**/*.Async.cs" />
3737
<None Include="**/*.Async.cs" />
3838
</ItemGroup>
39-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'net5.0'">
39+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
4040
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
4141
</PropertyGroup>
42-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
42+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
4343
<Reference Include="System.Configuration" />
4444
<Reference Include="System.Threading" />
4545
<Reference Include="System.Threading.Tasks" />
@@ -49,7 +49,7 @@
4949
<Reference Include="System.Web.Extensions" />
5050
<Reference Include="Microsoft.CSharp" />
5151
</ItemGroup>
52-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
52+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
5353
<PackageReference Include="Microsoft.Extensions.Primitives" Version="2.2.0" />
5454
</ItemGroup>
5555
</Project>

0 commit comments

Comments
 (0)