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

diff --git a/Src/Merge.vs2015.vcxproj b/Src/Merge.vs2015.vcxproj
index 07b2a6d..525eb4d 100644 (file)
--- a/Src/Merge.vs2015.vcxproj
+++ b/Src/Merge.vs2015.vcxproj
@@ -941,6 +941,7 @@
     <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
     <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
     <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h" />\r
     <ClInclude Include="..\Version.h" />\r
     <ClInclude Include="7zCommon.h" />\r
     <ClInclude Include="AboutDlg.h" />\r

diff --git a/Src/Merge.vs2015.vcxproj.filters b/Src/Merge.vs2015.vcxproj.filters
index 43eb1c6..c0fcb89 100644 (file)
--- a/Src/Merge.vs2015.vcxproj.filters
+++ b/Src/Merge.vs2015.vcxproj.filters
@@ -56,6 +56,9 @@
     <Filter Include="GNU diffutils">\r
       <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="MergeTest">\r
+      <UniqueIdentifier>{63f0497b-0d8f-4660-b727-dac620d74635}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="charsets.c">\r
@@ -748,12 +751,6 @@
     <ClCompile Include="MergeStatusBar.cpp">\r
       <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Test.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TestMain.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="diffutils\src\mystat.cpp">\r
       <Filter>GNU diffutils</Filter>\r
     </ClCompile>\r
@@ -781,6 +778,12 @@
     <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
       <Filter>Compare Engines</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MergeTest</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MergeTest</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="charsets.h">\r
@@ -1410,9 +1413,6 @@
     <ClInclude Include="MergeStatusBar.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TestMain.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
       <Filter>EditLib</Filter>\r
     </ClInclude>\r
@@ -1443,6 +1443,12 @@
     <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
       <Filter>Compare Engines</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="TestMain.h">\r
+      <Filter>MergeTest</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <Filter>MergeTest</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="res\binarydiff.ico">\r

diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index d4070fb..151b411 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -948,6 +948,7 @@
     <ClInclude Include="..\Externals\crystaledit\editlib\UndoRecord.h" />\r
     <ClInclude Include="..\Externals\crystaledit\editlib\ViewableWhitespace.h" />\r
     <ClInclude Include="..\Externals\crystaledit\editlib\wispelld.h" />\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h" />\r
     <ClInclude Include="..\Version.h" />\r
     <ClInclude Include="7zCommon.h" />\r
     <ClInclude Include="AboutDlg.h" />\r

diff --git a/Src/Merge.vs2017.vcxproj.filters b/Src/Merge.vs2017.vcxproj.filters
index 43eb1c6..c0fcb89 100644 (file)
--- a/Src/Merge.vs2017.vcxproj.filters
+++ b/Src/Merge.vs2017.vcxproj.filters
@@ -56,6 +56,9 @@
     <Filter Include="GNU diffutils">\r
       <UniqueIdentifier>{16e1af2b-75c9-4deb-b49f-819018df0478}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="MergeTest">\r
+      <UniqueIdentifier>{63f0497b-0d8f-4660-b727-dac620d74635}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="charsets.c">\r
@@ -748,12 +751,6 @@
     <ClCompile Include="MergeStatusBar.cpp">\r
       <Filter>MFCGui\Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="Test.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="TestMain.cpp">\r
-      <Filter>MFCGui\Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="diffutils\src\mystat.cpp">\r
       <Filter>GNU diffutils</Filter>\r
     </ClCompile>\r
@@ -781,6 +778,12 @@
     <ClCompile Include="CompareEngines\Wrap_DiffUtils.cpp">\r
       <Filter>Compare Engines</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="Test.cpp">\r
+      <Filter>MergeTest</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="TestMain.cpp">\r
+      <Filter>MergeTest</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="charsets.h">\r
@@ -1410,9 +1413,6 @@
     <ClInclude Include="MergeStatusBar.h">\r
       <Filter>MFCGui\Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="TestMain.h">\r
-      <Filter>MFCGui\Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\Externals\crystaledit\editlib\ccrystaltextmarkers.h">\r
       <Filter>EditLib</Filter>\r
     </ClInclude>\r
@@ -1443,6 +1443,12 @@
     <ClInclude Include="CompareEngines\Wrap_DiffUtils.h">\r
       <Filter>Compare Engines</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="TestMain.h">\r
+      <Filter>MergeTest</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\Externals\gtest\include\gtest\gtest.h">\r
+      <Filter>MergeTest</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <None Include="res\binarydiff.ico">\r