Skip to content

Commit f53b390

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into rename_bad_websocket_api
2 parents cf9c2c0 + 6ff179c commit f53b390

File tree

4 files changed

+25
-66
lines changed

4 files changed

+25
-66
lines changed

‎Release/tests/functional/http/client/vs11.winrt/HttpClient110_test.winrt.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
8787
<CompileAsWinRT>true</CompileAsWinRT>
8888
<MinimalRebuild>false</MinimalRebuild>
89-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
89+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
9090
</ClCompile>
9191
<Link>
9292
<SubSystem>Windows</SubSystem>
@@ -103,7 +103,7 @@
103103
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
104104
<CompileAsWinRT>true</CompileAsWinRT>
105105
<MinimalRebuild>false</MinimalRebuild>
106-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
106+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
107107
</ClCompile>
108108
<Link>
109109
<SubSystem>Windows</SubSystem>
@@ -120,7 +120,7 @@
120120
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
121121
<CompileAsWinRT>true</CompileAsWinRT>
122122
<MinimalRebuild>false</MinimalRebuild>
123-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
123+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
124124
</ClCompile>
125125
<Link>
126126
<SubSystem>Windows</SubSystem>
@@ -139,7 +139,7 @@
139139
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
140140
<CompileAsWinRT>true</CompileAsWinRT>
141141
<MinimalRebuild>false</MinimalRebuild>
142-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
142+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
143143
</ClCompile>
144144
<Link>
145145
<SubSystem>Windows</SubSystem>
@@ -160,7 +160,7 @@
160160
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
161161
<CompileAsWinRT>true</CompileAsWinRT>
162162
<MinimalRebuild>false</MinimalRebuild>
163-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
163+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
164164
</ClCompile>
165165
<Link>
166166
<SubSystem>Windows</SubSystem>
@@ -181,7 +181,7 @@
181181
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
182182
<CompileAsWinRT>true</CompileAsWinRT>
183183
<MinimalRebuild>false</MinimalRebuild>
184-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
184+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
185185
</ClCompile>
186186
<Link>
187187
<SubSystem>Windows</SubSystem>

‎Release/tests/functional/http/client/vs12.winrt/HttpClient120_test.winrt.vcxproj

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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="$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.winrt.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.winrt.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|ARM">
65
<Configuration>Debug</Configuration>
@@ -87,16 +86,6 @@
8786
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8887
</ClCompile>
8988
</ItemDefinitionGroup>
90-
91-
<!-- If testing against a VS installation, need to include the libs. -->
92-
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
93-
<Link>
94-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
95-
</Link>
96-
<Link>
97-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
98-
</Link>
99-
</ItemDefinitionGroup>
10089

