after fixing the nuget release errors, the nuget package is not findi…

…ng the assemblies anymore, ongoing work to sort out why they are missing
desjarlais · Dec 7, 2023 · fcf6838 · fcf6838
1 parent c7e1fbb
commit fcf6838
Show file tree

Hide file tree

Showing 3 changed files with 11 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.1</Version>
+		<Version>5.3.3.5</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;

diff --git a/native/scintilla5.net.targets b/native/scintilla5.net.targets
@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <NativeLibraries Include="$(MSBuildThisFileDirectory)**\*.dll" />
+    <None Include="@(NativeLibraries)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>