Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Scintilla.NET/Scintilla.NET.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.0</Version>
<Version>6.1.1</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<UseWindowsForms>true</UseWindowsForms>
Expand Down
10 changes: 2 additions & 8 deletions Scintilla.NET/Scintilla.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ procName is "devenv" or "DesignToolsServer" or // WinForms app in VS IDE
public static IEnumerable<string> EnumerateSatelliteLibrarySearchPaths()
{
// 1. User configured (must be set before first Scintilla usage)
if (!string.IsNullOrWhiteSpace(SatelliteDirectory))
if (!string.IsNullOrWhiteSpace(ScintillaNativeLibrary.SatelliteDirectory))
{
yield return SatelliteDirectory;
yield return ScintillaNativeLibrary.SatelliteDirectory;
}

// 2. check run-time paths
Expand Down Expand Up @@ -3577,12 +3577,6 @@ 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>
Expand Down
16 changes: 16 additions & 0 deletions Scintilla.NET/ScintillaNativeLibrary.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#nullable enable
namespace ScintillaNET;

/// <summary>
/// Provides optional early configuration for locating native satellite libraries (Scintilla.dll, Lexilla.dll).
/// Must be configured BEFORE the <see cref="Scintilla"/> type is first touched; otherwise changes have no effect.
/// </summary>
public static class ScintillaNativeLibrary
{
/// <summary>
/// Optional absolute directory path probed first for native satellite libraries.
/// If set, this directory is checked before all default probing locations.
/// Example Usage: ScintillaNativeLibrary.SatelliteDirectory = @"C:\MyApp\binaries";
/// </summary>
public static string? SatelliteDirectory { get; set; }
}