Skip to content

Commit a17c64b

Browse files
committed
fix appveyor
1 parent d0c30e2 commit a17c64b

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

NppJSONViewer/NPPJSONViewer.vcxproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<ProjectGuid>{1590D7CD-7D3A-4AB7-A355-EE02F7FB987D}</ProjectGuid>
2323
<RootNamespace>NppPluginJsonViewer</RootNamespace>
2424
<Keyword>Win32Proj</Keyword>
25+
<WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
2526
</PropertyGroup>
2627
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2728
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -68,11 +69,11 @@
6869
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
6970
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
7071
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
71-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
72-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
72+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
73+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
7374
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
74-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
75-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
75+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
76+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
7677
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
7778
</PropertyGroup>
7879
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

appveyor.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
version: 1.0.{build}
2-
image: Visual Studio 2015
2+
image: Visual Studio 2017
33

44

55
environment:
66
matrix:
7-
- PlatformToolset: v120_xp
8-
- PlatformToolset: v140_xp
7+
- PlatformToolset: v141_xp
98

109
platform:
1110
- x64
@@ -16,9 +15,8 @@ configuration:
1615
- Debug
1716

1817
install:
19-
- if "%platform%"=="x64" set archi=amd64
20-
- if "%platform%"=="Win32" set archi=x86
21-
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
18+
- if "%platform%"=="x64" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
19+
- if "%platform%"=="Win32" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
2220

2321
build:
2422
parallel: true # enable MSBuild parallel builds
@@ -27,10 +25,10 @@ build:
2725
build_script:
2826
- cd "%APPVEYOR_BUILD_FOLDER%"
2927
- cd NppJSONViewer
30-
- msbuild NppJSONViewer.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%"
28+
- msbuild NppJSONViewer.sln /m /p:configuration="%configuration%" /p:platform="%platform%"
3129

3230
artifacts:
3331
- path: NppJSONViewer\x64\Release\NPPJSONViewer.dll
3432
name: x64
35-
- path: NppJSONViewer\Release\NPPJSONViewer.dll
33+
- path: NppJSONViewer\Win32\Release\NPPJSONViewer.dll
3634
name: Win32

0 commit comments

Comments
 (0)