Removing some unnecssary MSC_VER macros as VS2012 is no longer supported.

Author: stgates

Release/include/cpprest/details/http_client_impl.h

@@ -442,7 +442,7 @@ void http_client::build_pipeline(const uri &base_uri, const http_client_config &
         m_pipeline = ::web::http::http_pipeline::create_pipeline(std::make_shared<details::http_network_handler>(base_uri, client_config));
     }
 
-#if !defined(CPPREST_TARGET_XP) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP || _MSC_VER > 1700)
+#if !defined(CPPREST_TARGET_XP)
     add_handler(std::static_pointer_cast<http::http_pipeline_stage>(
         std::make_shared<oauth1::details::oauth1_handler>(client_config.oauth1())));
 #endif

Release/include/cpprest/details/web_utilities.h

@@ -48,7 +48,6 @@ typedef std::unique_ptr<::utility::string_t, zero_memory_deleter> plaintext_stri
 
 #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
 #if defined(__cplusplus_winrt)
-#if !(WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800)
 class winrt_encryption
 {
 public:
@@ -58,7 +57,6 @@ class winrt_encryption
 private:
     ::pplx::task<Windows::Storage::Streams::IBuffer ^> m_buffer;
 };
-#endif
 #else
 class win32_encryption
 {
@@ -111,11 +109,7 @@ class credentials
         utility::string_t password() const
     {
 #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
-#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800
-        return m_password;
-#else
         return utility::string_t(*m_password.decrypt());
-#endif
 #else
         return m_password;
 #endif
@@ -135,13 +129,9 @@ class credentials
 
     details::plaintext_string decrypt() const
     {
-        // Encryption APIs not supported on Windows Phone 8.0 or XP
+        // Encryption APIs not supported on XP
 #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
-#if defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800
-        return details::plaintext_string(new ::utility::string_t(m_password));
-#else
         return m_password.decrypt();
-#endif
 #else
         return details::plaintext_string(new ::utility::string_t(m_password));
 #endif
@@ -151,11 +141,7 @@ class credentials
 
 #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
 #if defined(__cplusplus_winrt)
-#if WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800
-    ::utility::string_t m_password;
-#else
     details::winrt_encryption m_password;
-#endif
 #else
     details::win32_encryption m_password;
 #endif

Release/include/cpprest/http_client.h

@@ -51,7 +51,7 @@ typedef void* native_handle;}}}
 #include "cpprest/details/basic_types.h"
 #include "cpprest/asyncrt_utils.h"
 
-#if !defined(CPPREST_TARGET_XP) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP || _MSC_VER > 1700)
+#if !defined(CPPREST_TARGET_XP)
 #include "cpprest/oauth1.h"
 #endif
 
@@ -94,7 +94,7 @@ class http_client_config
     {
     }
 
-#if !defined(CPPREST_TARGET_XP) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP || _MSC_VER > 1700)
+#if !defined(CPPREST_TARGET_XP)
     /// <summary>
     /// Get OAuth 1.0 configuration.
     /// </summary>
@@ -307,7 +307,7 @@ class http_client_config
     }
 
 private:
-#if !defined(CPPREST_TARGET_XP) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP || _MSC_VER > 1700)
+#if !defined(CPPREST_TARGET_XP)
     std::shared_ptr<oauth1::experimental::oauth1_config> m_oauth1;
 #endif
 

Release/src/http/oauth/oauth1.cpp

@@ -25,7 +25,7 @@
 
 #include "stdafx.h"
 
-#if !defined(CPPREST_TARGET_XP) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP || _MSC_VER > 1700)
+#if !defined(CPPREST_TARGET_XP)
 
 using namespace utility;
 using web::http::client::http_client;

Release/src/utilities/web_utilities.cpp

@@ -40,9 +40,6 @@ namespace details
 #if defined(_WIN32) && !defined(CPPREST_TARGET_XP)
 #if defined(__cplusplus_winrt)
 
-// Not available on Windows Phone 8.0
-#if !(WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP && _MSC_VER < 1800)
-
 // Helper function to zero out memory of an IBuffer.
 void winrt_secure_zero_buffer(Windows::Storage::Streams::IBuffer ^buffer)
 {
@@ -101,8 +98,9 @@ plaintext_string winrt_encryption::decrypt() const
     SecureZeroMemory(rawPlaintext, plaintext->Length);
     return std::move(data);
 }
-#endif
+
 #else
+
 win32_encryption::win32_encryption(const std::wstring &data) :
     m_numCharacters(data.size())
 {