Skip to content

Commit c8fbe9a

Browse files
committed
Fixed incorrect references in HttpTestUtilities projects
1 parent d50a165 commit c8fbe9a

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

Release/tests/functional/http/utilities/vs11.xp/HttpTestUtilities110.xp.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
@@ -187,7 +187,7 @@
187187
<ProjectReference Include="$(CasablancaSrcDir)\build\vs11.xp\casablanca110.xp.vcxproj">
188188
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
189189
</ProjectReference>
190-
<ProjectReference Include="..\..\..\..\Common\utilities\VS11.xp\CommonUtilities110.xp.vcxproj">
190+
<ProjectReference Include="$(TestRoot)\Common\utilities\VS11.xp\CommonUtilities110.xp.vcxproj">
191191
<Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>
192192
</ProjectReference>
193193
</ItemGroup>
@@ -217,4 +217,4 @@
217217
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
218218
<ImportGroup Label="ExtensionTargets">
219219
</ImportGroup>
220-
</Project>
220+
</Project>

Release/tests/functional/http/utilities/vs12.xp/HttpTestUtilities120.xp.vcxproj

Lines changed: 13 additions & 14 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="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|ARM">
55
<Configuration>Debug</Configuration>
@@ -33,48 +33,47 @@
3333
<SccLocalPath>SAK</SccLocalPath>
3434
<SccProvider>SAK</SccProvider>
3535
<Keyword>Win32Proj</Keyword>
36-
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
3736
<RootNamespace>actors::tests::common::HttpTestUtilities</RootNamespace>
3837
</PropertyGroup>
3938
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4039
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4140
<ConfigurationType>DynamicLibrary</ConfigurationType>
4241
<UseDebugLibraries>true</UseDebugLibraries>
4342
<CharacterSet>Unicode</CharacterSet>
44-
<PlatformToolset>v110</PlatformToolset>
43+
<PlatformToolset>v120</PlatformToolset>
4544
</PropertyGroup>
4645
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4746
<ConfigurationType>DynamicLibrary</ConfigurationType>
4847
<UseDebugLibraries>true</UseDebugLibraries>
4948
<CharacterSet>Unicode</CharacterSet>
50-
<PlatformToolset>v110</PlatformToolset>
49+
<PlatformToolset>v120</PlatformToolset>
5150
</PropertyGroup>
5251
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5352
<ConfigurationType>DynamicLibrary</ConfigurationType>
5453
<UseDebugLibraries>true</UseDebugLibraries>
5554
<CharacterSet>Unicode</CharacterSet>
56-
<PlatformToolset>v110</PlatformToolset>
55+
<PlatformToolset>v120</PlatformToolset>
5756
</PropertyGroup>
5857
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5958
<ConfigurationType>DynamicLibrary</ConfigurationType>
6059
<UseDebugLibraries>false</UseDebugLibraries>
6160
<WholeProgramOptimization>true</WholeProgramOptimization>
6261
<CharacterSet>Unicode</CharacterSet>
63-
<PlatformToolset>v110</PlatformToolset>
62+
<PlatformToolset>v120</PlatformToolset>
6463
</PropertyGroup>
6564
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
6665
<ConfigurationType>DynamicLibrary</ConfigurationType>
6766
<UseDebugLibraries>false</UseDebugLibraries>
6867
<WholeProgramOptimization>true</WholeProgramOptimization>
6968
<CharacterSet>Unicode</CharacterSet>
70-
<PlatformToolset>v110</PlatformToolset>
69+
<PlatformToolset>v120</PlatformToolset>
7170
</PropertyGroup>
7271
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7372
<ConfigurationType>DynamicLibrary</ConfigurationType>
7473
<UseDebugLibraries>false</UseDebugLibraries>
7574
<WholeProgramOptimization>true</WholeProgramOptimization>
7675
<CharacterSet>Unicode</CharacterSet>
77-
<PlatformToolset>v110</PlatformToolset>
76+
<PlatformToolset>v120</PlatformToolset>
7877
</PropertyGroup>
7978
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
8079
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Tests.Settings" />
@@ -181,13 +180,13 @@
181180
</Link>
182181
</ItemDefinitionGroup>
183182
<ItemGroup>
184-
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs11\UnitTestpp110.vcxproj">
183+
<ProjectReference Include="$(TestRoot)\Common\UnitTestpp\vs12\UnitTestpp120.vcxproj">
185184
<Project>{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}</Project>
186185
</ProjectReference>
187-
<ProjectReference Include="$(CasablancaSrcDir)\build\vs11.xp\casablanca110.xp.vcxproj">
188-
<Project>{90d85ff4-f0ae-4816-923f-0ef2758f30ab}</Project>
186+
<ProjectReference Include="$(CasablancaSrcDir)\build\vs12.xp\casablanca120.xp.vcxproj">
187+
<Project>{15f3b200-1aed-4b57-af37-b21cd67914b1}</Project>
189188
</ProjectReference>
190-
<ProjectReference Include="..\..\..\..\Common\utilities\VS11.xp\CommonUtilities110.xp.vcxproj">
189+
<ProjectReference Include="$(TestRoot)\Common\utilities\vs12.xp\CommonUtilities120.xp.vcxproj">
191190
<Project>{0c9d50d9-94fb-4732-a4ad-58e068315bb2}</Project>
192191
</ProjectReference>
193192
</ItemGroup>
@@ -217,4 +216,4 @@
217216
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
218217
<ImportGroup Label="ExtensionTargets">
219218
</ImportGroup>
220-
</Project>
219+
</Project>

0 commit comments

Comments
 (0)