Merge pull request #164 from desjarlais/add-customlibrarysetting

add fix for #162 to add setting a custom path and directory for scintilla binaries

Author: desjarlais

README.md

@@ -34,9 +34,9 @@ For the latest and greatest you can build the [Master](https://github.com/desjar
 **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/desjarlais/Scintilla.NET/issues/16).
 
-Scintilla library version = 5.5.5
+Scintilla library version = 5.5.7
 
-Lexilla library version = 5.4.3
+Lexilla library version = 5.4.5
 
 ## Background
 For more information about the history and background information, look at the wiki [here](https://github.com/desjarlais/Scintilla.NET/wiki/Scintilla.NET-History).

Scintilla.NET/Scintilla.NET.csproj

@@ -5,7 +5,7 @@
 		<NeutralLanguage>en-US</NeutralLanguage>
 		<Description>Source Editing Component based on Scintilla 5 series.</Description>
 		<Copyright>Copyright (c) Jacob Slusser 2018, VPKSoft, cyber960 2022, desjarlais 2023, Ahmet Sait 2025</Copyright>
-		<Version>6.0.1</Version>
+		<Version>6.1.0</Version>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<UseWindowsForms>true</UseWindowsForms>

Scintilla.NET/Scintilla.cs

@@ -76,7 +76,13 @@ procName is "devenv" or "DesignToolsServer" or // WinForms app in VS IDE
         /// </summary>
         public static IEnumerable<string> EnumerateSatelliteLibrarySearchPaths()
         {
-            // check run-time paths
+            // 1. User configured (must be set before first Scintilla usage)
+            if (!string.IsNullOrWhiteSpace(SatelliteDirectory))
+            {
+                yield return SatelliteDirectory;
+            }
+
+            // 2. check run-time paths
             string nativeSubFolder = Path.Combine("runtimes", "win-" + Helpers.GetArchitectureRid(WinApiHelpers.GetProcessArchitecture()), "native");
 
             {
@@ -106,6 +112,7 @@ public static IEnumerable<string> EnumerateSatelliteLibrarySearchPaths()
                 }
             }
 
+            // 3. check design-time paths
             if (InDesignProcess())
             {
                 // Look for the assemblies in the nuget global packages folder
@@ -121,6 +128,19 @@ public static IEnumerable<string> EnumerateSatelliteLibrarySearchPaths()
                 string rootProjectFolder = Path.GetFullPath(Path.Combine(nugetScintillaNETLocation, @"..\..\..\.."));
                 yield return Path.Combine(rootProjectFolder, "packages", nugetScintillaPackageName + "." + versionString, nativeSubFolder);
             }
+
+            // 4. check environment variable custom paths
+            string x86CustomPath = Environment.GetEnvironmentVariable("SCINTILLA_X86", EnvironmentVariableTarget.User);
+            if (!string.IsNullOrWhiteSpace(x86CustomPath))
+            {
+                yield return x86CustomPath;
+            }
+
+            string x64CustomPath = Environment.GetEnvironmentVariable("SCINTILLA_X64", EnvironmentVariableTarget.User);
+            if (!string.IsNullOrWhiteSpace(x64CustomPath))
+            {
+                yield return x64CustomPath;
+            }
         }
 
         #region Fields
@@ -3557,6 +3577,12 @@ public void ClearChangeHistory()
 
         #region Properties
 
+        /// <summary>
+        /// Optional absolute directory path probed first for native satellite libraries.
+        /// If set, this directory is checked before all default probing locations.
+        /// </summary>
+        public static string SatelliteDirectory { get; set; }
+
         /// <summary>
         /// Gets or sets whether Scintilla's native drag &amp; drop should be used instead of WinForms based one.
         /// </summary>