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

Commit 9e9ad07

Browse files
mythzmythz
committed
extract .Core to build-core.proj
1 parent 2a1855f commit 9e9ad07

3 files changed

Lines changed: 77 additions & 16 deletions

File tree

‎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.proj‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,8 @@
3030
</Target>
3131

3232
<Target Name="BuildSolutions">
33-
<ItemGroup>
34-
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
35-
</ItemGroup>
36-
<Delete Files="@(NugetPackageFilesToDelete)" />
3733
<CallTarget Targets="ClearNuGetRestoreCaches" />
3834
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis.sln" Targets="Restore" />
39-
4035
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis.sln" Targets="Build"
4136
Properties="Configuration=$(Configuration)" />
4237
</Target>
@@ -66,17 +61,6 @@
6661
Properties="Configuration=$(Configuration)" />
6762

6863

69-
<!-- Restore for *.Core.csproj -->
70-
<CallTarget Targets="ClearNuGetRestoreCaches" />
71-
72-
73-
<!-- ServiceStack.Redis.Core -->
74-
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.Core.csproj" Targets="Restore" />
75-
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.Core.csproj"
76-
Targets="Build;Pack"
77-
Properties="Configuration=$(Configuration)" />
78-
79-
8064
<!-- Copy all *.nupkg to /NuGet -->
8165
<ItemGroup>
8266
<NugetPackagesToMove Include="$(BuildSolutionDir)/src/**/bin/$(Configuration)/*.nupkg"/>

‎src/ServiceStack.Redis.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{38F69F8F
1111
..\README.md = ..\README.md
1212
Directory.Build.props = Directory.Build.props
1313
ServiceStack.Redis\ServiceStack.Redis.Core.csproj = ServiceStack.Redis\ServiceStack.Redis.Core.csproj
14+
..\build\build-core.proj = ..\build\build-core.proj
1415
EndProjectSection
1516
EndProject
1617
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Redis", "ServiceStack.Redis\ServiceStack.Redis.csproj", "{AF99F19B-4C04-4F58-81EF-B092F1FCC540}"

0 commit comments

Comments
 (0)