diff --git a/LICENSE b/LICENSE index e315fb2..69177b5 100644 --- a/LICENSE +++ b/LICENSE @@ -2,6 +2,7 @@ The MIT License (MIT) Copyright (c) 2017, Jacob Slusser, https://github.com/jacobslusser, Copyright (c) 2020-2022 VPKSoft +Copyright (c) 2023 desjarlais Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 7e8399b..38bd5ce 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,7 @@ Scintilla.NET is a Windows Forms control, wrapper, and bindings for the versatile [Scintilla](http://www.scintilla.org/) source code editing component. -[![.Build validate](https://github.com/VPKSoft/Scintilla.NET/actions/workflows/dotnet-desktop-build.yml/badge.svg)](https://github.com/VPKSoft/Scintilla.NET/actions/workflows/dotnet-desktop-build.yml) [![.NET NuGet Release](https://github.com/VPKSoft/Scintilla.NET/actions/workflows/dotnet-nuget-release.yml/badge.svg)](https://github.com/VPKSoft/Scintilla.NET/actions/workflows/dotnet-nuget-release.yml) [![Nuget](https://img.shields.io/nuget/v/Scintilla.NET)](https://www.nuget.org/packages/Scintilla.NET) - -**NOTE: See discussion about the "Looking for a new maintainer": [#76](https://github.com/VPKSoft/Scintilla.NET/discussions/78)** +[![.Build validate](https://github.com/desjarlais/Scintilla.NET/actions/workflows/dotnet-desktop-build.yml/badge.svg)](https://github.com/desjarlais/Scintilla.NET/actions/workflows/dotnet-desktop-build.yml) [![.NET NuGet Release](https://github.com/desjarlais/Scintilla.NET/actions/workflows/dotnet-nuget-release.yml/badge.svg)](https://github.com/desjarlais/Scintilla.NET/actions/workflows/dotnet-nuget-release.yml) [![Nuget](https://img.shields.io/nuget/v/Scintilla.NET)](https://www.nuget.org/packages/Scintilla.NET) > "As well as features found in standard text editing components, Scintilla includes features especially useful when editing and debugging source code. These include support for syntax styling, error indicators, code completion and call tips. The selection margin can contain markers like those used in debuggers to indicate breakpoints and the current line. Styling choices are more open than with many editors, allowing the use of proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts." -- [scintilla.org](http://www.scintilla.org/) @@ -12,29 +10,29 @@ Scintilla.NET can also be used with WPF using the {F25685EC-098A-4080-95A9-445268609806} WinExe - net7-windows + net8.0-windows7.0 true ScintillaNET.TestApp ScintillaNET.TestApp - Copyright © VPKSoft 2020 + Copyright © desjarlais 2023 bin\$(Configuration)\ - VPKSoft - VPKSoft + desjarlais + desjarlais A test application to validate that the ScintillaNET control is working. MIT - https://github.com/VPKSoft/ScintillaNET + https://github.com/desjarlais/ScintillaNET true AnyCPU;x64;x86 diff --git a/Scintilla.NET/NuGet-Push.ps1 b/Scintilla.NET/NuGet-Push.ps1 deleted file mode 100644 index d8ee6fe..0000000 --- a/Scintilla.NET/NuGet-Push.ps1 +++ /dev/null @@ -1,90 +0,0 @@ -<# -MIT License - -Copyright (c) 2021 Petteri Kautonen - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -#> - -Write-Output "Init NuGet push..." - -$output_file = "ScintillaNET\CryptEnvVar.exe" - -$download_url = "https://www.vpksoft.net/toolset/CryptEnvVar.exe" - -Write-Output "Download file: $download_url ..." -(New-Object System.Net.WebClient).DownloadFile($download_url, $output_file) -Write-Output "Download done." - -# application parameters.. -$application = "ScintillaNET" -$environment_cryptor = "CryptEnvVar.exe" - -# create the digital signature.. -$arguments = @("-s", $Env:SECRET_KEY, "-e", "CERT_1;CERT_2;CERT_3;CERT_4;CERT_5;CERT_6;CERT_7;CERT_8", "-f", "C:\vpksoft.pfx", "-w", "80", "-i", "-v") -& (-join($application, "\", $environment_cryptor)) $arguments - -#create nuget.config file.. -$arguments = @("-s", $Env:SECRET_KEY, "-e", "NUGET_CONFIG", "-f", "nuget.config", "-w", "80", "-i", "-v") -& (-join($application, "\", $environment_cryptor)) $arguments - -# register the certificate to the CI image.. -$certpw=ConvertTo-SecureString $Env:PFX_PASS –asplaintext –force -Import-PfxCertificate -FilePath "C:\vpksoft.pfx" -CertStoreLocation Cert:\LocalMachine\My -Password $certpw | Out-Null - -# sign and push the NuGet packages.. -if ([string]::IsNullOrEmpty($Env:CIRCLE_PR_NUMBER)) # dont push on PR's.. -{ - $files = Get-ChildItem $Env:CIRCLE_WORKING_DIRECTORY -r -Filter *Scintilla.NET*.nupkg # use the mask to discard possible third party packages.. - for ($i = 0; $i -lt $files.Count; $i++) - { - $file = $files[$i].FullName - - # sign the NuGet packages. - Write-Output (-join("Signing package: ", $file, " ...")) - - $arguments = @("sign", $file, "-CertificatePath", "C:\vpksoft.pfx", "-Timestamper", "http://timestamp.comodoca.com", "-CertificatePassword", $Env:PFX_PASS) - - nuget.exe $arguments > null 2>&1 - Write-Output (-join("Package signed: ", $file, ".")) - - # push the NuGet packges.. - $nuget_api = "https://api.nuget.org/v3/index.json" - #$nuget_api = "https://apiint.nugettest.org/v3/index.json" - $nuget_packages_api = "https://nuget.pkg.github.com/VPKSoft/index.json" - - Write-Output (-join("Pushing NuGet:", $file, " ...")) - - # To nuget.org.. - $arguments = @("push", $file, $Env:NUGET_APIKEY, "-Source", $nuget_api, "-SkipDuplicate") - #$args = @("push", $file, $Env:NUGET_TEST_APIKEY, "-Source", $nuget_api, "-SkipDuplicate") - nuget.exe $arguments - - # To GitHub packages.. - $arguments = @("push", $file, $Env:NUGET_PACKAGES_API, "-Source", $nuget_packages_api, "-SkipDuplicate") - nuget.exe $arguments - - Write-Output (-join("Pushing done:", $file, ".")) - } - Write-Output "NuGet push finished." -} -else -{ - Write-Output (-join("PR detected, no package publish: ", $Env:CIRCLE_PR_NUMBER)) -} diff --git a/Scintilla.NET/Properties/AssemblyInfo.cs b/Scintilla.NET/Properties/AssemblyInfo.cs index 2d1ceff..c1c5033 100644 --- a/Scintilla.NET/Properties/AssemblyInfo.cs +++ b/Scintilla.NET/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f8ac48e7-9378-482d-8c7f-92c8408dd4f2")] +[assembly: Guid("a0ca8ffd-6851-40ec-8b13-ae30b2bc33f8")] diff --git a/Scintilla.NET/Scintilla.NET.csproj b/Scintilla.NET/Scintilla.NET.csproj index f80dadf..e0045e6 100644 --- a/Scintilla.NET/Scintilla.NET.csproj +++ b/Scintilla.NET/Scintilla.NET.csproj @@ -1,14 +1,14 @@  {22AE2386-60F1-476E-9303-61CDB0AAC4CF} - netcoreapp3.1;net45;net6-windows;net7-windows + net45;net6-windows;net7-windows;net8-windows ScintillaNET - Jacob Slusser, VPKSoft, cyber960 + Jacob Slusser, VPKSoft, cyber960, desjarlais Scintilla.NET en-US Source Editing Component based on Scintilla 5 series. - Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2022. - 5.3.2.9 + Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2022, desjarlais 2023. + 5.3.3.0 true bin\$(Configuration)\ScintillaNET.xml true @@ -25,21 +25,21 @@ AnyCPU - Scintilla.NET + Scintilla5.NET MIT - https://github.com/VPKSoft/ScintillaNET - https://github.com/VPKSoft/ScintillaNET + https://github.com/desjarlais/ScintillaNET + https://github.com/desjarlais/ScintillaNET vpksoft_logo.png git ScintillaNET Scintilla Editor - Please visit https://github.com/VPKSoft/ScintillaNET/releases to view the release notes. + Please visit https://github.com/desjarlais/ScintillaNET/releases to view the release notes. true true true scintilla.net.pfx Scintilla.NET Scintilla.NET - Jacob Slusser, VPKSoft, cyber960 + Jacob Slusser, VPKSoft, cyber960, desjarlais AnyCPU @@ -49,6 +49,12 @@ AnyCPU + + 7 + + + 7 + diff --git a/Shared/vpksoft_logo.png b/Shared/vpksoft_logo.png index dd8f20d..2855643 100644 Binary files a/Shared/vpksoft_logo.png and b/Shared/vpksoft_logo.png differ diff --git a/native/x64/Lexilla.dll b/native/x64/Lexilla.dll index f64dbe0..ebf3ce6 100644 Binary files a/native/x64/Lexilla.dll and b/native/x64/Lexilla.dll differ diff --git a/native/x64/Scintilla.dll b/native/x64/Scintilla.dll index 5f69551..045acfa 100644 Binary files a/native/x64/Scintilla.dll and b/native/x64/Scintilla.dll differ diff --git a/native/x64/version.txt b/native/x64/version.txt deleted file mode 100644 index 7893e1a..0000000 --- a/native/x64/version.txt +++ /dev/null @@ -1,2 +0,0 @@ -Scintilla: 5.3.6 -Lexilla: 5.2.6 \ No newline at end of file diff --git a/native/x64/versions.txt b/native/x64/versions.txt new file mode 100644 index 0000000..edcb030 --- /dev/null +++ b/native/x64/versions.txt @@ -0,0 +1,2 @@ +Scintilla: 5.4.0 +Lexilla: 5.2.9 diff --git a/native/x86/Lexilla.dll b/native/x86/Lexilla.dll index c1b2fbc..7d9c363 100644 Binary files a/native/x86/Lexilla.dll and b/native/x86/Lexilla.dll differ diff --git a/native/x86/Scintilla.dll b/native/x86/Scintilla.dll index 840c0a5..6e3962e 100644 Binary files a/native/x86/Scintilla.dll and b/native/x86/Scintilla.dll differ diff --git a/native/x86/version.txt b/native/x86/version.txt deleted file mode 100644 index 8e9a9f7..0000000 --- a/native/x86/version.txt +++ /dev/null @@ -1,2 +0,0 @@ -Scintilla: 5.3.2 -Lexilla: 5.2.1 \ No newline at end of file diff --git a/native/x86/versions.txt b/native/x86/versions.txt index 7893e1a..edcb030 100644 --- a/native/x86/versions.txt +++ b/native/x86/versions.txt @@ -1,2 +1,2 @@ -Scintilla: 5.3.6 -Lexilla: 5.2.6 \ No newline at end of file +Scintilla: 5.4.0 +Lexilla: 5.2.9