Include packages for x86/x64 onigwrap.dll, and dynamic binding betwee…

…n them #51
danipen · Jul 3, 2023 · 30516a1 · 30516a1
1 parent a50198b
commit 30516a1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/build/CopyNativeLibraries.targets b/build/CopyNativeLibraries.targets
diff --git a/build/TextMateSharp.targets b/build/TextMateSharp.targets
@@ -1,3 +1,14 @@
-<Project>
-    <Import Project="$(MSBuildThisFileDirectory)\CopyNativeLibraries.targets" />
-</Project>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition="'$(TargetFramework)' == '' Or '$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
+    <None Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\onigwrap-x64.dll">
+      <Link>onigwrap-x64.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\runtimes\win-x86\native\onigwrap-x86.dll">
+      <Link>onigwrap-x86.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/TextMateSharp/TextMateSharp.csproj b/src/TextMateSharp/TextMateSharp.csproj
@@ -77,9 +77,6 @@ TextMateSharp uses a wrapper around Oniguruma regex engine. Read below to learn
     <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <Content Pack="True"
-      PackagePath="build"
-      Include="..\..\build\CopyNativeLibraries.targets" />
     <Content Pack="True"
       PackagePath="build"
       Include="..\..\build\TextMateSharp.targets" />