Skip to content

Commit cda5888

Browse files
committed
Reverted upgrade to dev14 for pplx_win8_tests
1 parent c8fbe9a commit cda5888

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

Release/tests/functional/pplx/pplx_win8_tests/pplx_win8_tests.vcxproj

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
55
<Configuration>Debug</Configuration>
@@ -27,6 +27,7 @@
2727
</ProjectConfiguration>
2828
</ItemGroup>
2929
<PropertyGroup Label="Globals">
30+
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and '$(VisualStudioVersion)' == ''">$(VCTargetsPath11)</VCTargetsPath>
3031
<ProjectGuid>{45A68926-B2BC-4B18-89B2-A0F5CA5BA45F}</ProjectGuid>
3132
<Keyword>Win32Proj</Keyword>
3233
<ProjectName>pplx_win8_verification</ProjectName>
@@ -42,35 +43,35 @@
4243
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4344
<ConfigurationType>DynamicLibrary</ConfigurationType>
4445
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v140</PlatformToolset>
46+
<PlatformToolset>v110</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4849
<ConfigurationType>DynamicLibrary</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
51+
<PlatformToolset>v110</PlatformToolset>
5152
</PropertyGroup>
5253
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5354
<ConfigurationType>DynamicLibrary</ConfigurationType>
5455
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v140</PlatformToolset>
56+
<PlatformToolset>v110</PlatformToolset>
5657
</PropertyGroup>
5758
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5859
<ConfigurationType>DynamicLibrary</ConfigurationType>
5960
<UseDebugLibraries>false</UseDebugLibraries>
6061
<WholeProgramOptimization>true</WholeProgramOptimization>
61-
<PlatformToolset>v140</PlatformToolset>
62+
<PlatformToolset>v110</PlatformToolset>
6263
</PropertyGroup>
6364
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
6465
<ConfigurationType>DynamicLibrary</ConfigurationType>
6566
<UseDebugLibraries>false</UseDebugLibraries>
6667
<WholeProgramOptimization>true</WholeProgramOptimization>
67-
<PlatformToolset>v140</PlatformToolset>
68+
<PlatformToolset>v110</PlatformToolset>
6869
</PropertyGroup>
6970
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7071
<ConfigurationType>DynamicLibrary</ConfigurationType>
7172
<UseDebugLibraries>false</UseDebugLibraries>
7273
<WholeProgramOptimization>true</WholeProgramOptimization>
73-
<PlatformToolset>v140</PlatformToolset>
74+
<PlatformToolset>v110</PlatformToolset>
7475
</PropertyGroup>
7576
<PropertyGroup>
7677
<GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
@@ -118,7 +119,7 @@
118119
<ItemDefinitionGroup>
119120
<ClCompile>
120121
<PrecompiledHeader>Use</PrecompiledHeader>
121-
<PreprocessorDefinitions>_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122+
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
122123
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
123124
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir)</AdditionalIncludeDirectories>
124125
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
@@ -167,4 +168,4 @@
167168
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
168169
<ImportGroup Label="ExtensionTargets">
169170
</ImportGroup>
170-
</Project>
171+
</Project>

0 commit comments

Comments
 (0)