Skip to content

Commit 600d39c

Browse files
hohonghohong
committed
merge from tfs to codeplex
1 parent daad374 commit 600d39c

File tree

21 files changed

+87
-85
lines changed

21 files changed

+87
-85
lines changed

‎Release/collateral/MakeZip/MakeZip.proj

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<Delete Files="$(BuildRoot)\Release\Collateral\MakeZip\$(ZipFileName)" />
1717
</Target>
1818
<Target Name="Build">
19-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
20-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
21-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
22-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
23-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
24-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
25-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
26-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
27-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
28-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
19+
<Copy SourceFiles="$(VSProjFolder)\CppRestVC10.props" DestinationFiles="$(SamplesFolder)\BingRequest\VC10\CppRest.props" OverwriteReadOnlyFiles="true"/>
20+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
21+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
22+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
23+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
24+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
25+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
26+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
27+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
28+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
2929
<ItemGroup>
3030
<DefaultExclude Include="$(SamplesFolder)\**\bin\**" />
3131
<DefaultExclude Include="$(SamplesFolder)\**\ipch\**" />

‎Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj

+3-54
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,10 @@
55
<Configuration>Debug</Configuration>
66
<Platform>Win32</Platform>
77
</ProjectConfiguration>
8-
<ProjectConfiguration Include="Debug|ARM">
9-
<Configuration>Debug</Configuration>
10-
<Platform>ARM</Platform>
11-
</ProjectConfiguration>
128
<ProjectConfiguration Include="Debug|x64">
139
<Configuration>Debug</Configuration>
1410
<Platform>x64</Platform>
1511
</ProjectConfiguration>
16-
<ProjectConfiguration Include="Release|ARM">
17-
<Configuration>Release</Configuration>
18-
<Platform>ARM</Platform>
19-
</ProjectConfiguration>
2012
<ProjectConfiguration Include="Release|Win32">
2113
<Configuration>Release</Configuration>
2214
<Platform>Win32</Platform>
@@ -42,12 +34,6 @@
4234
<CharacterSet>NotSet</CharacterSet>
4335
<PlatformToolset>v110_xp</PlatformToolset>
4436
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
46-
<ConfigurationType>Application</ConfigurationType>
47-
<UseDebugLibraries>true</UseDebugLibraries>
48-
<CharacterSet>NotSet</CharacterSet>
49-
<PlatformToolset>v110</PlatformToolset>
50-
</PropertyGroup>
5137
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5238
<ConfigurationType>Application</ConfigurationType>
5339
<UseDebugLibraries>true</UseDebugLibraries>
@@ -61,13 +47,6 @@
6147
<CharacterSet>NotSet</CharacterSet>
6248
<PlatformToolset>v110_xp</PlatformToolset>
6349
</PropertyGroup>
64-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
65-
<ConfigurationType>Application</ConfigurationType>
66-
<UseDebugLibraries>false</UseDebugLibraries>
67-
<WholeProgramOptimization>true</WholeProgramOptimization>
68-
<CharacterSet>NotSet</CharacterSet>
69-
<PlatformToolset>v110</PlatformToolset>
70-
</PropertyGroup>
7150
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7251
<ConfigurationType>Application</ConfigurationType>
7352
<UseDebugLibraries>false</UseDebugLibraries>
@@ -92,20 +71,6 @@
9271
<GenerateDebugInformation>true</GenerateDebugInformation>
9372
</Link>
9473
</ItemDefinitionGroup>
95-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
96-
<ClCompile>
97-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
98-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
99-
<Optimization>Disabled</Optimization>
100-
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
101-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir)</AdditionalIncludeDirectories>
102-
<ExceptionHandling>Async</ExceptionHandling>
103-
</ClCompile>
104-
<Link>
105-
<SubSystem>Console</SubSystem>
106-
<GenerateDebugInformation>true</GenerateDebugInformation>
107-
</Link>
108-
</ItemDefinitionGroup>
10974
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
11075
<ClCompile>
11176
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -138,24 +103,6 @@
138103
<OptimizeReferences>true</OptimizeReferences>
139104
</Link>
140105
</ItemDefinitionGroup>
141-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
142-
<ClCompile>
143-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
144-
<PrecompiledHeader>NotUsing</PrecompiledHeader>
145-
<Optimization>MaxSpeed</Optimization>
146-
<FunctionLevelLinking>true</FunctionLevelLinking>
147-
<IntrinsicFunctions>true</IntrinsicFunctions>
148-
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);</AdditionalIncludeDirectories>
150-
<ExceptionHandling>Async</ExceptionHandling>
151-
</ClCompile>
152-
<Link>
153-
<SubSystem>Console</SubSystem>
154-
<GenerateDebugInformation>true</GenerateDebugInformation>
155-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
156-
<OptimizeReferences>true</OptimizeReferences>
157-
</Link>
158-
</ItemDefinitionGroup>
159106
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
160107
<ClCompile>
161108
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -178,7 +125,9 @@
178125
<ClCompile Include="$(CollateralsDir)\Samples\BingRequest\bingrequest.cpp" />
179126
</ItemGroup>
180127
<ItemGroup>
181-
<Library Include="..\..\..\..\..\Binaries\Win32\Release\cpprest110_xp_1_2.lib" />
128+
<ProjectReference Include="$(CasablancaSrcDir)\build\casablanca110.xp.vcxproj">
129+
<Project>{4D9ED383-673B-4E48-A6AF-6BD9F108150E}</Project>
130+
</ProjectReference>
182131
</ItemGroup>
183132
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
184133
</Project>

