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

Commit ada4889

Browse files
mythzmythz
committed
Upgrade to v6
1 parent 6e7234a commit ada4889

File tree

8 files changed

+24
-44
lines changed

8 files changed

+24
-44
lines changed

‎build/build-core.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>

‎build/build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
7-
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
7+
<MajorVersion Condition="$(MajorVersion) == ''">6</MajorVersion>
88
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>

‎src/Directory.Build.props‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>5.14.0</Version>
4+
<Version>6.0.0</Version>
55
<Authors>ServiceStack</Authors>
66
<Company>ServiceStack, Inc.</Company>
77
<Copyright>&#169; 2008-2018 ServiceStack, Inc</Copyright>
@@ -24,31 +24,23 @@
2424
<Optimize>true</Optimize>
2525
</PropertyGroup>
2626

27-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net451' OR '$(TargetFramework)' == 'net452' OR '$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net472' ">
28-
<DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
27+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
28+
<DefineConstants>$(DefineConstants);NETFX;NET45;NET472</DefineConstants>
2929
<SignAssembly>True</SignAssembly>
3030
<DelaySign>False</DelaySign>
3131
<AssemblyOriginatorKeyFile>../servicestack.snk</AssemblyOriginatorKeyFile>
3232
</PropertyGroup>
3333

34-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
35-
<DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
36-
</PropertyGroup>
37-
3834
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
3935
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
4036
</PropertyGroup>
4137

42-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
43-
<DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
44-
</PropertyGroup>
45-
46-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
47-
<DefineConstants>$(DefineConstants);NET50</DefineConstants>
38+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
39+
<DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
4840
</PropertyGroup>
4941

50-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' ">
51-
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
42+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
43+
<DefineConstants>$(DefineConstants);NETCORE;NETCORE_SUPPORT</DefineConstants>
5244
</PropertyGroup>
5345

5446
<ItemGroup>

‎src/ServiceStack.Redis/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
[assembly: ComVisible(false)]
44
[assembly: Guid("70a33fa7-9f81-418d-bb25-6a4be6648ae4")]
5-
[assembly: System.Reflection.AssemblyVersion("5.0.0.0")]
5+
[assembly: System.Reflection.AssemblyVersion("6.0.0.0")]

‎src/ServiceStack.Redis/ServiceStack.Redis.csproj‎

Lines changed: 2 additions & 11 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;net6.0</TargetFrameworks>
5+
<TargetFrameworks>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.
@@ -24,19 +24,10 @@
2424
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0'">
2525
<DefineConstants>$(DefineConstants);ASYNC_MEMORY;NETCORE;NET6_0</DefineConstants>
2626
</PropertyGroup>
27-
<ItemGroup Condition="'$(TargetFramework)'=='net45'">
28-
<Compile Remove="**/*.Async.cs" />
29-
<Compile Remove="AsyncInterfaces/**/*.cs" />
30-
<None Include="**/*.Async.cs" />
31-
<None Include="AsyncInterfaces/**/*.cs" />
32-
</ItemGroup>
3327
<ItemGroup>
3428
<PackageReference Include="ServiceStack.Common" Version="$(Version)" />
3529
</ItemGroup>
36-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
37-
<Reference Include="System.Net" />
38-
</ItemGroup>
39-
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
4031
<Reference Include="System.Net" />
4132
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
4233
</ItemGroup>

‎tests/Console.Tests/Console.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<RootNamespace>Console.Tests</RootNamespace>
77
</PropertyGroup>
88

‎tests/Directory.Build.props‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>5.14.0</Version>
4+
<Version>6.0.0</Version>
55
<LangVersion>latest</LangVersion>
66
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
77
</PropertyGroup>
@@ -10,23 +10,20 @@
1010
<DefineConstants>DEBUG</DefineConstants>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
14-
<DefineConstants>$(DefineConstants);NETFX;NET45</DefineConstants>
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
14+
<DefineConstants>$(DefineConstants);NETFX;NET472</DefineConstants>
1515
</PropertyGroup>
1616

17-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net46' ">
18-
<DefineConstants>$(DefineConstants);NETFX;NET46</DefineConstants>
17+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
18+
<DefineConstants>$(DefineConstants);NETCORE;NETSTANDARD2_0</DefineConstants>
1919
</PropertyGroup>
2020

21-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
22-
<DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
21+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
22+
<DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
2323
</PropertyGroup>
2424

25-
<ItemGroup>
26-
<PackageReference Include="Microsoft.NetFramework.ReferenceAssemblies" Version="1.0.0-preview.2">
27-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
28-
<PrivateAssets>all</PrivateAssets>
29-
</PackageReference>
30-
</ItemGroup>
25+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
26+
<DefineConstants>$(DefineConstants);NETCORE;NETCORE_SUPPORT</DefineConstants>
27+
</PropertyGroup>
3128

3229
</Project>

‎tests/ServiceStack.Redis.Benchmark/ServiceStack.Redis.Benchmark.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net5.0;net472</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net472</TargetFrameworks>
66
<LangVersion>8</LangVersion>
77
</PropertyGroup>
88
<ItemGroup>

0 commit comments

Comments
 (0)