Skip to content

Commit ed2df91

Browse files
stgatesstgates
committed
Merge branch 'uap_support' into vs14rc_update
Conflicts: Release/include/cpprest/ws_client.h Release/include/cpprest/ws_msg.h Release/src/websockets/client/ws_client.cpp Release/src/websockets/client/ws_client_wspp.cpp Release/src/websockets/client/ws_msg.cpp
2 parents 4ddf58d + 8dfe2f6 commit ed2df91

File tree

54 files changed

+1508
-2445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1508
-2445
lines changed

‎Release/include/cpprest/http_client.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
#define _CASA_HTTP_CLIENT_H
2929

3030
#if defined (__cplusplus_winrt)
31+
#if !defined(__WRL_NO_DEFAULT_LIB__)
3132
#define __WRL_NO_DEFAULT_LIB__
33+
#endif
3234
#include <wrl.h>
3335
#include <msxml6.h>
3436
namespace web { namespace http{namespace client{

‎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 Windows Desktop ARM, unless explicitly excluded.
29-
#if !defined(_MSC_VER) || (defined(__cplusplus_winrt) || !defined(__cplusplus_winrt) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
29+
#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !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 Windows Desktop ARM, unless explicitly excluded.
26-
#if !defined(_MSC_VER) || (defined(__cplusplus_winrt) || !defined(__cplusplus_winrt) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
26+
#if !defined(_MSC_VER) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) && !defined(_M_ARM)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
2727

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

‎Release/src/build/vs14.uwp/cpprestsdk140.uwp.vcxproj

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
4+
<ItemGroup Label="ProjectConfigurations">
5+
<ProjectConfiguration Include="Debug|ARM">
6+
<Configuration>Debug</Configuration>
7+
<Platform>ARM</Platform>
8+
</ProjectConfiguration>
9+
<ProjectConfiguration Include="Debug|Win32">
10+
<Configuration>Debug</Configuration>
11+
<Platform>Win32</Platform>
12+
</ProjectConfiguration>
13+
<ProjectConfiguration Include="Debug|x64">
14+
<Configuration>Debug</Configuration>
15+
<Platform>x64</Platform>
16+
</ProjectConfiguration>
17+
<ProjectConfiguration Include="Release|ARM">
18+
<Configuration>Release</Configuration>
19+
<Platform>ARM</Platform>
20+
</ProjectConfiguration>
21+
<ProjectConfiguration Include="Release|Win32">
22+
<Configuration>Release</Configuration>
23+
<Platform>Win32</Platform>
24+
</ProjectConfiguration>
25+
<ProjectConfiguration Include="Release|x64">
26+
<Configuration>Release</Configuration>
27+
<Platform>x64</Platform>
28+
</ProjectConfiguration>
29+
</ItemGroup>
30+
<PropertyGroup Label="Globals">
31+
<ProjectGuid>{36d79e79-7e9e-4b3a-88a3-9f9b295c80b9}</ProjectGuid>
32+
<Keyword>DynamicLibrary</Keyword>
33+
<DefaultLanguage>en-US</DefaultLanguage>
34+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
35+
<AppContainerApplication>true</AppContainerApplication>
36+
<ApplicationType>Windows Store</ApplicationType>
37+
<ApplicationTypeRevision>8.2</ApplicationTypeRevision>
38+
<ProjectName>cpprestsdk140.uwp</ProjectName>
39+
<PlatformToolset>v140</PlatformToolset>
40+
<ConfigurationType>DynamicLibrary</ConfigurationType>
41+
<OutDir>$(OutDir)\$(MsBuildProjectName)</OutDir>
42+
</PropertyGroup>
43+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
44+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
45+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
46+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
47+
<ImportGroup Label="ExtensionSettings">
48+
</ImportGroup>
49+
<ImportGroup Label="Shared">
50+
<Import Project="..\common.vcxitems" Label="Shared" />
51+
<Import Project="..\winrt.vcxitems" Label="Shared" />
52+
</ImportGroup>
53+
<ImportGroup Label="PropertySheets">
54+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
55+
</ImportGroup>
56+
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
57+
<DebugFileSuffix>d</DebugFileSuffix>
58+
</PropertyGroup>
59+
<PropertyGroup>
60+
<TargetName>$(CppRestBaseFileName)140$(DebugFileSuffix)_uwp_$(CppRestSDKVersionFileSuffix)</TargetName>
61+
</PropertyGroup>
62+
<PropertyGroup Label="UserMacros" />
63+
<PropertyGroup />
64+
<PropertyGroup>
65+
<GenerateManifest>false</GenerateManifest>
66+
<IgnoreImportLibrary>false</IgnoreImportLibrary>
67+
</PropertyGroup>
68+
<ItemDefinitionGroup>
69+
<ClCompile>
70+
<PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions);</PreprocessorDefinitions>
71+
<PrecompiledHeader>Use</PrecompiledHeader>
72+
<CompileAsWinRT>true</CompileAsWinRT>
73+
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
74+
<PrecompiledHeader>Use</PrecompiledHeader>
75+
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
76+
<AdditionalOptions>-Zm250 /bigobj %(AdditionalOptions)</AdditionalOptions>
77+
<WholeProgramOptimization Condition="'$(Configuration)'=='Release'">true</WholeProgramOptimization>
78+
</ClCompile>
79+
<Link>
80+
<SubSystem>Console</SubSystem>
81+
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
82+
<LinkTimeCodeGeneration Condition="'$(Configuration)'=='Release'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
83+
<GenerateWindowsMetadata>false</GenerateWindowsMetadata>
84+
</Link>
85+
</ItemDefinitionGroup>
86+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
87+
<ItemDefinitionGroup>
88+
<PostBuildEvent>
89+
<Command>copy /Y $(OutDir)\* $(OutDir)..\
90+
link /edit /appcontainer:no $(OutDir)..\$(TargetName).dll
91+
exit 0</Command>
92+
<Message>Copying $(TargetName).winrt binaries to OutDir and removing appcontainer flag</Message>
93+
</PostBuildEvent>
94+
</ItemDefinitionGroup>
95+
<ImportGroup Label="ExtensionTargets">
96+
</ImportGroup>
97+
</Project>

‎Release/src/build/vs14.winrt/casablanca140.winrt.vcxproj

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

‎Release/src/build/vs14.wp81/casablanca140.wp81.vcxproj

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

‎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.uwp\cpprestsdk120.uwp.vcxproj" />
28+
</ItemGroup>
2529

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

‎Release/src/http/client/http_client_winrt.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030

3131
#include <Strsafe.h>
3232
// Important for WP8
33+
#if !defined(__WRL_NO_DEFAULT_LIB__)
3334
#define __WRL_NO_DEFAULT_LIB__
35+
#endif
3436
#include <wrl.h>
3537
#include <msxml6.h>
3638
using namespace std;
@@ -474,7 +476,7 @@ class winrt_client : public _http_client_communicator
474476
// Specifies never to call OnDataAvailable improving performance and we
475477
// already don't use OnDataAvaliable anyway.
476478
#ifdef XHR_PROP_ONDATA_NEVER
477-
hr = winrt_context->m_hRequest->SetProperty(SetProperty(XHR_PROP_ONDATA_THRESHOLD, XHR_PROP_ONDATA_NEVER);
479+
hr = winrt_context->m_hRequest->SetProperty(XHR_PROP_ONDATA_THRESHOLD, XHR_PROP_ONDATA_NEVER);
478480
if (FAILED(hr))
479481
{
480482
request->report_error(hr, L"Failure to turn off on data threshold");

‎Release/src/websockets/client/ws_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "stdafx.h"
2424

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

2828
namespace web
2929
{

‎Release/src/websockets/client/ws_client_winrt.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
#include "stdafx.h"
2626
#include <concrt.h>
2727

28-
// ws_winrt only available for Windows Store apps and Windows Phone 8.1
29-
#if (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PC_APP) || (WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_PHONE_APP) && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)) && !defined(CPPREST_EXCLUDE_WEBSOCKETS)
28+
#if !defined(CPPREST_EXCLUDE_WEBSOCKETS)
3029

3130
using namespace ::Windows::Foundation;
3231
using namespace ::Windows::Storage;

0 commit comments

Comments
 (0)