From 5c672d9bc1dda46321f4540b6c4ae29a6299031e Mon Sep 17 00:00:00 2001
From: Mikko <mikko.roysko@gmail.com>
Date: Tue, 19 Apr 2022 18:44:16 +0300
Subject: [PATCH 1/4] Rename osx-universal to osx

---
 deps/cimgui/{osx-universal => osx}/cimgui.dylib | Bin
 src/ImGui.NET/ImGui.NET.csproj                  |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename deps/cimgui/{osx-universal => osx}/cimgui.dylib (100%)

diff --git a/deps/cimgui/osx-universal/cimgui.dylib b/deps/cimgui/osx/cimgui.dylib
similarity index 100%
rename from deps/cimgui/osx-universal/cimgui.dylib
rename to deps/cimgui/osx/cimgui.dylib
diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj
index b89d85d0..e605ca8c 100644
--- a/src/ImGui.NET/ImGui.NET.csproj
+++ b/src/ImGui.NET/ImGui.NET.csproj
@@ -41,8 +41,8 @@
       <PackagePath>runtimes/linux-x64/native/libcimgui.so</PackagePath>
       <Pack>true</Pack>
     </Content>
-    <Content Include="..\..\deps\cimgui\osx-universal\cimgui.dylib">
-      <PackagePath>runtimes/osx-universal/native/libcimgui.dylib</PackagePath>
+    <Content Include="..\..\deps\cimgui\osx\cimgui.dylib">
+      <PackagePath>runtimes/osx/native/libcimgui.dylib</PackagePath>
       <Pack>true</Pack>
     </Content>
     <Content Include="build\net40\ImGui.NET.targets">

From 5d2f5cb965f5cefc2d1ec7fa275cf738782e1df9 Mon Sep 17 00:00:00 2001
From: Mikko <mikko.roysko@gmail.com>
Date: Tue, 19 Apr 2022 19:08:24 +0300
Subject: [PATCH 2/4] Fix paths for examples

---
 .../ImGui.NET.SampleProgram.XNA.csproj                        | 2 +-
 src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj b/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj
index fc6979b9..80298dd8 100644
--- a/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj
+++ b/src/ImGui.NET.SampleProgram.XNA/ImGui.NET.SampleProgram.XNA.csproj
@@ -15,7 +15,7 @@
 
     <ItemGroup>
         <Content Include="$(RepositoryRootDirectory)/deps/cimgui/win-x64/cimgui.dll" CopyToOutputDirectory="PreserveNewest" />
-        <Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx-universal/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="lib%(Filename)%(Extension)" />
+        <Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" Link="lib%(Filename)%(Extension)" />
         <Content Include="$(RepositoryRootDirectory)/deps/cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" Link="lib%(Filename)%(Extension)" />
     </ItemGroup>
 
diff --git a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
index 9e9d7b44..560728dd 100644
--- a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
+++ b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <Content Include="$(RepositoryRootDirectory)/deps/cimgui/win-x64/cimgui.dll" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx-universal/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(RepositoryRootDirectory)/deps/cimgui/osx/cimgui.dylib" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="$(RepositoryRootDirectory)/deps/cimgui/linux-x64/cimgui.so" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 

From fce0dc985d50a831aa1eadef6531763f1b44be10 Mon Sep 17 00:00:00 2001
From: mikko <mikko.roysko@gmail.com>
Date: Tue, 19 Apr 2022 20:19:08 +0300
Subject: [PATCH 3/4] M1 mac needs arm64 folder...

---
 src/ImGui.NET/ImGui.NET.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj
index e605ca8c..d568c2b9 100644
--- a/src/ImGui.NET/ImGui.NET.csproj
+++ b/src/ImGui.NET/ImGui.NET.csproj
@@ -45,6 +45,10 @@
       <PackagePath>runtimes/osx/native/libcimgui.dylib</PackagePath>
       <Pack>true</Pack>
     </Content>
+    <Content Include="..\..\deps\cimgui\osx\cimgui.dylib">
+      <PackagePath>runtimes/osx-arm64/native/libcimgui.dylib</PackagePath>
+      <Pack>true</Pack>
+    </Content>
     <Content Include="build\net40\ImGui.NET.targets">
       <PackagePath>build/net40/ImGui.NET.targets</PackagePath>
       <Pack>true</Pack>

From 9f6dd1e0fec33c4c378a4e05dda97fcf4bd2107d Mon Sep 17 00:00:00 2001
From: mikko <mikko.roysko@gmail.com>
Date: Thu, 21 Apr 2022 13:18:41 +0300
Subject: [PATCH 4/4] Revert "M1 mac needs arm64 folder..."

This reverts commit fce0dc985d50a831aa1eadef6531763f1b44be10.
---
 src/ImGui.NET/ImGui.NET.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj
index d568c2b9..e605ca8c 100644
--- a/src/ImGui.NET/ImGui.NET.csproj
+++ b/src/ImGui.NET/ImGui.NET.csproj
@@ -45,10 +45,6 @@
       <PackagePath>runtimes/osx/native/libcimgui.dylib</PackagePath>
       <Pack>true</Pack>
     </Content>
-    <Content Include="..\..\deps\cimgui\osx\cimgui.dylib">
-      <PackagePath>runtimes/osx-arm64/native/libcimgui.dylib</PackagePath>
-      <Pack>true</Pack>
-    </Content>
     <Content Include="build\net40\ImGui.NET.targets">
       <PackagePath>build/net40/ImGui.NET.targets</PackagePath>
       <Pack>true</Pack>