Merge from TFS

Author: ras0219-msft

Build/version.props

@@ -8,4 +8,7 @@
     <CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
     <CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
   </PropertyGroup>
+<!--
+  Note: remember to regenerate guiddefs.wxi files using gen_guids_for_msi.ps1 whenever major or minor version file changes
+-->
 </Project>

Release/include/cpprest/asyncrt_utils.h

@@ -220,6 +220,13 @@ namespace details
 #endif
     }
 
+    // Turn const_iterator into an iterator
+    template <typename Container, typename ConstIterator>
+    typename Container::iterator remove_iterator_constness(Container& c, ConstIterator it)
+    {
+        return c.erase(it, it);
+    }
+
 #ifdef _MS_WINDOWS
 
 /// <summary>

Release/include/cpprest/http_client.h

@@ -55,16 +55,22 @@ namespace pplx = Concurrency;
 
 #include "cpprest/json.h"
 #include "cpprest/uri.h"
+#include "cpprest/web_utilities.h"
 #include "cpprest/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 
 namespace web 
-{ 
+{
 namespace http
 {
 namespace client
 {
 
+// credentials class has been moved from web::http::client namespace to web namespace.
+// The below using declarations ensure we dont break existing code.
+// Please use the web::credentials class going forward.
+using web::credentials;
+
 #ifdef _MS_WINDOWS
 namespace details {
 #ifdef __cplusplus_winrt
@@ -75,33 +81,6 @@ namespace details {
 }  
 #endif // _MS_WINDOWS
 
-/// <summary>
-/// credentials represents a set of user credentials (username and password) to be used
-/// for the client and proxy authentication
-/// </summary>
-class credentials
-{
-public:
-    credentials(utility::string_t username, utility::string_t password) :
-        m_is_set(true),
-        m_username(std::move(username)),
-        m_password(std::move(password))
-    {}
-
-    const utility::string_t& username() const { return m_username; }
-    const utility::string_t& password() const { return m_password; }
-    bool is_set() const { return m_is_set; }
-
-private:
-    friend class web_proxy;
-    friend class http_client_config;
-    credentials() : m_is_set(false) {}
-
-    utility::string_t m_username;
-    utility::string_t m_password;
-    bool m_is_set;
-};
-
 /// <summary>
 /// web_proxy represents the concept of the web proxy, which can be auto-discovered,
 /// disabled, or specified explicitly by the user

Release/include/cpprest/http_client_impl.h

@@ -24,6 +24,7 @@
 *
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
+
 #include "cpprest/http_helpers.h"
 #ifdef _MS_WINDOWS
 #if !defined(__cplusplus_winrt)
@@ -463,12 +464,6 @@ void http_client::build_pipeline(uri base_uri, http_client_config client_config)
     m_pipeline = ::web::http::http_pipeline::create_pipeline(std::make_shared<details::http_network_handler>(std::move(base_uri), std::move(client_config)));
 }
 
-pplx::task<http_response> http_client::request(http_request request, pplx::cancellation_token token)
-{
-    request._set_cancellation_token(token);
-    return m_pipeline->propagate(request);
-}
-
 const http_client_config& http_client::client_config() const
 {
     auto* ph = static_cast<details::http_network_handler*>(m_pipeline->last_stage().get());