From e3e8977f44540e9dd31415bca8578396c59e3c22 Mon Sep 17 00:00:00 2001
From: Christian Grasser <christian.grasser@live.de>
Date: Sat, 13 Oct 2018 21:16:37 +0200
Subject: [PATCH] - update to VM for VS2017 - avoid warnings: LINK : warning
 LNK4075: ignoring '/INCREMENTAL' due to '/OPT:ICF' specification
 [C:\projects\pynpp\PyNPP.vcxproj] and 
 c:\projects\pynpp\dockingfeature\staticdialog.cpp(83): warning C4996:
 'sprintf': This function or variable may be unsafe. Consider using sprintf_s
 instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help
 for details.

---
 PyNPP.vcxproj | 11 ++++++-----
 appveyor.yml  | 27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/PyNPP.vcxproj b/PyNPP.vcxproj
index 9824979..5b6768e 100644
--- a/PyNPP.vcxproj
+++ b/PyNPP.vcxproj
@@ -69,12 +69,9 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -90,7 +87,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -107,6 +104,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -118,11 +116,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PYNPP_EXPORTS;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <WarningLevel>Level3</WarningLevel>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
     </Link>
diff --git a/appveyor.yml b/appveyor.yml
index c9f2ab5..abf2703 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,10 +1,11 @@
 version: 1.2.1.{build}
-image: Visual Studio 2015
+image: Visual Studio 2017
 
 
 environment:
   matrix:
     - PlatformToolset: v140_xp
+    - PlatformToolset: v141_xp
 
 platform:
     - x64
@@ -17,35 +18,37 @@ configuration:
 
 install:
     - if "%platform%"=="x64" set archi=amd64
+    - if "%platform%"=="x64" set platform_input=x64
+
     - if "%platform%"=="x86" set archi=x86
-    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+    - if "%platform%"=="x86" set platform_input=x86
+
+    - if "%PlatformToolset%"=="v140_xp" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+    - if "%PlatformToolset%"=="v141_xp" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
 
-build:
-    parallel: true                  # enable MSBuild parallel builds
-    verbosity: minimal
 
 build_script:
     - cd "%APPVEYOR_BUILD_FOLDER%"
-    - msbuild PyNPP.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+    - msbuild PyNPP.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 after_build:
     - cd "%APPVEYOR_BUILD_FOLDER%"
     - ps: >-
 
-        if ($env:PLATFORM -eq "x64") {
-            Push-AppveyorArtifact "$env:PLATFORM\$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
+        if ($env:PLATFORM_INPUT -eq "x64") {
+            Push-AppveyorArtifact "$env:PLATFORM_INPUT\$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
         }
 
-        if ($env:PLATFORM -eq "x86" ) {
+        if ($env:PLATFORM_INPUT -eq "x86" ) {
             Push-AppveyorArtifact "$env:CONFIGURATION\PyNPP.dll" -FileName PyNPP.dll
         }
 
         if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
-            if($env:PLATFORM -eq "x64"){
+            if($env:PLATFORM_INPUT -eq "x64"){
             $ZipFileName = "PyNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
-            7z a $ZipFileName $env:PLATFORM\$env:CONFIGURATION\PyNPP.dll
+            7z a $ZipFileName $env:PLATFORM_INPUT\$env:CONFIGURATION\PyNPP.dll
             }
-            if($env:PLATFORM -eq "x86"){
+            if($env:PLATFORM_INPUT -eq "x86"){
             $ZipFileName = "PyNPP_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
             7z a $ZipFileName $env:CONFIGURATION\PyNPP.dll
             }