diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..2d01d71 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,13 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + + # Maintain dependencies for GitHub Actions + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" diff --git a/.github/workflows/CI_build.yml b/.github/workflows/CI_build.yml new file mode 100644 index 0000000..62dbc27 --- /dev/null +++ b/.github/workflows/CI_build.yml @@ -0,0 +1,45 @@ +name: CI_build + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-latest + strategy: + max-parallel: 6 + matrix: + build_configuration: [Unicode Release, Unicode Debug] + build_platform: [x64, Win32, ARM64] + + steps: + - name: Checkout repo + uses: actions/checkout@v3 + + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v1 + + - name: MSBuild of plugin dll + working-directory: . + run: msbuild FingerText.vcxproj /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" /p:PlatformToolset="v142" + + - name: Archive artifacts for x64 + if: matrix.build_platform == 'x64' && matrix.build_configuration == 'Unicode Release' + uses: actions/upload-artifact@v3 + with: + name: plugin_dll_x64 + path: ${{ matrix.build_platform }}\${{ matrix.build_configuration }}\FingerText.dll + + - name: Archive artifacts for Win32 + if: matrix.build_platform == 'Win32' && matrix.build_configuration == 'Unicode Release' + uses: actions/upload-artifact@v3 + with: + name: plugin_dll_x86 + path: ${{ matrix.build_configuration }}\FingerText.dll + + - name: Archive artifacts for ARM64 + if: matrix.build_platform == 'ARM64' && matrix.build_configuration == 'Unicode Release' + uses: actions/upload-artifact@v3 + with: + name: plugin_dll_arm64 + path: ${{ matrix.build_platform }}\${{ matrix.build_configuration }}\FingerText.dll diff --git a/Dialogs/Dialog.h b/Dialogs/Dialog.h index 9ba382b..2bf602e 100644 --- a/Dialogs/Dialog.h +++ b/Dialogs/Dialog.h @@ -1382,7 +1382,6 @@ #define FILEOPENORD 1536 #define _WIN32_WINNT_WIN7 0x0601 #define _WIN32_IE_IE60SP1 0x0601 -#define _WIN32_WINNT 0x0601 #define MULTIFILEOPENORD 1537 #define _WIN32_IE_WS03 0x0602 #define PRINTDLGORD 1538 @@ -1405,7 +1404,6 @@ #define IDC_MANAGE_LINK 1592 #define _WIN32_IE_IE70 0x0700 #define _WIN32_IE_IE80 0x0800 -#define _WIN32_IE 0x0800 #define CS_SAVEBITS 0x0800 #define HDS_NOSIZING 0x0800 #define TBSTYLE_FLAT 0x0800 diff --git a/FingerText.vcxproj b/FingerText.vcxproj index a2a60a6..88a2f5a 100644 --- a/FingerText.vcxproj +++ b/FingerText.vcxproj @@ -1,6 +1,10 @@  + + Unicode Debug + ARM64 + Unicode Debug Win32 @@ -9,6 +13,10 @@ Unicode Debug x64 + + Unicode Release + ARM64 + Unicode Release Win32 @@ -22,7 +30,7 @@ {2879EF3E-1AA6-4504-9C24-1F685F215BB5} FingerText Win32Proj - 8.1 + 10.0 @@ -30,26 +38,39 @@ Unicode false true - v120_xp + v143 DynamicLibrary Unicode false true - v120_xp + v143 + + + DynamicLibrary + Unicode + false + true + v143 DynamicLibrary Unicode true - v120_xp + v143 DynamicLibrary Unicode true - v120_xp + v143 + + + DynamicLibrary + Unicode + true + v143 @@ -62,6 +83,10 @@ + + + + @@ -70,6 +95,10 @@ + + + + <_ProjectFileVersion>10.0.30319.1 @@ -77,10 +106,12 @@ $(Configuration)\ false false + false $(Configuration)\ $(Configuration)\ true true + true @@ -123,6 +154,26 @@ $(OutDir)$(TargetName).lib + + + .\Utils;.\DuckEval;.\NppApi;.\DefaultSnippetPackage;.\sqlite3;.\DialogFeatures;.\Dialogs;.\;.\Config;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + MultiThreaded + Level3 + ProgramDatabase + true + true + + + winhttp.lib;shlwapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + Windows + true + true + $(OutDir)$(TargetName).lib + + Disabled @@ -177,6 +228,32 @@ + + + Disabled + .\Utils;.\DuckEval;.\NppApi;.\DefaultSnippetPackage;.\sqlite3;.\DialogFeatures;.\Dialogs;.\;.\Config;%(AdditionalIncludeDirectories) + WIN32;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + Level3 + ProgramDatabase + true + true + + + winhttp.lib;shlwapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + $(OutDir)$(TargetName).pdb + Windows + $(OutDir)$(TargetName).lib + false + + + + + +