From 5ace052807573267036f6dc1adec4e9f87af8b78 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Dec 2020 14:52:45 +0900
Subject: [PATCH 1/2] Rename linux libraries to match expected filename

---
 .github/workflows/build.yml                       |   4 ++--
 native/linux-x64/{libSDL2-2.0.so.0 => libSDL2.so} | Bin
 native/linux-x86/{libSDL2-2.0.so.0 => libSDL2.so} | Bin
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename native/linux-x64/{libSDL2-2.0.so.0 => libSDL2.so} (100%)
 rename native/linux-x86/{libSDL2-2.0.so.0 => libSDL2.so} (100%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e2cf1e9..640737e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,14 +41,14 @@ jobs:
         cd linux-build
         docker build -t sdl2-i386 -f Dockerfile.i386 .
         docker run -v `pwd`/compile:/entry -v /tmp/i386:/io -v /tmp/SDL:/src sdl2-i386
-        cp /tmp/i386/lib/libSDL2-2.0.so.0 ../native/linux-x86
+        cp /tmp/i386/lib/libSDL2-2.0.so.0 ../native/linux-x86/libSDL2.so
     - name: Build amd64 binaries
       run: |
         mkdir /tmp/amd64
         cd linux-build
         docker build -t sdl2-amd64 -f Dockerfile.amd64 .
         docker run -v `pwd`/compile:/entry -v /tmp/amd64:/io -v /tmp/SDL:/src sdl2-amd64
-        cp /tmp/amd64/lib/libSDL2-2.0.so.0 ../native/linux-x64
+        cp /tmp/amd64/lib/libSDL2-2.0.so.0 ../native/linux-x64/libSDL2.so
     - name: Create pull request
       uses: peter-evans/create-pull-request@v2
       with:
diff --git a/native/linux-x64/libSDL2-2.0.so.0 b/native/linux-x64/libSDL2.so
similarity index 100%
rename from native/linux-x64/libSDL2-2.0.so.0
rename to native/linux-x64/libSDL2.so
diff --git a/native/linux-x86/libSDL2-2.0.so.0 b/native/linux-x86/libSDL2.so
similarity index 100%
rename from native/linux-x86/libSDL2-2.0.so.0
rename to native/linux-x86/libSDL2.so

From c5911dcc22e5fdf89f97c69fbab60cf6f0d1853f Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 2 Dec 2020 14:53:00 +0900
Subject: [PATCH 2/2] Add missing include rules for linux bianries to csproj

---
 SDL2-CS.csproj | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/SDL2-CS.csproj b/SDL2-CS.csproj
index 3cfd471..fa342b4 100644
--- a/SDL2-CS.csproj
+++ b/SDL2-CS.csproj
@@ -32,6 +32,16 @@
             <PackagePath>runtimes/osx-x64/native</PackagePath>
             <Pack>true</Pack>
         </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\linux-x64\libSDL2.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/linux-x64/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
+        <Content Include="$(MSBuildThisFileDirectory)native\linux-x86\libSDL2.so">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <PackagePath>runtimes/linux-x86/native</PackagePath>
+            <Pack>true</Pack>
+        </Content>
     </ItemGroup>
     <ItemGroup>
         <Content Include="app.config">