From 31ba720753891fd68db473f5c4b5a3490ec5c84e Mon Sep 17 00:00:00 2001
From: Bill <GreyMerlin@gmail.com>
Date: Mon, 16 Jul 2018 16:25:53 -0700
Subject: [PATCH] Add a new Solution Filter for TestMerge source files

- Add **MergeTest** as a filter folder to the Solution Explorer.

- Move the Files `Test.cpp`, `TestMain.cpp`, `TestMain.h` and
`...\gtest\gtest.h` to this new filter folder (they were in the MFCGui
folder)

- Add new MergeTest solution filter to VS2015
---
 Src/Merge.vs2015.vcxproj         |  1 +
 Src/Merge.vs2015.vcxproj.filters | 24 +++++++++++++++---------
 Src/Merge.vs2017.vcxproj         |  1 +
 Src/Merge.vs2017.vcxproj.filters | 24 +++++++++++++++---------
 4 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 07b2a6d08..525eb4d6c 100644
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -941,6 +941,7 @@
     <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />
     <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />
     <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h" />
     <ClInclude Include="..\Version.h" />
     <ClInclude Include="7zCommon.h" />
     <ClInclude Include="AboutDlg.h" />
diff --git a/Src/Merge.vs2015.vcxproj.filters b/Src/Merge.vs2015.vcxproj.filters
index 43eb1c605..c0fcb89fc 100644
--- a/Src/Merge.vs2015.vcxproj.filters
+++ b/Src/Merge.vs2015.vcxproj.filters
@@ -56,6 +56,9 @@
     <Filter Include="GNU diffutils">
       <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>
     </Filter>
+    <Filter Include="MergeTest">
+      <UniqueIdentifier>{63f0497b-0d8f-4660-b727-dac620d74635}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="charsets.c">
@@ -748,12 +751,6 @@
     <ClCompile Include="MergeStatusBar.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Test.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="diffutils\src\mystat.cpp">
       <Filter>GNU diffutils</Filter>
     </ClCompile>
@@ -781,6 +778,12 @@
     <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
       <Filter>Compare Engines</Filter>
     </ClCompile>
+    <ClCompile Include="Test.cpp">
+      <Filter>MergeTest</Filter>
+    </ClCompile>
+    <ClCompile Include="TestMain.cpp">
+      <Filter>MergeTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="charsets.h">
@@ -1410,9 +1413,6 @@
     <ClInclude Include="MergeStatusBar.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TestMain.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
       <Filter>EditLib</Filter>
     </ClInclude>
@@ -1443,6 +1443,12 @@
     <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
       <Filter>Compare Engines</Filter>
     </ClInclude>
+    <ClInclude Include="TestMain.h">
+      <Filter>MergeTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
+      <Filter>MergeTest</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\binarydiff.ico">
diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index d4070fbbd..151b411f7 100644
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -948,6 +948,7 @@
     <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />
     <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />
     <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h" />
     <ClInclude Include="..\Version.h" />
     <ClInclude Include="7zCommon.h" />
     <ClInclude Include="AboutDlg.h" />
diff --git a/Src/Merge.vs2017.vcxproj.filters b/Src/Merge.vs2017.vcxproj.filters
index 43eb1c605..c0fcb89fc 100644
--- a/Src/Merge.vs2017.vcxproj.filters
+++ b/Src/Merge.vs2017.vcxproj.filters
@@ -56,6 +56,9 @@
     <Filter Include="GNU diffutils">
       <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>
     </Filter>
+    <Filter Include="MergeTest">
+      <UniqueIdentifier>{63f0497b-0d8f-4660-b727-dac620d74635}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="charsets.c">
@@ -748,12 +751,6 @@
     <ClCompile Include="MergeStatusBar.cpp">
       <Filter>MFCGui\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Test.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TestMain.cpp">
-      <Filter>MFCGui\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="diffutils\src\mystat.cpp">
       <Filter>GNU diffutils</Filter>
     </ClCompile>
@@ -781,6 +778,12 @@
     <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">
       <Filter>Compare Engines</Filter>
     </ClCompile>
+    <ClCompile Include="Test.cpp">
+      <Filter>MergeTest</Filter>
+    </ClCompile>
+    <ClCompile Include="TestMain.cpp">
+      <Filter>MergeTest</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="charsets.h">
@@ -1410,9 +1413,6 @@
     <ClInclude Include="MergeStatusBar.h">
       <Filter>MFCGui\Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TestMain.h">
-      <Filter>MFCGui\Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">
       <Filter>EditLib</Filter>
     </ClInclude>
@@ -1443,6 +1443,12 @@
     <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">
       <Filter>Compare Engines</Filter>
     </ClInclude>
+    <ClInclude Include="TestMain.h">
+      <Filter>MergeTest</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">
+      <Filter>MergeTest</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="res\binarydiff.ico">
-- 
2.11.0