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

Commit d60f669

Browse files
mythzmythz
committed
Remove signed projects + update to v5.0.0
1 parent a74f086 commit d60f669

11 files changed

Lines changed: 13 additions & 184 deletions

File tree

‎NuGet.Core/nuget.exe‎

-3.77 MB
Binary file not shown.

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

Lines changed: 0 additions & 29 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
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.5.0</version>
6+
<version>5.0.0</version>
77
<authors>Service Stack</authors>
88
<owners>Service Stack</owners>
99
<description>

‎build/appsettings.license.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/build-sn.proj‎

Lines changed: 0 additions & 92 deletions
This file was deleted.

‎build/build.proj‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

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

@@ -33,6 +33,7 @@
3333
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)" />
3434

3535
<Target Name="TeamCityBuild">
36+
<CallTarget Targets="UpdateVersion" />
3637
<CallTarget Targets="Default" />
3738
</Target>
3839

@@ -51,13 +52,9 @@
5152
<Find>AssemblyFileVersion\(\"\d+\.\d+\.\d+\.\d+\"\)</Find>
5253
<ReplaceWith>AssemblyFileVersion("$(Version)")</ReplaceWith>
5354
</RegexTransform>
54-
<RegexTransform Include="$(SrcDir)/**/AssemblyInfo.cs">
55-
<Find>AssemblyVersion\(\"\d+\.\d+\.\d+\.\d+\"\)</Find>
56-
<ReplaceWith>AssemblyVersion("$(Version)")</ReplaceWith>
57-
</RegexTransform>
5855
<!--Update Min Dependency Version -->
5956
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
60-
<Find>version="4\.5[^"]*"</Find>
57+
<Find>version="5\.0[^"]*"</Find>
6158
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
6259
</RegexTransform>
6360
</ItemGroup>
@@ -66,13 +63,11 @@
6663
</Target>
6764

6865
<Target Name="NuGetPack">
69-
70-
<CallTarget Targets="UpdateVersion" />
71-
7266
<Delete Files="@(NugetPackageFilesToDelete)" />
7367

7468
<ItemGroup>
7569
<RedisFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/net45/ServiceStack.Redis.*"></RedisFiles>
70+
<RedisCoreFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/netstandard2.0/ServiceStack.Redis.*"></RedisCoreFiles>
7671
</ItemGroup>
7772

7873
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.csproj"
@@ -82,6 +77,9 @@
8277
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis/lib/net45')" />
8378
<Copy SourceFiles="%(RedisFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis/lib/net45" />
8479

80+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis/lib/netstandard2.0')" />
81+
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis/lib/netstandard2.0" />
82+
8583
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis/servicestack.redis.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
8684
LogStandardErrorAsError="true" />
8785

‎lib/copy.bat‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ COPY ..\..\ServiceStack\src\ServiceStack.Interfaces\bin\%BUILD%\netstandard2.0\S
66

77
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\net45\ServiceStack.Text.* net45
88
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\%BUILD%\netstandard2.0\ServiceStack.Text.* netstandard2.0
9-
COPY ..\..\ServiceStack.Text\src\ServiceStack.Text\bin\Signed\net45\ServiceStack.Text.* signed
109

1110
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\net45\ServiceStack.Client.* net45
1211
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\%BUILD%\netstandard2.0\ServiceStack.Client.* netstandard2.0
13-
COPY ..\..\ServiceStack\src\ServiceStack.Client\bin\Signed\net45\ServiceStack.Client.* signed
1412

1513
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\net45\ServiceStack.Common.* net45
1614
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\%BUILD%\netstandard2.0\ServiceStack.Common.* netstandard2.0
17-
COPY ..\..\ServiceStack\src\ServiceStack.Common\bin\Signed\net45\ServiceStack.Common.* signed
1815

1916
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.dll net45
2017
COPY ..\..\ServiceStack\src\ServiceStack\bin\%BUILD%\net45\ServiceStack.xml net45

‎src/ServiceStack.Redis.sln‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
33
VisualStudioVersion = 15.0.26430.14
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{38F69F8F-9303-4BAF-B081-D28339163E07}"
66
ProjectSection(SolutionItems) = preProject
7-
..\build\appsettings.license.txt = ..\build\appsettings.license.txt
87
..\build\build-core.proj = ..\build\build-core.proj
9-
..\build\build-sn.proj = ..\build\build-sn.proj
108
..\build\build.bat = ..\build\build.bat
119
..\build\build.proj = ..\build\build.proj
1210
..\build\build.tasks = ..\build\build.tasks
1311
..\build\copy.bat = ..\build\copy.bat
1412
..\README.md = ..\README.md
1513
..\NuGet.Core\ServiceStack.Redis.Core\servicestack.redis.core.nuspec = ..\NuGet.Core\ServiceStack.Redis.Core\servicestack.redis.core.nuspec
1614
..\NuGet\ServiceStack.Redis\servicestack.redis.nuspec = ..\NuGet\ServiceStack.Redis\servicestack.redis.nuspec
17-
..\NuGet.Signed\ServiceStack.Redis.Signed\servicestack.redis.signed.nuspec = ..\NuGet.Signed\ServiceStack.Redis.Signed\servicestack.redis.signed.nuspec
1815
EndProjectSection
1916
EndProject
2017
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Redis", "ServiceStack.Redis\ServiceStack.Redis.csproj", "{AF99F19B-4C04-4F58-81EF-B092F1FCC540}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("4.0.0.0")]
36-
[assembly: AssemblyFileVersion("4.0.0.0")]
35+
[assembly: AssemblyVersion("5.0.0.0")]
36+
[assembly: AssemblyFileVersion("5.0.0.0")]

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

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)