From 54297dc68f40929da2c85b8b29e350bd4a5a8b98 Mon Sep 17 00:00:00 2001
From: Anna Clemens <git@annaclemens.io>
Date: Sun, 11 Apr 2021 08:54:17 -0400
Subject: [PATCH] chore: use ILMerge instead of Costura

---
 Tourist/FodyWeavers.xml | 12 +++++-------
 Tourist/Tourist.csproj  | 20 ++++++++------------
 global.json             |  5 -----
 3 files changed, 13 insertions(+), 24 deletions(-)
 mode change 100644 => 100755 Tourist/FodyWeavers.xml
 delete mode 100644 global.json

diff --git a/Tourist/FodyWeavers.xml b/Tourist/FodyWeavers.xml
old mode 100644
new mode 100755
index 135ae2f..328a52d
--- a/Tourist/FodyWeavers.xml
+++ b/Tourist/FodyWeavers.xml
@@ -1,7 +1,5 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <Costura>
-    <IncludeAssemblies>
-      FFXIVWeather.Lumina
-    </IncludeAssemblies>
-  </Costura>
-</Weavers>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+    <ILMerge>
+        <IncludeAssemblies>FFXIVWeather\.Lumina</IncludeAssemblies>
+    </ILMerge>
+</Weavers>
diff --git a/Tourist/Tourist.csproj b/Tourist/Tourist.csproj
index 850b40d..417609d 100755
--- a/Tourist/Tourist.csproj
+++ b/Tourist/Tourist.csproj
@@ -9,41 +9,37 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Reference Include="Dalamud, Version=5.2.4.2, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="Dalamud">
             <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="ImGui.NET, Version=1.72.0.0, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="ImGui.NET">
             <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="ImGuiScene, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="ImGuiScene">
             <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="Lumina, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="Lumina">
             <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="Lumina.Excel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+        <Reference Include="Lumina.Excel">
             <HintPath>$(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
             <Private>False</Private>
         </Reference>
-        <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+        <Reference Include="System.Memory">
             <HintPath>C:\Users\Anna\AppData\Roaming\XIVLauncher\addon\Hooks\dev\System.Memory.dll</HintPath>
             <Private>False</Private>
         </Reference>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Costura.Fody" Version="5.1.0">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
         <PackageReference Include="DalamudPackager" Version="1.2.1"/>
         <PackageReference Include="FFXIVWeather.Lumina" Version="1.2.2"/>
-        <PackageReference Include="Fody" Version="6.5.1">
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="Fody" Version="6.5.1" PrivateAssets="all"/>
+        <PackageReference Include="ILMerge.Fody" Version="1.16.0" PrivateAssets="all"/>
     </ItemGroup>
 
 </Project>
diff --git a/global.json b/global.json
deleted file mode 100644
index 8c50959..0000000
--- a/global.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "sdk": {
-    "version": "5.0.103"
-  }
-}
\ No newline at end of file