- Updated native binaries (scintilla 5.4.0, lexilla 5.2.9)

- adding support for .net8 - updated url's and logo - updated test app to .net8
desjarlais · Dec 6, 2023 · 5a6e453 · 5a6e453
1 parent d56108b
commit 5a6e453
Show file tree

Hide file tree

Showing 16 changed files with 39 additions and 128 deletions.
diff --git 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
@@ -2,39 +2,37 @@
 
 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/)
 
 Scintilla.NET can also be used with WPF using the <a href="https://msdn.microsoft.com/en-us/library/system.windows.forms.integration.windowsformshost(v=vs.110).aspx">WindowsFormsHost</a>.
 For Linux, see the [Scintilla.NET.Gtk](https://github.com/VPKSoft/Scintilla.NET.Gtk).
 
 ## Utility assemblies
-* [ScintillaLexers](https://github.com/VPKSoft/ScintillaLexers) - A class library containing lexer definitions for the Scintilla.NET
-* [VPKSoft.ScintillaUrlDetect](https://github.com/VPKSoft/VPKSoft.ScintillaUrlDetect) - A library to detect URLs with the ScintillaNET control
-* [VPKSoft.ScintillaSpellCheck](https://github.com/VPKSoft/VPKSoft.ScintillaSpellCheck) - A spell checking library for the Scintilla.NET
-* [ScintillaDiff](https://github.com/VPKSoft/ScintillaDiff) - A class library for comparing two text files with the Scintilla.NET control
+* [ScintillaLexers](https://github.com/desjarlais/ScintillaLexers) - A class library containing lexer definitions for the Scintilla.NET
+* [VPKSoft.ScintillaUrlDetect](https://github.com/desjarlais/VPKSoft.ScintillaUrlDetect) - A library to detect URLs with the ScintillaNET control
+* [VPKSoft.ScintillaSpellCheck](https://github.com/desjarlais/VPKSoft.ScintillaSpellCheck) - A spell checking library for the Scintilla.NET
+* [ScintillaDiff](https://github.com/desjarlais/ScintillaDiff) - A class library for comparing two text files with the Scintilla.NET control
 * [ScintillaTabbedTextControl](https://github.com/VPKSoft/ScintillaTabbedTextControl) - A tabbed control for Scintilla.NET to display multiple documents
-* [ScintillaNetPrinting](https://github.com/VPKSoft/ScintillaNetPrinting) - Add print functionallity to Scintilla.NET
+* [ScintillaNetPrinting](https://github.com/desjarlais/ScintillaNetPrinting) - Add print functionallity to Scintilla.NET
 * [AutoCompleteMenu-ScintillaNET](https://github.com/Ahmad45123/AutoCompleteMenu-ScintillaNET) - Adds an autocomplete menu to ScintillaNET that's more flexible.
 
 ### Project Status
-This project is continuing from the abandoned [ScintllaNET](https://github.com/jacobslusser/ScintillaNET) by Jacob Slusser.
+This project is continuing from the abandoned [ScintllaNET](https://github.com/jacobslusser/ScintillaNET) by Jacob Slusser and transferred from [VPKSoft](https://github.com/VPKSoft) who has done an incredible job of updating and extending the original project.
 
-Scintilla.NET is in active development. If you find any issues or just have a question feel free to use the [Issues](https://github.com/VPKSoft/ScintillaNET/issues) feature at our GitHub page. **NOTE:** I don't read the issues posted to the main fork - so if your issue is about this project, post it here.
+Scintilla.NET is in active development. If you find any issues or just have a question feel free to use the [Issues](https://github.com/desjarlais/ScintillaNET/issues) feature at our GitHub page. **NOTE:** I don't read the issues posted to the main fork - so if your issue is about this project, post it here.
 
-Compiled versions which are production ready can be downloaded from [NuGet](https://www.nuget.org/packages/Scintilla.NET/) or the [Releases](https://github.com/VPKSoft/ScintillaNET/releases) page.
+Compiled versions which are production ready can be downloaded from [NuGet](https://www.nuget.org/packages/Scintilla.NET/) or the [Releases](https://github.com/desjarlais/ScintillaNET/releases) page.
 
-For the latest and greatest you can build the [Master](https://github.com/VPKSoft/ScintillaNET/archive/master.zip) branch from source using Visual Studio 2022.
+For the latest and greatest you can build the [Master](https://github.com/desjarlais/ScintillaNET/archive/master.zip) branch from source using Visual Studio 2022.
 
 ### Technical notes
 **Versions before v.5.3.1.1:**
-[Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017, 2019, and 2022](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170) is required for the component to work, see [#16](https://github.com/VPKSoft/ScintillaNET/issues/16).
+[Microsoft Visual C++ Redistributable for Visual Studio 2015, 2017, 2019, and 2022](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist?view=msvc-170) is required for the component to work, see [#16](https://github.com/desjarlais/ScintillaNET/issues/16).
 
 ### Related Projects
-- The [ScintillaNET-FindReplaceDialog](https://github.com/VPKSoft/ScintillaNET-FindReplaceDialog) project for adding a Find/Replace dialog to ScintillaNET (thanks to @Stumpii)
+- The [ScintillaNET-FindReplaceDialog](https://github.com/desjarlais/ScintillaNET-FindReplaceDialog) project for adding a Find/Replace dialog to ScintillaNET (thanks to @Stumpii)
 
 ## Background
 > This project is a rewrite of the [ScintillaNET project hosted at CodePlex](http://scintillanet.codeplex.com/) and maintained by myself and others. After many years of contributing to that project I decided to think differently about the API we had created and felt I could make better one if I was willing to go back to a blank canvas. Thus, this project is the spiritual successor to the original ScintillaNET but has been written from scratch.

diff --git a/Scintilla.NET.TestApp/FormMain.cs b/Scintilla.NET.TestApp/FormMain.cs
@@ -12,7 +12,7 @@ public FormMain()
     {
         InitializeComponent();
         // ReSharper disable once VirtualMemberCallInConstructor
-        Text += @"  © VPKSoft " + DateTime.Now.Year;
+        Text += @"  © desjarlais " + DateTime.Now.Year;
 //            scintilla.Technology = Technology.DirectWrite;
     }
 
@@ -22,7 +22,6 @@ private void mnuOpen_Click(object sender, EventArgs e)
         {
             scintilla.Text = File.ReadAllText(odFile.FileName);
             scintilla.EmptyUndoBuffer();
-            //scintilla.Lexer = Lexer.Xml;
             SetLexerCs();
         }
     }
@@ -50,7 +49,6 @@ private void SetLexerCs()
         scintilla.Styles[Style.Cpp.StringEol].BackColor = Color.Pink;
         scintilla.Styles[Style.Cpp.Operator].ForeColor = Color.Purple;
         scintilla.Styles[Style.Cpp.Preprocessor].ForeColor = Color.Maroon;
-//            scintilla.Lexer = Lexer.Cpp;
         scintilla.LexerName = "cpp";
 
         // Set the keywords

diff --git a/Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj b/Scintilla.NET.TestApp/Scintilla.NET.TestApp.csproj
@@ -2,18 +2,18 @@
   <PropertyGroup>
     <ProjectGuid>{F25685EC-098A-4080-95A9-445268609806}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
 <!--    <TargetFramework>net47</TargetFramework> -->
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyTitle>ScintillaNET.TestApp</AssemblyTitle>
     <Product>ScintillaNET.TestApp</Product>
-    <Copyright>Copyright © VPKSoft 2020</Copyright>
+    <Copyright>Copyright © desjarlais 2023</Copyright>
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <Company>VPKSoft</Company>
-    <Authors>VPKSoft</Authors>
+    <Company>desjarlais</Company>
+    <Authors>desjarlais</Authors>
     <Description>A test application to validate that the ScintillaNET control is working.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <RepositoryUrl>https://github.com/VPKSoft/ScintillaNET</RepositoryUrl>
+    <RepositoryUrl>https://github.com/desjarlais/ScintillaNET</RepositoryUrl>
     <UseWindowsForms>true</UseWindowsForms>  
     <RepositoryType />  
     <Platforms>AnyCPU;x64;x86</Platforms>  

diff --git a/Scintilla.NET/NuGet-Push.ps1 b/Scintilla.NET/NuGet-Push.ps1
diff --git 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
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<ProjectGuid>{22AE2386-60F1-476E-9303-61CDB0AAC4CF}</ProjectGuid>
-		<TargetFrameworks>netcoreapp3.1;net45;net6-windows;net7-windows</TargetFrameworks>
+		<TargetFrameworks>net45;net6-windows;net7-windows;net8-windows</TargetFrameworks>
 		<AssemblyTitle>ScintillaNET</AssemblyTitle>
-		<Company>Jacob Slusser, VPKSoft, cyber960</Company>
+		<Company>Jacob Slusser, VPKSoft, cyber960, desjarlais</Company>
 		<Product>Scintilla.NET</Product>
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<Description>Source Editing Component based on Scintilla 5 series.</Description>
-		<Copyright>Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2022.</Copyright>
-		<Version>5.3.2.9</Version>
+		<Copyright>Copyright (c) 2018, Jacob Slusser. All rights reserved. VPKSoft, cyber960 2022, desjarlais 2023.</Copyright>
+		<Version>5.3.3.0</Version>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DocumentationFile>bin\$(Configuration)\ScintillaNET.xml</DocumentationFile>
 		<UseWindowsForms>true</UseWindowsForms>
@@ -25,21 +25,21 @@
 		<PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
 	<PropertyGroup>
-		<PackageId>Scintilla.NET</PackageId>
+		<PackageId>Scintilla5.NET</PackageId>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<PackageProjectUrl>https://github.com/VPKSoft/ScintillaNET</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/VPKSoft/ScintillaNET</RepositoryUrl>
+		<PackageProjectUrl>https://github.com/desjarlais/ScintillaNET</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/desjarlais/ScintillaNET</RepositoryUrl>
 		<PackageIcon>vpksoft_logo.png</PackageIcon>
 		<RepositoryType>git</RepositoryType>
 		<PackageTags>ScintillaNET Scintilla Editor</PackageTags>
-		<PackageReleaseNotes>Please visit https://github.com/VPKSoft/ScintillaNET/releases to view the release notes.</PackageReleaseNotes>
+		<PackageReleaseNotes>Please visit https://github.com/desjarlais/ScintillaNET/releases to view the release notes.</PackageReleaseNotes>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
 		<SignAssembly Condition="'$(SignAssembly)' == 'true'">true</SignAssembly>
 		<AssemblyOriginatorKeyFile>scintilla.net.pfx</AssemblyOriginatorKeyFile>
 		<AssemblyName>Scintilla.NET</AssemblyName>
 		<RootNamespace>Scintilla.NET</RootNamespace>
-		<Authors>Jacob Slusser, VPKSoft, cyber960</Authors>
+		<Authors>Jacob Slusser, VPKSoft, cyber960, desjarlais</Authors>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
 		<PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,6 +49,12 @@
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
 		<PlatformTarget>AnyCPU</PlatformTarget>
 	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8-windows|AnyCPU'">
+	  <WarningLevel>7</WarningLevel>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8-windows|AnyCPU'">
+	  <WarningLevel>7</WarningLevel>
+	</PropertyGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
 		<Reference Include="System.Windows.Forms" />
 		<Reference Include="System.Data.DataSetExtensions" />

diff --git a/Shared/vpksoft_logo.png b/Shared/vpksoft_logo.png
diff --git a/native/x64/Lexilla.dll b/native/x64/Lexilla.dll
diff --git a/native/x64/Scintilla.dll b/native/x64/Scintilla.dll
diff --git a/native/x64/version.txt b/native/x64/version.txt
diff --git a/native/x64/versions.txt 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
diff --git a/native/x86/Scintilla.dll b/native/x86/Scintilla.dll
diff --git a/native/x86/version.txt b/native/x86/version.txt
diff --git a/native/x86/versions.txt b/native/x86/versions.txt
@@ -1,2 +1,2 @@
-Scintilla: 5.3.6
-Lexilla: 5.2.6
+Scintilla: 5.4.0
+Lexilla: 5.2.9