From 4046d37ed8c959d8d6ae568f67dbdeb66c10bc47 Mon Sep 17 00:00:00 2001 From: GreyMerlin Date: Wed, 26 Jul 2017 09:36:28 -0700 Subject: [PATCH] VS2017 - update .sln, .vcxproj and .cmd files * update to *.vs2017.vcxproj names * update .sln header lines for VS2017 * update .vcxproj ToolsVersion in header * update PlatformToolset to v141_xp (was v140) * add new *.vs2017.cmd files to VS solution explorer * update BuildBin.vs2017.cmd to use VS141COMNTOOLS * Update VisualStudioVersion to 15.0.26430.16 --- BuildAll.vs2017.cmd | 2 +- BuildBin.vs2017.cmd | 8 ++++---- Externals/poco/Foundation/Foundation.vs2017.vcxproj | 10 +++++----- Externals/poco/Util/Util.vs2017.vcxproj | 10 +++++----- Externals/poco/XML/XML.vs2017.vcxproj | 10 +++++----- Src/Merge.vs2017.vcxproj | 10 +++++----- Src/MergeLang.vs2017.vcxproj | 10 +++++----- Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj | 10 +++++----- WinMerge.vs2017.sln | 18 ++++++++++-------- 9 files changed, 45 insertions(+), 43 deletions(-) diff --git a/BuildAll.vs2017.cmd b/BuildAll.vs2017.cmd index 5181d7df2..a54759e10 100644 --- a/BuildAll.vs2017.cmd +++ b/BuildAll.vs2017.cmd @@ -1,4 +1,4 @@ cd /d "%~dp0" call BuildManual.cmd -call BuildBin.vs2015.cmd +call BuildBin.vs2017.cmd call BuildArc.cmd diff --git a/BuildBin.vs2017.cmd b/BuildBin.vs2017.cmd index ed212f4c6..847f7c6e8 100644 --- a/BuildBin.vs2017.cmd +++ b/BuildBin.vs2017.cmd @@ -7,10 +7,10 @@ call SetVersion.cmd cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h setlocal -set VisualStudioVersion=14.0 -call "%VS140COMNTOOLS%vsvars32.bat" -MSBuild WinMerge.vs2015.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause -MSBuild WinMerge.vs2015.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause +set VisualStudioVersion=15.0 +call "%VS141COMNTOOLS%vsvars32.bat" +MSBuild WinMerge.vs2017.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="Win32" || pause +MSBuild WinMerge.vs2017.sln /t:Rebuild /p:Configuration="Release Unicode" /p:Platform="x64" || pause endlocal if exist "%SIGNBAT_PATH%" ( diff --git a/Externals/poco/Foundation/Foundation.vs2017.vcxproj b/Externals/poco/Foundation/Foundation.vs2017.vcxproj index 34602fc22..baea43ee4 100644 --- a/Externals/poco/Foundation/Foundation.vs2017.vcxproj +++ b/Externals/poco/Foundation/Foundation.vs2017.vcxproj @@ -1,5 +1,5 @@  - + UnicodeDebug @@ -29,22 +29,22 @@ StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp diff --git a/Externals/poco/Util/Util.vs2017.vcxproj b/Externals/poco/Util/Util.vs2017.vcxproj index 8ed43841e..a31538192 100644 --- a/Externals/poco/Util/Util.vs2017.vcxproj +++ b/Externals/poco/Util/Util.vs2017.vcxproj @@ -1,5 +1,5 @@  - + UnicodeDebug @@ -29,22 +29,22 @@ StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp diff --git a/Externals/poco/XML/XML.vs2017.vcxproj b/Externals/poco/XML/XML.vs2017.vcxproj index 6e10f1e11..01212cc3b 100644 --- a/Externals/poco/XML/XML.vs2017.vcxproj +++ b/Externals/poco/XML/XML.vs2017.vcxproj @@ -1,5 +1,5 @@  - + UnicodeDebug @@ -29,22 +29,22 @@ StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp StaticLibrary Unicode - v140_xp + v141_xp diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj index fba188635..5eff82d3b 100644 --- a/Src/Merge.vs2017.vcxproj +++ b/Src/Merge.vs2017.vcxproj @@ -1,5 +1,5 @@  - + UnicodeDebug @@ -29,25 +29,25 @@ Application Static Unicode - v140_xp + v141_xp Application Static Unicode - v140_xp + v141_xp Application Static Unicode - v140_xp + v141_xp Application Static Unicode - v140_xp + v141_xp diff --git a/Src/MergeLang.vs2017.vcxproj b/Src/MergeLang.vs2017.vcxproj index 8e90d2dcb..d18d91c10 100644 --- a/Src/MergeLang.vs2017.vcxproj +++ b/Src/MergeLang.vs2017.vcxproj @@ -1,5 +1,5 @@  - + UnicodeDebug @@ -29,22 +29,22 @@ DynamicLibrary Unicode - v140_xp + v141_xp DynamicLibrary Unicode - v140_xp + v141_xp DynamicLibrary Unicode - v140_xp + v141_xp DynamicLibrary Unicode - v140_xp + v141_xp diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj index 6d86fbb8d..42152017b 100644 --- a/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj +++ b/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,22 +28,22 @@ Application Unicode - v140_xp + v141_xp Application Unicode - v140_xp + v141_xp Application Unicode - v140_xp + v141_xp Application Unicode - v140_xp + v141_xp diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln index 79b113b8c..b543e7b0e 100644 --- a/WinMerge.vs2017.sln +++ b/WinMerge.vs2017.sln @@ -1,24 +1,24 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2015.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge", "Src\Merge.vs2017.vcxproj", "{9FDA4AF0-CCFD-4812-BDB9-53EFEDB32BDE}" ProjectSection(ProjectDependencies) = postProject {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D} {6FF56CDB-787A-4714-A28C-919003F9FA6C} = {6FF56CDB-787A-4714-A28C-919003F9FA6C} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2015.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLang.vs2017.vcxproj", "{4B011DDA-2279-437D-903C-8028913AF31B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2015.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Externals\poco\Foundation\Foundation.vs2017.vcxproj", "{8164D41D-B053-405B-826C-CF37AC0EF176}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2015.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XML", "Externals\poco\XML\XML.vs2017.vcxproj", "{9E211743-85FE-4977-82F3-4F04B40C912D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2015.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Util", "Externals\poco\Util\Util.vs2017.vcxproj", "{6FF56CDB-787A-4714-A28C-919003F9FA6C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2015.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "Testing\GoogleTest\UnitTests\UnitTests.vs2017.vcxproj", "{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}" ProjectSection(ProjectDependencies) = postProject {8164D41D-B053-405B-826C-CF37AC0EF176} = {8164D41D-B053-405B-826C-CF37AC0EF176} {9E211743-85FE-4977-82F3-4F04B40C912D} = {9E211743-85FE-4977-82F3-4F04B40C912D} @@ -30,10 +30,12 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files", "{DC3B258E-444F-460D-8FD9-09A8165212FA}" ProjectSection(SolutionItems) = preProject BuildAll.vs2015.cmd = BuildAll.vs2015.cmd + BuildAll.vs2017.cmd = BuildAll.vs2017.cmd BuildAll2.cmd = BuildAll2.cmd BuildArc.cmd = BuildArc.cmd BuildBin.cmd = BuildBin.cmd BuildBin.vs2015.cmd = BuildBin.vs2015.cmd + BuildBin.vs2017.cmd = BuildBin.vs2017.cmd BuildInstaller.cmd = BuildInstaller.cmd BuildManual.cmd = BuildManual.cmd SetVersion.cmd = SetVersion.cmd -- 2.11.0