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

Commit 70c5a78

Browse files
mythzmythz
committed
2 parents 8d715e2 + 9e9ad07 commit 70c5a78

57 files changed

Lines changed: 251 additions & 30456 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NuGet.Config‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="ServiceStack CI feed" value="http://build.servicestack.net/guestAuth/app/nuget/v1/FeedService.svc" />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
6+
</packageSources>
7+
</configuration>

‎NuGet/NuGetPack.cmd‎

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

‎NuGet/NuGetPush.cmd‎

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

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

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

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

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

‎build/build-core.proj‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Default"
3+
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
4+
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
5+
6+
<PropertyGroup>
7+
<MajorVersion Condition="$(MajorVersion) == ''">5</MajorVersion>
8+
<MinorVersion Condition="$(MinorVersion) == ''">0</MinorVersion>
9+
<PatchVersion Condition="$(PatchVersion) == ''">$(BUILD_NUMBER)</PatchVersion>
10+
</PropertyGroup>
11+
12+
<PropertyGroup>
13+
<BuildSolutionDir>$(MSBuildProjectDirectory)/..</BuildSolutionDir>
14+
<SrcDir>$(BuildSolutionDir)/src</SrcDir>
15+
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
16+
<NuGetPackageDir>$(BuildSolutionDir)/NuGet/</NuGetPackageDir>
17+
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
18+
</PropertyGroup>
19+
20+
<PropertyGroup>
21+
<DoBuildSolutionsDependsOn>
22+
BeforeBuildSolutions;
23+
BuildSolutions
24+
</DoBuildSolutionsDependsOn>
25+
</PropertyGroup>
26+
27+
<Target Name="BeforeBuildSolutions">
28+
<Message Text="*****Before building solution*****" Importance="high"/>
29+
<CallTarget Targets="UpdateVersion" />
30+
</Target>
31+
32+
<Target Name="BuildSolutions">
33+
<ItemGroup>
34+
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
35+
</ItemGroup>
36+
<Delete Files="@(NugetPackageFilesToDelete)" />
37+
<CallTarget Targets="ClearNuGetRestoreCaches" />
38+
</Target>
39+
40+
<!-- need to remove old caches from nuget restore from .Core csproj's -->
41+
<Target Name="ClearNuGetRestoreCaches">
42+
<RemoveDir Directories="$(SrcDir)/ServiceStack.Redis/obj" />
43+
</Target>
44+
45+
<Target Name="UpdateVersion">
46+
<!-- Update Version -->
47+
<ItemGroup>
48+
<RegexTransform Include="$(BuildSolutionDir)/src/Directory.Build.props;$(BuildSolutionDir)/tests/Directory.Build.props">
49+
<Find>&lt;Version&gt;[^&lt;]*</Find>
50+
<ReplaceWith>&lt;Version&gt;$(PackageVersion)</ReplaceWith>
51+
</RegexTransform>
52+
</ItemGroup>
53+
54+
<RegexTransform Items="@(RegexTransform)" />
55+
</Target>
56+
57+
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)">
58+
59+
<!-- ServiceStack.Redis.Core -->
60+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.Core.csproj" Targets="Restore" />
61+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.Core.csproj"
62+
Targets="Build;Pack"
63+
Properties="Configuration=$(Configuration)" />
64+
65+
66+
<!-- Copy all *.nupkg to /NuGet -->
67+
<ItemGroup>
68+
<NugetPackagesToMove Include="$(BuildSolutionDir)/src/**/bin/$(Configuration)/*.nupkg"/>
69+
</ItemGroup>
70+
<Move SourceFiles="@(NugetPackagesToMove)" DestinationFolder="$(NuGetPackageDir)" />
71+
72+
<!-- leave .sln in optimal state then NuGet restore .sln to build -->
73+
<CallTarget Targets="ClearNuGetRestoreCaches" />
74+
75+
</Target>
76+
</Project>

‎build/build.bat‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
22

3-
%MSBUILD% build.proj /target:Default;NuGetPack /property:Configuration=Release;MinorVersion=1;PatchVersion=0
4-
5-
msbuild /p:Configuration=Release ..\src\ServiceStack.Redis.sln
3+
%MSBUILD% build.proj /property:Configuration=Release;MinorVersion=4;PatchVersion=1

‎build/build.proj‎

Lines changed: 24 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Default"
3-
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
3+
xmlns='http://schemas.microsoft.com/developer/msbuild/2003' ToolsVersion="4.0">
44
<Import Project="$(MSBuildProjectDirectory)/build.tasks" />
55

