Merge pull request #70 from aikawayataro/use-onigwrap-package

Refactor to use Onigwrap package

.gitignore

@@ -359,27 +359,16 @@ MigrationBackup/
 
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
-onigwrap/src/libonigwrap.dylib
-onigwrap/src/libonig.a
-onigwrap/.DS_Store
 src/.DS_Store
 src/TextMateSharp/.DS_Store
 src/TextMateSharp/Internal/.DS_Store
-src/TextMateSharp/Internal/Oniguruma/.DS_Store
 .DS_Store
 src/.vscode/tasks.json
 src/.vscode/launch.json
 .idea/.idea.TextMateSharp/.idea/vcs.xml
 .idea/.idea.TextMateSharp/.idea/indexLayout.xml
 .idea/.idea.TextMateSharp/.idea/encodings.xml
-onigwrap/src/libonigwrap.so
 .idea/.idea.TextMateSharp.dir/.idea/encodings.xml
 .idea/.idea.TextMateSharp.dir/.idea/indexLayout.xml
 .idea/.idea.TextMateSharp.dir/.idea/vcs.xml
-onigwrap/src/onigwrap.lib
-onigwrap/src/onigwrap.exp
-onigwrap/src/onigwrap.dll
-onigwrap/src/onig_s.lib
-onigwrap/src/arm_libonigwrap.dylib
-onigwrap/src/x86_libonigwrap.dylib
 .idea/.idea.TextMateSharp/.idea/riderMarkupCache.xml

README.md

@@ -11,7 +11,7 @@ An interpreter for grammar files as defined by TextMate. TextMate grammars use t
 
 TextMateSharp is a port of [microsoft/vscode-textmate](https://github.com/microsoft/vscode-textmate) that brings TextMate grammars to dotnet ecosystem. The implementation is based the Java port [eclipse/tm4e](https://github.com/eclipse/tm4e).
 
-TextMateSharp uses a wrapper around [Oniguruma](https://github.com/kkos/oniguruma) regex engine. Read below to learn how to build Oniguruma bindings.
+TextMateSharp uses a [wrapper](https://github.com/aikawayataro/Onigwrap) via [nuget packges](https://www.nuget.org/packages/Onigwrap) around [Oniguruma](https://github.com/kkos/oniguruma) regex engine. Thanks @aikawayataro for your contribution.
 
 TextMateSharp is used by [AvaloniaEdit](https://github.com/AvaloniaUI/AvaloniaEdit).
 
@@ -180,6 +180,3 @@ cd src/TestMateSharp.Demo
 dotnet build
 dotnet run -- ./testdata/samplefiles/sample.cs
 ```
-
-## Building Oniguruma wrapper
-Instructions about how to build Oniguruma bindings can be found in [`onigwrap/README.md`](https://github.com/danipen/TextMateSharp/tree/master/onigwrap)

TextMateSharp.sln

@@ -31,8 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Workflows", "Workflows", "{
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TextMateSharp.Grammars.Tests", "src\TextMateSharp.Grammars.Tests\TextMateSharp.Grammars.Tests.csproj", "{B9194474-83A7-47E6-B5E6-6CE360B1189B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TextMateSharp.Wasm", "src\TextMateSharp.Wasm\TextMateSharp.Wasm.csproj", "{2B4FA8C9-D88A-4D78-9C22-E8873947B140}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -59,10 +57,6 @@ Global
 		{B9194474-83A7-47E6-B5E6-6CE360B1189B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9194474-83A7-47E6-B5E6-6CE360B1189B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9194474-83A7-47E6-B5E6-6CE360B1189B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B4FA8C9-D88A-4D78-9C22-E8873947B140}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B4FA8C9-D88A-4D78-9C22-E8873947B140}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B4FA8C9-D88A-4D78-9C22-E8873947B140}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B4FA8C9-D88A-4D78-9C22-E8873947B140}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

build/Directory.Build.props

@@ -3,5 +3,6 @@
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
+    <OnigwrapVersion>1.0.3</OnigwrapVersion>
   </PropertyGroup>
 </Project>