From 0c8228172bee684065dd88a5c1c822901cda666e Mon Sep 17 00:00:00 2001
From: Eric Voskuil <eric@voskuil.org>
Date: Sat, 18 Jul 2026 21:59:07 -0400
Subject: [PATCH 1/4] Avoid OptionInfo name conflict.

---
 builds/msvc/vs2022/libbitcoin-network.import.props | 2 +-
 builds/msvc/vs2022/libbitcoin-system.import.props  | 2 +-
 builds/msvc/vs2026/libbitcoin-network.import.props | 2 +-
 builds/msvc/vs2026/libbitcoin-system.import.props  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/msvc/vs2022/libbitcoin-network.import.props b/builds/msvc/vs2022/libbitcoin-network.import.props
index fda00c04..b1ad8ee4 100644
--- a/builds/msvc/vs2022/libbitcoin-network.import.props
+++ b/builds/msvc/vs2022/libbitcoin-network.import.props
@@ -19,7 +19,7 @@
 
   <!-- Messages -->
 
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+  <Target Name="NetworkOptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-ssl        : $(Option-ssl)" Importance="high"/>
   </Target>
 
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
index 6d9a890f..ac07efd1 100644
--- a/builds/msvc/vs2022/libbitcoin-system.import.props
+++ b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -34,7 +34,7 @@
 
   <!-- Messages -->
 
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+  <Target Name="SystemOptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-sha        : $(Option-sha)" Importance="high"/>
     <!--<Message Text="Option-512        : $(Option-512)" Importance="high"/>-->
     <!--<Message Text="Option-256        : $(Option-256)" Importance="high"/>-->
diff --git a/builds/msvc/vs2026/libbitcoin-network.import.props b/builds/msvc/vs2026/libbitcoin-network.import.props
index fda00c04..b1ad8ee4 100644
--- a/builds/msvc/vs2026/libbitcoin-network.import.props
+++ b/builds/msvc/vs2026/libbitcoin-network.import.props
@@ -19,7 +19,7 @@
 
   <!-- Messages -->
 
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+  <Target Name="NetworkOptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-ssl        : $(Option-ssl)" Importance="high"/>
   </Target>
 
diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props
index 6d9a890f..ac07efd1 100644
--- a/builds/msvc/vs2026/libbitcoin-system.import.props
+++ b/builds/msvc/vs2026/libbitcoin-system.import.props
@@ -34,7 +34,7 @@
 
   <!-- Messages -->
 
-  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+  <Target Name="SystemOptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-sha        : $(Option-sha)" Importance="high"/>
     <!--<Message Text="Option-512        : $(Option-512)" Importance="high"/>-->
     <!--<Message Text="Option-256        : $(Option-256)" Importance="high"/>-->

From 84af09776594a3d1c7359aefc87a541b82c8a461 Mon Sep 17 00:00:00 2001
From: Eric Voskuil <eric@voskuil.org>
Date: Sat, 18 Jul 2026 22:21:38 -0400
Subject: [PATCH 2/4] Set vs .props Option-sha/ssl defaults only if not set.

---
 builds/msvc/vs2022/libbitcoin-network.import.props | 2 +-
 builds/msvc/vs2022/libbitcoin-system.import.props  | 2 +-
 builds/msvc/vs2026/libbitcoin-network.import.props | 2 +-
 builds/msvc/vs2026/libbitcoin-system.import.props  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/builds/msvc/vs2022/libbitcoin-network.import.props b/builds/msvc/vs2022/libbitcoin-network.import.props
index b1ad8ee4..d2b892a1 100644
--- a/builds/msvc/vs2022/libbitcoin-network.import.props
+++ b/builds/msvc/vs2022/libbitcoin-network.import.props
@@ -14,7 +14,7 @@
   <!-- Options -->
 
   <PropertyGroup>
-    <Option-ssl>true</Option-ssl>
+    <Option-ssl Condition="'$(Option-ssl)' == ''">true</Option-ssl>
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props
index ac07efd1..bbf13a73 100644
--- a/builds/msvc/vs2022/libbitcoin-system.import.props
+++ b/builds/msvc/vs2022/libbitcoin-system.import.props
@@ -20,7 +20,7 @@
     <!--<Option-512>false</Option-512>-->
     <!--<Option-256>true</Option-256>-->
     <!--<Option-128>true</Option-128>-->
