From 89d610a3063b02c0dec81ac35f1e4e186d44f77f Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 7 Sep 2018 14:04:02 +0200 Subject: [PATCH] Switch to Visual Studio 2017 --- .gitignore | 5 +--- UpdCheck/UpdCheck.vcxproj | 9 ++++-- UpdPublish/UpdPublish.vcxproj | 9 ++++-- UpdSignXML/UpdSignXML.vcxproj | 9 ++++-- Updater.sln | 55 +++++++++++++++++++---------------- Updater/build/Updater.vcxproj | 9 ++++-- 6 files changed, 59 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index e661545..031619b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -/*.opensdf -/*.sdf -/*.suo -/ipch +/.vs *.user temp diff --git a/UpdCheck/UpdCheck.vcxproj b/UpdCheck/UpdCheck.vcxproj index 5f7df09..94f0074 100644 --- a/UpdCheck/UpdCheck.vcxproj +++ b/UpdCheck/UpdCheck.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -22,29 +22,34 @@ {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3} Win32Proj UpdCheck + 10.0.17134.0 Application true Unicode + v141 Application true Unicode + v141 Application false true Unicode + v141 Application false true Unicode + v141 @@ -98,7 +103,7 @@ - + {a3a36689-ac35-4026-93da-a3ba0c0e767c} diff --git a/UpdPublish/UpdPublish.vcxproj b/UpdPublish/UpdPublish.vcxproj index 9835072..df11a98 100644 --- a/UpdPublish/UpdPublish.vcxproj +++ b/UpdPublish/UpdPublish.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,6 +21,7 @@ {C5829278-D55E-41EB-B866-1E7D814694D1} UpdPublish + 10.0.17134.0 @@ -28,12 +29,14 @@ true Unicode Dynamic + v141 Application true Unicode Dynamic + v141 Application @@ -41,6 +44,7 @@ true Unicode Dynamic + v141 Application @@ -48,6 +52,7 @@ true Unicode Dynamic + v141 @@ -91,7 +96,7 @@ - + {a3a36689-ac35-4026-93da-a3ba0c0e767c} diff --git a/UpdSignXML/UpdSignXML.vcxproj b/UpdSignXML/UpdSignXML.vcxproj index 84bb5a0..5aa0940 100644 --- a/UpdSignXML/UpdSignXML.vcxproj +++ b/UpdSignXML/UpdSignXML.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,6 +21,7 @@ {2A403460-7834-41B8-9823-199E8FE36FA8} UpdSignXML + 10.0.17134.0 @@ -28,12 +29,14 @@ true Unicode Dynamic + v141 Application true Unicode Dynamic + v141 Application @@ -41,6 +44,7 @@ true Unicode Dynamic + v141 Application @@ -48,6 +52,7 @@ true Unicode Dynamic + v141 @@ -91,7 +96,7 @@ - + {a3a36689-ac35-4026-93da-a3ba0c0e767c} diff --git a/Updater.sln b/Updater.sln index eb7cdde..99f29f8 100644 --- a/Updater.sln +++ b/Updater.sln @@ -1,11 +1,13 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{A7D28E0C-BB96-444D-AAB0-F22A6483FE5F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdCheck", "UpdCheck\UpdCheck.vcxproj", "{0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "..\lib\wxExtend\build\wxExtendDll-10.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "..\lib\wxExtend\build\wxExtendDll-15.0.vcxproj", "{A3A36689-AC35-4026-93DA-A3BA0C0E767C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UpdSignXML", "UpdSignXML\UpdSignXML.vcxproj", "{2A403460-7834-41B8-9823-199E8FE36FA8}" EndProject @@ -20,52 +22,52 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution 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 - {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|Win32.ActiveCfg = Debug|Win32 - {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|Win32.Build.0 = Debug|Win32 {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|x64.ActiveCfg = Debug|x64 {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|x64.Build.0 = Debug|x64 - {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|Win32.ActiveCfg = Release|Win32 - {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|Win32.Build.0 = Release|Win32 + {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|x86.ActiveCfg = Debug|Win32 + {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Debug|x86.Build.0 = Debug|Win32 {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x64.ActiveCfg = Release|x64 {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x64.Build.0 = Release|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.ActiveCfg = Debug|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|Win32.Build.0 = Debug|Win32 + {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x86.ActiveCfg = Release|Win32 + {0B2B7A10-3FA0-46CD-AD89-6D02DA2C5FC3}.Release|x86.Build.0 = Release|Win32 {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.ActiveCfg = Debug|x64 {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x64.Build.0 = Debug|x64 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.ActiveCfg = Release|Win32 - {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|Win32.Build.0 = Release|Win32 + {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x86.ActiveCfg = Debug|Win32 + {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Debug|x86.Build.0 = Debug|Win32 {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.ActiveCfg = Release|x64 {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x64.Build.0 = Release|x64 - {2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|Win32.ActiveCfg = Debug|Win32 - {2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|Win32.Build.0 = Debug|Win32 + {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x86.ActiveCfg = Release|Win32 + {A3A36689-AC35-4026-93DA-A3BA0C0E767C}.Release|x86.Build.0 = Release|Win32 {2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x64.ActiveCfg = Debug|x64 {2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x64.Build.0 = Debug|x64 - {2A403460-7834-41B8-9823-199E8FE36FA8}.Release|Win32.ActiveCfg = Release|Win32 - {2A403460-7834-41B8-9823-199E8FE36FA8}.Release|Win32.Build.0 = Release|Win32 + {2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x86.ActiveCfg = Debug|Win32 + {2A403460-7834-41B8-9823-199E8FE36FA8}.Debug|x86.Build.0 = Debug|Win32 {2A403460-7834-41B8-9823-199E8FE36FA8}.Release|x64.ActiveCfg = Release|x64 {2A403460-7834-41B8-9823-199E8FE36FA8}.Release|x64.Build.0 = Release|x64 - {C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|Win32.Build.0 = Debug|Win32 + {2A403460-7834-41B8-9823-199E8FE36FA8}.Release|x86.ActiveCfg = Release|Win32 + {2A403460-7834-41B8-9823-199E8FE36FA8}.Release|x86.Build.0 = Release|Win32 {C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|x64.ActiveCfg = Debug|x64 {C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|x64.Build.0 = Debug|x64 - {C5829278-D55E-41EB-B866-1E7D814694D1}.Release|Win32.ActiveCfg = Release|Win32 - {C5829278-D55E-41EB-B866-1E7D814694D1}.Release|Win32.Build.0 = Release|Win32 + {C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|x86.ActiveCfg = Debug|Win32 + {C5829278-D55E-41EB-B866-1E7D814694D1}.Debug|x86.Build.0 = Debug|Win32 {C5829278-D55E-41EB-B866-1E7D814694D1}.Release|x64.ActiveCfg = Release|x64 {C5829278-D55E-41EB-B866-1E7D814694D1}.Release|x64.Build.0 = Release|x64 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.ActiveCfg = Debug|Win32 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|Win32.Build.0 = Debug|Win32 + {C5829278-D55E-41EB-B866-1E7D814694D1}.Release|x86.ActiveCfg = Release|Win32 + {C5829278-D55E-41EB-B866-1E7D814694D1}.Release|x86.Build.0 = Release|Win32 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.ActiveCfg = Debug|x64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x64.Build.0 = Debug|x64 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.ActiveCfg = Release|Win32 - {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|Win32.Build.0 = Release|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x86.ActiveCfg = Debug|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Debug|x86.Build.0 = Debug|Win32 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.ActiveCfg = Release|x64 {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x64.Build.0 = Release|x64 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x86.ActiveCfg = Release|Win32 + {990D8CF9-4457-4DC0-AA18-4968EF434741}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -74,4 +76,7 @@ Global {A3A36689-AC35-4026-93DA-A3BA0C0E767C} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} {990D8CF9-4457-4DC0-AA18-4968EF434741} = {A7D28E0C-BB96-444D-AAB0-F22A6483FE5F} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {E86510CB-829C-41C4-8E19-CBB300B80B81} + EndGlobalSection EndGlobal diff --git a/Updater/build/Updater.vcxproj b/Updater/build/Updater.vcxproj index 4055fae..b7ba962 100644 --- a/Updater/build/Updater.vcxproj +++ b/Updater/build/Updater.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -45,36 +45,41 @@ - + {a3a36689-ac35-4026-93da-a3ba0c0e767c} {990D8CF9-4457-4DC0-AA18-4968EF434741} Updater + 10.0.17134.0 DynamicLibrary true Unicode + v141 DynamicLibrary true Unicode + v141 DynamicLibrary false true Unicode + v141 DynamicLibrary false true Unicode + v141