- accidentally deleted the .net design time check code, putting back in

desjarlais · Dec 22, 2023 · 4d44c4d · 4d44c4d
1 parent 6e0aa0d
commit 4d44c4d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 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.9</Version>
+		<Version>5.3.3.11</Version>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DocumentationFile>bin\$(Configuration)\ScintillaNET.xml</DocumentationFile>
 		<UseWindowsForms>true</UseWindowsForms>

diff --git a/Shared/Scintilla.cs b/Shared/Scintilla.cs
@@ -62,7 +62,7 @@ private static string LocateNativeDllDirectory()
 
             // check design-mode paths
             string frameworkName = assembly?.GetCustomAttribute<TargetFrameworkAttribute>()?.FrameworkName;
-            if (frameworkName.Contains("NETFramework") && Process.GetCurrentProcess().ProcessName == "devenv")
+            if (frameworkName.Contains("NETFramework"))
             {
                 // In.NET Framework, look for the assemblies in the nuget global packages folder
                 string nugetScintillaPackageFolder = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\.nuget\packages\scintilla5.net\";
@@ -85,9 +85,20 @@ private static string LocateNativeDllDirectory()
                 {
                     return hostProjectFolder;
                 }
+
+                throw new InvalidOperationException(@$"Unable to locate the Scintilla.NET satellite assemblies : directory '{basePath}' not found");
             }
+            else
+            {
+                // if .NET in design mode
+                basePath = Path.GetFullPath(Path.Combine(managedLocation, "..", "..", "build", platform));
+                if (Directory.Exists(basePath))
+                {
+                    return basePath;
+                }
 
-            throw new InvalidOperationException(@$"Unable to locate the Scintilla.NET satellite assemblies : directory '{basePath}' not found");
+                throw new InvalidOperationException(@$"Unable to locate the Scintilla.NET satellite assemblies : directory '{basePath}' not found");
+            }
         }
 
         #region Fields