Skip to content

Commit 9805923

Browse files
chcgchcg
committed
update to VS2022
1 parent eec85d0 commit 9805923

File tree

8 files changed

+39
-38
lines changed

8 files changed

+39
-38
lines changed

‎NppPlugin/project/NppPlugin.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,33 @@
3737
<ConfigurationType>StaticLibrary</ConfigurationType>
3838
<CharacterSet>Unicode</CharacterSet>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
40-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4343
<ConfigurationType>StaticLibrary</ConfigurationType>
4444
<CharacterSet>Unicode</CharacterSet>
4545
<WholeProgramOptimization>true</WholeProgramOptimization>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
5050
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5454
<ConfigurationType>StaticLibrary</ConfigurationType>
5555
<CharacterSet>Unicode</CharacterSet>
56-
<PlatformToolset>v142</PlatformToolset>
56+
<PlatformToolset>v143</PlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
5959
<ConfigurationType>StaticLibrary</ConfigurationType>
6060
<CharacterSet>Unicode</CharacterSet>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
6464
<ConfigurationType>StaticLibrary</ConfigurationType>
6565
<CharacterSet>Unicode</CharacterSet>
66-
<PlatformToolset>v142</PlatformToolset>
66+
<PlatformToolset>v143</PlatformToolset>
6767
</PropertyGroup>
6868
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6969
<ImportGroup Label="ExtensionSettings">

‎PythonScript.Tests/PythonScript.Tests.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,39 @@
3737
<ConfigurationType>Application</ConfigurationType>
3838
<UseDebugLibraries>true</UseDebugLibraries>
3939
<CharacterSet>Unicode</CharacterSet>
40-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
4545
<CharacterSet>Unicode</CharacterSet>
46-
<PlatformToolset>v142</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>true</UseDebugLibraries>
5151
<CharacterSet>Unicode</CharacterSet>
52-
<PlatformToolset>v142</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5353
</PropertyGroup>
5454
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
5555
<ConfigurationType>Application</ConfigurationType>
5656
<UseDebugLibraries>true</UseDebugLibraries>
5757
<CharacterSet>Unicode</CharacterSet>
58-
<PlatformToolset>v142</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5959
</PropertyGroup>
6060
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6161
<ConfigurationType>Application</ConfigurationType>
6262
<UseDebugLibraries>false</UseDebugLibraries>
6363
<WholeProgramOptimization>true</WholeProgramOptimization>
6464
<CharacterSet>Unicode</CharacterSet>
65-
<PlatformToolset>v142</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6666
</PropertyGroup>
6767
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6868
<ConfigurationType>Application</ConfigurationType>
6969
<UseDebugLibraries>false</UseDebugLibraries>
7070
<WholeProgramOptimization>true</WholeProgramOptimization>
7171
<CharacterSet>Unicode</CharacterSet>
72-
<PlatformToolset>v142</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7373
</PropertyGroup>
7474
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7575
<ImportGroup Label="ExtensionSettings">
@@ -312,13 +312,13 @@
312312
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
313313
<ImportGroup Label="ExtensionTargets">
314314
<Import Project="..\packages\boost.1.78.0\build\boost.targets" Condition="Exists('..\packages\boost.1.78.0\build\boost.targets')" />
315-
<Import Project="..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets" Condition="Exists('..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets')" />
315+
<Import Project="..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets" Condition="Exists('..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets')" />
316316
</ImportGroup>
317317
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
318318
<PropertyGroup>
319319
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
320320
</PropertyGroup>
321321
<Error Condition="!Exists('..\packages\boost.1.78.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.78.0\build\boost.targets'))" />
322-
<Error Condition="!Exists('..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets'))" />
322+
<Error Condition="!Exists('..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets'))" />
323323
</Target>
324324
</Project>

