Merge from TFS

Author: ras0219-msft

Release/include/cpprest/json.h

@@ -431,7 +431,7 @@ namespace web { namespace json
         /// </summary>
         /// <param name="key">The name of the field</param>
         /// <returns>The value kept in the field; null if the field does not exist</returns>
-        CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release, use operator[] instead.")
+        CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release, use json::value::at() instead.")
         value get(const utility::string_t &key) const;
 
         /// <summary>
@@ -469,13 +469,6 @@ namespace web { namespace json
         /// <returns>A reference to the value kept in the field.</returns>
         _ASYNCRTIMP value & operator [] (const utility::string_t &key);
 
-        /// <summary>
-        /// Accesses a field of a JSON object.
-        /// </summary>
-        /// <param name="key">The name of the field</param>
-        /// <returns>A reference to the value kept in the field.</returns>
-        _ASYNCRTIMP const value & operator [] (const utility::string_t &key) const;
-
 #ifdef _MS_WINDOWS
 private:
         // Only used internally by JSON parser
@@ -492,7 +485,7 @@ namespace web { namespace json
         /// </summary>
         /// <param name="key">The index of an element in the JSON array</param>
         /// <returns>The value kept at the array index; null if outside the boundaries of the array</returns>
-        CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release, use operator[] instead.")
+        CASABLANCA_DEPRECATED("This API is deprecated and will be removed in a future release, use json::value::at() instead.")
         value get(size_t index) const;
 
         /// <summary>

Release/tests/Functional/http/listener/response_stream_tests.cpp

@@ -272,6 +272,7 @@ TEST_FIXTURE(uri_address, reply_transfer_encoding_4k)
     listener.close().wait();
 }
 
+// Fails sporadically, TFS 906957
 TEST_FIXTURE(uri_address, reply_chunked_4k)
 {
     web::http::experimental::listener::http_listener listener(m_uri);