66
<PropertyGroup>
@@ -13,84 +13,62 @@
1313
<BuildSolutionDir>$(MSBuildProjectDirectory)/..</BuildSolutionDir>
1414
<SrcDir>$(BuildSolutionDir)/src</SrcDir>
1515
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
16-
<NuGetPath>$(BuildSolutionDir)/src/.nuget/nuget.exe</NuGetPath>
1716
<NuGetPackageDir>$(BuildSolutionDir)/NuGet/</NuGetPackageDir>
18-
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion).0</Version>
1917
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
2018
</PropertyGroup>
2119

22-
<ItemGroup>
23-
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
24-
</ItemGroup>
25-
2620
<PropertyGroup>
2721
<DoBuildSolutionsDependsOn>
2822
BeforeBuildSolutions;
2923
BuildSolutions
3024
</DoBuildSolutionsDependsOn>
3125
</PropertyGroup>
3226

33-
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)" />
34-
35-
<Target Name="TeamCityBuild">
36-
<CallTarget Targets="UpdateVersion" />
37-
<CallTarget Targets="Default" />
38-
</Target>
39-
4027
<Target Name="BeforeBuildSolutions">
4128
<Message Text="*****Before building solution*****" Importance="high"/>
4229
<CallTarget Targets="UpdateVersion" />
4330
</Target>
4431

4532
<Target Name="BuildSolutions">
33+
<CallTarget Targets="ClearNuGetRestoreCaches" />
34+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis.sln" Targets="Restore" />
4635
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis.sln" Targets="Build"
47-
Properties="Configuration=$(Configuration)" />
36+
Properties="Configuration=$(Configuration)" />
37+
</Target>
38+
39+
<!-- need to remove old caches from nuget restore from .Core csproj's -->
40+
<Target Name="ClearNuGetRestoreCaches">
41+
<RemoveDir Directories="$(SrcDir)/ServiceStack.Redis/obj" />
4842
</Target>
4943

5044
<Target Name="UpdateVersion">
45+
<!-- Update Version -->
5146
<ItemGroup>
52-
<RegexTransform Include="$(SrcDir)/**/AssemblyInfo.cs">
53-
<Find>AssemblyFileVersion\(\"\d+\.\d+\.\d+\.\d+\"\)</Find>
54-
<ReplaceWith>AssemblyFileVersion("$(Version)")</ReplaceWith>
55-
</RegexTransform>
56-
<!--Update Min Dependency Version -->
57-
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
58-
<Find>version="5\.[^"]*"</Find>
59-
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
47+
<RegexTransform Include="$(BuildSolutionDir)/src/Directory.Build.props;$(BuildSolutionDir)/tests/Directory.Build.props">
48+
<Find>&lt;Version&gt;[^&lt;]*</Find>
49+
<ReplaceWith>&lt;Version&gt;$(PackageVersion)</ReplaceWith>
6050
</RegexTransform>
6151
</ItemGroup>
6252

6353
<RegexTransform Items="@(RegexTransform)" />
6454
</Target>
6555

66-
<Target Name="NuGetPack">
67-
<Delete Files="@(NugetPackageFilesToDelete)" />
68-
69-
<ItemGroup>
70-
<RedisFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/net45/ServiceStack.Redis.*"></RedisFiles>
71-
<RedisCoreFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/netstandard2.0/ServiceStack.Redis.*"></RedisCoreFiles>
72-
</ItemGroup>
56+
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)">
7357

58+
<!-- ServiceStack.Redis -->
7459
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.csproj"
75-
Targets="Build"
76-
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
77-
78-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis/lib/net45" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis/lib/net45')" />
79-
<Copy SourceFiles="%(RedisFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis/lib/net45" />
80-
81-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis/lib/netstandard2.0')" />
82-
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis/lib/netstandard2.0" />
60+
Targets="Build;Pack"
61+
Properties="Configuration=$(Configuration)" />
8362

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

87-
<!-- ServiceStack.Redis.Core -->
88-
89-
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard2.0" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard2.0')" />
90-
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard2.0" />
64+
<!-- Copy all *.nupkg to /NuGet -->
65+
<ItemGroup>
66+
<NugetPackagesToMove Include="$(BuildSolutionDir)/src/**/bin/$(Configuration)/*.nupkg"/>
67+
</ItemGroup>
68+
<Move SourceFiles="@(NugetPackagesToMove)" DestinationFolder="$(NuGetPackageDir)" />
9169

92-
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis.Core/servicestack.redis.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
93-
LogStandardErrorAsError="true" />
70+
<!-- leave .sln in optimal state then NuGet restore .sln to build -->
71+
<CallTarget Targets="ClearNuGetRestoreCaches" />
9472

9573
</Target>
9674
</Project>

‎build/copy.bat‎

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

‎lib/copy.bat‎

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

0 commit comments

Comments
 (0)