Merge branch 'development' of https://git01.codeplex.com/forks/stevetgates/stgatesdev into development

Author: stgates

Release/include/cpprest/xxpublic.h

@@ -47,7 +47,9 @@
 // for guids, used in comm.h
 #if defined(MS_TARGET_APPLE)
 #include "cpprest/details/apple_compat.h"
-#elif !defined(_MS_WINDOWS)
+#elif defined(_MS_WINDOWS)
+#include "cpprest/details/windows_compat.h"
+#else
 #include "boost/uuid/uuid.hpp"
 #endif
 

Release/src/build/vs12.wps81/casablanca120.wps81.vcxproj

@@ -32,7 +32,7 @@
     <DebugFileSuffix>d</DebugFileSuffix>
   </PropertyGroup>
   <PropertyGroup>
-    <TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_wp81_$(CppRestSDKVersionFileSuffix)</TargetName>
+    <TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_wps81_$(CppRestSDKVersionFileSuffix)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>