Merge branch 'msbuild' into patch-5

3 files changed, 3 insertions, 3 deletions

diff --git a/configure b/configure
index 23df3f02c..c5c273156 100755
--- a/configure
+++ b/configure
@@ -2739,7 +2739,8 @@ done
 #
 
 # parse triplet
-# e.g. i686-linux-gnu, aarch64-apple-darwin, x86_64-w64-mingw32
+# https://github.com/xmake-io/xmake/issues/3869
+# e.g. i686-linux-gnu, aarch64-apple-darwin, x86_64-w64-mingw32, i686-redhat-linux-gnu
 _parse_triplet() {
     local triplet="${1}"
     string_split "${triplet}" "-"
@@ -2775,6 +2776,7 @@ _get_plat_from_vendor_os() {
             fi
             ;;
         w64) _ret="mingw";;
+        *) _ret="${os}";;
     esac
 }
 
diff --git a/core/src/tbox/tbox b/core/src/tbox/tbox
-Subproject 23fb0c033b30f9909efa62f8cfee7cee8d5a8dc
+Subproject 59fdba9ecadeecf3a9f3b794dac36c9f7708377
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index 64a6f5419..10ddb8dbc 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -214,8 +214,6 @@ end
 
 -- make header
 function _make_header(vcxprojfile, vsinfo)
-
-    -- make header
     vcxprojfile:print("<?xml version=\"1.0\" encoding=\"utf-8\"?>")
     vcxprojfile:enter("<Project DefaultTargets=\"Build\" ToolsVersion=\"%s.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", assert(vsinfo.project_version))
 end