‎PythonScript.Tests/gtest.proj/gtest.vcxproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,46 @@
3030
<ProjectGuid>{2DDE822D-E7AC-4650-B875-D33FADC0EED9}</ProjectGuid>
3131
<Keyword>Win32Proj</Keyword>
3232
<RootNamespace>gtestvcxproj</RootNamespace>
33+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3334
</PropertyGroup>
3435
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3536
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3637
<ConfigurationType>StaticLibrary</ConfigurationType>
3738
<UseDebugLibraries>true</UseDebugLibraries>
3839
<CharacterSet>Unicode</CharacterSet>
39-
<PlatformToolset>v141_xp</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4041
</PropertyGroup>
4142
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4243
<ConfigurationType>StaticLibrary</ConfigurationType>
4344
<UseDebugLibraries>true</UseDebugLibraries>
4445
<CharacterSet>Unicode</CharacterSet>
45-
<PlatformToolset>v141_xp</PlatformToolset>
46+
<PlatformToolset>v143</PlatformToolset>
4647
</PropertyGroup>
4748
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
4849
<ConfigurationType>StaticLibrary</ConfigurationType>
4950
<UseDebugLibraries>true</UseDebugLibraries>
5051
<CharacterSet>Unicode</CharacterSet>
51-
<PlatformToolset>v141_xp</PlatformToolset>
52+
<PlatformToolset>v143</PlatformToolset>
5253
</PropertyGroup>
5354
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
5455
<ConfigurationType>StaticLibrary</ConfigurationType>
5556
<UseDebugLibraries>true</UseDebugLibraries>
5657
<CharacterSet>Unicode</CharacterSet>
57-
<PlatformToolset>v141_xp</PlatformToolset>
58+
<PlatformToolset>v143</PlatformToolset>
5859
</PropertyGroup>
5960
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
6061
<ConfigurationType>StaticLibrary</ConfigurationType>
6162
<UseDebugLibraries>false</UseDebugLibraries>
6263
<WholeProgramOptimization>true</WholeProgramOptimization>
6364
<CharacterSet>Unicode</CharacterSet>
64-
<PlatformToolset>v141_xp</PlatformToolset>
65+
<PlatformToolset>v143</PlatformToolset>
6566
</PropertyGroup>
6667
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6768
<ConfigurationType>StaticLibrary</ConfigurationType>
6869
<UseDebugLibraries>false</UseDebugLibraries>
6970
<WholeProgramOptimization>true</WholeProgramOptimization>
7071
<CharacterSet>Unicode</CharacterSet>
71-
<PlatformToolset>v141_xp</PlatformToolset>
72+
<PlatformToolset>v143</PlatformToolset>
7273
</PropertyGroup>
7374
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7475
<ImportGroup Label="ExtensionSettings">

‎PythonScript.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.78.0" targetFramework="native" />
4-
<package id="boost_python310-vc142" version="1.78.0" targetFramework="native" />
4+
<package id="boost_python310-vc143" version="1.78.0" targetFramework="native" />
55
</packages>

