From f626d52e3702eb2e4975752262a999c602263870 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Tue, 3 Feb 2026 23:59:15 +0100
Subject: [PATCH] VS 2026 toolsets may not define PlatformToolsetVersion

---
 builds/msvc/properties/Common.props | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props
index 17b42843..3090a551 100644
--- a/builds/msvc/properties/Common.props
+++ b/builds/msvc/properties/Common.props
@@ -10,6 +10,13 @@
     <Import Project="$(Platform).props" />
   </ImportGroup>  
 
+  <PropertyGroup>
+    <!-- VS 2026 toolsets may not define PlatformToolsetVersion. Derive it from PlatformToolset when needed. -->
+    <_SodiumToolsetVersion Condition="'$(PlatformToolsetVersion)' != ''">$(PlatformToolsetVersion)</_SodiumToolsetVersion>
+    <_SodiumToolsetVersion Condition="'$(PlatformToolsetVersion)' == '' and $(PlatformToolset.StartsWith('v'))">$(PlatformToolset.Substring(1))</_SodiumToolsetVersion>
+    <_SodiumToolsetVersion Condition="'$(_SodiumToolsetVersion)' == ''">0</_SodiumToolsetVersion>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -18,10 +25,10 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <ItemDefinitionGroup Condition="'$(PlatformToolsetVersion)' &gt;= '143'">
+  <ItemDefinitionGroup Condition="$(_SodiumToolsetVersion) &gt;= 143">
     <ClCompile>
       <AdditionalOptions>/UndefIntOverflow- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
   </ItemDefinitionGroup>
 
-</Project>
\ No newline at end of file
+</Project>