MSBuild platform guessing in a shareable props file (microsoft#299)

Author: lubeltra

Include/httpClient/config.h

@@ -74,3 +74,7 @@
 
 #define HC_PLATFORM_IS_MICROSOFT \
    (HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_UWP || HC_PLATFORM == HC_PLATFORM_XDK)
+
+#if defined(HC_PLATFORM_MSBUILD_GUESS) && (HC_PLATFORM_MSBUILD_GUESS != HC_PLATFORM)
+    #error The platform guessed by MSBuild does not agree with the platform selected by config.h
+#endif

Include/httpClient/pal.h

@@ -11,7 +11,7 @@
 
 #include <httpClient/config.h>
 
-#if HC_PLATFORM == HC_PLATFORM_WIN32 || HC_PLATFORM == HC_PLATFORM_UWP || HC_PLATFORM == HC_PLATFORM_XDK
+#if HC_PLATFORM_IS_MICROSOFT
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN

libHttpClient.props

@@ -5,6 +5,11 @@
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <Import Project="$(MSBuildThisFileDirectory)platform_select.props" />
+  <PropertyGroup>
+    <HCLibPlatformType>$(HCPlatform)</HCLibPlatformType>
+  </PropertyGroup>
+
   <!-- Valid values for HCLibPlatformType:
       Android
       UWP
@@ -17,8 +22,8 @@
     <HCLibPlatformType Condition="'$(ApplicationType)'=='' AND '$(Platform)'!='Durango'">Win32</HCLibPlatformType>
     <HCLibPlatformType Condition="'$(ApplicationType)'=='' AND '$(Platform)'=='Durango'">XDK</HCLibPlatformType>
     <HCLibPlatformType Condition="'$(ApplicationType)'=='Android'">Android</HCLibPlatformType>
-  </PropertyGroup> 
-  
+  </PropertyGroup>
+
   <PropertyGroup>
     <useWsppWebsockets>false</useWsppWebsockets>
     <useWsppWebsockets Condition="'$(HCLibPlatformType)'=='Android'">true</useWsppWebsockets>

platform_select.props

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--If the HCPlatform is not set, infer it-->
+  <Choose>
+    <When Condition="'$(HCPlatform)'!=''">
+    </When>
+    <When Condition="'$(ApplicationType)'=='Android'">
+      <PropertyGroup>
+        <HCPlatform>Android</HCPlatform>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(ApplicationType)'=='Windows Store'">
+      <PropertyGroup>
+        <HCPlatform>UWP</HCPlatform>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Platform)'=='Durango'">
+      <PropertyGroup>
+        <HCPlatform>XDK</HCPlatform>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <HCPlatform>Win32</HCPlatform>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions Condition="'$(HCPlatform)'=='Android'">%(PreprocessorDefinitions);HC_PLATFORM_MSBUILD_GUESS=HC_PLATFORM_ANDROID</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(HCPlatform)'=='UWP'">%(PreprocessorDefinitions);HC_PLATFORM_MSBUILD_GUESS=HC_PLATFORM_UWP</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(HCPlatform)'=='XDK'">%(PreprocessorDefinitions);HC_PLATFORM_MSBUILD_GUESS=HC_PLATFORM_XDK</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(HCPlatform)'=='Win32'">%(PreprocessorDefinitions);HC_PLATFORM_MSBUILD_GUESS=HC_PLATFORM_WIN32</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+</Project>