From 1e14190621511909654253cee62bcfda72d36d84 Mon Sep 17 00:00:00 2001 From: Christian Grasser Date: Wed, 13 Sep 2023 18:30:59 +0200 Subject: [PATCH] use VS2022 and corresponding toolset v143 --- .github/workflows/CI_build.yml | 4 ++-- .github/workflows/codeql-analysis.yml | 4 ++-- HexEditor/projects/2003/HexEditor.vcxproj | 24 +++++++++++++++++------ HexEditor/src/HEXDialog.cpp | 2 +- appveyor.yml | 9 +++++---- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml index a7d3573..d26a953 100644 --- a/.github/workflows/CI_build.yml +++ b/.github/workflows/CI_build.yml @@ -7,7 +7,7 @@ jobs: runs-on: windows-latest strategy: - max-parallel: 6 + fail-fast: false matrix: build_configuration: [Release, Debug] build_platform: [x64, Win32, ARM64] @@ -21,7 +21,7 @@ jobs: - name: MSBuild of plugin dll working-directory: HexEditor\projects\2003\ - run: msbuild HexEditor.vcxproj /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:PlatformToolset="v142" + run: msbuild HexEditor.vcxproj /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:PlatformToolset="v143" - name: Archive artifacts for x64 if: matrix.build_platform == 'x64' && matrix.build_configuration == 'Release' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 935abe5..1a4f035 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -12,7 +12,7 @@ on: jobs: analyze: name: Analyze - runs-on: windows-2019 + runs-on: windows-latest steps: - name: Checkout repository @@ -46,7 +46,7 @@ jobs: - name: MSBuild of plugin dll working-directory: HexEditor\projects\2003\ - run: msbuild HexEditor.vcxproj /m /p:configuration="Debug" /p:platform="x64" /p:PlatformToolset="v142" + run: msbuild HexEditor.vcxproj /m /p:configuration="Debug" /p:platform="x64" /p:PlatformToolset="v143" - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v2 diff --git a/HexEditor/projects/2003/HexEditor.vcxproj b/HexEditor/projects/2003/HexEditor.vcxproj index 8bc4b3d..7580401 100644 --- a/HexEditor/projects/2003/HexEditor.vcxproj +++ b/HexEditor/projects/2003/HexEditor.vcxproj @@ -34,32 +34,32 @@ DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode DynamicLibrary - v142 + v143 Unicode @@ -121,6 +121,8 @@ true true false + stdcpp14 + stdc17 shlwapi.lib;%(AdditionalDependencies) @@ -144,6 +146,8 @@ true true false + stdcpp14 + stdc17 shlwapi.lib;%(AdditionalDependencies) @@ -166,6 +170,8 @@ true true false + stdcpp14 + stdc17 shlwapi.lib;%(AdditionalDependencies) @@ -193,6 +199,8 @@ true true Default + stdcpp14 + stdc17 shlwapi.lib;%(AdditionalDependencies) @@ -225,6 +233,8 @@ true true Default + stdcpp14 + stdc17 shlwapi.lib;%(AdditionalDependencies) @@ -256,6 +266,8 @@ true true Default + stdcpp14 + stdc17 shlwapi.lib;%(AdditionalDependencies) diff --git a/HexEditor/src/HEXDialog.cpp b/HexEditor/src/HEXDialog.cpp index d7af229..451b087 100644 --- a/HexEditor/src/HEXDialog.cpp +++ b/HexEditor/src/HEXDialog.cpp @@ -4601,7 +4601,7 @@ void HexEdit::CopyBinary(void) size_t selectionStart = execute(SCI_GETSELECTIONSTART); size_t selectionEnd = execute(SCI_GETSELECTIONEND); - int32_t strLen = static_cast(selectionEnd - selectionStart); + int32_t selectionLen = static_cast(selectionEnd - selectionStart); hSciTgt = (HWND)::SendMessage(_hParent, NPPM_CREATESCINTILLAHANDLE, 0, (LPARAM)_hSelf); GetSelection(&posBeg, &posEnd); diff --git a/appveyor.yml b/appveyor.yml index 087df92..37953ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,10 @@ version: 0.9.12.{build} -image: Visual Studio 2019 +image: Visual Studio 2022 environment: matrix: - - PlatformToolset: v142 + - PlatformToolset: v143 platform: - x64 @@ -26,6 +26,7 @@ install: - if "%platform%"=="arm64" set platform_input=arm64 - if "%PlatformToolset%"=="v142" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% + - if "%PlatformToolset%"=="v143" call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% build_script: @@ -38,7 +39,7 @@ after_build: Push-AppveyorArtifact "HexEditor\projects\2003\$env:PLATFORM_INPUT\$env:CONFIGURATION\HexEditor.dll" -FileName HexEditor.dll - if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v142") { + if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v143") { $ZipFileName = "HexEditor_$($env:APPVEYOR_REPO_TAG_NAME)_$($env:PLATFORM_INPUT).zip" 7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\HexEditor\projects\2003\$env:PLATFORM_INPUT\$env:CONFIGURATION\*.dll" } @@ -57,5 +58,5 @@ deploy: force_update: true on: appveyor_repo_tag: true - PlatformToolset: v142 + PlatformToolset: v143 configuration: Release