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

Commit 087534c

Browse files
mythzmythz
committed
Extract .NET Core build into separate build-core.proj
1 parent d1777b1 commit 087534c

File tree

3 files changed

+92
-17
lines changed

3 files changed

+92
-17
lines changed

‎build/build-core.proj

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
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) == ''">1</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+
<NuGetPath>$(BuildSolutionDir)/src/.nuget/nuget.exe</NuGetPath>
17+
<NuGetPackageDir>$(BuildSolutionDir)/NuGet.Core/</NuGetPackageDir>
18+
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion).0</Version>
19+
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
24+
</ItemGroup>
25+
26+
<PropertyGroup>
27+
<DoBuildSolutionsDependsOn>
28+
BeforeBuildSolutions;
29+
BuildSolutions
30+
</DoBuildSolutionsDependsOn>
31+
</PropertyGroup>
32+
33+
<Target Name="Default" DependsOnTargets="$(DoBuildSolutionsDependsOn)" />
34+
35+
<Target Name="TeamCityBuild">
36+
<CallTarget Targets="Default" />
37+
</Target>
38+
39+
<Target Name="BeforeBuildSolutions">
40+
<Message Text="*****Before building solution*****" Importance="high"/>
41+
</Target>
42+
43+
<Target Name="BuildSolutions">
44+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis.sln" Targets="Build"
45+
Properties="Configuration=$(Configuration)" />
46+
</Target>
47+
48+
<Target Name="UpdateVersion">
49+
<ItemGroup>
50+
<RegexTransform Include="$(SrcDir)/**/AssemblyInfo.cs">
51+
<Find>AssemblyFileVersion\(\"\d+\.\d+\.\d+\.\d+\"\)</Find>
52+
<ReplaceWith>AssemblyFileVersion("$(Version)")</ReplaceWith>
53+
</RegexTransform>
54+
<RegexTransform Include="$(SrcDir)/**/AssemblyInfo.cs">
55+
<Find>AssemblyVersion\(\"\d+\.\d+\.\d+\.\d+\"\)</Find>
56+
<ReplaceWith>AssemblyVersion("$(Version)")</ReplaceWith>
57+
</RegexTransform>
58+
<!--Update Min Dependency Version -->
59+
<RegexTransform Include="$(NuGetPackageDir)/**/*.nuspec">
60+
<Find>version="1\.0\.[^"]*"</Find>
61+
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
62+
</RegexTransform>
63+
</ItemGroup>
64+
65+
<RegexTransform Items="@(RegexTransform)" />
66+
</Target>
67+
68+
<Target Name="NuGetPack">
69+
70+
<CallTarget Targets="UpdateVersion" />
71+
72+
<Delete Files="@(NugetPackageFilesToDelete)" />
73+
74+
<ItemGroup>
75+
<RedisCoreFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/netstandard1.3/ServiceStack.Redis.*"></RedisCoreFiles>
76+
</ItemGroup>
77+
78+
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.csproj"
79+
Targets="Build"
80+
Properties="Version=$(PackageVersion);Configuration=$(Configuration)" />
81+
82+
<MakeDir Directories="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard1.3" Condition="!Exists('$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard1.3')" />
83+
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageDir)/ServiceStack.Redis.Core/lib/netstandard1.3" />
84+
85+
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis.Core/servicestack.redis.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion)"
86+
LogStandardErrorAsError="true" />
87+
88+
</Target>
89+
</Project>

‎build/build.bat

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

3-
%MSBUILD% build.proj /target:NuGetPack /property:Configuration=Release;RELEASE=true;PatchVersion=0;PatchCoreVersion=0
3+
%MSBUILD% build-core.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Release;PatchVersion=41
4+
%MSBUILD% build.proj /target:TeamCityBuild;NuGetPack /property:Configuration=Release;PatchVersion=9
45
REM %MSBUILD% build-sn.proj /target:NuGetPack /property:Configuration=Signed;RELEASE=true;PatchVersion=0;PatchCoreVersion=0

‎build/build.proj

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,12 @@
1515
<Configuration Condition="$(Configuration) == ''">Release</Configuration>
1616
<NuGetPath>$(BuildSolutionDir)/src/.nuget/nuget.exe</NuGetPath>
1717
<NuGetPackageDir>$(BuildSolutionDir)/NuGet/</NuGetPackageDir>
18-
<NuGetPackageCoreDir>$(BuildSolutionDir)/NuGet.Core/</NuGetPackageCoreDir>
1918
<Version>$(MajorVersion).$(MinorVersion).$(PatchVersion).0</Version>
2019
<PackageVersion>$(MajorVersion).$(MinorVersion).$(PatchVersion)</PackageVersion>
21-
<PackageCoreVersion>1.0.$(PatchCoreVersion)</PackageCoreVersion>
2220
</PropertyGroup>
2321

2422
<ItemGroup>
2523
<NugetPackageFilesToDelete Include="$(NuGetPackageDir)/*.nupkg"/>
26-
<NugetPackageFilesToDelete Include="$(NuGetPackageCoreDir)/*.nupkg"/>
2724
</ItemGroup>
2825

2926
<PropertyGroup>
@@ -67,10 +64,6 @@
6764
<Find>version="4\.5[^"]*"</Find>
6865
<ReplaceWith>version="$(PackageVersion)"</ReplaceWith>
6966
</RegexTransform>
70-
<RegexTransform Include="$(NuGetPackageCoreDir)/**/*.nuspec">
71-
<Find>version="1\.0\.[^"]*"</Find>
72-
<ReplaceWith>version="$(PackageCoreVersion)"</ReplaceWith>
73-
</RegexTransform>
7467
</ItemGroup>
7568

7669
<RegexTransform Items="@(RegexTransform)" />
@@ -84,7 +77,6 @@
8477

8578
<ItemGroup>
8679
<RedisFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/net45/ServiceStack.Redis.*"></RedisFiles>
87-
<RedisCoreFiles Include="$(SrcDir)/ServiceStack.Redis/bin/$(Configuration)/netstandard1.3/ServiceStack.Redis.*"></RedisCoreFiles>
8880
</ItemGroup>
8981

9082
<MSBuild Projects="$(BuildSolutionDir)/src/ServiceStack.Redis/ServiceStack.Redis.csproj"
@@ -96,13 +88,6 @@
9688

9789
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageDir)/ServiceStack.Redis/servicestack.redis.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageDir)&quot; -Version $(PackageVersion) -Symbols"
9890
LogStandardErrorAsError="true" />
99-
100-
<!-- .NET Core -->
101-
<MakeDir Directories="$(NuGetPackageCoreDir)/ServiceStack.Redis.Core/lib/netstandard1.3" Condition="!Exists('$(NuGetPackageCoreDir)/ServiceStack.Redis.Core/lib/netstandard1.3')" />
102-
<Copy SourceFiles="%(RedisCoreFiles.Identity)" DestinationFolder="$(NuGetPackageCoreDir)/ServiceStack.Redis.Core/lib/netstandard1.3" />
103-
104-
<Exec Command="&quot;$(NuGetPath)&quot; pack &quot;$(NuGetPackageCoreDir)/ServiceStack.Redis.Core/servicestack.redis.core.nuspec&quot; -OutputDirectory &quot;$(NuGetPackageCoreDir)&quot; -Version $(PackageCoreVersion) -Symbols"
105-
LogStandardErrorAsError="true" />
106-
91+
10792
</Target>
10893
</Project>

0 commit comments

Comments
 (0)