10190
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
10291
<ClCompile>
@@ -106,7 +95,7 @@
10695
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
10796
<CompileAsWinRT>true</CompileAsWinRT>
10897
<MinimalRebuild>false</MinimalRebuild>
109-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
98+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
11099
</ClCompile>
111100
<Link>
112101
<SubSystem>Windows</SubSystem>
@@ -122,7 +111,7 @@
122111
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
123112
<CompileAsWinRT>true</CompileAsWinRT>
124113
<MinimalRebuild>false</MinimalRebuild>
125-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
114+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
126115
</ClCompile>
127116
<Link>
128117
<SubSystem>Windows</SubSystem>
@@ -138,7 +127,7 @@
138127
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
139128
<CompileAsWinRT>true</CompileAsWinRT>
140129
<MinimalRebuild>false</MinimalRebuild>
141-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
130+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
142131
</ClCompile>
143132
<Link>
144133
<SubSystem>Windows</SubSystem>
@@ -156,7 +145,7 @@
156145
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
157146
<CompileAsWinRT>true</CompileAsWinRT>
158147
<MinimalRebuild>false</MinimalRebuild>
159-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
148+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
160149
</ClCompile>
161150
<Link>
162151
<SubSystem>Windows</SubSystem>
@@ -176,7 +165,7 @@
176165
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
177166
<CompileAsWinRT>true</CompileAsWinRT>
178167
<MinimalRebuild>false</MinimalRebuild>
179-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
168+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
180169
</ClCompile>
181170
<Link>
182171
<SubSystem>Windows</SubSystem>
@@ -196,7 +185,7 @@
196185
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
197186
<CompileAsWinRT>true</CompileAsWinRT>
198187
<MinimalRebuild>false</MinimalRebuild>
199-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
188+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
200189
</ClCompile>
201190
<Link>
202191
<SubSystem>Windows</SubSystem>
@@ -216,14 +205,10 @@
216205
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs12.winrt\UnitTestpp120.winrt.vcxproj">
217206
<Project>{B341AA9C-F38B-4D59-B6B7-8F22491090B7}</Project>
218207
</ProjectReference>
219-
</ItemGroup>
220-
221-
<ItemGroup Condition="'$(BuildAgainstVSInstallation)'==''">
222208
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12.winrt\casablanca120.winrt.vcxproj">
223209
<Project>{198ED804-2655-4D92-8104-C220E3EA9452}</Project>
224210
</ProjectReference>
225211
</ItemGroup>
226-
227212
<ItemGroup>
228213
<ClInclude Include="..\http_client_tests.h" />
229214
<ClInclude Include="..\stdafx.h" />

‎Release/tests/functional/http/client/vs14.winrt/HttpClient140_test.winrt.vcxproj

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,6 @@
8787
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8888
</ClCompile>
8989
</ItemDefinitionGroup>
90-
91-
<!-- If testing against a VS installation, need to include the libs. -->
92-
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
93-
<Link>
94-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
95-
</Link>
96-
<Link>
97-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
98-
</Link>
99-
</ItemDefinitionGroup>
10090

10191
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
10292
<ClCompile>
@@ -106,7 +96,7 @@
10696
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
10797
<CompileAsWinRT>true</CompileAsWinRT>
10898
<MinimalRebuild>false</MinimalRebuild>
109-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
99+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
110100
</ClCompile>
111101
<Link>
112102
<SubSystem>Windows</SubSystem>
@@ -122,7 +112,7 @@
122112
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
123113
<CompileAsWinRT>true</CompileAsWinRT>
124114
<MinimalRebuild>false</MinimalRebuild>
125-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
115+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
126116
</ClCompile>
127117
<Link>
128118
<SubSystem>Windows</SubSystem>
@@ -138,7 +128,7 @@
138128
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
139129
<CompileAsWinRT>true</CompileAsWinRT>
140130
<MinimalRebuild>false</MinimalRebuild>
141-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
131+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
142132
</ClCompile>
143133
<Link>
144134
<SubSystem>Windows</SubSystem>
@@ -156,7 +146,7 @@
156146
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
157147
<CompileAsWinRT>true</CompileAsWinRT>
158148
<MinimalRebuild>false</MinimalRebuild>
159-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
149+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
160150
</ClCompile>
161151
<Link>
162152
<SubSystem>Windows</SubSystem>
@@ -176,7 +166,7 @@
176166
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
177167
<CompileAsWinRT>true</CompileAsWinRT>
178168
<MinimalRebuild>false</MinimalRebuild>
179-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
169+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
180170
</ClCompile>
181171
<Link>
182172
<SubSystem>Windows</SubSystem>
@@ -196,7 +186,7 @@
196186
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
197187
<CompileAsWinRT>true</CompileAsWinRT>
198188
<MinimalRebuild>false</MinimalRebuild>
199-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
189+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
200190
</ClCompile>
201191
<Link>
202192
<SubSystem>Windows</SubSystem>
@@ -216,14 +206,10 @@
216206
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs14.winrt\UnitTestpp140.winrt.vcxproj">
217207
<Project>{B341AA9C-F38B-4D59-B6B7-8F22491090B7}</Project>
218208
</ProjectReference>
219-
</ItemGroup>
220-
221-
<ItemGroup Condition="'$(BuildAgainstVSInstallation)'==''">
222209
<ProjectReference Include="$(CasablancaSrcDir)\build\vs14.winrt\casablanca140.winrt.vcxproj">
223210
<Project>{198ED804-2655-4D92-8104-C220E3EA9452}</Project>
224211
</ProjectReference>
225-
</ItemGroup>
226-
212+
</ItemGroup>
227213
<ItemGroup>
228214
<ClInclude Include="..\http_client_tests.h" />
229215
<ClInclude Include="..\stdafx.h" />
@@ -261,7 +247,6 @@
261247
<ClCompile Include="..\to_string_tests.cpp" />
262248
</ItemGroup>
263249
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
264-
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
265250
<ImportGroup Label="ExtensionTargets">
266251
</ImportGroup>
267252

