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..761fc56 --- /dev/null +++ b/.github/workflows/CI_build.yml @@ -0,0 +1,54 @@ +name: CI_build + +on: [push, pull_request] + +jobs: + build: + + runs-on: windows-latest + strategy: + max-parallel: 6 + matrix: + build_configuration: [Release, Debug] + build_platform: [x64, Any CPU] + + 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 BracketsCheck.sln /m /p:configuration="${{ matrix.build_configuration }}" /p:platform="${{ matrix.build_platform }}" + + - name: Archive artifacts for ${{ matrix.build_platform }} + if: matrix.build_platform == 'x64' && matrix.build_configuration == 'Release' + uses: actions/upload-artifact@v3 + with: + name: BracketsCheck-${{ steps.tagName.outputs.tag }}-x64 + path: BracketsCheck\bin\${{ matrix.build_platform }}\${{ matrix.build_configuration }}\BracketsCheck.dll + + - name: Archive artifacts for ${{ matrix.build_platform }} + if: matrix.build_platform == 'Any CPU' && matrix.build_configuration == 'Release' + uses: actions/upload-artifact@v3 + with: + name: BracketsCheck-${{ steps.tagName.outputs.tag }}-x86 + path: BracketsCheck\bin\${{ matrix.build_configuration }}\BracketsCheck.dll + + - uses: olegtarasov/get-tag@v2.1.2 + id: tagName + + - name: Release for ${{ matrix.build_platform }} + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') && matrix.build_platform == 'x64' + with: + files: BracketsCheck-${{ steps.tagName.outputs.tag }}-x64 + + - name: Release for ${{ matrix.build_platform }} + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') && matrix.build_platform == 'Any CPU' + with: + files: BracketsCheck-${{ steps.tagName.outputs.tag }}-x86 + diff --git a/BracketsCheck/BracketsCheck.csproj b/BracketsCheck/BracketsCheck.csproj index a79041e..92a8048 100644 --- a/BracketsCheck/BracketsCheck.csproj +++ b/BracketsCheck/BracketsCheck.csproj @@ -10,7 +10,7 @@ BracketsCheck BracketsCheck bin\Debug\ - v4.0 + v4.8.1 3.5 @@ -48,6 +48,7 @@ prompt false MinimumRecommendedRules.ruleset + false bin\x64\Release\ @@ -57,6 +58,7 @@ x64 prompt MinimumRecommendedRules.ruleset + false true diff --git a/BracketsCheck/DllExport/NppPlugin.DllExport.targets b/BracketsCheck/DllExport/NppPlugin.DllExport.targets index a069eb5..ea73185 100644 --- a/BracketsCheck/DllExport/NppPlugin.DllExport.targets +++ b/BracketsCheck/DllExport/NppPlugin.DllExport.targets @@ -5,6 +5,11 @@ + + + $(DevEnvDir)\..\..\VC\bin + diff --git a/BracketsCheck/Properties/AssemblyInfo.cs b/BracketsCheck/Properties/AssemblyInfo.cs index 613a051..3f3139e 100644 --- a/BracketsCheck/Properties/AssemblyInfo.cs +++ b/BracketsCheck/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.2")] -[assembly: AssemblyFileVersion("1.2.2.0")] +[assembly: AssemblyVersion("1.2.3")] +[assembly: AssemblyFileVersion("1.2.3.0")] diff --git a/BracketsCheck/bin/Release/BracketsCheck.dll b/BracketsCheck/bin/Release/BracketsCheck.dll deleted file mode 100644 index f16a36a..0000000 Binary files a/BracketsCheck/bin/Release/BracketsCheck.dll and /dev/null differ diff --git a/BracketsCheck/bin/Release/BracketsCheck.zip b/BracketsCheck/bin/Release/BracketsCheck.zip deleted file mode 100644 index fe44338..0000000 Binary files a/BracketsCheck/bin/Release/BracketsCheck.zip and /dev/null differ diff --git a/appveyor.yml b/appveyor.yml index 761026a..1f4f89e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ -version: 1.0.{build} -image: Visual Studio 2015 +version: 1.2.3.{build} +image: Visual Studio 2022 platform: @@ -8,48 +8,54 @@ platform: - x64 configuration: - - Debug - Release + - Debug install: - - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" + - if "%platform%"=="x64" set archi=amd64 + - if "%platform%"=="x64" set platform_input=x64 + + - if "%platform%"=="x86" set archi=x86 + - if "%platform%"=="x86" set platform_input=x86 -build: - parallel: true # enable MSBuild parallel builds - verbosity: minimal + - if "%platform%"=="AnyCPU" set archi=x86 + - if "%platform%"=="AnyCPU" set platform_input=AnyCPU + + + - call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi% build_script: - cd "%APPVEYOR_BUILD_FOLDER%\BracketsCheck" - - msbuild BracketsCheck.csproj /m /p:configuration="%configuration%" /p:platform="%platform%" + - msbuild BracketsCheck.csproj /m /p:configuration="%configuration%" /p:platform="%platform_input%" after_build: - - cd "%APPVEYOR_BUILD_FOLDER%\BracketsCheck" + - cd "%APPVEYOR_BUILD_FOLDER%" - ps: >- - if ($env:PLATFORM -eq "x64") { - Push-AppveyorArtifact "bin\$($env:PLATFORM)\$($env:CONFIGURATION)\BracketsCheck.dll" -FileName BracketsCheck.dll + if ($env:PLATFORM_INPUT -eq "x64") { + Push-AppveyorArtifact "BracketsCheck\bin\$($env:PLATFORM_INPUT)\$($env:CONFIGURATION)\BracketsCheck.dll" -FileName BracketsCheck.dll } - if ($env:PLATFORM -eq "x86" ) { - Push-AppveyorArtifact "bin\$($env:PLATFORM)\$($env:CONFIGURATION)\BracketsCheck.dll" -FileName BracketsCheck.dll + if ($env:PLATFORM_INPUT -eq "x86" ) { + Push-AppveyorArtifact "BracketsCheck\bin\$($env:PLATFORM_INPUT)\$($env:CONFIGURATION)\BracketsCheck.dll" -FileName BracketsCheck.dll } - if ($env:PLATFORM -eq "AnyCPU" ) { - Push-AppveyorArtifact "bin\$($env:CONFIGURATION)\BracketsCheck.dll" -FileName BracketsCheck.dll + if ($env:PLATFORM_INPUT -eq "AnyCPU" ) { + Push-AppveyorArtifact "BracketsCheck\bin\$($env:CONFIGURATION)\BracketsCheck.dll" -FileName BracketsCheck.dll } if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release") { - if($env:PLATFORM -eq "x64"){ - $ZipFileName = "NppHash_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip" - 7z a $ZipFileName bin\$env:PLATFORM\$env:CONFIGURATION\BracketsCheck.dll + if($env:PLATFORM_INPUT -eq "x64"){ + $ZipFileName = "BracketsCheck_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip" + 7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\BracketsCheck\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\BracketsCheck.dll" } - if($env:PLATFORM -eq "x86"){ - $ZipFileName = "NppHash_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" - 7z a $ZipFileName bin\$env:PLATFORM\$env:CONFIGURATION\BracketsCheck.dll + if($env:PLATFORM_INPUT -eq "x86"){ + $ZipFileName = "BracketsCheck_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" + 7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\BracketsCheck\bin\$env:PLATFORM_INPUT\$env:CONFIGURATION\BracketsCheck.dll" } - if($env:PLATFORM -eq "AnyCPU"){ - $ZipFileName = "NppHash_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" - 7z a $ZipFileName bin\$env:CONFIGURATION\BracketsCheck.dll + if($env:PLATFORM_INPUT -eq "AnyCPU"){ + $ZipFileName = "BracketsCheck_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip" + 7z a $ZipFileName "$($env:APPVEYOR_BUILD_FOLDER)\BracketsCheck\bin\$env:CONFIGURATION\BracketsCheck.dll" } }