‎PythonScript/project/PythonScript2010.vcxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,51 +46,51 @@
4646
<ConfigurationType>DynamicLibrary</ConfigurationType>
4747
<UseDebugLibraries>true</UseDebugLibraries>
4848
<CharacterSet>Unicode</CharacterSet>
49-
<PlatformToolset>v142</PlatformToolset>
49+
<PlatformToolset>v143</PlatformToolset>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5252
<ConfigurationType>DynamicLibrary</ConfigurationType>
5353
<UseDebugLibraries>true</UseDebugLibraries>
5454
<CharacterSet>Unicode</CharacterSet>
55-
<PlatformToolset>v142</PlatformToolset>
55+
<PlatformToolset>v143</PlatformToolset>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|Win32'" Label="Configuration">
5858
<ConfigurationType>DynamicLibrary</ConfigurationType>
5959
<UseDebugLibraries>true</UseDebugLibraries>
6060
<CharacterSet>Unicode</CharacterSet>
61-
<PlatformToolset>v142</PlatformToolset>
61+
<PlatformToolset>v143</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PythonDebug|x64'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
6565
<UseDebugLibraries>true</UseDebugLibraries>
6666
<CharacterSet>Unicode</CharacterSet>
67-
<PlatformToolset>v142</PlatformToolset>
67+
<PlatformToolset>v143</PlatformToolset>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStartup|Win32'" Label="Configuration">
7070
<ConfigurationType>DynamicLibrary</ConfigurationType>
7171
<UseDebugLibraries>true</UseDebugLibraries>
7272
<CharacterSet>Unicode</CharacterSet>
73-
<PlatformToolset>v142</PlatformToolset>
73+
<PlatformToolset>v143</PlatformToolset>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugStartup|x64'" Label="Configuration">
7676
<ConfigurationType>DynamicLibrary</ConfigurationType>
7777
<UseDebugLibraries>true</UseDebugLibraries>
7878
<CharacterSet>Unicode</CharacterSet>
79-
<PlatformToolset>v142</PlatformToolset>
79+
<PlatformToolset>v143</PlatformToolset>
8080
</PropertyGroup>
8181
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8282
<ConfigurationType>DynamicLibrary</ConfigurationType>
8383
<UseDebugLibraries>false</UseDebugLibraries>
8484
<WholeProgramOptimization>true</WholeProgramOptimization>
8585
<CharacterSet>Unicode</CharacterSet>
86-
<PlatformToolset>v142</PlatformToolset>
86+
<PlatformToolset>v143</PlatformToolset>
8787
</PropertyGroup>
8888
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
8989
<ConfigurationType>DynamicLibrary</ConfigurationType>
9090
<UseDebugLibraries>false</UseDebugLibraries>
9191
<WholeProgramOptimization>true</WholeProgramOptimization>
9292
<CharacterSet>Unicode</CharacterSet>
93-
<PlatformToolset>v142</PlatformToolset>
93+
<PlatformToolset>v143</PlatformToolset>
9494
</PropertyGroup>
9595
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
9696
<ImportGroup Label="ExtensionSettings">
@@ -544,13 +544,13 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
544544
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
545545
<ImportGroup Label="ExtensionTargets">
546546
<Import Project="..\..\packages\boost.1.78.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.78.0\build\boost.targets')" />
547-
<Import Project="..\..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets" Condition="Exists('..\..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets')" />
547+
<Import Project="..\..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets" Condition="Exists('..\..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets')" />
548548
</ImportGroup>
549549
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
550550
<PropertyGroup>
551551
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
552552
</PropertyGroup>
553553
<Error Condition="!Exists('..\..\packages\boost.1.78.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.78.0\build\boost.targets'))" />
554-
<Error Condition="!Exists('..\..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost_python310-vc142.1.78.0\build\boost_python310-vc142.targets'))" />
554+
<Error Condition="!Exists('..\..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost_python310-vc143.1.78.0\build\boost_python310-vc143.targets'))" />
555555
</Target>
556556
</Project>

‎PythonScript/project/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.78.0" targetFramework="native" />
4-
<package id="boost_python310-vc142" version="1.78.0" targetFramework="native" />
4+
<package id="boost_python310-vc143" version="1.78.0" targetFramework="native" />
55
</packages>

‎PythonScript/project/packages_appveyor.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="boost" version="1.78.0" targetFramework="native" />
4-
<package id="boost_python310-vc142" version="1.78.0" targetFramework="native" />
4+
<package id="boost_python310-vc143" version="1.78.0" targetFramework="native" />
55
<package id="python" version="3.10.1" targetFramework="native" />
66
<package id="pythonx86" version="3.10.1" targetFramework="native" />
77
</packages>

‎appveyor.yml‎

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

44

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

99
platform:
1010
- x64
@@ -25,7 +25,7 @@ install:
2525
- if "%platform%"=="Win32" set archi=x86
2626
- if "%platform%"=="Win32" set platform_input=Win32
2727

28-
- if "%PlatformToolset%"=="v142" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
28+
- if "%PlatformToolset%"=="v143" call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
2929

3030
- del "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages.config
3131
- copy "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages_appveyor.config "%APPVEYOR_BUILD_FOLDER%"\PythonScript\project\packages.config
@@ -64,7 +64,7 @@ after_build:
6464
Push-AppveyorArtifact "bin\$env:CONFIGURATION\PythonScript.dll" -FileName PythonScript.dll
6565
}
6666
67-
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v142") {
67+
if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v143") {
6868
if($env:PLATFORM_INPUT -eq "x64"){
6969
$ZipFileName = "PythonScript_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
7070
7z a $ZipFileName $env:APPVEYOR_BUILD_FOLDER\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll
@@ -95,5 +95,5 @@ deploy:
9595
force_update: true
9696
on:
9797
appveyor_repo_tag: true
98-
PlatformToolset: v142
98+
PlatformToolset: v143
9999
configuration: Release

0 commit comments

Comments
 (0)