Skip to content
This repository was archived by the owner on Mar 12, 2021. It is now read-only.

Commit e236ac7

Browse files
author
moozzyk
committed
BuildBuild\build.msbuild
Adding the build.msbuild file to enable building and running tests from command line (now) and building the NuGet package (soon). Renaming signalrclient.build.settings -> SignalRClient.Build.Settings to follow MSBuild conventions.
1 parent dc65b8c commit e236ac7

File tree

9 files changed

+57
-14
lines changed

9 files changed

+57
-14
lines changed

‎Build/Common.Build.Settings

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)..\</SolutionDir>
5+
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
6+
<Platform Condition="'$(Platform)'==''">Win32</Platform>
7+
<PlatformToolset Condition=" '$(PlatformToolset)' == ''">v120</PlatformToolset>
8+
<OutputPath Condition="'$(OutputPath)' == ''">$(SolutionDir)bin\$(Platform)\$(Configuration)\</OutputPath>
9+
<OutDir>$(OutputPath)</OutDir>
10+
</PropertyGroup>
11+
</Project>

‎Build/Config.Definitions.Props

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -18,4 +18,4 @@
1818
<Platform>x64</Platform>
1919
</ProjectConfiguration>
2020
</ItemGroup>
21-
</Project>
21+
</Project>

‎Build/signalrclient.build.settings renamed to ‎Build/SignalRClient.Build.Settings

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
5-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
6-
</PropertyGroup>
3+
<Import Project="$(MSBuildThisFileDirectory)\Common.Build.Settings" />
74
<PropertyGroup>
85
<SignalrClientTargetName>signalrclient</SignalrClientTargetName>
96
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">true</DownloadNuGetExe>
107
<RestorePackages>true</RestorePackages>
11-
<PlatformToolset Condition=" '$(PlatformToolset)' == ''">v120</PlatformToolset>
128
<CharacterSet>Unicode</CharacterSet>
139
</PropertyGroup>
1410
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
@@ -32,6 +28,8 @@
3228
<Link>
3329
<SubSystem>Windows</SubSystem>
3430
<GenerateDebugInformation>true</GenerateDebugInformation>
31+
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
32+
<StripPrivateSymbols>$(OutDir)$(TargetName).pub.pdb</StripPrivateSymbols>
3533
</Link>
3634
</ItemDefinitionGroup>
3735

‎Build/build.msbuild

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildThisFileDirectory)\Common.Build.Settings" />
4+
5+
<ItemGroup>
6+
<Projects Include="$(SolutionDir)src\signalrclient\Build\VS2013\signalrclient.vcxproj" />
7+
<Projects Include="$(SolutionDir)src\signalrclientdll\Build\VS2013\signalrclientdll.vcxproj" />
8+
<Projects Include="$(SolutionDir)test\signalrclienttests\Build\VS2013\signalrclienttests.vcxproj" />
9+
</ItemGroup>
10+
11+
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
12+
13+
<Target Name="Build">
14+
<MSBuild Targets="$(BuildTargets)"
15+
Projects="@(Projects)"
16+
Properties="Configuration=$(Configuration);Platform=$(Platform);PlatformToolset=$(PlatformToolset)" />
17+
</Target>
18+
19+
<Target Name="Clean">
20+
<MSBuild Targets="Clean"
21+
Projects="@(Projects)" />
22+
</Target>
23+
24+
<Target Name="Rebuild">
25+
<MSBuild Projects="$(MSBuildProjectFile)" Properties="BuildTargets=Rebuild;Configuration=$(Configuration)" Targets="Clean;Build" />
26+
</Target>
27+
28+
<Target Name="Test" DependsOnTargets="Build">
29+
<Exec Command="$(OutDir)\signalrclienttests.exe" />
30+
</Target>
31+
</Project>

‎build.cmd

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
msbuild "%~dp0\Build\build.msbuild" /v:minimal /maxcpucount /nodeReuse:false %*

‎src/signalrclient/Build/VS2013/signalrclient.vcxproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\..\packages\cpprestsdk.2.2.0\build\native\cpprestsdk.props" Condition="Exists('..\..\..\..\packages\cpprestsdk.2.2.0\build\native\cpprestsdk.props')" />
4-
<Import Project="..\..\..\..\Build\signalrclient.build.settings" />
4+
<Import Project="..\..\..\..\Build\SignalRClient.Build.Settings" />
55
<PropertyGroup Label="Globals">
66
<ProjectGuid>{87ED3AD4-D820-48CD-8382-A12564213A12}</ProjectGuid>
77
<Keyword>Win32Proj</Keyword>
88
<RootNamespace>signalr</RootNamespace>
99
<ProjectName>signalrclient</ProjectName>
1010
<TargetName>$(SignalrClientTargetName)</TargetName>
11-
<OutDir>$(SolutionDir)$(Configuration)\lib\</OutDir>
12-
<IntDir>$(Configuration)\lib\</IntDir>
1311
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
12+
<OutDir Condition="'$(OutDir)' == ''">$(SolutionDir)$(Configuration)\</OutDir>
13+
<OutDir>$(OutDir)lib\</OutDir>
14+
<IntDir>$(Configuration)\lib\</IntDir>
1415
<ConfigurationType>StaticLibrary</ConfigurationType>
1516
</PropertyGroup>
1617
<Import Project="..\..\..\..\Build\Config.Definitions.props" />

‎src/signalrclientdll/Build/VS2013/signalrclientdll.vcxproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<RootNamespace>signalrclient</RootNamespace>
99
<ProjectName>signalrclientdll</ProjectName>
1010
<TargetName>$(SignalrClientTargetName)</TargetName>
11-
<OutDir>$(SolutionDir)$(Configuration)\dll\</OutDir>
12-
<IntDir>$(Configuration)\dll\</IntDir>
1311
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
12+
<OutDir Condition="'$(OutDir)' == ''">$(SolutionDir)$(Configuration)\</OutDir>
13+
<OutDir>$(OutDir)dll\</OutDir>
14+
<IntDir>$(Configuration)\dll\</IntDir>
1415
<ConfigurationType>DynamicLibrary</ConfigurationType>
1516
</PropertyGroup>
1617
<Import Project="..\..\..\..\Build\Config.Definitions.props" />

‎test/gtest-1.7.0/msvc/gtest.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\Build\signalrclient.build.settings" />
3+
<Import Project="..\..\..\Build\SignalRClient.Build.Settings" />
44
<Import Project="..\..\..\Build\Config.Definitions.props" />
55
<ItemGroup>
66
<ClCompile Include="..\src\gtest-all.cc" />

‎test/signalrclienttests/Build/VS2013/signalrclienttests.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\..\..\..\packages\cpprestsdk.2.2.0\build\native\cpprestsdk.props" Condition="Exists('..\..\..\..\packages\cpprestsdk.2.2.0\build\native\cpprestsdk.props')" />
4-
<Import Project="..\..\..\..\Build\signalrclient.build.settings" />
4+
<Import Project="..\..\..\..\Build\SignalRClient.Build.Settings" />
55
<PropertyGroup Label="Globals">
66
<ProjectGuid>{10376148-BCF4-4B55-98A5-3C98C87FD898}</ProjectGuid>
77
<Keyword>Win32Proj</Keyword>

0 commit comments

Comments
 (0)