- possible conflict with issue #68

- basePath is initially correct, but after calling "Combine", it is changing the path to end with \bin\build\x64 as an example, which could be something related to changes I made to correct the errors in the build processes, but for now, removing the combine to see if that resolves the issue
desjarlais · Dec 6, 2023 · c7e1fbb · c7e1fbb
1 parent 61e66c6
commit c7e1fbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Scintilla.NET/Scintilla.NET.csproj b/Scintilla.NET/Scintilla.NET.csproj
@@ -8,7 +8,7 @@
 		<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, desjarlais 2023.</Copyright>
-		<Version>5.3.3.0</Version>
+		<Version>5.3.3.1</Version>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DocumentationFile>bin\$(Configuration)\ScintillaNET.xml</DocumentationFile>
 		<UseWindowsForms>true</UseWindowsForms>

diff --git a/Shared/Scintilla.cs b/Shared/Scintilla.cs
@@ -80,7 +80,7 @@ private static string LocateNativeDllDirectory()
             else 
             {
                 // if .NET in design mode
-                basePath = Path.GetFullPath(Path.Combine(managedLocation, "..", "..", "build", platform));
+                // basePath = Path.GetFullPath(Path.Combine(managedLocation, "..", "..", "build", platform));
                 if (Directory.Exists(basePath))
                 {
                     return basePath;