-    <Option-sha>false</Option-sha>
+    <Option-sha Condition="'$(Option-sha)' == ''">false</Option-sha>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
diff --git a/builds/msvc/vs2026/libbitcoin-network.import.props b/builds/msvc/vs2026/libbitcoin-network.import.props
index b1ad8ee4..d2b892a1 100644
--- a/builds/msvc/vs2026/libbitcoin-network.import.props
+++ b/builds/msvc/vs2026/libbitcoin-network.import.props
@@ -14,7 +14,7 @@
   <!-- Options -->
 
   <PropertyGroup>
-    <Option-ssl>true</Option-ssl>
+    <Option-ssl Condition="'$(Option-ssl)' == ''">true</Option-ssl>
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2026/libbitcoin-system.import.props b/builds/msvc/vs2026/libbitcoin-system.import.props
index ac07efd1..bbf13a73 100644
--- a/builds/msvc/vs2026/libbitcoin-system.import.props
+++ b/builds/msvc/vs2026/libbitcoin-system.import.props
@@ -20,7 +20,7 @@
     <!--<Option-512>false</Option-512>-->
     <!--<Option-256>true</Option-256>-->
     <!--<Option-128>true</Option-128>-->
-    <Option-sha>false</Option-sha>
+    <Option-sha Condition="'$(Option-sha)' == ''">false</Option-sha>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>

From 879092e8d966eb184310b3094f431267175f3049 Mon Sep 17 00:00:00 2001
From: Eric Voskuil <eric@voskuil.org>
Date: Sat, 18 Jul 2026 22:31:59 -0400
Subject: [PATCH 3/4] Integrate Option-arch into Release and Messages.

---
 builds/msvc/properties/Messages.props |  1 +
 builds/msvc/properties/Release.props  | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/builds/msvc/properties/Messages.props b/builds/msvc/properties/Messages.props
index 034c6105..a66b49ff 100644
--- a/builds/msvc/properties/Messages.props
+++ b/builds/msvc/properties/Messages.props
@@ -11,6 +11,7 @@
     <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
     <Message Text="Configuration     : $(Configuration)" Importance="high"/>
     <Message Text="Processor         : $(ProcessorArchitecture)" Importance="high"/>
+    <Message Text="Architecture      : $(Option-arch)" Importance="high"/>
     <Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
   </Target>
 
diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props
index 05e34a28..e95049ba 100644
--- a/builds/msvc/properties/Release.props
+++ b/builds/msvc/properties/Release.props
@@ -10,6 +10,11 @@
     <DebugOrRelease>Release</DebugOrRelease>
     <!--<LinkIncremental>false</LinkIncremental>-->
   </PropertyGroup>
+
+  <!-- Overridable per machine (e.g. Directory.Build.props above repos, or environment). -->
+  <PropertyGroup>
+    <Option-arch Condition="'$(Option-arch)' == ''">AdvancedVectorExtensions2</Option-arch>
+  </PropertyGroup>
   
   <!-- DebugInformationFormat and GenerateDebugInformation were formerly disabled. -->
   <!-- This is why we were not getting symbols in release builds (update nuget). -->
@@ -29,10 +34,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <Optimization>MaxSpeed</Optimization>
 
-      <!-- SSE4/AVX2 (also AVX512) -->
-      <!--TODO: these should be integrated with the HAVE build options.-->
-      <!--<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>-->
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet>$(Option-arch)</EnableEnhancedInstructionSet>
   
       <!-- Other. -->
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

From ea1d7b842f7b476b9de197ff34c721183099cbdd Mon Sep 17 00:00:00 2001
From: Eric Voskuil <eric@voskuil.org>
Date: Sat, 18 Jul 2026 22:52:02 -0400
Subject: [PATCH 4/4] Map vs props Option-arch to name (for proper display).

---
 builds/msvc/properties/Release.props | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props
index e95049ba..fcfac109 100644
--- a/builds/msvc/properties/Release.props
+++ b/builds/msvc/properties/Release.props
@@ -34,7 +34,14 @@
       <OmitFramePointers>true</OmitFramePointers>
       <Optimization>MaxSpeed</Optimization>
 
-      <EnableEnhancedInstructionSet>$(Option-arch)</EnableEnhancedInstructionSet>
+      <!-- Literal (not macro) values retain property page presentation text. -->
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'NotSet'">NotSet</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'NoExtensions'">NoExtensions</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'StreamingSIMDExtensions'">StreamingSIMDExtensions</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'StreamingSIMDExtensions2'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'AdvancedVectorExtensions'">AdvancedVectorExtensions</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'AdvancedVectorExtensions2'">AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
+      <EnableEnhancedInstructionSet Condition="'$(Option-arch)' == 'AdvancedVectorExtensions512'">AdvancedVectorExtensions512</EnableEnhancedInstructionSet>
   
       <!-- Other. -->
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>