Index: src/libicpf/libicpf.vc140.vcxproj
===================================================================
diff -u -N -rb5982438edac1abb34f8f5013ba073fd01523afc -r8c7dd924e354ba961910136e6b7d090921e98b0d
--- src/libicpf/libicpf.vc140.vcxproj	(.../libicpf.vc140.vcxproj)	(revision b5982438edac1abb34f8f5013ba073fd01523afc)
+++ src/libicpf/libicpf.vc140.vcxproj	(.../libicpf.vc140.vcxproj)	(revision 8c7dd924e354ba961910136e6b7d090921e98b0d)
@@ -221,27 +221,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>
@@ -305,27 +292,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>
@@ -381,27 +355,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>
@@ -463,27 +424,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>