Fixed issues with TFS Sync

Author: ras0219-msft

Release/include/cpprest/ws_client.h

@@ -255,14 +255,14 @@ class websocket_client
     /// Creates a new websocket_client to connect to the specified uri.
     /// </summary>
     /// <param name="base_uri">A string representation of the base uri to be used for all messages. Must start with either "ws://" or "wss://"</param>
-    _ASYNCRTIMP websocket_client(uri base_uri);
+    _ASYNCRTIMP websocket_client(web::uri base_uri);
 
     /// <summary>
     /// Creates a new websocket_client to connect to the specified uri.
     /// </summary>
     /// <param name="base_uri">A string representation of the base uri to be used for all requests. Must start with either "ws://" or "wss://"</param>
     /// <param name="client_config">The client configuration object containing the possible configuration options to intitialize the <c>websocket_client</c>. </param>
-    _ASYNCRTIMP websocket_client(uri base_uri, websocket_client_config client_config);
+    _ASYNCRTIMP websocket_client(web::uri base_uri, websocket_client_config client_config);
 
     /// <summary>
     /// </summary>
@@ -319,7 +319,7 @@ class websocket_client
     /// <param name="close_status">Endpoint MAY use the following pre-defined status codes when sending a Close frame.</param>
     /// <param name="close_reason">While closing an established connection, an endpoint may indicate the reason for closure.</param>
     /// <returns>An asynchronous operation that is completed the connection has been successfully closed.</returns>
-    pplx::task<void> websocket_client::close(websocket_close_status close_status, const utility::string_t& close_reason=_XPLATSTR(""))
+    pplx::task<void> close(websocket_close_status close_status, const utility::string_t& close_reason=_XPLATSTR(""))
     { 
         return m_client->close(close_status, close_reason); 
     }
@@ -330,7 +330,7 @@ class websocket_client
     /// <returns>
     /// A base uri initialized in constructor
     /// </return>
-    const uri& uri() const
+    const web::uri& uri() const
     {
         return m_client->uri();
     }

Release/samples/BingRequest/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_executable(BingRequest ../../collateral/Samples/BingRequest/bingrequest.cpp)
+add_executable(BingRequest bingrequest.cpp)
 target_link_libraries(BingRequest ${Casablanca_LIBRARIES})

Release/samples/BlackJack/BlackJack_Client/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_executable(blackjackclient
-  ../../../collateral/Samples/BlackJack/BlackJack_Client/BlackJackClient.cpp
-  ../../../collateral/Samples/BlackJack/BlackJack_Client/stdafx.cpp
+  BlackJackClient.cpp
+  stdafx.cpp
   )
 
 target_link_libraries(blackjackclient ${Casablanca_LIBRARIES})

Release/samples/BlackJack/BlackJack_Server/CMakeLists.txt

@@ -1,10 +1,10 @@
 add_definitions(-Wno-sign-compare -Wno-enum-compare)
 
 add_executable(blackjackserver
-  ../../../collateral/Samples/BlackJack/BlackJack_Server/BlackJack_Server.cpp
-  ../../../collateral/Samples/BlackJack/BlackJack_Server/Dealer.cpp
-  ../../../collateral/Samples/BlackJack/BlackJack_Server/stdafx.cpp
-  ../../../collateral/Samples/BlackJack/BlackJack_Server/Table.cpp
+  BlackJack_Server.cpp
+  Dealer.cpp
+  stdafx.cpp
+  Table.cpp
   )
 
 target_link_libraries(blackjackserver ${Casablanca_LIBRARIES})

Release/samples/SearchFile/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_executable(SearchFile ../../collateral/Samples/SearchFile/searchfile.cpp)
+add_executable(SearchFile searchfile.cpp)
 target_link_libraries(SearchFile ${Casablanca_LIBRARIES})