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

Commit 4371a06

Browse files
committed
Add .NET 6 build support
1 parent faf81c4 commit 4371a06

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

src/ServiceStack.Redis/ServiceStack.Redis.Core.csproj

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,19 @@
33
<PackageId>ServiceStack.Redis.Core</PackageId>
44
<AssemblyName>ServiceStack.Redis</AssemblyName>
55
<RootNamespace>ServiceStack.Redis</RootNamespace>
6-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
77
<Title>ServiceStack.Redis .NET Standard 2.0</Title>
88
<PackageDescription>
99
.NET Standard 2.0 version of ServiceStack.Redis
1010
</PackageDescription>
1111
<PackageTags>Redis;NoSQL;Client;Distributed;Cache;PubSub;Messaging;Transactions</PackageTags>
1212
</PropertyGroup>
13+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
14+
<DefineConstants>$(DefineConstants);ASYNC_MEMORY</DefineConstants>
15+
</PropertyGroup>
16+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
17+
<DefineConstants>$(DefineConstants);ASYNC_MEMORY;NET6_0</DefineConstants>
18+
</PropertyGroup>
1319
<ItemGroup>
1420
<PackageReference Include="ServiceStack.Common.Core" Version="$(Version)" />
1521
</ItemGroup>
@@ -20,6 +26,16 @@
2026
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
2127
<PackageReference Include="System.Data.Common" Version="4.3.0" />
2228
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
29+
<!-- note: not needed from netstandard2.1 or netcoreapp3.0 onwards -->
30+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
31+
</ItemGroup>
32+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
33+
<PackageReference Include="System.Net.Security" Version="4.3.2" />
34+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
35+
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
36+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
37+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
38+
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
2339
</ItemGroup>
2440

2541
</Project>

src/ServiceStack.Redis/ServiceStack.Redis.csproj

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<PackageId>ServiceStack.Redis</PackageId>
44
<AssemblyName>ServiceStack.Redis</AssemblyName>
5-
<TargetFrameworks>net45;net472;netstandard2.0;netstandard2.1</TargetFrameworks>
5+
<TargetFrameworks>net45;net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
66
<Title>C# Redis client for the Redis NoSQL DB</Title>
77
<PackageDescription>
88
C# Redis Client for the worlds fastest distributed NoSQL datastore.
@@ -15,6 +15,9 @@
1515
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
1616
<DefineConstants>$(DefineConstants);ASYNC_MEMORY</DefineConstants>
1717
</PropertyGroup>
18+
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
19+
<DefineConstants>$(DefineConstants);ASYNC_MEMORY;NET6_0</DefineConstants>
20+
</PropertyGroup>
1821
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
1922
<Compile Remove="**/*.Async.cs" />
2023
<Compile Remove="AsyncInterfaces/**/*.cs" />
@@ -38,9 +41,16 @@
3841
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
3942
<PackageReference Include="System.Data.Common" Version="4.3.0" />
4043
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
41-
4244
<!-- note: not needed from netstandard2.1 or netcoreapp3.0 onwards -->
4345
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
4446
</ItemGroup>
47+
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
48+
<PackageReference Include="System.Net.Security" Version="4.3.2" />
49+
<PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
50+
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
51+
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
52+
<PackageReference Include="System.Data.Common" Version="4.3.0" />
53+
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
54+
</ItemGroup>
4555

4656
</Project>

0 commit comments

Comments
 (0)