Skip to content

Commit fc38c07

Browse files
stgatesstgates
committed
Adding websocket winrt tests for 120 toolset to dirs.proj.
1 parent 7a8b5e9 commit fc38c07

File tree

4 files changed

+3
-78
lines changed

4 files changed

+3
-78
lines changed

‎Release/tests/functional/websockets/client/dirs.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<ProjectFile Include="vs12.xp\websocketsclient120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'"/>
1717
</ItemGroup>
1818

19-
<!--
2019
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
2120
<ProjectFile Include="VS12.winrt\websocketsclient120_test.winrt.vcxproj" />
2221
</ItemGroup>
2322

23+
<!--
2424
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2525
<ProjectFile Include="vs14\websocketsclient140_test.vcxproj" />
2626
<ProjectFile Include="vs14.android\websocketsclient140_test.android.vcxproj" Condition="'$(Platform)'!='x64'" />

‎Release/tests/functional/websockets/client/vs12.winrt/websocketsclient120_test.winrt.vcxproj

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<?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">
4-
<ProjectConfiguration Include="Debug|ARM">
5-
<Configuration>Debug</Configuration>
6-
<Platform>ARM</Platform>
7-
</ProjectConfiguration>
84
<ProjectConfiguration Include="Debug|Win32">
95
<Configuration>Debug</Configuration>
106
<Platform>Win32</Platform>
@@ -13,10 +9,6 @@
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>
@@ -50,26 +42,13 @@
5042
<CharacterSet>Unicode</CharacterSet>
5143
<PlatformToolset>v120</PlatformToolset>
5244
</PropertyGroup>
53-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
54-
<ConfigurationType>DynamicLibrary</ConfigurationType>
55-
<UseDebugLibraries>true</UseDebugLibraries>
56-
<CharacterSet>Unicode</CharacterSet>
57-
<PlatformToolset>v120</PlatformToolset>
58-
</PropertyGroup>
5945
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6046
<ConfigurationType>DynamicLibrary</ConfigurationType>
6147
<UseDebugLibraries>false</UseDebugLibraries>
6248
<WholeProgramOptimization>true</WholeProgramOptimization>
6349
<CharacterSet>Unicode</CharacterSet>
6450
<PlatformToolset>v120</PlatformToolset>
6551
</PropertyGroup>
66-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
67-
<ConfigurationType>DynamicLibrary</ConfigurationType>
68-
<UseDebugLibraries>false</UseDebugLibraries>
69-
<WholeProgramOptimization>true</WholeProgramOptimization>
70-
<CharacterSet>Unicode</CharacterSet>
71-
<PlatformToolset>v120</PlatformToolset>
72-
</PropertyGroup>
7352
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7453
<ConfigurationType>DynamicLibrary</ConfigurationType>
7554
<UseDebugLibraries>false</UseDebugLibraries>
@@ -113,23 +92,6 @@
11392
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
11493
</Link>
11594
</ItemDefinitionGroup>
116-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
117-
<ClCompile>
118-
<PrecompiledHeader>Use</PrecompiledHeader>
119-
<Optimization>Disabled</Optimization>
120-
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities;</AdditionalIncludeDirectories>
122-
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
123-
<CompileAsWinRT>true</CompileAsWinRT>
124-
<MinimalRebuild>false</MinimalRebuild>
125-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
126-
</ClCompile>
127-
<Link>
128-
<SubSystem>Windows</SubSystem>
129-
<GenerateDebugInformation>true</GenerateDebugInformation>
130-
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
131-
</Link>
132-
</ItemDefinitionGroup>
13395
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
13496
<ClCompile>
13597
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -172,27 +134,6 @@
172134
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173135
</Link>
174136
</ItemDefinitionGroup>
175-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
176-
<ClCompile>
177-
<PrecompiledHeader>Use</PrecompiledHeader>
178-
<Optimization>MaxSpeed</Optimization>
179-
<FunctionLevelLinking>true</FunctionLevelLinking>
180-
<IntrinsicFunctions>true</IntrinsicFunctions>
181-
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
182-
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities</AdditionalIncludeDirectories>
183-
<AdditionalUsingDirectories>$(WindowsSDKDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
184-
<CompileAsWinRT>true</CompileAsWinRT>
185-
<MinimalRebuild>false</MinimalRebuild>
186-
<AdditionalOptions>-Zm200 %(AdditionalOptions)</AdditionalOptions>
187-
</ClCompile>
188-
<Link>
189-
<SubSystem>Windows</SubSystem>
190-
<GenerateDebugInformation>true</GenerateDebugInformation>
191-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
192-
<OptimizeReferences>true</OptimizeReferences>
193-
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
194-
</Link>
195-
</ItemDefinitionGroup>
196137
<ItemGroup>
197138
<ProjectReference Include="$(TestRoot)\Common\utilities\vs12.winrt\CommonUtilities120.winrt.vcxproj">
198139
<Project>{ea2d69a1-55c8-4c15-805e-de7e85872484}</Project>
@@ -222,8 +163,6 @@
222163
<ClCompile Include="..\stdafx.cpp">
223164
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
224165
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
225-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
226-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
227166
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
228167
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
229168
</ClCompile>

‎Release/tests/functional/websockets/utilities/dirs.proj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
<ProjectFile Include="VS12\websockets_test_utilities120.vcxproj" />
2020
<ProjectFile Include="VS12.xp\websockets_test_utilities120.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'"/>
2121
</ItemGroup>
22-
<!--
22+
2323
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
2424
<ProjectFile Include="VS12.winrt\websockets_test_utilities120.winrt.vcxproj" />
2525
</ItemGroup>
2626

27+
<!--
2728
<ItemGroup Condition="'$(DevToolsVersion)'=='140'">
2829
<ProjectFile Include="VS14\websockets_test_utilities140.vcxproj" />
2930
<ProjectFile Include="vs14.android\websockets_test_utilities140.android.vcxproj" Condition="'$(Platform)'!='x64'" />

‎Release/tests/functional/websockets/utilities/vs12.winrt/websockets_test_utilities120.winrt.vcxproj

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,13 @@
4242
<CharacterSet>Unicode</CharacterSet>
4343
<PlatformToolset>v120</PlatformToolset>
4444
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
46-
<ConfigurationType>DynamicLibrary</ConfigurationType>
47-
<UseDebugLibraries>true</UseDebugLibraries>
48-
<CharacterSet>Unicode</CharacterSet>
49-
<PlatformToolset>v120</PlatformToolset>
50-
</PropertyGroup>
5145
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5246
<ConfigurationType>DynamicLibrary</ConfigurationType>
5347
<UseDebugLibraries>false</UseDebugLibraries>
5448
<WholeProgramOptimization>true</WholeProgramOptimization>
5549
<CharacterSet>Unicode</CharacterSet>
5650
<PlatformToolset>v120</PlatformToolset>
5751
</PropertyGroup>
58-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
59-
<ConfigurationType>DynamicLibrary</ConfigurationType>
60-
<UseDebugLibraries>false</UseDebugLibraries>
61-
<WholeProgramOptimization>true</WholeProgramOptimization>
62-
<CharacterSet>Unicode</CharacterSet>
63-
<PlatformToolset>v120</PlatformToolset>
64-
</PropertyGroup>
6552
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6653
<ConfigurationType>DynamicLibrary</ConfigurationType>
6754
<UseDebugLibraries>false</UseDebugLibraries>
@@ -173,8 +160,6 @@
173160
<ClCompile Include="..\stdafx.cpp">
174161
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
175162
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
176-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
177-
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
178163
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
179164
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
180165
</ClCompile>

0 commit comments

Comments
 (0)