From ec412efb60910f9af8920ffffa16805260cb51f6 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Sep 2018 13:39:44 +0200 Subject: [PATCH] Switch to Visual Studio 2017 --- .gitignore | 5 +---- MSICA.sln | 41 +++++++++++++++++++++++------------------ MSICA/MSICA.vcxproj | 11 ++++++++--- include/Debug.props | 1 - lib/WinStd | 2 +- 5 files changed, 33 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 97c23ac..67fcf5d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -/*.opensdf -/*.sdf -/*.suo -/ipch +/.vs *.user temp diff --git a/MSICA.sln b/MSICA.sln index 2e61840..1e19e7b 100644 --- a/MSICA.sln +++ b/MSICA.sln @@ -1,46 +1,48 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib-10.0.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib-15.0.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{26350A68-2F55-4732-972C-4A5E9077699E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-10.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 + Debug|x86 = Debug|x86 Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.ActiveCfg = Debug|Win32 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|Win32.Build.0 = Debug|Win32 {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.ActiveCfg = Debug|x64 {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x64.Build.0 = Debug|x64 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.ActiveCfg = Release|Win32 - {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|Win32.Build.0 = Release|Win32 + {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x86.ActiveCfg = Debug|Win32 + {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Debug|x86.Build.0 = Debug|Win32 {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.ActiveCfg = Release|x64 {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x64.Build.0 = Release|x64 - {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|Win32.ActiveCfg = Debug|Win32 - {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|Win32.Build.0 = Debug|Win32 + {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x86.ActiveCfg = Release|Win32 + {8552EE55-177E-4F51-B51B-BAF7D6462CDE}.Release|x86.Build.0 = Release|Win32 {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x64.ActiveCfg = Debug|x64 {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x64.Build.0 = Debug|x64 - {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|Win32.ActiveCfg = Release|Win32 - {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|Win32.Build.0 = Release|Win32 + {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x86.ActiveCfg = Debug|Win32 + {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Debug|x86.Build.0 = Debug|Win32 {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x64.ActiveCfg = Release|x64 {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x64.Build.0 = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32 + {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x86.ActiveCfg = Release|Win32 + {A7D9EBC1-1E64-4399-9C88-6692F8742153}.Release|x86.Build.0 = Release|Win32 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.ActiveCfg = Debug|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x86.Build.0 = Debug|Win32 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64 {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.ActiveCfg = Release|Win32 + {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -49,4 +51,7 @@ Global {8552EE55-177E-4F51-B51B-BAF7D6462CDE} = {26350A68-2F55-4732-972C-4A5E9077699E} {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {26350A68-2F55-4732-972C-4A5E9077699E} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C683F89B-816D-4124-B3D4-F44182E34490} + EndGlobalSection EndGlobal diff --git a/MSICA/MSICA.vcxproj b/MSICA/MSICA.vcxproj index b682090..9b7e686 100644 --- a/MSICA/MSICA.vcxproj +++ b/MSICA/MSICA.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,25 +21,30 @@ {A7D9EBC1-1E64-4399-9C88-6692F8742153} v4.0 + 10.0.17134.0 DynamicLibrary Unicode true + v141 DynamicLibrary Unicode + v141 DynamicLibrary Unicode true + v141 DynamicLibrary Unicode + v141 @@ -92,10 +97,10 @@ - + {8552ee55-177e-4f51-b51b-baf7d6462cde} - + {47399d91-7eb9-41de-b521-514ba5db0c43} diff --git a/include/Debug.props b/include/Debug.props index a26bac9..1ca75dc 100644 --- a/include/Debug.props +++ b/include/Debug.props @@ -29,7 +29,6 @@ _DEBUG;%(PreprocessorDefinitions) MultiThreadedDebug EnableFastChecks - true _DEBUG;%(PreprocessorDefinitions) diff --git a/lib/WinStd b/lib/WinStd index f2f62d5..c8e387b 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit f2f62d5cacb71d60626274bfb45daae9c086f620 +Subproject commit c8e387b38f91e560826c2851ab21f80311555c29