honor runtime from profile

Author: SpaceIm

recipes/libsodium/all/conanfile.py

@@ -123,25 +123,53 @@ def _msvc_sln_folder(self):
     def _build_msvc(self):
         msvc_builds_folder = os.path.join(self.source_folder, "builds", "msvc")
         msvc_sln_folder = os.path.join(msvc_builds_folder, self._msvc_sln_folder)
+        vcxproj_path = os.path.join(msvc_sln_folder, "libsodium", "libsodium.vcxproj")
 
         # 1.0.18 only supported up to vs2019. Add support for newer toolsets.
         if self.version == "1.0.18" and self._msvc_sln_folder == "vs2019":
             toolset = MSBuildToolchain(self).toolset
             replace_in_file(
-                self, os.path.join(msvc_sln_folder, "libsodium", "libsodium.vcxproj"),
-                f"<PlatformToolset>v142</PlatformToolset>",
+                self, vcxproj_path,
+                "<PlatformToolset>v142</PlatformToolset>",
                 f"<PlatformToolset>{toolset}</PlatformToolset>",
             )
 
-        # There is no automagic interaction between MSBuildToolchain & MSBuild helper,
-        # props file generated by MSBuildToolchain must be manually injected by any means.
+        # FIXME: There is currently no guarantee from new MSBuild helper that props files
+        # generated by MSBuildToolchain and MSBuildDeps have precedence over custom values of project.
+        # Therefore conantoolchain.props is injected manually before Microsoft.Cpp.Default.props like it was done
+        # with /p:ForceImportBeforeCppTargets in legacy MSBuild helper.
+        # see:
+        #  - https://learn.microsoft.com/en-us/cpp/build/modify-project-properties-without-changing-project-file
+        #  - https://github.com/conan-io/conan/issues/12155
         conantoolchain_props = os.path.join(self.generators_folder, "conantoolchain.props")
         replace_in_file(
-            self, os.path.join(msvc_builds_folder, "properties", "Common.props"),
-            "<ImportGroup Label=\"PropertySheets\">",
-            f"<ImportGroup Label=\"PropertySheets\"><Import Project=\"{conantoolchain_props}\" />",
+            self, vcxproj_path,
+            "<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />",
+            f"<Import Project=\"{conantoolchain_props}\" />\n<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />",
         )
 
+        # Honor runtime library from profile
+        runtime_library = MSBuildToolchain(self).runtime_library
+        for prop_file, runtime_library_old in [
+            ("DebugDEXE.props", "MultiThreadedDebugDLL"),
+            ("DebugDLL.props", "MultiThreadedDebugDLL"),
+            ("DebugLEXE.props", "MultiThreadedDebug"),
+            ("DebugLIB.props", "MultiThreadedDebug"),
+            ("DebugLTCG.props", "MultiThreadedDebug"),
+            ("DebugSEXE.props", "MultiThreadedDebug"),
+            ("ReleaseDEXE.props", "MultiThreadedDLL"),
+            ("ReleaseDLL.props", "MultiThreadedDLL"),
+            ("ReleaseLEXE.props", "MultiThreaded"),
+            ("ReleaseLIB.props", "MultiThreaded"),
+            ("ReleaseLTCG.props", "MultiThreaded"),
+            ("ReleaseSEXE.props", "MultiThreaded"),
+        ]:
+            replace_in_file(
+                self, os.path.join(msvc_builds_folder, "properties", prop_file),
+                f"<RuntimeLibrary>{runtime_library_old}</RuntimeLibrary>",
+                f"<RuntimeLibrary>{runtime_library}</RuntimeLibrary>",
+            )
+
         msbuild = MSBuild(self)
         build_type = "{}{}".format(
             "Dyn" if self.options.shared else "Static",