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

Commit 5a72dcd

Browse files
xplicitxplicit
committed
Merge branch 'master' of https://github.com/ServiceStack/ServiceStack.Redis into netcore
2 parents ea53aaa + f47f201 commit 5a72dcd

30 files changed

+2214
-883
lines changed

‎NuGet.Signed/ServiceStack.Redis.Signed/servicestack.redis.signed.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>ServiceStack.Redis.Signed</id>
55
<title>ServiceStack.Redis.Signed</title>
6-
<version>4.0.0</version>
6+
<version>4.5.0</version>
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<description>
@@ -17,9 +17,9 @@
1717
<iconUrl>https://servicestack.net/img/logo-32.png</iconUrl>
1818
<tags>Redis NoSQL Client Distributed Cache PubSub Messaging Transactions</tags>
1919
<language>en-US</language>
20-
<copyright>ServiceStack 2013 and contributors</copyright>
20+
<copyright>ServiceStack 2016 and contributors</copyright>
2121
<dependencies>
22-
<dependency id="ServiceStack.Common.Signed" version="4.0" />
22+
<dependency id="ServiceStack.Common.Signed" version="4.5" />
2323
</dependencies>
2424
</metadata>
2525
<files>

‎NuGet/ServiceStack.Redis/servicestack.redis.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>ServiceStack.Redis</id>
55
<title>C# Redis client for the Redis NoSQL DB</title>
6-
<version>4.0.0</version>
6+
<version>4.5.0</version>
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<description>
@@ -19,9 +19,9 @@
1919
<iconUrl>https://servicestack.net/img/logo-32.png</iconUrl>
2020
<tags>Redis NoSQL Client Distributed Cache PubSub Messaging Transactions</tags>
2121
<language>en-US</language>
22-
<copyright>ServiceStack 2013 and contributors</copyright>
22+
<copyright>ServiceStack 2016 and contributors</copyright>
2323
<dependencies>
24-
<dependency id="ServiceStack.Common" version="4.0" />
24+
<dependency id="ServiceStack.Common" version="4.5" />
2525
</dependencies>
2626
</metadata>
2727
<files>

‎build/build-sn.proj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8-
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>
1111

@@ -74,7 +74,7 @@
7474

7575
<!--Update Min Dependency Version -->
7676
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
77-
<Find>version="4\.0[^"]*"</Find>
77+
<Find>version="4\.5[^"]*"</Find>
7878
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
7979
</RegexTransform>
8080
</ItemGroup>
@@ -95,8 +95,8 @@
9595
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.Signed.csproj"
9696
Targets="Build" Properties="Configuration=$(Configuration)" />
9797

98-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis.Signed/lib/net40" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis.Signed/lib/net40')" />
99-
<Copy SourceFiles="%(RedisFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis.Signed/lib/net40" />
98+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis.Signed/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis.Signed/lib/net45')" />
99+
<Copy SourceFiles="%(RedisFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis.Signed/lib/net45" />
100100

101101
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis.Signed/servicestack.redis.signed.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
102102
LogStandardErrorAsError="true" />

‎build/build.proj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<PropertyGroup>
77
<MajorVersion Condition="$(MajorVersion) == ''">4</MajorVersion>
8-
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">5</MinorVersion>
99
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
1010
</PropertyGroup>
1111

@@ -74,7 +74,7 @@
7474
</RegexTransform>
7575
<!--Update Min Dependency Version -->
7676
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
77-
<Find>version="4\.0[^"]*"</Find>
77+
<Find>version="4\.5[^"]*"</Find>
7878
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
7979
</RegexTransform>
8080
</ItemGroup>
@@ -96,8 +96,8 @@
9696
Targets="Build"
9797
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
9898

99-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis/lib/net40" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis/lib/net40')" />
100-
<Copy SourceFiles="%(RedisFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis/lib/net40" />
99+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis/lib/net45')" />
100+
<Copy SourceFiles="%(RedisFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis/lib/net45" />
101101

102102
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis/servicestack.redis.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
103103
LogStandardErrorAsError="true" />

‎lib/ServiceStack.Client.dll

512 Bytes
Binary file not shown.

‎lib/ServiceStack.Common.dll

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Interfaces.dll

0 Bytes
Binary file not shown.

‎lib/ServiceStack.Text.dll

1 KB
Binary file not shown.

‎lib/signed/ServiceStack.Common.dll

1.5 KB
Binary file not shown.

‎lib/signed/ServiceStack.Text.dll

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)