diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebb63f23..974b6cc4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,13 +176,6 @@ include(${CMAKE_SOURCE_DIR}/cmake/x_3rd.cmake)
 include(${CMAKE_SOURCE_DIR}/cmake/x_qt.cmake)
 message(STATUS "[xTools]Link libraries: ${X_LIBS}")
 
-# --------------------------------------------------------------------------------------------------
-# xApplications selector(just for Qt6.8.0 or later)
-include(${CMAKE_SOURCE_DIR}/xapps/xApp.cmake)
-if(NOT ${X_APP} STREQUAL "xTools")
-  return()
-endif()
-
 # --------------------------------------------------------------------------------------------------
 # if X_LATEST_GIT_TAG contain "v", remove it...
 if(NOT X_LATEST_GIT_TAG)
@@ -193,6 +186,13 @@ if(X_LATEST_GIT_TAG MATCHES "^v[0-9].*")
   string(SUBSTRING ${X_LATEST_GIT_TAG} 1 -1 X_LATEST_GIT_TAG)
 endif()
 
+# --------------------------------------------------------------------------------------------------
+# xApplications selector(just for Qt6.8.0 or later)
+include(${CMAKE_SOURCE_DIR}/xapps/xApp.cmake)
+if(NOT ${X_APP} STREQUAL "xTools")
+  return()
+endif()
+
 # --------------------------------------------------------------------------------------------------
 # xTools application
 set(bin ${X_BINS_DIR}/xTools)
diff --git a/xapps/xassistant/xAssistant.cmake b/xapps/xassistant/xAssistant.cmake
index 0f8352b7..45f8bfd5 100644
--- a/xapps/xassistant/xAssistant.cmake
+++ b/xapps/xassistant/xAssistant.cmake
@@ -39,7 +39,7 @@ endif()
 
 # --------------------------------------------------------------------------------------------------
 # Make installer for Windows
-set(X_ASSISTANT_VERSION "1.3.0")
+set(X_ASSISTANT_VERSION ${X_LATEST_GIT_TAG})
 add_compile_definitions(X_ASSISTANT_VERSION="${X_ASSISTANT_VERSION}")
 if(WIN32)
   include(${CMAKE_SOURCE_DIR}/cmake/msix/msix.cmake)