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

Commit 715d4d2

Browse files
author
moozzyk
committed
Merge branch 'release' into dev
2 parents f77aeb1 + 5e9552a commit 715d4d2

10 files changed

Lines changed: 111 additions & 77 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ Release/
1414
ipch/
1515
*.vcxproj.user
1616
*.exe
17-
artifacts/
17+
artifacts/
18+
*.aps

‎Build/SignalRClient.Build.Settings‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,15 @@
55
<DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">true</DownloadNuGetExe>
66
<RestorePackages>true</RestorePackages>
77
<CharacterSet>Unicode</CharacterSet>
8+
<LinkIncremental>false</LinkIncremental>
89
</PropertyGroup>
910
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
1011
<UseDebugLibraries>true</UseDebugLibraries>
1112
<WholeProgramOptimization>false</WholeProgramOptimization>
12-
<LinkIncremental>true</LinkIncremental>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
1515
<UseDebugLibraries>false</UseDebugLibraries>
1616
<WholeProgramOptimization>true</WholeProgramOptimization>
17-
<LinkIncremental>false</LinkIncremental>
1817
</PropertyGroup>
1918

2019
<ItemDefinitionGroup>
@@ -23,12 +22,15 @@
2322
<WarningLevel>Level4</WarningLevel>
2423
<TreatWarningAsError Condition="'$(TreatWarningsAsErrors)' != ''">true</TreatWarningAsError>
2524
<SDLCheck>true</SDLCheck>
25+
<StringPooling>true</StringPooling>
2626
</ClCompile>
2727
<Link>
2828
<SubSystem>Windows</SubSystem>
2929
<GenerateDebugInformation>true</GenerateDebugInformation>
3030
<ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
3131
<StripPrivateSymbols>$(OutDir)$(TargetName).pub.pdb</StripPrivateSymbols>
32+
<OptimizeReferences>true</OptimizeReferences>
33+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
3234
</Link>
3335
</ItemDefinitionGroup>
3436

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<ClCompile>
2525
<PreprocessorDefinitions>_WINDOWS;_USRDLL;NO_SIGNALRCLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2626
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
27+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
2728
</ClCompile>
2829
</ItemDefinitionGroup>
2930
<ItemGroup>
@@ -97,4 +98,4 @@
9798
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
9899
<Error Condition="!Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
99100
</Target>
100-
</Project>
101+
</Project>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<ClCompile>
2525
<PreprocessorDefinitions>_WINDOWS;_USRDLL;SIGNALRCLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2626
<AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\packages\cpprestsdk.2.2.0\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
27+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
2728
</ClCompile>
2829
</ItemDefinitionGroup>
2930
<ItemGroup>
@@ -58,6 +59,7 @@
5859
<ClInclude Include="..\..\..\signalrclient\web_request.h" />
5960
<ClInclude Include="..\..\..\signalrclient\web_request_factory.h" />
6061
<ClInclude Include="..\..\..\signalrclient\web_response.h" />
62+
<ClInclude Include="..\..\resource.h" />
6163
</ItemGroup>
6264
<ItemGroup>
6365
<ClCompile Include="..\..\..\signalrclient\connection.cpp" />
@@ -90,6 +92,9 @@
9092
<ItemGroup>
9193
<None Include="packages.config" />
9294
</ItemGroup>
95+
<ItemGroup>
96+
<ResourceCompile Include="..\..\Resource.rc" />
97+
</ItemGroup>
9398
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
9499
<ImportGroup Label="ExtensionTargets">
95100
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
@@ -102,4 +107,4 @@
102107
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
103108
<Error Condition="!Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
104109
</Target>
105-
</Project>
110+
</Project>

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@
108108
<ClInclude Include="..\..\..\signalrclient\case_insensitive_comparison_utils.h">
109109
<Filter>Header Files</Filter>
110110
</ClInclude>
111+
<ClInclude Include="..\..\resource.h">
112+
<Filter>Header Files</Filter>
113+
</ClInclude>
111114
</ItemGroup>
112115
<ItemGroup>
113116
<ClCompile Include="..\..\dllmain.cpp">
@@ -174,4 +177,9 @@
174177
<ItemGroup>
175178
<None Include="packages.config" />
176179
</ItemGroup>
177-
</Project>
180+
<ItemGroup>
181+
<ResourceCompile Include="..\..\Resource.rc">
182+
<Filter>Resource Files</Filter>
183+
</ResourceCompile>
184+
</ItemGroup>
185+
</Project>

