Skip to content

Commit 2cc07b1

Browse files
SinghRajenMSinghRajenM
authored
Move to VS 2022 (#130)
1 parent f302236 commit 2cc07b1

File tree

2 files changed

+24
-30
lines changed

2 files changed

+24
-30
lines changed

‎NppJSONViewer/NPPJSONViewer.vcxproj

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,32 @@
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
3838
<CharacterSet>Unicode</CharacterSet>
39-
<PlatformToolset>v142</PlatformToolset>
39+
<PlatformToolset>v143</PlatformToolset>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4242
<ConfigurationType>DynamicLibrary</ConfigurationType>
4343
<CharacterSet>Unicode</CharacterSet>
44-
<PlatformToolset>v142</PlatformToolset>
44+
<PlatformToolset>v143</PlatformToolset>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>DynamicLibrary</ConfigurationType>
4848
<CharacterSet>Unicode</CharacterSet>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
5252
<ConfigurationType>DynamicLibrary</ConfigurationType>
5353
<CharacterSet>Unicode</CharacterSet>
54-
<PlatformToolset>v142</PlatformToolset>
54+
<PlatformToolset>v143</PlatformToolset>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5757
<ConfigurationType>DynamicLibrary</ConfigurationType>
5858
<CharacterSet>Unicode</CharacterSet>
59-
<PlatformToolset>v142</PlatformToolset>
59+
<PlatformToolset>v143</PlatformToolset>
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
6262
<ConfigurationType>DynamicLibrary</ConfigurationType>
6363
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v142</PlatformToolset>
64+
<PlatformToolset>v143</PlatformToolset>
6565
</PropertyGroup>
6666
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6767
<ImportGroup Label="ExtensionSettings">
@@ -87,23 +87,23 @@
8787
<PropertyGroup Label="UserMacros" />
8888
<PropertyGroup>
8989
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
90-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
91-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</OutDir>
92-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
93-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(Platform)\$(Configuration)\</IntDir>
90+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Build\Bin\$(Platform)\$(Configuration)\</OutDir>
91+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Build\Bin\$(Platform)\$(Configuration)\</OutDir>
92+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Build\Intermediate\$(Platform)\$(Configuration)\</IntDir>
93+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Build\Intermediate\$(Platform)\$(Configuration)\</IntDir>
9494
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
9595
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</LinkIncremental>
96-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
97-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</OutDir>
98-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
99-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">$(Platform)\$(Configuration)\</IntDir>
96+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Build\Bin\$(Platform)\$(Configuration)\</OutDir>
97+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Build\Bin\$(Platform)\$(Configuration)\</OutDir>
98+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Build\Intermediate\$(Platform)\$(Configuration)\</IntDir>
99+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Build\Intermediate\$(Platform)\$(Configuration)\</IntDir>
100100
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
101101
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</LinkIncremental>
102-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
103-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
102+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Build\Bin\$(Platform)\$(Configuration)\</OutDir>
103+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Build\Intermediate\$(Platform)\$(Configuration)\</IntDir>
104104
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
105-
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
106-
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
105+
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Build\Bin\$(Platform)\$(Configuration)\</OutDir>
106+
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Build\Intermediate\$(Platform)\$(Configuration)\</IntDir>
107107
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
108108
</PropertyGroup>
109109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -142,7 +142,6 @@
142142
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
143143
<GenerateDebugInformation>true</GenerateDebugInformation>
144144
<SubSystem>Windows</SubSystem>
145-
<ImportLibrary>$(TargetName).lib</ImportLibrary>
146145
<TargetMachine>MachineX64</TargetMachine>
147146
</Link>
148147
</ItemDefinitionGroup>
@@ -164,7 +163,6 @@
164163
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
165164
<GenerateDebugInformation>true</GenerateDebugInformation>
166165
<SubSystem>Windows</SubSystem>
167-
<ImportLibrary>$(TargetName).lib</ImportLibrary>
168166
</Link>
169167
</ItemDefinitionGroup>
170168
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -184,7 +182,6 @@
184182
<SubSystem>Windows</SubSystem>
185183
<OptimizeReferences>true</OptimizeReferences>
186184
<EnableCOMDATFolding>true</EnableCOMDATFolding>
187-
<ImportLibrary>$(TargetName).lib</ImportLibrary>
188185
<TargetMachine>MachineX64</TargetMachine>
189186
</Link>
190187
</ItemDefinitionGroup>
@@ -205,7 +202,6 @@
205202
<SubSystem>Windows</SubSystem>
206203
<OptimizeReferences>true</OptimizeReferences>
207204
<EnableCOMDATFolding>true</EnableCOMDATFolding>
208-
<ImportLibrary>$(TargetName).lib</ImportLibrary>
209205
</Link>
210206
</ItemDefinitionGroup>
211207
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -225,7 +221,6 @@
225221
<SubSystem>Windows</SubSystem>
226222
<OptimizeReferences>true</OptimizeReferences>
227223
<EnableCOMDATFolding>true</EnableCOMDATFolding>
228-
<ImportLibrary>$(TargetName).lib</ImportLibrary>
229224
<TargetMachine>MachineX86</TargetMachine>
230225
</Link>
231226
</ItemDefinitionGroup>
@@ -247,7 +242,6 @@
247242
<AdditionalDependencies>shlwapi.lib;comctl32.lib;Version.lib;%(AdditionalDependencies)</AdditionalDependencies>
248243
<GenerateDebugInformation>true</GenerateDebugInformation>
249244
<SubSystem>Windows</SubSystem>
250-
<ImportLibrary>$(TargetName).lib</ImportLibrary>
251245
<TargetMachine>MachineX86</TargetMachine>
252246
</Link>
253247
</ItemDefinitionGroup>

‎appveyor.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
version: 1.34.{build}
2-
image: Visual Studio 2019
1+
version: 2.0.1.{build}
2+
image: Visual Studio 2022
33

44

55
environment:
66
matrix:
7-
- PlatformToolset: v142_xp
7+
- PlatformToolset: v143
88

99
platform:
1010
- x64
@@ -31,9 +31,9 @@ build_script:
3131
- msbuild NppJSONViewer.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
3232

3333
artifacts:
34-
- path: NppJSONViewer\x64\Release\NPPJSONViewer.dll
34+
- path: NppJSONViewer\Build\Bin\x64\Release\NPPJSONViewer.dll
3535
name: x64
36-
- path: NppJSONViewer\Win32\Release\NPPJSONViewer.dll
36+
- path: NppJSONViewer\Build\Bin\Win32\Release\NPPJSONViewer.dll
3737
name: Win32
38-
- path: NppJSONViewer\ARM64\Release\NPPJSONViewer.dll
38+
- path: NppJSONViewer\Build\Bin\ARM64\Release\NPPJSONViewer.dll
3939
name: ARM64

0 commit comments

Comments
 (0)