Skip to content

Commit eb4ffec

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into trailing_whitespace
2 parents 24aea53 + b3b1a74 commit eb4ffec

File tree

5 files changed

+9
-40
lines changed

5 files changed

+9
-40
lines changed

‎Release/src/build/sources.proj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<Filter Include="Header Files\pplx">
1313
<UniqueIdentifier>{8ee80092-f08b-4b6a-914c-1990a3fc88de}</UniqueIdentifier>
1414
</Filter>
15-
<Filter Include="Header Files\compat">
15+
<Filter Include="Header Files\cpprest\details">
1616
<UniqueIdentifier>{e02ecd04-cecf-4527-9ae9-9fc076e7be12}</UniqueIdentifier>
1717
</Filter>
1818
<Filter Include="Header Files\cpprest">
@@ -78,11 +78,11 @@
7878
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\json.h">
7979
<Filter>Header Files\cpprest</Filter>
8080
</ClInclude>
81-
<ClInclude Include="$(CasablancaIncludeDir)\compat\linux_compat.h">
82-
<Filter>Header Files\compat</Filter>
81+
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\details\linux_compat.h">
82+
<Filter>Header Files\cpprest\details</Filter>
8383
</ClInclude>
84-
<ClInclude Include="$(CasablancaIncludeDir)\compat\nosal.h">
85-
<Filter>Header Files\compat</Filter>
84+
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\details\nosal.h">
85+
<Filter>Header Files\cpprest\details</Filter>
8686
</ClInclude>
8787
<ClInclude Include="$(CasablancaIncludeDir)\pplx\pplx.h">
8888
<Filter>Header Files\pplx</Filter>
@@ -105,8 +105,8 @@
105105
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\rawptrstream.h">
106106
<Filter>Header Files\cpprest</Filter>
107107
</ClInclude>
108-
<ClInclude Include="$(CasablancaIncludeDir)\compat\SafeInt3.hpp">
109-
<Filter>Header Files\cpprest</Filter>
108+
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\details\SafeInt3.hpp">
109+
<Filter>Header Files\cpprest\details</Filter>
110110
</ClInclude>
111111
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\streams.h">
112112
<Filter>Header Files\cpprest</Filter>
@@ -123,8 +123,8 @@
123123
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\uri_parser.h">
124124
<Filter>Header Files\pplx</Filter>
125125
</ClInclude>
126-
<ClInclude Include="$(CasablancaIncludeDir)\compat\windows_compat.h">
127-
<Filter>Header Files\compat</Filter>
126+
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\details\windows_compat.h">
127+
<Filter>Header Files\cpprest\details</Filter>
128128
</ClInclude>
129129
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\xxpublic.h">
130130
<Filter>Header Files\cpprest</Filter>

‎Release/tests/functional/pplx/pplx_test/vs12.xp/pplx120_test.xp.vcxproj

Lines changed: 0 additions & 14 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.razzle.props" Condition="exists('$(_NTDRIVE)$(_NTROOT)\vctools\cpp_rest\cpprest.razzle.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|Win32">
65
<Configuration>Debug</Configuration>
@@ -63,15 +62,6 @@
6362
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6463
</ClCompile>
6564
</ItemDefinitionGroup>
66-
<!-- If testing against a VS installation, need to include the libs. -->
67-
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
68-
<Link>
69-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
70-
</Link>
71-
<Link>
72-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
73-
</Link>
74-
</ItemDefinitionGroup>
7565
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7666
<ClCompile>
7767
<WarningLevel>Level4</WarningLevel>
@@ -84,7 +74,6 @@
8474
<SubSystem>Windows</SubSystem>
8575
<GenerateDebugInformation>true</GenerateDebugInformation>
8676
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
87-
<Profile>true</Profile>
8877
</Link>
8978
</ItemDefinitionGroup>
9079
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -159,14 +148,11 @@
159148
<ProjectReference Include="..\..\..\..\Common\utilities\VS12.xp\CommonUtilities120.xp.vcxproj">
160149
<Project>{5ad81270-b089-4e1b-8741-6486f39de273}</Project>
161150
</ProjectReference>
162-
</ItemGroup>
163-
<ItemGroup Condition="'$(BuildAgainstVSInstallation)'==''">
164151
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12.xp\casablanca120.xp.vcxproj">
165152
<Project>{75885703-7F3D-4086-8E60-C60B9B126F7E}</Project>
166153
</ProjectReference>
167154
</ItemGroup>
168155
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
169-
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
170156
<ImportGroup Label="ExtensionTargets">
171157
</ImportGroup>
172158
</Project>

‎Release/tests/functional/pplx/pplx_test/vs12/pplx120_test.vcxproj

Lines changed: 0 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="12.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>
@@ -86,16 +85,6 @@
8685
</ClCompile>
8786
</ItemDefinitionGroup>
8887

89-
<!-- If testing against a VS installation, need to include the libs. -->
90-
<ItemDefinitionGroup Condition="'$(BuildAgainstVSInstallation)'!=''">
91-
<Link>
92-
<AdditionalLibraryDirectories>$(CasablancaVSLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
93-
</Link>
94-
<Link>
95-
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
96-
</Link>
97-
</ItemDefinitionGroup>
98-
9988
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
10089
<ClCompile>
10190
<WarningLevel>Level3</WarningLevel>
@@ -108,7 +97,6 @@
10897
<SubSystem>Windows</SubSystem>
10998
<GenerateDebugInformation>true</GenerateDebugInformation>
11099
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
111-
<Profile>true</Profile>
112100
</Link>
113101
</ItemDefinitionGroup>
114102
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -123,7 +111,6 @@
123111
<SubSystem>Windows</SubSystem>
124112
<GenerateDebugInformation>true</GenerateDebugInformation>
125113
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
126-
<Profile>true</Profile>
127114
</Link>
128115
</ItemDefinitionGroup>
129116
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -218,16 +205,12 @@
218205
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs12\UnitTestpp120.vcxproj">
219206
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
220207
</ProjectReference>
221-
</ItemGroup>
222-
223-
<ItemGroup Condition="'$(BuildAgainstVSInstallation)'==''">
224208
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12\casablanca120.vcxproj">
225209
<Project>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</Project>
226210
</ProjectReference>
227211
</ItemGroup>
228212

229213
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
230-
<Import Project="$(BuildRoot)\cpprest.razzle.targets" Condition="'$(BuildInRazzle)'!=''" />
231214
<ImportGroup Label="ExtensionTargets">
232215
</ImportGroup>
233216
</Project>

‎Release/tests/Functional/streams/CppSparseFile.cpp renamed to ‎Release/tests/functional/streams/CppSparseFile.cpp

File renamed without changes.

‎Release/tests/Functional/streams/CppSparseFile.h renamed to ‎Release/tests/functional/streams/CppSparseFile.h

File renamed without changes.

0 commit comments

Comments
 (0)