‎Release/samples/BingRequest/dirs.proj

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<ProjectFile Include="BingRequest$(DevToolsVersion)\BingRequest$(DevToolsVersion).vcxproj"/>
77
</ItemGroup>
88

9+
<ItemGroup Condition="'$(DevToolsVersion)'=='110'">
10+
<ProjectFile Include="BingRequest$(DevToolsVersion).xp\BingRequest$(DevToolsVersion).xp.vcxproj"/>
11+
</ItemGroup>
912
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
1013

1114
</Project>

‎Release/setup/VSProject/CppRestVC10.props

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<Import Project="version.props" />
5+
6+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
7+
<DebugFileSuffix>d</DebugFileSuffix>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition="'$(Platform)' == 'Win32'">
11+
<PlatformLibPath>x86</PlatformLibPath>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Platform)' == 'x64'">
14+
<PlatformLibPath>x64</PlatformLibPath>
15+
</PropertyGroup>
16+
<PropertyGroup Condition="'$(Platform)' == 'ARM'">
17+
<PlatformLibPath>arm</PlatformLibPath>
18+
</PropertyGroup>
19+
20+
<PropertyGroup>
21+
<CppRestSDKPath>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\100\v$(CppRestSDKVersionString)\SDK`, `InstallDir`))</CppRestSDKPath>
22+
<CppRestRuntimeBaseFileName>$(CppRestBaseFileName)100$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)</CppRestRuntimeBaseFileName>
23+
</PropertyGroup>
24+
25+
<ItemDefinitionGroup>
26+
<ClCompile>
27+
<AdditionalIncludeDirectories>$(CppRestSDKPath)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
28+
</ClCompile>
29+
<Link>
30+
<AdditionalDependencies>$(CppRestRuntimeBaseFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
31+
<AdditionalLibraryDirectories>$(CppRestSDKPath)\lib\$(PlatformLibPath)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
32+
</Link>
33+
<PostBuildEvent>
34+
<Message>Copying C++ REST Runtime</Message>
35+
<Command>
36+
copy /y "$(CppRestSDKPath)\bin\$(PlatformLibPath)\$(Configuration)\$(CppRestRuntimeBaseFileName).dll" "$(TargetDir)"
37+
copy /y "$(CppRestSDKPath)\bin\$(PlatformLibPath)\$(Configuration)\$(CppRestRuntimeBaseFileName).pdb" "$(TargetDir)"
38+
</Command>
39+
</PostBuildEvent>
40+
</ItemDefinitionGroup>
41+
</Project>

‎Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ClCompile>
1515
<Link>
1616
<AdditionalLibraryDirectories>$(CppRestSDKPath)\LIB\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
17-
<AdditionalDependencies>$(CppRestBaseFileName)110$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
17+
<AdditionalDependencies>$(CppRestBaseFileName)110$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
1818
</Link>
1919
</ItemDefinitionGroup>
2020
</Project>

‎Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ClCompile>
1515
<Link>
1616
<AdditionalLibraryDirectories>$(CppRestSDKPath)\LIB\arm\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
17-
<AdditionalDependencies>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
17+
<AdditionalDependencies>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
1818
</Link>
1919
</ItemDefinitionGroup>
2020
</Project>

‎Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ClCompile>
1515
<Link>
1616
<AdditionalLibraryDirectories>$(CppRestSDKPath)\LIB\x64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
17-
<AdditionalDependencies>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
17+
<AdditionalDependencies>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
1818
</Link>
1919
</ItemDefinitionGroup>
2020
</Project>

‎Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ClCompile>
1515
<Link>
1616
<AdditionalLibraryDirectories>$(CppRestSDKPath)\LIB\x86\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
17-
<AdditionalDependencies>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
17+
<AdditionalDependencies>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
1818
</Link>
1919
</ItemDefinitionGroup>
2020
</Project>

‎Release/tests/Common/utilities/VS11.xp/CommonUtilities110.xp.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
30-
<ProjectGuid>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</ProjectGuid>
30+
<ProjectGuid>{E3C7A314-A6B5-4169-A323-8655035E4EA8}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>CommonUtilities110</RootNamespace>
3333
<SccProjectName>SAK</SccProjectName>
@@ -195,7 +195,7 @@
195195
<Project>{6490C580-DD4A-4F2D-A345-732C5148349F}</Project>
196196
</ProjectReference>
197197
<ProjectReference Include="..\..\..\..\src\build\casablanca110.xp.vcxproj">
198-
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
198+
<Project>{4d9ed383-673b-4e48-a6af-6bd9f108150e}</Project>
199199
</ProjectReference>
200200
</ItemGroup>
201201
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Release/tests/Common/utilities/dirs.proj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup Condition="'$(DevToolsVersion)'=='110'">
1010
<ProjectFile Include="VS11\CommonUtilities110.vcxproj" />
11+
<ProjectFile Include="VS11.xp\CommonUtilities110.xp.vcxproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup Condition="'$(DevToolsVersion)'=='120'">

‎Release/tests/Functional/http/client/outside_tests.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ TEST_FIXTURE(uri_address, reading_google_stream,
9494
memset(chars, 0, sizeof(chars));
9595

9696
streams::rawptr_buffer<uint8_t> temp(chars, sizeof(chars));
97+
9798
VERIFY_ARE_EQUAL(response.body().read(temp, 80).get(), 80);
98-
VERIFY_ARE_EQUAL(strcmp((const char *)chars, "<!doctype html><html itemscope=\"itemscope\" itemtype=\"http://schema.org/WebPage\">"), 0);
99+
VERIFY_ARE_EQUAL(strcmp((const char *)chars, "<!doctype html><html itemscope=\"\" itemtype=\"http://schema.org/WebPage\"><head><me"), 0);
99100
}
100101

101102
TEST_FIXTURE(uri_address, outside_ssl_json,

‎Release/tests/Functional/json/VS11.xp/JSON110_test.xp.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
30-
<ProjectGuid>{6F026328-4D10-4EF1-BD6C-8FD3CBE0F530}</ProjectGuid>
30+
<ProjectGuid>{1CD44176-1F99-4D59-82C5-D07940114533}</ProjectGuid>
3131
<SccProjectName>SAK</SccProjectName>
3232
<SccAuxPath>SAK</SccAuxPath>
3333
<SccLocalPath>SAK</SccLocalPath>
@@ -191,7 +191,7 @@
191191
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
192192
</ProjectReference>
193193
<ProjectReference Include="..\..\..\..\src\build\casablanca110.xp.vcxproj">
194-
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
194+
<Project>{4d9ed383-673b-4e48-a6af-6bd9f108150e}</Project>
195195
</ProjectReference>
196196
<ProjectReference Include="..\..\..\Common\utilities\VS11.xp\CommonUtilities110.xp.vcxproj">
197197
<Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>

‎Release/tests/Functional/json/dirs.proj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup Condition="'$(DevToolsVersion)'=='110'">
1010
<ProjectFile Include="VS11\JSON110_test.vcxproj" />
11+
<ProjectFile Include="VS11.xp\JSON110_test.xp.vcxproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">

‎Release/tests/Functional/pplx/pplx_test/VS11.xp/pplx110_test.xp.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
30-
<ProjectGuid>{5115840E-A5A8-4044-B595-CDA05C2D65D0}</ProjectGuid>
30+
<ProjectGuid>{5F853B89-AACA-4A7B-93A8-8F9A74DD73EA}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>HttpTests</RootNamespace>
3333
<SccProjectName>SAK</SccProjectName>
@@ -198,7 +198,7 @@
198198
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
199199
</ProjectReference>
200200
<ProjectReference Include="..\..\..\..\..\src\build\casablanca110.xp.vcxproj">
201-
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
201+
<Project>{4d9ed383-673b-4e48-a6af-6bd9f108150e}</Project>
202202
</ProjectReference>
203203
<ProjectReference Include="..\..\..\..\Common\utilities\VS11.xp\CommonUtilities110.xp.vcxproj">
204204
<Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>

‎Release/tests/Functional/pplx/pplx_test/dirs.proj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup Condition="'$(DevToolsVersion)'=='110'">
1010
<ProjectFile Include="VS11\pplx110_test.vcxproj" />
11+
<ProjectFile Include="VS11.xp\pplx110_test.xp.vcxproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">

‎Release/tests/Functional/streams/VS11.xp/streams110_test.xp.vcxproj

+8-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
30-
<ProjectGuid>{181CCB80-9AE8-4ED7-8B7D-4C0CBC80EEDD}</ProjectGuid>
30+
<ProjectGuid>{77683C34-494E-4CB1-96C7-DA035D2E9ED8}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>HttpTests</RootNamespace>
3333
<SccProjectName>SAK</SccProjectName>
@@ -178,13 +178,15 @@
178178
</Link>
179179
</ItemDefinitionGroup>
180180
<ItemGroup>
181-
<ClCompile Include="..\fstreambuf_tests.cpp" />
182-
<ClCompile Include="..\ostream_tests.cpp" />
183-
<ClCompile Include="..\stdstream_tests.cpp" />
184181
<ClCompile Include="..\memstream_tests.cpp" />
185-
<ClCompile Include="..\istream_tests.cpp" />
186182
<ClCompile Include="..\fuzz_tests.cpp" />
187183
<ClCompile Include="..\stdafx.cpp">
184+
<!-- Disabled to include following test files for Bug: 759503-->
185+
<!-- <ClCompile Include="..\fstreambuf_tests.cpp" /> -->
186+
<!-- <ClCompile Include="..\ostream_tests.cpp" /> -->
187+
<!-- <ClCompile Include="..\stdstream_tests.cpp" /> -->
188+
<!-- <ClCompile Include="..\istream_tests.cpp" /> -->
189+
188190
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
189191
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
190192
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -202,7 +204,7 @@
202204
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
203205
</ProjectReference>
204206
<ProjectReference Include="..\..\..\..\src\build\casablanca110.xp.vcxproj">
205-
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
207+
<Project>{4d9ed383-673b-4e48-a6af-6bd9f108150e}</Project>
206208
</ProjectReference>
207209
</ItemGroup>
208210
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

‎Release/tests/Functional/streams/dirs.proj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup Condition="'$(DevToolsVersion)'=='110'">
1010
<ProjectFile Include="VS11\streams110_test.vcxproj" />
11+
<ProjectFile Include="VS11.xp\streams110_test.xp.vcxproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">

‎Release/tests/Functional/uri/VS11.xp/Uri110_test.xp.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
30-
<ProjectGuid>{3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}</ProjectGuid>
30+
<ProjectGuid>{248328B2-88DA-4495-A9B0-567561463502}</ProjectGuid>
3131
<SccProjectName>SAK</SccProjectName>
3232
<SccAuxPath>SAK</SccAuxPath>
3333
<SccLocalPath>SAK</SccLocalPath>
@@ -195,7 +195,7 @@
195195
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
196196
</ProjectReference>
197197
<ProjectReference Include="..\..\..\..\src\build\casablanca110.xp.vcxproj">
198-
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
198+
<Project>{4d9ed383-673b-4e48-a6af-6bd9f108150e}</Project>
199199
</ProjectReference>
200200
<ProjectReference Include="..\..\..\Common\utilities\VS11.xp\CommonUtilities110.xp.vcxproj">
201201
<Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>

‎Release/tests/Functional/uri/dirs.proj

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ItemGroup Condition="'$(DevToolsVersion)'=='110'">
1010
<ProjectFile Include="VS11\Uri110_test.vcxproj" />
11+
<ProjectFile Include="VS11.xp\Uri110_test.xp.vcxproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">

0 commit comments

Comments
 (0)