From ec54a4778be22f97909ef844fb468535671ce8fd Mon Sep 17 00:00:00 2001
From: "Patrick Petrushonis (HCG)" <v-patrickpe@microsoft.com>
Date: Fri, 5 Jun 2026 13:05:08 -0700
Subject: [PATCH] GDK: add ASIO_DISABLE_SERIAL_PORT to per-file
 websocketpp_websocket.cpp defines

PR #987 set ASIO_DISABLE_SERIAL_PORT in Build/libHttpClient.GDK.props
ItemDefinitionGroup ClCompile PreprocessorDefinitions, but the per-file
override on websocketpp_websocket.cpp (Win32.Shared.vcxitems:32 and
GDK.Shared.vcxitems:39) uses %(PreprocessorDefinitions) - which does NOT
inherit the project ItemDefinitionGroup defaults across shared-items
imports. The actual CL.exe command for that TU on GDK was missing
/D ASIO_DISABLE_SERIAL_PORT (verified in PFSDKAll TestDrop 148864603
GDK x64_Debug log), so serial_port_base.hpp still compiled and failed
with C2061 'DCB' / C2065 'storage'/'ec' on GDK where WINAPI_FAMILY_GAMES
strips DCB.

Add the define unconditionally to both per-file overrides. Safe for
Win32 too - asio serial-port transport is unused by the websocketpp
provider on every platform we ship.

Follow-up to #987. Surfaced by PFSDKAll TestDrop 148864603 against
libHttpClient e79302c.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../libHttpClient.GDK.Shared.vcxitems                     | 8 +++++++-
 .../libHttpClient.Win32.Shared.vcxitems                   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Build/libHttpClient.GDK.Shared/libHttpClient.GDK.Shared.vcxitems b/Build/libHttpClient.GDK.Shared/libHttpClient.GDK.Shared.vcxitems
index af162ecf..1d43809f 100644
--- a/Build/libHttpClient.GDK.Shared/libHttpClient.GDK.Shared.vcxitems
+++ b/Build/libHttpClient.GDK.Shared/libHttpClient.GDK.Shared.vcxitems
@@ -36,7 +36,13 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Platform\Windows\PlatformTrace_Windows.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\WebSocket\Websocketpp\websocketpp_websocket.cpp" Condition="Exists('$(HCRoot)\External\boost-wintls\include\wintls.hpp') and '$(HCEnableWebSocketCompression)' == 'true'">
       <AdditionalIncludeDirectories>$(HCRoot)\External\asio\asio\include;$(HCRoot)\External\websocketpp;$(HCRoot)\External\boost-wintls\include;$(HCRoot)\External\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WEBSOCKETPP_CPP11_STL_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;HC_ENABLE_WEBSOCKET_COMPRESSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!--
+        ASIO_DISABLE_SERIAL_PORT must be set per-file here: %(PreprocessorDefinitions)
+        does not inherit ItemDefinitionGroup defaults across shared-items imports, so
+        the GDK.props-level define is dropped for this TU.
+        Safe to define unconditionally - asio serial-port transport is unused by websocketpp.
+      -->
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WEBSOCKETPP_CPP11_STL_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;HC_ENABLE_WEBSOCKET_COMPRESSION=1;ASIO_DISABLE_SERIAL_PORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/std:c++17 %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
diff --git a/Build/libHttpClient.Win32.Shared/libHttpClient.Win32.Shared.vcxitems b/Build/libHttpClient.Win32.Shared/libHttpClient.Win32.Shared.vcxitems
index 4089c9b8..e8913303 100644
--- a/Build/libHttpClient.Win32.Shared/libHttpClient.Win32.Shared.vcxitems
+++ b/Build/libHttpClient.Win32.Shared/libHttpClient.Win32.Shared.vcxitems
@@ -29,7 +29,13 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\Task\WaitTimer_win32.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)..\..\Source\WebSocket\Websocketpp\websocketpp_websocket.cpp" Condition="Exists('$(HCRoot)\External\boost-wintls\include\wintls.hpp') and '$(HCEnableWebSocketCompression)' == 'true'">
       <AdditionalIncludeDirectories>$(HCRoot)\External\asio\asio\include;$(HCRoot)\External\websocketpp;$(HCRoot)\External\boost-wintls\include;$(HCRoot)\External\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WEBSOCKETPP_CPP11_STL_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;HC_ENABLE_WEBSOCKET_COMPRESSION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <!--
+        ASIO_DISABLE_SERIAL_PORT must be set per-file here: %(PreprocessorDefinitions)
+        does not inherit ItemDefinitionGroup defaults across shared-items imports, so
+        the GDK.props-level define is dropped for this TU on GDK builds.
+        Safe to define unconditionally - asio serial-port transport is unused by websocketpp.
+      -->
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WEBSOCKETPP_CPP11_STL_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;HC_ENABLE_WEBSOCKET_COMPRESSION=1;ASIO_DISABLE_SERIAL_PORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/std:c++17 %(AdditionalOptions)</AdditionalOptions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>