Merge branch 'development' of https://git01.codeplex.com/forks/tsone/casadev into development

Conflicts:
	Release/samples/Oauth2Client/Oauth2Client120/Oauth2Client120.vcxproj

Author: arturl

Build/Common.Build.settings

@@ -39,6 +39,9 @@
     <CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
     <CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>
     <CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
+    <WebsocketppIncludeDir>$(BuildRoot)\Release\libs\websocketpp</WebsocketppIncludeDir>
+    <PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\packages')">$(BuildRoot)\packages</PackagesRoot>
+    <PackagesRoot Condition="'$(PackagesRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\packages')">$(BuildRoot)\..\Tools\packages</PackagesRoot>
     <CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
     <PocoRoot Condition="'$(PocoRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)')">$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)</PocoRoot>
   </PropertyGroup>

Build/version.props

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <CppRestBaseFileName>cpprest</CppRestBaseFileName>
     <CppRestSDKVersionMajor>2</CppRestSDKVersionMajor>
-    <CppRestSDKVersionMinor>0</CppRestSDKVersionMinor>
-    <CppRestSDKVersionRevision>1</CppRestSDKVersionRevision>
+    <CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
+    <CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
   </PropertyGroup>

Build_iOS/CMakeLists.txt

@@ -35,7 +35,7 @@ execute_process(WORKING_DIRECTORY ${ARM_BINARY_DIR}
 add_custom_target(sim
   COMMAND ${CMAKE_COMMAND}
     --build ${SIM_BINARY_DIR}
-    --target casablanca
+    --target cpprest
     --config ${CMAKE_BUILD_TYPE}
   COMMENT "Building for i386 (simulator)"
   VERBATIM
@@ -45,24 +45,25 @@ add_custom_target(sim
 add_custom_target(arm
   COMMAND ${CMAKE_COMMAND}
     --build ${ARM_BINARY_DIR}
-    --target casablanca
+    --target cpprest
     --config ${CMAKE_BUILD_TYPE}
   COMMENT "Building for armv7, armv7s, arm64"
   VERBATIM
 )
 
+set(LIB_CPPREST libcpprest.a)
 add_custom_command(
-  OUTPUT libcasablanca.a
+  OUTPUT ${LIB_CPPREST}
   COMMAND lipo -create
-    -output "${CMAKE_CURRENT_BINARY_DIR}/libcasablanca.a"
-    ${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a
-    ${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a
+    -output "${CMAKE_CURRENT_BINARY_DIR}/${LIB_CPPREST}"
+    ${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
+    ${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}
   DEPENDS
     sim
     arm
-    "${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a"
-    "${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/libcasablanca.a"
+    "${SIM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
+    "${ARM_BINARY_DIR}/Binaries/${CMAKE_BUILD_TYPE}/${LIB_CPPREST}"
   VERBATIM
 )
 
-add_custom_target(casablanca ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/libcasablanca.a)
+add_custom_target(cpprest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${LIB_CPPREST})

Build_iOS/README.md

@@ -110,7 +110,7 @@ Using Casablanca
 ----------------
 You will need to link against the following from your project:
 
-  * build.ios/libcasablanca.a
+  * build.ios/libcpprest.a
   * boost.framework
   * openssl/lib/libcrypto.a
   * openssl/lib/libssl.a

Build_iOS/configure.sh

@@ -10,7 +10,7 @@ mv OpenSSL-for-iPhone/include openssl
 mv OpenSSL-for-iPhone/lib openssl
 git clone https://git.gitorious.org/boostoniphone/galbraithjosephs-boostoniphone.git boostoniphone
 pushd boostoniphone
-sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="thread filesystem regex locale system"}/g' -i .bak boost.sh
+sed -e 's/\${BOOST_LIBS:=".*"}/\${BOOST_LIBS:="random thread filesystem regex locale system"}/g' -i .bak boost.sh
 ./boost.sh
 pushd ios/framework/boost.framework/Versions/A
 mkdir Headers2

CONTRIBUTORS.txt

@@ -0,0 +1,9 @@
+Contributors should submit an update to this file with a commit in order to receive recognition. Thank you for your contributions. 
+
+
+List of Contributors
+====================
+
+Microsoft Corporation
+Brian Wengert (bwengert79)
+Leslie Brody (Les1966)

Release/CMakeLists.txt

@@ -24,7 +24,7 @@ if(IOS)
 
   set(BUILD_SHARED_LIBS OFF)
 elseif(UNIX) # This includes OSX
-  find_package(Boost COMPONENTS system thread locale regex filesystem REQUIRED)
+  find_package(Boost REQUIRED COMPONENTS random system thread locale regex filesystem)
   find_package(Threads REQUIRED)
   find_package(OpenSSL REQUIRED)
 
@@ -62,7 +62,7 @@ elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   message("-- Setting gcc options")
 
   set(WARNINGS "-Wall -Wextra -Wunused-parameter -Wcast-align -Wcast-qual -Wconversion -Wformat=2 -Winit-self -Winvalid-pch -Wmissing-format-attribute -Wmissing-include-dirs -Wpacked -Wredundant-decls -Wunreachable-code")
-  set(LINUX_SUPPRESSIONS "-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-deprecated -Wno-unused-value -Wno-unused-local-typedefs")
+  set(LINUX_SUPPRESSIONS "-Wno-deprecated -Wno-unknown-pragmas -Wno-reorder -Wno-unused-function -Wno-char-subscripts -Wno-switch -Wno-unused-but-set-parameter -Wno-unused-value -Wno-unused-local-typedefs")
 
   set(WARNINGS "${WARNINGS} ${LINUX_SUPPRESSIONS}")
   set(LD_FLAGS "${LD_FLAGS} -Wl,-z,defs")
@@ -80,10 +80,10 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
 
 # These settings can be used by the test targets
 set(Casablanca_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR})
-set(Casablanca_LIBRARY ${LIB}casablanca)
-set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
+set(Casablanca_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/libs/websocketpp)
 
+set(Casablanca_LIBRARY ${LIB}cpprest)
+set(Casablanca_LIBRARIES ${Casablanca_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK})
 
 # Everything in the project needs access to the casablanca include directories
 include_directories(${Casablanca_INCLUDE_DIRS})

Release/Makefile

@@ -63,29 +63,14 @@ typedef uint32_t HRESULT;
 #define E_NOTIMPL 0x80004001
 #define E_NOINTERFACE 0x80004002
 
-typedef unsigned long ULONG;
-typedef unsigned short WORD;
-typedef unsigned long DWORD;
-
-typedef struct _SYSTEMTIME {
-  WORD wYear;
-  WORD wMonth;
-  WORD wDayOfWeek;
-  WORD wDay;
-  WORD wHour;
-  WORD wMinute;
-  WORD wSecond;
-  WORD wMilliseconds;
-} SYSTEMTIME, *PSYSTEMTIME;
-
 #define ULARGE_INTEGER uint64_t
 #define LARGE_INTEGER int64_t
 
 #define WINAPI __stdcall
 
 #define YieldProcessor() __asm__ __volatile__ ("pause")
 
-#define UNREFERENCED_PARAMETER(x) (void)x
+#define CASABLANCA_UNREFERENCED_PARAMETER(x) (void)x
 #define _ASSERTE(x) assert(x)
 
 #ifdef CASABLANCA_DEPRECATION_NO_WARNINGS

Release/include/compat/linux_compat.h

@@ -38,6 +38,8 @@
 
 #define _noexcept 
 
+#define CASABLANCA_UNREFERENCED_PARAMETER(x) (x)
+
 #ifdef CASABLANCA_DEPRECATION_NO_WARNINGS
 #define CASABLANCA_DEPRECATED(x)
 #else