- update vcxproj to VS2015

- updated appveyor.yml to image VS2017 - removed unnecessary sln file
chcg · Jan 5, 2018 · 572e0cb · 572e0cb
1 parent b6d9e3c
commit 572e0cb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 48 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,4 +13,5 @@ vs7project/NppExport.lib
 *.exp
 *.aps
 *.zip
-*.ipch
+*.ipch
+*.sln
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,11 @@
 version: 0.2.8.{build}
-image: Visual Studio 2015
+image: Visual Studio 2017
 
 
 environment:
   matrix:
   - PlatformToolset: v140_xp
-  - PlatformToolset: v120_xp
+  - PlatformToolset: v141_xp
 
 platform:
     - x64
@@ -17,35 +17,37 @@ configuration:
 
 install:
     - if "%platform%"=="x64" set archi=amd64
+    - if "%platform%"=="x64" set platform_input=x64
+
     - if "%platform%"=="Win32" set archi=x86
-    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+    - if "%platform%"=="Win32" set platform_input=Win32
+
+    - 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%"\vs7project\
-    - msbuild NppExport.vcxproj /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%"
+    - msbuild NppExport.vcxproj /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 "vs7project\$env:PLATFORM\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll
+        if ($env:PLATFORM_INPUT -eq "x64") {
+            Push-AppveyorArtifact "vs7project\$env:PLATFORM_INPUT\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll
         }
 
-        if ($env:PLATFORM -eq "Win32" ) {
+        if ($env:PLATFORM_INPUT -eq "Win32" ) {
             Push-AppveyorArtifact "vs7project\$env:CONFIGURATION\NppExport.dll" -FileName NppExport.dll
         }
 
-        if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v120_xp") {
-            if($env:PLATFORM -eq "x64"){
+        if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
+            if($env:PLATFORM_INPUT -eq "x64"){
             $ZipFileName = "NppExport_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
-            7z a $ZipFileName vs7project\$env:PLATFORM\$env:CONFIGURATION\*.dll
+            7z a $ZipFileName vs7project\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll
             }
-            if($env:PLATFORM -eq "Win32"){
+            if($env:PLATFORM_INPUT -eq "Win32"){
             $ZipFileName = "NppExport_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
             7z a $ZipFileName vs7project\$env:CONFIGURATION\*.dll
             }
@@ -65,6 +67,6 @@ deploy:
     force_update: true
     on:
         appveyor_repo_tag: true
-        PlatformToolset: v120_xp
+        PlatformToolset: v140_xp
         configuration: Release
 
diff --git a/vs7project/NppExport.sln b/vs7project/NppExport.sln
diff --git a/vs7project/NppExport.vcxproj b/vs7project/NppExport.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -25,22 +25,22 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120_xp</PlatformToolset>
+    <PlatformToolset>v140_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />