From a50198b5f00dcbeb00b8b47b17bd610fd766f77f Mon Sep 17 00:00:00 2001
From: Andrii Medvediev <42775640+Andrew1Medvedev@users.noreply.github.com>
Date: Fri, 9 Jun 2023 13:46:34 +1000
Subject: [PATCH 1/2] Include packages for x86/x64 onigwrap.dll, and dynamic
 binding between them #51

---
 build/CopyNativeLibraries.targets      | 14 ++++++++++++++
 build/TextMateSharp.targets            |  3 +++
 src/TextMateSharp/TextMateSharp.csproj | 10 +++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 build/CopyNativeLibraries.targets
 create mode 100644 build/TextMateSharp.targets

diff --git a/build/CopyNativeLibraries.targets b/build/CopyNativeLibraries.targets
new file mode 100644
index 0000000..e9988c9
--- /dev/null
+++ b/build/CopyNativeLibraries.targets
@@ -0,0 +1,14 @@
+<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/build/TextMateSharp.targets b/build/TextMateSharp.targets
new file mode 100644
index 0000000..7c5af55
--- /dev/null
+++ b/build/TextMateSharp.targets
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$(MSBuildThisFileDirectory)\CopyNativeLibraries.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/TextMateSharp/TextMateSharp.csproj b/src/TextMateSharp/TextMateSharp.csproj
index 86a8401..e9162a1 100644
--- a/src/TextMateSharp/TextMateSharp.csproj
+++ b/src/TextMateSharp/TextMateSharp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -76,6 +76,14 @@ TextMateSharp uses a wrapper around Oniguruma regex engine. Read below to learn
   <ItemGroup>
     <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" />
+  </ItemGroup>
   <Import Project="..\..\build\SourceLink.props" />
   <Import Project="..\..\build\Directory.Build.props" />
 </Project>

From 30516a14bb913da98ae85e19b5932bfb6c559871 Mon Sep 17 00:00:00 2001
From: Andrii Medvediev <42775640+Andrew1Medvedev@users.noreply.github.com>
Date: Tue, 4 Jul 2023 09:51:54 +1000
Subject: [PATCH 2/2] Include packages for x86/x64 onigwrap.dll, and dynamic
 binding between them #51

---
 build/CopyNativeLibraries.targets      | 14 --------------
 build/TextMateSharp.targets            | 17 ++++++++++++++---
 src/TextMateSharp/TextMateSharp.csproj |  3 ---
 3 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 build/CopyNativeLibraries.targets

diff --git a/build/CopyNativeLibraries.targets b/build/CopyNativeLibraries.targets
deleted file mode 100644
index e9988c9..0000000
--- a/build/CopyNativeLibraries.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<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/build/TextMateSharp.targets b/build/TextMateSharp.targets
index 7c5af55..e9988c9 100644
--- a/build/TextMateSharp.targets
+++ b/build/TextMateSharp.targets
@@ -1,3 +1,14 @@
-<Project>
-    <Import Project="$(MSBuildThisFileDirectory)\CopyNativeLibraries.targets" />
-</Project>
\ No newline at end of file
+<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
index e9162a1..f5bc4c0 100644
--- 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" />