Skip to content

Commit d4759b1

Browse files
committed
Removing some accidentally checked in files, and updating the websockets header file macro check.
1 parent b04bcbe commit d4759b1

21 files changed

+6
-410
lines changed

Release/include/cpprest/ws_client.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#define _CASA_WS_CLIENT_H
2727

2828
// Include on everything except VS2015 Windows Desktop and Windows Desktop ARM, unless explicitly excluded.
29-
#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) || (_MSC_VER < 1900 && !defined(_M_ARM))) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
29+
#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (_MSC_VER < 1900 && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
3030

3131
#include <memory>
3232
#include <limits>

Release/include/cpprest/ws_msg.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#pragma once
2424

2525
// Include on everything except VS2015 Windows Desktop and Windows Desktop ARM, unless explicitly excluded.
26-
#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) || (_MSC_VER < 1900 && !defined(_M_ARM))) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
26+
#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (_MSC_VER < 1900 && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
2727

2828
#include <memory>
2929
#include <limits>

Release/src/dirs.proj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<ProjectFile Include="build\vs14.wod\casablanca140.wod.vcxproj" Condition="'$(Platform)'!='ARM'" />
2323
<ProjectFile Include="build\vs14.android\casablanca140.android.vcxproj" Condition="'$(Platform)'!='x64'"/>
2424
</ItemGroup>
25+
26+
<ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|140'">
27+
<ProjectFile Include="build\vs14.uap\cpprestsdk120.uap.vcxproj" />
28+
</ItemGroup>
2529

2630
<Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
2731

Release/tests/functional/http/client/vs14.uap/Debug/MultipleQualifiersPerDimensionFound.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

Release/tests/functional/http/client/vs14.uap/Debug/priconfig.xml

Lines changed: 0 additions & 67 deletions
This file was deleted.

Release/tests/functional/http/client/vs14.uap/Debug/qualifiers.txt

Whitespace-only changes.

Release/tests/functional/json/vs14.uap/Debug/MultipleQualifiersPerDimensionFound.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

Release/tests/functional/json/vs14.uap/Debug/priconfig.xml

Lines changed: 0 additions & 67 deletions
This file was deleted.

Release/tests/functional/json/vs14.uap/Debug/qualifiers.txt

Whitespace-only changes.

Release/tests/functional/json/vs14.uap/Release/MultipleQualifiersPerDimensionFound.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)