From 0bd386630c96136e83fea23ac0cec9ca3ee4f685 Mon Sep 17 00:00:00 2001 From: BenKeyFSI Date: Sat, 15 Feb 2020 20:07:06 -0600 Subject: [PATCH] Ported Arabica to VS2019. --- include/DOM/Simple/NodeImpl.hpp | 2 +- include/io/convertstream.hpp | 4 +++- include/io/socket_stream.hpp | 13 ++++++++++--- include/io/uri.hpp | 11 +++++++---- vs2013+/Arabica.props | 3 ++- vs2013+/Arabica.sln | 4 ++-- vs2013+/Arabica_noboost.sln | 4 ++-- vs2013+/Arabica_noboost_tests.sln | 4 ++-- vs2013+/Arabica_tests.sln | 4 ++-- vs2013+/CppUnitLib.vcxproj | 7 ++++--- vs2013+/example_DOM_writer.vcxproj | 7 ++++--- vs2013+/example_SAX_Taggle.vcxproj | 7 ++++--- vs2013+/example_SAX_pyx.vcxproj | 7 ++++--- vs2013+/example_SAX_simplehander.vcxproj | 7 ++++--- vs2013+/example_SAX_writer.vcxproj | 7 ++++--- vs2013+/example_SAX_xmlbase.vcxproj | 7 ++++--- vs2013+/example_Utils_transcode.vcxproj | 7 ++++--- vs2013+/example_XPath_xgrep.vcxproj | 7 ++++--- vs2013+/example_XSLT_Mangle.vcxproj | 7 ++++--- vs2013+/lib_arabica.vcxproj | 7 ++++--- vs2013+/lib_arabica_noboost.vcxproj | 7 ++++--- vs2013+/test_DOM.vcxproj | 7 ++++--- vs2013+/test_DOM_silly.vcxproj | 7 ++++--- vs2013+/test_DOM_wide.vcxproj | 7 ++++--- vs2013+/test_SAX_filter.vcxproj | 7 ++++--- vs2013+/test_SAX_filter_silly.vcxproj | 7 ++++--- vs2013+/test_SAX_filter_wide.vcxproj | 7 ++++--- vs2013+/test_utils.vcxproj | 7 ++++--- vs2013+/test_xpath.vcxproj | 7 ++++--- vs2013+/test_xpath_silly.vcxproj | 7 ++++--- vs2013+/test_xpath_wide.vcxproj | 7 ++++--- vs2013+/test_xslt.vcxproj | 7 ++++--- vs2013+/test_xslt_silly.vcxproj | 7 ++++--- vs2013+/test_xslt_wide.vcxproj | 7 ++++--- vs2013+/test_xslt_wide.vcxproj.bak | 5 +++-- 35 files changed, 134 insertions(+), 95 deletions(-) diff --git a/include/DOM/Simple/NodeImpl.hpp b/include/DOM/Simple/NodeImpl.hpp index c9c02b3a..e9a8586f 100644 --- a/include/DOM/Simple/NodeImpl.hpp +++ b/include/DOM/Simple/NodeImpl.hpp @@ -112,7 +112,7 @@ class NodeImpl : virtual public DOM::Node_impl removeChild(next); next = textNode->getNextSibling(); } // while - if(string_adaptorT::empty(textNode->getData())) + if(textNode != 0 && string_adaptorT::empty(textNode->getData())) removeChild(textNode); } else diff --git a/include/io/convertstream.hpp b/include/io/convertstream.hpp index 26bb317d..8459dba0 100644 --- a/include/io/convertstream.hpp +++ b/include/io/convertstream.hpp @@ -96,7 +96,8 @@ public: explicit basic_iconvertstream(std::ios_base::openmode mode = std::ios_base::in) : convertstreambuf_initT(mode | std::ios_base::in), std::basic_istream(convertstreambuf_initT::buf()) - { + { + std::fill_n(to_, toSize_, 0); } // basic_iconvertstream explicit basic_iconvertstream(const stringT& str, std::ios_base::openmode mode = std::ios_base::in) : @@ -190,6 +191,7 @@ public: convertstreambuf_initT(mode | std::ios_base::out), std::basic_ostream(convertstreambuf_initT::buf()) { + std::fill_n(to_, toSize_, 0); } // basic_oconvertstream explicit basic_oconvertstream(const stringT& str, std::ios_base::openmode mode = std::ios_base::out) : diff --git a/include/io/socket_stream.hpp b/include/io/socket_stream.hpp index 83b8dd54..5eea5df1 100644 --- a/include/io/socket_stream.hpp +++ b/include/io/socket_stream.hpp @@ -27,6 +27,7 @@ #include #include #include +#include #include #ifndef INADDR_NONE @@ -49,6 +50,11 @@ class basic_socketbuf : public std::basic_streambuf { public: typedef typename traitsT::int_type int_type; +#if defined(ARABICA_USE_WINSOCK) && defined(UINTPTR_MAX) + typedef std::uintptr_t socket_type; +#else + typedef int socket_type; +#endif using std::basic_streambuf::setp; using std::basic_streambuf::setg; @@ -77,7 +83,8 @@ class basic_socketbuf : public std::basic_streambuf private: typedef typename traitsT::state_type state_t; - int sock_; + socket_type sock_; + std::vector outBuffer_; state_t outState_; std::vector inBuffer_; @@ -87,7 +94,7 @@ class basic_socketbuf : public std::basic_streambuf bool writeSocket(); void growInBuffer(); int readSocket(); - int closeSocket(int sock) const; + int closeSocket(socket_type sock) const; static const size_t bufferSize_; static const size_t pbSize_; @@ -325,7 +332,7 @@ int basic_socketbuf::readSocket() } // readSocket template -int basic_socketbuf::closeSocket(int sock) const +int basic_socketbuf::closeSocket(socket_type sock) const { #ifdef ARABICA_USE_WINSOCK return closesocket(sock); diff --git a/include/io/uri.hpp b/include/io/uri.hpp index 0bd9ef8e..3ffee5ff 100644 --- a/include/io/uri.hpp +++ b/include/io/uri.hpp @@ -10,7 +10,10 @@ namespace Arabica class URI { public: - URI() { } + URI(): + is_absolute_(false) + { + } URI(const std::string& URI); @@ -21,9 +24,9 @@ namespace Arabica host_(rhs.host_), path_(rhs.path_), port_(rhs.port_), - is_absolute_(rhs.is_absolute_) - { - } // URI + is_absolute_(rhs.is_absolute_) + { + } // URI URI& operator=(const URI& rhs) { diff --git a/vs2013+/Arabica.props b/vs2013+/Arabica.props index 7c246371..1e21ed38 100644 --- a/vs2013+/Arabica.props +++ b/vs2013+/Arabica.props @@ -9,6 +9,7 @@ vc12 vc14 vc141 + vc142 $([System.IO.Path]::GetFullPath('$(SolutionDir)..\$(VCSubDir)\$(TargetPlatform)\$(Configuration)\')) $(SolutionDir)int\$(VCSubDir)\$(TargetPlatform)\$(Configuration)\$(ProjectName)\ @@ -18,7 +19,7 @@ EnableFastChecks ProgramDatabase false - 4503 + 4503;26439;26444;26451;26495;26812 true true true diff --git a/vs2013+/Arabica.sln b/vs2013+/Arabica.sln index 674e4456..5c5695f2 100644 --- a/vs2013+/Arabica.sln +++ b/vs2013+/Arabica.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 12.0.40629.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}" EndProject diff --git a/vs2013+/Arabica_noboost.sln b/vs2013+/Arabica_noboost.sln index f2276fd5..632b6dad 100644 --- a/vs2013+/Arabica_noboost.sln +++ b/vs2013+/Arabica_noboost.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 12.0.40629.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example_SAX_pyx", "example_SAX_pyx.vcxproj", "{5214A867-2768-4CD0-9E29-6EED20718556}" EndProject diff --git a/vs2013+/Arabica_noboost_tests.sln b/vs2013+/Arabica_noboost_tests.sln index 616c2a05..236033e5 100644 --- a/vs2013+/Arabica_noboost_tests.sln +++ b/vs2013+/Arabica_noboost_tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 12.0.40629.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_DOM", "test_DOM.vcxproj", "{74A66132-475A-4DA1-8EF7-9CB0EF71E3D8}" ProjectSection(ProjectDependencies) = postProject diff --git a/vs2013+/Arabica_tests.sln b/vs2013+/Arabica_tests.sln index 9a1fc817..c1a2237e 100644 --- a/vs2013+/Arabica_tests.sln +++ b/vs2013+/Arabica_tests.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29728.190 MinimumVisualStudioVersion = 12.0.40629.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ArabicaLib", "lib_arabica.vcxproj", "{4CA72415-D03A-4447-BE4E-C093A5146CAC}" EndProject diff --git a/vs2013+/CppUnitLib.vcxproj b/vs2013+/CppUnitLib.vcxproj index 311cd5de..e8ba445f 100644 --- a/vs2013+/CppUnitLib.vcxproj +++ b/vs2013+/CppUnitLib.vcxproj @@ -25,8 +25,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -122,4 +123,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_DOM_writer.vcxproj b/vs2013+/example_DOM_writer.vcxproj index 4a817703..5957dd86 100644 --- a/vs2013+/example_DOM_writer.vcxproj +++ b/vs2013+/example_DOM_writer.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -119,4 +120,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_SAX_Taggle.vcxproj b/vs2013+/example_SAX_Taggle.vcxproj index c72e319b..617b8f6d 100644 --- a/vs2013+/example_SAX_Taggle.vcxproj +++ b/vs2013+/example_SAX_Taggle.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -107,4 +108,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_SAX_pyx.vcxproj b/vs2013+/example_SAX_pyx.vcxproj index c309d1cc..1dc5a7d5 100644 --- a/vs2013+/example_SAX_pyx.vcxproj +++ b/vs2013+/example_SAX_pyx.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -130,4 +131,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_SAX_simplehander.vcxproj b/vs2013+/example_SAX_simplehander.vcxproj index 200e09cd..c514c5eb 100644 --- a/vs2013+/example_SAX_simplehander.vcxproj +++ b/vs2013+/example_SAX_simplehander.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -135,4 +136,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_SAX_writer.vcxproj b/vs2013+/example_SAX_writer.vcxproj index efa02c5e..47e45565 100644 --- a/vs2013+/example_SAX_writer.vcxproj +++ b/vs2013+/example_SAX_writer.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -132,4 +133,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_SAX_xmlbase.vcxproj b/vs2013+/example_SAX_xmlbase.vcxproj index 2ecd2995..191cd4b9 100644 --- a/vs2013+/example_SAX_xmlbase.vcxproj +++ b/vs2013+/example_SAX_xmlbase.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -115,4 +116,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_Utils_transcode.vcxproj b/vs2013+/example_Utils_transcode.vcxproj index bbb58216..631b2bad 100644 --- a/vs2013+/example_Utils_transcode.vcxproj +++ b/vs2013+/example_Utils_transcode.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -115,4 +116,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_XPath_xgrep.vcxproj b/vs2013+/example_XPath_xgrep.vcxproj index a1317ed5..f2939a25 100644 --- a/vs2013+/example_XPath_xgrep.vcxproj +++ b/vs2013+/example_XPath_xgrep.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -119,4 +120,4 @@ - \ No newline at end of file + diff --git a/vs2013+/example_XSLT_Mangle.vcxproj b/vs2013+/example_XSLT_Mangle.vcxproj index ce2b3924..057bdfb8 100644 --- a/vs2013+/example_XSLT_Mangle.vcxproj +++ b/vs2013+/example_XSLT_Mangle.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -187,4 +188,4 @@ - \ No newline at end of file + diff --git a/vs2013+/lib_arabica.vcxproj b/vs2013+/lib_arabica.vcxproj index 75b4aa29..1fadd9d2 100644 --- a/vs2013+/lib_arabica.vcxproj +++ b/vs2013+/lib_arabica.vcxproj @@ -25,8 +25,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -386,4 +387,4 @@ - \ No newline at end of file + diff --git a/vs2013+/lib_arabica_noboost.vcxproj b/vs2013+/lib_arabica_noboost.vcxproj index 26c1e1d3..4b3886fe 100644 --- a/vs2013+/lib_arabica_noboost.vcxproj +++ b/vs2013+/lib_arabica_noboost.vcxproj @@ -25,8 +25,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -386,4 +387,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_DOM.vcxproj b/vs2013+/test_DOM.vcxproj index 4553241e..ea2b6995 100644 --- a/vs2013+/test_DOM.vcxproj +++ b/vs2013+/test_DOM.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -159,4 +160,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_DOM_silly.vcxproj b/vs2013+/test_DOM_silly.vcxproj index 68828568..be2055dc 100644 --- a/vs2013+/test_DOM_silly.vcxproj +++ b/vs2013+/test_DOM_silly.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -162,4 +163,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_DOM_wide.vcxproj b/vs2013+/test_DOM_wide.vcxproj index 92e12e27..12b2c5fa 100644 --- a/vs2013+/test_DOM_wide.vcxproj +++ b/vs2013+/test_DOM_wide.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -164,4 +165,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_SAX_filter.vcxproj b/vs2013+/test_SAX_filter.vcxproj index a056de9c..a2a05371 100644 --- a/vs2013+/test_SAX_filter.vcxproj +++ b/vs2013+/test_SAX_filter.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -144,4 +145,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_SAX_filter_silly.vcxproj b/vs2013+/test_SAX_filter_silly.vcxproj index 1c8a380e..f604cbaf 100644 --- a/vs2013+/test_SAX_filter_silly.vcxproj +++ b/vs2013+/test_SAX_filter_silly.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -140,4 +141,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_SAX_filter_wide.vcxproj b/vs2013+/test_SAX_filter_wide.vcxproj index 3ec3748a..a611899f 100644 --- a/vs2013+/test_SAX_filter_wide.vcxproj +++ b/vs2013+/test_SAX_filter_wide.vcxproj @@ -23,8 +23,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -140,4 +141,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_utils.vcxproj b/vs2013+/test_utils.vcxproj index 92338566..385210b6 100644 --- a/vs2013+/test_utils.vcxproj +++ b/vs2013+/test_utils.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -130,4 +131,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xpath.vcxproj b/vs2013+/test_xpath.vcxproj index ba9acd0f..5b235714 100644 --- a/vs2013+/test_xpath.vcxproj +++ b/vs2013+/test_xpath.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -142,4 +143,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xpath_silly.vcxproj b/vs2013+/test_xpath_silly.vcxproj index 67002c45..641f38aa 100644 --- a/vs2013+/test_xpath_silly.vcxproj +++ b/vs2013+/test_xpath_silly.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -147,4 +148,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xpath_wide.vcxproj b/vs2013+/test_xpath_wide.vcxproj index d8103c15..2ca575c7 100644 --- a/vs2013+/test_xpath_wide.vcxproj +++ b/vs2013+/test_xpath_wide.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -145,4 +146,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xslt.vcxproj b/vs2013+/test_xslt.vcxproj index 56eaa278..e10c164d 100644 --- a/vs2013+/test_xslt.vcxproj +++ b/vs2013+/test_xslt.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -138,4 +139,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xslt_silly.vcxproj b/vs2013+/test_xslt_silly.vcxproj index cef2cea2..a835e28c 100644 --- a/vs2013+/test_xslt_silly.vcxproj +++ b/vs2013+/test_xslt_silly.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -139,4 +140,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xslt_wide.vcxproj b/vs2013+/test_xslt_wide.vcxproj index 2fa08b09..ce9ed260 100644 --- a/vs2013+/test_xslt_wide.vcxproj +++ b/vs2013+/test_xslt_wide.vcxproj @@ -24,8 +24,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1 @@ -138,4 +139,4 @@ - \ No newline at end of file + diff --git a/vs2013+/test_xslt_wide.vcxproj.bak b/vs2013+/test_xslt_wide.vcxproj.bak index 10abd775..f6a714e9 100644 --- a/vs2013+/test_xslt_wide.vcxproj.bak +++ b/vs2013+/test_xslt_wide.vcxproj.bak @@ -16,8 +16,9 @@ v120 v140 v141 - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - $(LatestTargetPlatformVersion) + v142 + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + $(LatestTargetPlatformVersion) 8.1