diff --git a/ThirdParty/GTest/Fsl.gen b/ThirdParty/GTest/Fsl.gen
index 301c098077..31f025bc97 100644
--- a/ThirdParty/GTest/Fsl.gen
+++ b/ThirdParty/GTest/Fsl.gen
@@ -9,7 +9,7 @@
       <ExternalDependency Name="gtest_main" Access="Public" Type="StaticLib"/>
     </Platform>    
     <Platform Name="Ubuntu;Windows" Supported="true">
-      <Dependency Name="Recipe.GTest_1_11"/>
+      <Dependency Name="Recipe.GTest_1_17"/>
     </Platform>    
     
   </ExternalLibrary>
diff --git a/ThirdParty/Recipe/GTest_1_11/.gitignore b/ThirdParty/Recipe/GTest_1_17/.gitignore
similarity index 100%
rename from ThirdParty/Recipe/GTest_1_11/.gitignore
rename to ThirdParty/Recipe/GTest_1_17/.gitignore
diff --git a/ThirdParty/Recipe/GTest_1_11/Fsl.gen b/ThirdParty/Recipe/GTest_1_17/Fsl.gen
similarity index 61%
rename from ThirdParty/Recipe/GTest_1_11/Fsl.gen
rename to ThirdParty/Recipe/GTest_1_17/Fsl.gen
index e866855e9e..8cc2fe69a0 100644
--- a/ThirdParty/Recipe/GTest_1_11/Fsl.gen
+++ b/ThirdParty/Recipe/GTest_1_17/Fsl.gen
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
-  <ExternalLibrary Name="Recipe.GTest_1_11" CreationYear="2017">
+  <ExternalLibrary Name="Recipe.GTest_1_17" CreationYear="2017">
     <Default.Platform.Supported Value="false"/>
     <Requirement Name="GoogleUnitTest" Type="feature"/>
     <Platform Name="Ubuntu" Supported="true">
-      <ExperimentalRecipe Name="GTest" Version="1.11" FindTargetName="GTest::GTest GTest::Main">
+      <ExperimentalRecipe Name="GTest" Version="1.17" FindTargetName="GTest::GTest GTest::Main">
         <Pipeline>
-          <Download URL="https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz" To="googletest-1.11.0.tar.gz" Hash="b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5"/>
-          <Unpack File="googletest-1.11.0.tar.gz" OutputPath="googletest-release-1.11.0"/>
+          <Download URL="https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz" To="googletest-1.17.0.tar.gz" Hash="65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"/>
+          <Unpack File="googletest-1.17.0.tar.gz" OutputPath="googletest-1.17.0"/>
+          <Copy>
+            <GitApply From="{RECIPE_PATH}/changes-debug.patch"/>
+          </Copy>
           <CMakeBuild Project="googletest-distribution" Target="install" Configuration="release" Options="-Dgtest_force_shared_crt=ON" OutputPath="_Install"/>
         </Pipeline>
         <Installation>
@@ -20,10 +23,13 @@
       </ExperimentalRecipe>
     </Platform>
     <Platform Name="Windows" Supported="true">
-      <ExperimentalRecipe Name="GTest" Version="1.11" FindTargetName="GTest::GTest GTest::Main" Find="true">
+      <ExperimentalRecipe Name="GTest" Version="1.17" FindTargetName="GTest::GTest GTest::Main" Find="true">
         <Pipeline>
-          <Download URL="https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz" To="googletest-1.11.0.tar.gz" Hash="b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5"/>
-          <Unpack File="googletest-1.11.0.tar.gz" OutputPath="googletest-release-1.11.0"/>
+          <Download URL="https://github.com/google/googletest/releases/download/v1.17.0/googletest-1.17.0.tar.gz" To="googletest-1.17.0.tar.gz" Hash="65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"/>
+          <Unpack File="googletest-1.17.0.tar.gz" OutputPath="googletest-1.17.0"/>
+          <Copy>
+            <GitApply From="{RECIPE_PATH}/changes-debug.patch"/>
+          </Copy>
           <CMakeBuild Project="googletest-distribution" Target="install" Configuration="debug;release" Options="-Dgtest_force_shared_crt=ON" OutputPath="_Install"/>
         </Pipeline>
         <Installation>
diff --git a/ThirdParty/Recipe/GTest_1_11/README.md b/ThirdParty/Recipe/GTest_1_17/README.md
similarity index 100%
rename from ThirdParty/Recipe/GTest_1_11/README.md
rename to ThirdParty/Recipe/GTest_1_17/README.md
diff --git a/ThirdParty/Recipe/GTest_1_17/changes-debug.patch b/ThirdParty/Recipe/GTest_1_17/changes-debug.patch
new file mode 100644
index 0000000000..c24be362f1
--- /dev/null
+++ b/ThirdParty/Recipe/GTest_1_17/changes-debug.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,12 @@ if(NOT CYGWIN AND NOT MSYS AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL QNX)
+   set(CMAKE_CXX_EXTENSIONS OFF)
+ endif()
+ 
++if(MSVC)
++  # Always apply postfix for Debug configs in MSVC
++  set(CMAKE_DEBUG_POSTFIX d)
++  message(STATUS "MSVC detected: Debug postfix enabled ('d')")
++endif()
++
+ enable_testing()
+ 
+ include(CMakeDependentOption)