diff --git a/cmake/versiontools.cmake b/cmake/versiontools.cmake
index e27fa02aa63..c664b6e855d 100644
--- a/cmake/versiontools.cmake
+++ b/cmake/versiontools.cmake
@@ -1,118 +1,118 @@
 
 find_package(Git)
 
-if( EXISTS ${SURGESRC}/VERSION_GIT_INFO )
-  message( STATUS "VERSION_GIT_INFO file is present; using that rather than git query" )
-  # Line 2 is the branch, line 3 is the hash
-  execute_process(
-    COMMAND sed -n "2p" ${SURGESRC}/VERSION_GIT_INFO
-    WORKING_DIRECTORY ${SURGESRC}
-    OUTPUT_VARIABLE GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+if (EXISTS ${SURGESRC}/VERSION_GIT_INFO)
+    message(STATUS "VERSION_GIT_INFO file is present; using that rather than git query")
+    # Line 2 is the branch, line 3 is the hash
+    execute_process(
+            COMMAND sed -n "2p" ${SURGESRC}/VERSION_GIT_INFO
+            WORKING_DIRECTORY ${SURGESRC}
+            OUTPUT_VARIABLE GIT_BRANCH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-  execute_process(
-    COMMAND sed -n "3p" ${SURGESRC}/VERSION_GIT_INFO
-    WORKING_DIRECTORY ${SURGESRC}
-    OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+    execute_process(
+            COMMAND sed -n "3p" ${SURGESRC}/VERSION_GIT_INFO
+            WORKING_DIRECTORY ${SURGESRC}
+            OUTPUT_VARIABLE GIT_COMMIT_HASH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-elseif( Git_FOUND )
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${SURGESRC}
-    OUTPUT_VARIABLE GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+elseif (Git_FOUND)
+    execute_process(
+            COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+            WORKING_DIRECTORY ${SURGESRC}
+            OUTPUT_VARIABLE GIT_BRANCH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
 
-  execute_process(
-    COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-    WORKING_DIRECTORY ${SURGESRC}
-    OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+    execute_process(
+            COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+            WORKING_DIRECTORY ${SURGESRC}
+            OUTPUT_VARIABLE GIT_COMMIT_HASH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-endif()
+endif ()
 
-if("${GIT_BRANCH}" STREQUAL "")
-  message(WARNING "Could not determine Git branch, using placeholder.")
-  set(GIT_BRANCH "git-no-branch")
-endif()
+if ("${GIT_BRANCH}" STREQUAL "")
+    message(WARNING "Could not determine Git branch, using placeholder.")
+    set(GIT_BRANCH "git-no-branch")
+endif ()
 if ("${GIT_COMMIT_HASH}" STREQUAL "")
-  message(WARNING "Could not determine Git commit hash, using placeholder.")
-  set(GIT_COMMIT_HASH "git-no-commit")
-endif()
-
-if( WIN32 )
-  set( SURGE_BUILD_ARCH "x86" )
-else()
-  execute_process(
-    COMMAND uname -m
-    OUTPUT_VARIABLE SURGE_BUILD_ARCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-endif()
-
-cmake_host_system_information(RESULT SURGE_BUILD_FQDN QUERY FQDN )
-
-message( STATUS "Setting up surge version" )
-message( STATUS "  git hash is ${GIT_COMMIT_HASH} and branch is ${GIT_BRANCH}" )
-message( STATUS "  buildhost is ${SURGE_BUILD_FQDN}" )
-message( STATUS "  buildarch is ${SURGE_BUILD_ARCH}" )
-
-if( ${AZURE_PIPELINE} )
-  message( STATUS "Azure Pipeline Build" )
-  set( lpipeline "pipeline" )
-else()
-  message( STATUS "Developer Local Build" )
-  set( lpipeline "local" )
-endif()
-
-if(${GIT_BRANCH} STREQUAL "main" )
-  if( ${AZURE_PIPELINE} )
-    set( lverpatch "nightly" )
-  else()
-    set( lverpatch "main" )
-  endif()
-  set( lverrel "999" )
-  set( fverpatch ${lverpatch} )
-else()
-  string( FIND ${GIT_BRANCH} "release/" RLOC )
-  if( ${RLOC} EQUAL 0 )
-    message( STATUS "Configuring a Release Build from '${GIT_BRANCH}'" )
-    string( SUBSTRING ${GIT_BRANCH} 11 100 RV ) # that's release slash 1.7.
-    string( FIND ${RV} "." DLOC )
-    if( NOT ( DLOC EQUAL -1 ) )
-      math( EXPR DLP1 "${DLOC} + 1" )
-      string( SUBSTRING ${RV} ${DLP1} 100 LRV ) # skip that first dots
-      set( lverrel ${LRV} )
-    else()
-      set( lverrel "99" )
-    endif()
-    set( lverpatch "stable-${lverrel}" )
-    set( fverpatch "${lverrel}" )
-  else()
-    set( lverpatch ${GIT_BRANCH} )
-    set( fverpatch ${lverpatch} )
-    set( lverrel "1000" )
-  endif()
-endif()
-
-set( SURGE_FULL_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${fverpatch}.${GIT_COMMIT_HASH}" )
-set( SURGE_MAJOR_VERSION "${PROJECT_VERSION_MAJOR}" )
-set( SURGE_SUB_VERSION "${PROJECT_VERSION_MINOR}" )
-set( SURGE_RELEASE_VERSION "${lverpatch}" )
-set( SURGE_RELEASE_NUMBER "${lverrel}" )
-set( SURGE_BUILD_HASH "${GIT_COMMIT_HASH}" )
-set( SURGE_BUILD_LOCATION "${lpipeline}" )
-
-string( TIMESTAMP SURGE_BUILD_DATE "%Y-%m-%d" )
-string( TIMESTAMP SURGE_BUILD_YEAR "%Y" )
-string( TIMESTAMP SURGE_BUILD_TIME "%H:%M:%S" )
-
-message( STATUS "Using SURGE_VERSION=${SURGE_FULL_VERSION}" )
-
-message( STATUS "Configuring ${SURGEBLD}/geninclude/version.cpp" )
-configure_file( ${SURGESRC}/src/common/version.cpp.in
-  ${SURGEBLD}/geninclude/version.cpp )
+    message(WARNING "Could not determine Git commit hash, using placeholder.")
+    set(GIT_COMMIT_HASH "git-no-commit")
+endif ()
+
+if (WIN32)
+    set(SURGE_BUILD_ARCH "x86")
+else ()
+    execute_process(
+            COMMAND uname -m
+            OUTPUT_VARIABLE SURGE_BUILD_ARCH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+endif ()
+
+cmake_host_system_information(RESULT SURGE_BUILD_FQDN QUERY FQDN)
+
+message(STATUS "Setting up surge version")
+message(STATUS "  git hash is ${GIT_COMMIT_HASH} and branch is ${GIT_BRANCH}")
+message(STATUS "  buildhost is ${SURGE_BUILD_FQDN}")
+message(STATUS "  buildarch is ${SURGE_BUILD_ARCH}")
+
+if (${AZURE_PIPELINE})
+    message(STATUS "Azure Pipeline Build")
+    set(lpipeline "pipeline")
+else ()
+    message(STATUS "Developer Local Build")
+    set(lpipeline "local")
+endif ()
+
+if (${GIT_BRANCH} STREQUAL "main")
+    if (${AZURE_PIPELINE})
+        set(lverpatch "nightly")
+    else ()
+        set(lverpatch "main")
+    endif ()
+    set(lverrel "999")
+    set(fverpatch ${lverpatch})
+else ()
+    string(FIND ${GIT_BRANCH} "release-xt/" RLOC)
+    if (${RLOC} EQUAL 0)
+        message(STATUS "Configuring a Release Build from '${GIT_BRANCH}'")
+        string(SUBSTRING ${GIT_BRANCH} 13 100 RV) # that's release-xt slash 1.7.
+        string(FIND ${RV} "." DLOC)
+        if (NOT (DLOC EQUAL -1))
+            math(EXPR DLP1 "${DLOC} + 1")
+            string(SUBSTRING ${RV} ${DLP1} 100 LRV) # skip that first dots
+            set(lverrel ${LRV})
+        else ()
+            set(lverrel "99")
+        endif ()
+        set(lverpatch "stable-${lverrel}")
+        set(fverpatch "${lverrel}")
+    else ()
+        set(lverpatch ${GIT_BRANCH})
+        set(fverpatch ${lverpatch})
+        set(lverrel "1000")
+    endif ()
+endif ()
+
+set(SURGE_FULL_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${fverpatch}.${GIT_COMMIT_HASH}")
+set(SURGE_MAJOR_VERSION "${PROJECT_VERSION_MAJOR}")
+set(SURGE_SUB_VERSION "${PROJECT_VERSION_MINOR}")
+set(SURGE_RELEASE_VERSION "${lverpatch}")
+set(SURGE_RELEASE_NUMBER "${lverrel}")
+set(SURGE_BUILD_HASH "${GIT_COMMIT_HASH}")
+set(SURGE_BUILD_LOCATION "${lpipeline}")
+
+string(TIMESTAMP SURGE_BUILD_DATE "%Y-%m-%d")
+string(TIMESTAMP SURGE_BUILD_YEAR "%Y")
+string(TIMESTAMP SURGE_BUILD_TIME "%H:%M:%S")
+
+message(STATUS "Using SURGE_VERSION=${SURGE_FULL_VERSION}")
+
+message(STATUS "Configuring ${SURGEBLD}/geninclude/version.cpp")
+configure_file(${SURGESRC}/src/common/version.cpp.in
+        ${SURGEBLD}/geninclude/version.cpp)