From f3f78f9311fdd26d2732579c4f71e16ad908762d Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 8 Oct 2017 20:25:37 +0900 Subject: [PATCH] WinMerge.*.sln: Add Test solution configuration --- WinMerge.vs2015.sln | 32 ++++++++++++++++++++++++++++++++ WinMerge.vs2017.sln | 34 +++++++++++++++++++++++++++++++++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/WinMerge.vs2015.sln b/WinMerge.vs2015.sln index dd31cee04..bdb43754a 100644 --- a/WinMerge.vs2015.sln +++ b/WinMerge.vs2015.sln @@ -51,6 +51,8 @@ Global Debug Unicode|x64 = Debug Unicode|x64 Release Unicode|Win32 = Release Unicode|Win32 Release Unicode|x64 = Release Unicode|x64 + Test|Win32 = Test|Win32 + Test|x64 = Test|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 @@ -61,6 +63,10 @@ Global {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|Win32.ActiveCfg = Test|Win32 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|Win32.Build.0 = Test|Win32 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|x64.ActiveCfg = Test|x64 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|x64.Build.0 = Test|x64 {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -69,6 +75,10 @@ Global {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|x64.Build.0 = UnicodeDebug|x64 {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -77,6 +87,11 @@ Global {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.Deploy.0 = UnicodeDebug|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|x64.Build.0 = UnicodeDebug|x64 {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -85,6 +100,11 @@ Global {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.Deploy.0 = UnicodeDebug|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.Build.0 = UnicodeDebug|x64 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -93,6 +113,11 @@ Global {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.Deploy.0 = UnicodeDebug|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|x64.Build.0 = UnicodeDebug|x64 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64 @@ -101,6 +126,10 @@ Global {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|Win32.ActiveCfg = Debug|Win32 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|Win32.Build.0 = Debug|Win32 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.ActiveCfg = Debug|x64 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.Build.0 = Debug|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -111,4 +140,7 @@ Global {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15} {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BA780561-B5A9-4ED1-B35C-B342695F3F39} + EndGlobalSection EndGlobal diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln index 1c1f603bc..7aec05573 100644 --- a/WinMerge.vs2017.sln +++ b/WinMerge.vs2017.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.16 +VisualStudioVersion = 15.0.26730.15 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2017.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}" ProjectSection(ProjectDependencies) = postProject @@ -51,6 +51,8 @@ Global Debug Unicode|x64 = Debug Unicode|x64 Release Unicode|Win32 = Release Unicode|Win32 Release Unicode|x64 = Release Unicode|x64 + Test|Win32 = Test|Win32 + Test|x64 = Test|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 @@ -61,6 +63,10 @@ Global {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|Win32.ActiveCfg = Test|Win32 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|Win32.Build.0 = Test|Win32 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|x64.ActiveCfg = Test|x64 + {9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}.Test|x64.Build.0 = Test|x64 {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {4B011DDA-2279-437D-903C-8028913AF31B}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -69,6 +75,10 @@ Global {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {4B011DDA-2279-437D-903C-8028913AF31B}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {4B011DDA-2279-437D-903C-8028913AF31B}.Test|x64.Build.0 = UnicodeDebug|x64 {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -77,6 +87,11 @@ Global {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {8164D41D-B053-405B-826C-CF37AC0EF176}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|Win32.Deploy.0 = UnicodeDebug|Win32 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {8164D41D-B053-405B-826C-CF37AC0EF176}.Test|x64.Build.0 = UnicodeDebug|x64 {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {9E211743-85FE-4977-82F3-4F04B40C912D}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -85,6 +100,11 @@ Global {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {9E211743-85FE-4977-82F3-4F04B40C912D}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|Win32.Deploy.0 = UnicodeDebug|Win32 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {9E211743-85FE-4977-82F3-4F04B40C912D}.Test|x64.Build.0 = UnicodeDebug|x64 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.ActiveCfg = UnicodeDebug|Win32 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|Win32.Build.0 = UnicodeDebug|Win32 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Debug Unicode|x64.ActiveCfg = UnicodeDebug|x64 @@ -93,6 +113,11 @@ Global {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|Win32.Build.0 = UnicodeRelease|Win32 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.ActiveCfg = UnicodeRelease|x64 {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Release Unicode|x64.Build.0 = UnicodeRelease|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.ActiveCfg = UnicodeDebug|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.Build.0 = UnicodeDebug|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|Win32.Deploy.0 = UnicodeDebug|Win32 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|x64.ActiveCfg = UnicodeDebug|x64 + {6FF56CDB-787A-4714-A28C-919003F9FA6C}.Test|x64.Build.0 = UnicodeDebug|x64 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.ActiveCfg = Debug|Win32 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|Win32.Build.0 = Debug|Win32 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Debug Unicode|x64.ActiveCfg = Debug|x64 @@ -101,6 +126,10 @@ Global {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|Win32.Build.0 = Release|Win32 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.ActiveCfg = Release|x64 {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Release Unicode|x64.Build.0 = Release|x64 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|Win32.ActiveCfg = Debug|Win32 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|Win32.Build.0 = Debug|Win32 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.ActiveCfg = Debug|x64 + {733E7C0B-AC3D-47AC-A8DA-E13644D6294D}.Test|x64.Build.0 = Debug|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -111,4 +140,7 @@ Global {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {220B870C-D051-463E-997B-8C392081EE15} {8B625EC8-5063-4336-84F9-AA7FD5348525} = {DC3B258E-444F-460D-8FD9-09A8165212FA} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BA780561-B5A9-4ED1-B35C-B342695F3F39} + EndGlobalSection EndGlobal -- 2.11.0