Skip to content

Commit 982d7dc

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into automatemanualtests
2 parents 9d483a6 + 9167ab7 commit 982d7dc

22 files changed

+51
-120
lines changed

‎Build/version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<CppRestBaseFileName>cpprest</CppRestBaseFileName>
55
<CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
6-
<CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
6+
<CppRestSDKVersionMinor>2</CppRestSDKVersionMinor>
77
<CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
88
<CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
99
<CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>

‎Release/include/cpprest/http_client.h‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ namespace client
7373
{
7474

7575
// credentials and web_proxy class has been moved from web::http::client namespace to web namespace.
76-
// The below using declarations ensure we dont break existing code.
76+
// The below using declarations ensure we don't break existing code.
7777
// Please use the web::credentials and web::web_proxy class going forward.
7878
using web::credentials;
7979
using web::web_proxy;
@@ -125,9 +125,11 @@ class http_client_config
125125
/// Set OAuth 1.0 configuration.
126126
/// </summary>
127127
/// <param name="config">OAuth 1.0 configuration to set.</param>
128-
void set_oauth1(oauth1::experimental::oauth1_config config)
128+
void set_oauth1(oauth1::experimental::oauth1_config)
129129
{
130-
m_oauth1 = std::make_shared<oauth1::experimental::oauth1_config>(std::move(config));
130+
// CodePlex #230
131+
throw std::runtime_error("oauth1 is not implemented yet.");
132+
//m_oauth1 = std::make_shared<oauth1::experimental::oauth1_config>(std::move(config));
131133
}
132134
#endif
133135

‎Release/include/cpprest/version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* ==--==
1717
*/
1818
#define CPPREST_VERSION_REVISION 0
19-
#define CPPREST_VERSION_MINOR 1
19+
#define CPPREST_VERSION_MINOR 2
2020
#define CPPREST_VERSION_MAJOR 2
2121

2222
#define CPPREST_VERSION (CPPREST_VERSION_MAJOR*100000+CPPREST_VERSION_MINOR*100+CPPREST_VERSION_REVISION)

‎Release/include/cpprest/ws_client.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737

3838
#include "cpprest/xxpublic.h"
3939

40+
#if _NOT_PHONE8_
4041
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
4142
#include <ppltasks.h>
4243
namespace pplx = Concurrency;
@@ -397,5 +398,6 @@ class websocket_client
397398

398399
}}}}
399400

401+
#endif // _NOT_PHONE8_
400402
#endif
401403
#endif /* _CASA_WS_CLIENT_H */

‎Release/include/cpprest/ws_msg.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "cpprest/xxpublic.h"
3636
#include "cpprest/containerstream.h"
3737

38+
#if _NOT_PHONE8_
3839
#if defined(_MSC_VER) && (_MSC_VER >= 1800)
3940
#include <ppltasks.h>
4041
namespace pplx = Concurrency;
@@ -239,6 +240,6 @@ class websocket_incoming_message
239240

240241
}}}}
241242

243+
#endif // _NOT_PHONE8_
242244
#endif
243-
244245
#endif /* _CASA_WS_MSG_H */

‎Release/include/cpprest/xxpublic.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@
6868
#ifdef __clang__
6969
#include <cstdio>
7070
#endif
71+
72+
// Define the _NOT_PHONE8_ as non-windows or windows desktop without arm configuration or windows store app or windows phone8.1
73+
#define _NOT_PHONE8_ !defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP && !defined(_M_ARM)) || WINAPI_FAMILY == WINAPI_FAMILY_APP || (WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _WIN32_WINNT == _WIN32_WINNT_WINBLUE)

‎Release/src/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ elseif(WIN32)
6262
http/client/http_win7.cpp
6363
http/listener/http_windows_server.cpp
6464
http/oauth/oauth1.cpp
65+
http/oauth/oauth2.cpp
6566
streams/windows/fileio.cpp
6667
streams/windows/ioscheduler.cpp
6768
utilities/dllmain.cpp
@@ -96,7 +97,7 @@ target_link_libraries(${Casablanca_LIBRARY}
9697

9798
# Portions specific to cpprest binary versioning.
9899
set (CPPREST_VERSION_MAJOR 2)
99-
set (CPPREST_VERSION_MINOR 1)
100+
set (CPPREST_VERSION_MINOR 2)
100101
set (CPPREST_VERSION_REVISION 0)
101102

102103
if(WIN32)

‎Release/src/build/casablanca110.wp8.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<ItemDefinitionGroup>
3636
<ClCompile>
37-
<PreprocessorDefinitions>_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
37+
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE8_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
3838
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
3939
<CompileAsWinRT>true</CompileAsWinRT>
4040
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

‎Release/src/build/casablanca120.wp81.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838
<ItemDefinitionGroup>
3939
<ClCompile>
40-
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_PHONE81_;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
40+
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
4141
<AdditionalUsingDirectories>$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
4242
<CompileAsWinRT>true</CompileAsWinRT>
4343
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

‎Release/src/build/sources.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221

222222
<!-- non-TargetXP and non-Phone8.0 files go here-->
223223
<ItemGroup Condition ="'$(TargetXP)' != 'true' and '$(PlatformToolset)' != 'v110_wp80'">
224-
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\oauth1.h">
224+
<ClInclude Include="$(CasablancaIncludeDir)\cpprest\oauth1.h">
225225
<Filter>Header Files\cpprest</Filter>
226226
</ClInclude>
227227
<ClCompile Include="$(CasablancaSrcDir)\http\oauth\oauth1.cpp">

0 commit comments

Comments
 (0)