Index: src/chext/chext.vc140.vcxproj
===================================================================
diff -u -rbfc7a8378a96c5b58def559b343918fca32f05a6 -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/chext/chext.vc140.vcxproj	(.../chext.vc140.vcxproj)	(revision bfc7a8378a96c5b58def559b343918fca32f05a6)
+++ src/chext/chext.vc140.vcxproj	(.../chext.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -254,27 +254,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -349,27 +336,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -444,27 +418,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>
@@ -541,27 +502,14 @@
 
 if "$(PlatformName)" EQU "x64" goto x64
 
-if "$(Configuration)" EQU "Testing Release" goto x32rel
-
-:x32dbg
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
+:x32
+"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x32rel
-"$(SolutionDir)tools\test_runner32.exe" "$(TargetPath)"
-goto end
-
 :x64
-if "$(Configuration)" EQU "Testing Release" goto x64rel
-
-:x64dbg
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
+"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)" --gtest_shuffle --gtest_output="xml:$(TargetPath).UnitTests.xml"
 goto end
 
-:x64rel
-"$(SolutionDir)tools\test_runner64.exe" "$(TargetPath)"
-goto end
-
 :end
 </Command>
     </PostBuildEvent>