‎src/signalrclientdll/Resource.rc‎

4.61 KB
Binary file not shown.

‎src/signalrclientdll/resource.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
//{{NO_DEPENDENCIES}}
2+
// Microsoft Visual C++ generated include file.
3+
// Used by Resource.rc
4+
5+
// Next default values for new objects
6+
//
7+
#ifdef APSTUDIO_INVOKED
8+
#ifndef APSTUDIO_READONLY_SYMBOLS
9+
#define _APS_NEXT_RESOURCE_VALUE 101
10+
#define _APS_NEXT_COMMAND_VALUE 40001
11+
#define _APS_NEXT_CONTROL_VALUE 1001
12+
#define _APS_NEXT_SYMED_VALUE 101
13+
#endif
14+
#endif

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<PrecompiledHeader>NotUsing</PrecompiledHeader>
2121
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2222
<AdditionalIncludeDirectories>..;..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
23+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
2324
</ClCompile>
2425
</ItemDefinitionGroup>
2526
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎test/signalrclient-e2e-tests/Build/VS2013/signalrclient-e2e-tests.vcxproj‎

Lines changed: 71 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,71 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\..\Build\SignalRClient.Build.Settings" />
4-
<PropertyGroup Label="Globals">
5-
<ProjectGuid>{6006C96A-29F0-4B18-8DDD-764DC3419E2F}</ProjectGuid>
6-
<Keyword>Win32Proj</Keyword>
7-
<RootNamespace>signalrclient-e2e-tests</RootNamespace>
8-
<ProjectName>signalrclient-e2e-tests</ProjectName>
9-
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
10-
<ConfigurationType>Application</ConfigurationType>
11-
</PropertyGroup>
12-
<Import Project="..\..\..\..\Build\Config.Definitions.props" />
13-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
14-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
15-
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
16-
<PropertyGroup Label="UserMacros">
17-
<NuGetPackageImportStamp>bc81c417</NuGetPackageImportStamp>
18-
</PropertyGroup>
19-
<ItemDefinitionGroup>
20-
<ClCompile>
21-
<PreprocessorDefinitions>_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
22-
<AdditionalIncludeDirectories>..\..\..\gtest-1.7.0\include;..\..\..\..\include\signalrclient;..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
23-
</ClCompile>
24-
<Link>
25-
<SubSystem>Console</SubSystem>
26-
</Link>
27-
</ItemDefinitionGroup>
28-
<ItemGroup>
29-
<ClInclude Include="..\..\test_utils.h" />
30-
<ClInclude Include="..\..\stdafx.h" />
31-
</ItemGroup>
32-
<ItemGroup>
33-
<ClCompile Include="..\..\connection_tests.cpp" />
34-
<ClCompile Include="..\..\hub_connection_tests.cpp" />
35-
<ClCompile Include="..\..\test_utils.cpp" />
36-
<ClCompile Include="..\..\signalrclient-e2e-tests.cpp" />
37-
<ClCompile Include="..\..\stdafx.cpp">
38-
<PrecompiledHeader>Create</PrecompiledHeader>
39-
</ClCompile>
40-
</ItemGroup>
41-
<ItemGroup>
42-
<ProjectReference Include="..\..\..\..\src\signalrclientdll\Build\VS2013\signalrclientdll.vcxproj">
43-
<Project>{18377ae8-e372-40ce-94fd-7f65008d39a3}</Project>
44-
<CopyLocal>true</CopyLocal>
45-
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
46-
<LinkLibraryDependencies>true</LinkLibraryDependencies>
47-
</ProjectReference>
48-
<ProjectReference Include="..\..\..\gtest-1.7.0\msvc\gtest.vcxproj">
49-
<Project>{2af210a9-5bdc-45e8-95dd-07b5a2616493}</Project>
50-
</ProjectReference>
51-
</ItemGroup>
52-
<ItemGroup>
53-
<None Include="packages.config" />
54-
</ItemGroup>
55-
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
56-
<ImportGroup Label="ExtensionTargets">
57-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
58-
<Import Project="..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
59-
</ImportGroup>
60-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
61-
<PropertyGroup>
62-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
63-
</PropertyGroup>
64-
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
65-
<Error Condition="!Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
66-
</Target>
67-
<Target Name="AfterBuild">
68-
<Exec Command="copy /y &quot;$(SolutionDir)bin\$(Platform)\$(Configuration)\dll\$(SignalrClientTargetName).dll&quot; &quot;$(SolutionDir)bin\$(Platform)\$(Configuration)\$(SignalrClientTargetName).dll&quot;" />
69-
</Target>
70-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\..\..\Build\SignalRClient.Build.Settings" />
4+
<PropertyGroup Label="Globals">
5+
<ProjectGuid>{6006C96A-29F0-4B18-8DDD-764DC3419E2F}</ProjectGuid>
6+
<Keyword>Win32Proj</Keyword>
7+
<RootNamespace>signalrclient-e2e-tests</RootNamespace>
8+
<ProjectName>signalrclient-e2e-tests</ProjectName>
9+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
10+
<ConfigurationType>Application</ConfigurationType>
11+
</PropertyGroup>
12+
<Import Project="..\..\..\..\Build\Config.Definitions.props" />
13+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
14+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
15+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
16+
<PropertyGroup Label="UserMacros">
17+
<NuGetPackageImportStamp>bc81c417</NuGetPackageImportStamp>
18+
</PropertyGroup>
19+
<ItemDefinitionGroup>
20+
<ClCompile>
21+
<PreprocessorDefinitions>_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
22+
<AdditionalIncludeDirectories>..\..\..\gtest-1.7.0\include;..\..\..\..\include\signalrclient;..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
23+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
24+
</ClCompile>
25+
<Link>
26+
<SubSystem>Console</SubSystem>
27+
</Link>
28+
</ItemDefinitionGroup>
29+
<ItemGroup>
30+
<ClInclude Include="..\..\test_utils.h" />
31+
<ClInclude Include="..\..\stdafx.h" />
32+
</ItemGroup>
33+
<ItemGroup>
34+
<ClCompile Include="..\..\connection_tests.cpp" />
35+
<ClCompile Include="..\..\hub_connection_tests.cpp" />
36+
<ClCompile Include="..\..\test_utils.cpp" />
37+
<ClCompile Include="..\..\signalrclient-e2e-tests.cpp" />
38+
<ClCompile Include="..\..\stdafx.cpp">
39+
<PrecompiledHeader>Create</PrecompiledHeader>
40+
</ClCompile>
41+
</ItemGroup>
42+
<ItemGroup>
43+
<ProjectReference Include="..\..\..\..\src\signalrclientdll\Build\VS2013\signalrclientdll.vcxproj">
44+
<Project>{18377ae8-e372-40ce-94fd-7f65008d39a3}</Project>
45+
<CopyLocal>true</CopyLocal>
46+
<CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
47+
<LinkLibraryDependencies>true</LinkLibraryDependencies>
48+
</ProjectReference>
49+
<ProjectReference Include="..\..\..\gtest-1.7.0\msvc\gtest.vcxproj">
50+
<Project>{2af210a9-5bdc-45e8-95dd-07b5a2616493}</Project>
51+
</ProjectReference>
52+
</ItemGroup>
53+
<ItemGroup>
54+
<None Include="packages.config" />
55+
</ItemGroup>
56+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
57+
<ImportGroup Label="ExtensionTargets">
58+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
59+
<Import Project="..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
60+
</ImportGroup>
61+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
62+
<PropertyGroup>
63+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
64+
</PropertyGroup>
65+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
66+
<Error Condition="!Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
67+
</Target>
68+
<Target Name="AfterBuild">
69+
<Exec Command="copy /y &quot;$(SolutionDir)bin\$(Platform)\$(Configuration)\dll\$(SignalrClientTargetName).dll&quot; &quot;$(SolutionDir)bin\$(Platform)\$(Configuration)\$(SignalrClientTargetName).dll&quot;" />
70+
</Target>
71+
</Project>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<ClCompile>
2121
<PreprocessorDefinitions>_CONSOLE;_LIB;NO_SIGNALRCLIENT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2222
<AdditionalIncludeDirectories>..\..\..\gtest-1.7.0\include;..\..\..\..\include;..\..\..\..\src\signalrclient;..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
23+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
2324
</ClCompile>
2425
<Link>
2526
<SubSystem>Console</SubSystem>
@@ -82,4 +83,4 @@
8283
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
8384
<Error Condition="!Exists('..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.5.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
8485
</Target>
85-
</Project>
86+
</Project>

0 commit comments

Comments
 (0)