Sync to TFS

Author: ras0219-msft

Build/Common.Build.settings

@@ -35,9 +35,6 @@
   <PropertyGroup>
     <OutputPath>$(BuildRoot)\Binaries\$(Platform)\$(Configuration)\</OutputPath>
     <OutDir>$(OutputPath)</OutDir>
-    <MSBuildCommunityTasksPath Condition="'$(MSBuildCommunityTasksPath)'==''">$(BuildRoot)\Build\MSBuild.Community.Tasks</MSBuildCommunityTasksPath>
-    <WixToolPath Condition="'$(WixToolPath)'==''">$(BuildRoot)\Build\Wix\3.6\</WixToolPath>
-    <WixExtDir Condition="'$(WixExtDir)'==''">$(WixToolPath)</WixExtDir>
     <TestRoot>$(BuildRoot)\Release\Tests</TestRoot>
     <CasablancaSrcDir>$(BuildRoot)\Release\src</CasablancaSrcDir>
     <CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>
@@ -66,11 +63,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
 
-    <WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
-    <WixTasksPath >$(WixToolPath)WixTasks.dll</WixTasksPath>
-    <LuxTargetsPath>$(WixToolPath)Lux.targets</LuxTargetsPath>
-    <LuxTasksPath >$(WixToolPath)LuxTasks.dll</LuxTasksPath>
-
     <!--For C#:-->
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <!-- RunCodeAnalysis, false by default, is set true as necessary from the msbuild command line. -->
@@ -194,8 +186,6 @@
     <DefineConstants>TRACE;ARM</DefineConstants>
   </PropertyGroup>
 
-
-  
   <!--end paths configuration -->
   <Target Name="CopyToOutputDirectoryAlwaysError"
           Condition="'@(Content)'!='' or '@(None)'!=''">

Release/include/compat/linux_compat.h

@@ -88,6 +88,12 @@ typedef struct _SYSTEMTIME {
 #define UNREFERENCED_PARAMETER(x) (void)x
 #define _ASSERTE(x) assert(x)
 
+#ifdef CASABLANCA_DEPRECATION_NO_WARNINGS
+#define CASABLANCA_DEPRECATED(x)
+#else
+#define CASABLANCA_DEPRECATED(x) __attribute__((deprecated(x)))
+#endif
+
 #include <string>
 
 typedef char16_t utf16char;

Release/include/compat/windows_compat.h

@@ -38,6 +38,12 @@
 
 #define _noexcept 
 
+#ifdef CASABLANCA_DEPRECATION_NO_WARNINGS
+#define CASABLANCA_DEPRECATED(x)
+#else
+#define CASABLANCA_DEPRECATED(x) __declspec(deprecated(x))
+#endif
+
 typedef wchar_t utf16char;
 typedef std::wstring utf16string;
 typedef std::wstringstream utf16stringstream;

Release/include/cpprest/http_client.h

@@ -112,13 +112,39 @@ class web_proxy
 public:
     enum web_proxy_mode{ use_default = use_default_, use_auto_discovery = use_auto_discovery_, disabled  = disabled_};
 
+    /// <summary>
+    /// Constructs a proxy with the default settings.
+    /// </summary>
     web_proxy() : m_address(_XPLATSTR("")), m_mode(use_default_) {}
+    
+    /// <summary>
+    /// Creates a proxy with specified mode.
+    /// </summary>
+    /// <param name="mode">Mode to use.</param>
     web_proxy( web_proxy_mode mode ) : m_address(_XPLATSTR("")), m_mode(static_cast<web_proxy_mode_internal>(mode)) {}
+    
+    /// <summary>
+    /// Creates a proxy explicitly with provided address.
+    /// </summary>
+    /// <param name="address">Proxy URI to use.</param>
     web_proxy( http::uri address ) : m_address(address), m_mode(user_provided_) {}
 
+    /// <summary>
+    /// Gets this proxy's URI address. Returns an empty URI if not explicitly set by user.
+    /// </summary>
+    /// <returns>A reference to this proxy's URI.</returns>
     const http::uri& address() const { return m_address; }
 
+    /// <summary>
+    /// Gets the credentials used for authentication with this proxy.
+    /// </summary>
+    /// <returns>Credentials to for this proxy.</returns>
     const http::client::credentials& credentials() const { return m_credentials; }
+    
+    /// <summary>
+    /// Sets the credentials to use for authentication with this proxy.
+    /// </summary>
+    /// <param name="cred">Credentials to use for this proxy.</param>
     void set_credentials(http::client::credentials cred) {
         if( m_mode == disabled_ )
         {
@@ -127,9 +153,28 @@ class web_proxy
         m_credentials = std::move(cred);
     }
 
+    /// <summary>
+    /// Checks if this proxy was constructed with default settings.
+    /// </summary>
+    /// <returns>True if default, false otherwise.</param>
     bool is_default() const { return m_mode == use_default_; }
+
+    /// <summary>
+    /// Checks if using a proxy is disabled.
+    /// </summary>
+    /// <returns>True if disabled, false otherwise.</returns>
     bool is_disabled() const { return m_mode == disabled_; }
+
+    /// <summary>
+    /// Checks if the auto discovery protocol, WPAD, is to be used.
+    /// </summary>
+    /// <returns>True if auto discovery enabled, false otherwise.</returns>
     bool is_auto_discovery() const { return m_mode == use_auto_discovery_; }
+    
+    /// <summary>
+    /// Checks if a proxy address is explicitly specified by the user.
+    /// </summary>
+    /// <returns>True if a proxy address was explicitly specified, false otherwise.</returns> 
     bool is_specified() const { return m_mode == user_provided_; }
 
 private:

Release/include/cpprest/http_msg.h

@@ -790,7 +790,7 @@ class http_response
     /// </remarks>
     void set_body(const json::value &body_data)
     {
-        auto body_text = utility::conversions::to_utf8string(body_data.to_string());
+        auto body_text = utility::conversions::to_utf8string(body_data.serialize());
         auto length = body_text.size();
         set_body(concurrency::streams::bytestream::open_istream(std::move(body_text)), length, _XPLATSTR("application/json"));
     }
@@ -1169,7 +1169,7 @@ class http_request
     /// </remarks>
     void set_body(const json::value &body_data)
     {
-        auto body_text = utility::conversions::to_utf8string(body_data.to_string());
+        auto body_text = utility::conversions::to_utf8string(body_data.serialize());
         auto length = body_text.size();
         set_body(concurrency::streams::bytestream::open_istream(std::move(body_text)), length, _XPLATSTR("application/json"));
     }