From 15ae45c915a96c1c0e808b6a58976060fbcae721 Mon Sep 17 00:00:00 2001
From: Ethan Moffat <ethan@moffat.io>
Date: Sat, 18 Nov 2023 23:49:51 -0800
Subject: [PATCH] Remove reference to HairClip.mgfx in csproj on Linux
 platforms

---
 EndlessClient/EndlessClient.csproj | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/EndlessClient/EndlessClient.csproj b/EndlessClient/EndlessClient.csproj
index 77fd6bf35..5163d32c5 100644
--- a/EndlessClient/EndlessClient.csproj
+++ b/EndlessClient/EndlessClient.csproj
@@ -55,25 +55,19 @@
     <ProjectReference Include="..\EOLib.Logger\EOLib.Logger.csproj" />
     <ProjectReference Include="..\EOLib\EOLib.csproj" />
   </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
-    <Content Include="ContentPipeline\HairClip.mgfx">
-      <PublishFolderType>RootDirectory</PublishFolderType>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+  <ItemGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\config\*" Link="config\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\data\*" Link="data\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\gfx\*" Link="gfx\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\help\*" Link="help\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\jbox\*" Link="jbox\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\mfx\*" Link="mfx\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\sfx\*" Link="sfx\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
+    <None Include="ContentPipeline\bin\MacOSX\Content\*.xnb" Link="ContentPipeline\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
+    <None Include="ContentPipeline\bin\MacOSX\Content\ChatBubble\*.xnb" Link="ContentPipeline\ChatBubble\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
+    <None Include="ContentPipeline\bin\MacOSX\Content\BitmapFonts\*.xnb" Link="ContentPipeline\BitmapFonts\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
+    <None Include="ContentPipeline\bin\MacOSX\Content\Party\*.xnb" Link="ContentPipeline\Party\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
   </ItemGroup>
-<ItemGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\config\*" Link="config\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\data\*" Link="data\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\gfx\*" Link="gfx\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\help\*" Link="help\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\jbox\*" Link="jbox\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\mfx\*" Link="mfx\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="..\bin\$(Configuration)\client\net6.0-macos\osx-x64\sfx\*" Link="sfx\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="RootDirectory" />
-  <None Include="ContentPipeline\bin\MacOSX\Content\*.xnb" Link="ContentPipeline\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
-  <None Include="ContentPipeline\bin\MacOSX\Content\ChatBubble\*.xnb" Link="ContentPipeline\ChatBubble\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
-  <None Include="ContentPipeline\bin\MacOSX\Content\BitmapFonts\*.xnb" Link="ContentPipeline\BitmapFonts\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
-  <None Include="ContentPipeline\bin\MacOSX\Content\Party\*.xnb" Link="ContentPipeline\Party\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" PublishFolderType="Resource" />
-</ItemGroup>
   <ItemGroup>
     <Content Include="Resources\Game.ico" />
     <EmbeddedResource Include="Resources\Icon.bmp">