‎Release/tests/functional/http/client/vs14/HttpClient140_test.vcxproj

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|ARM">
65
<Configuration>Debug</Configuration>
@@ -83,21 +82,12 @@
8382
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8483
</ClCompile>
8584
</ItemDefinitionGroup>
86-
<!-- If testing against a VS installation, need to include the libs. -->
87-
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
88-
<Link>
89-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
90-
</Link>
91-
<Link>
92-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
93-
</Link>
94-
</ItemDefinitionGroup>
9585
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9686
<ClCompile>
9787
<PrecompiledHeader>Use</PrecompiledHeader>
9888
<Optimization>Disabled</Optimization>
9989
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
100-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
90+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
10191
</ClCompile>
10292
<Link>
10393
<SubSystem>Windows</SubSystem>
@@ -111,7 +101,7 @@
111101
<PrecompiledHeader>Use</PrecompiledHeader>
112102
<Optimization>Disabled</Optimization>
113103
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
114-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
104+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
115105
</ClCompile>
116106
<Link>
117107
<SubSystem>Windows</SubSystem>
@@ -125,7 +115,7 @@
125115
<PrecompiledHeader>Use</PrecompiledHeader>
126116
<Optimization>Disabled</Optimization>
127117
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128-
<AdditionalOptions>-Zm200 /bigobj %(AdditionalOptions)</AdditionalOptions>
118+
<AdditionalOptions>-Zm240 /bigobj %(AdditionalOptions)</AdditionalOptions>
129119
</ClCompile>
130120
<Link>
131121
<SubSystem>Windows</SubSystem>
@@ -141,7 +131,7 @@
141131
<FunctionLevelLinking>true</FunctionLevelLinking>
142132
<IntrinsicFunctions>true</IntrinsicFunctions>
143133
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
134+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
145135
</ClCompile>
146136
<Link>
147137
<SubSystem>Windows</SubSystem>
@@ -159,7 +149,7 @@
159149
<FunctionLevelLinking>true</FunctionLevelLinking>
160150
<IntrinsicFunctions>true</IntrinsicFunctions>
161151
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
162-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
152+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
163153
</ClCompile>
164154
<Link>
165155
<SubSystem>Windows</SubSystem>
@@ -177,7 +167,7 @@
177167
<FunctionLevelLinking>true</FunctionLevelLinking>
178168
<IntrinsicFunctions>true</IntrinsicFunctions>
179169
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
170+
<AdditionalOptions>-Zm240 %(AdditionalOptions)</AdditionalOptions>
181171
</ClCompile>
182172
<Link>
183173
<SubSystem>Windows</SubSystem>
@@ -241,7 +231,6 @@
241231
<ClCompile Include="..\to_string_tests.cpp" />
242232
</ItemGroup>
243233
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
244-
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
245234
<ImportGroup Label="ExtensionTargets">
246235
</ImportGroup>
247236
</Project>

0 commit comments

Comments
 (0)