From 2770e45b61ae99fe4c350a56baf8c895fead6f97 Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 15:09:21 +0100
Subject: [PATCH 1/9] Add inline task to automatically package mod on Release
 builds

---
 CelesteMod/Source/CelesteMod-core.csproj | 66 ++++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index 519df5c..b3e9fe8 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -37,9 +37,75 @@
         <Copy SourceFiles="$(OutputPath)\$(AssemblyName).dll" DestinationFolder="..\bin" />
         <Copy SourceFiles="$(OutputPath)\$(AssemblyName).pdb" DestinationFolder="..\bin" />
     </Target>
+
+    <Target Name="PackageMod" AfterTargets="CopyFiles" Condition="'$(Configuration)' == 'Release'">
+        <ItemGroup>
+            <FilesToPackage Include="..\Ahorn\**\*.*" />
+            <FilesToPackage Include="..\Loenn\**\*.*" />
+            <FilesToPackage Include="..\Dialog\**\*.*" />
+            <FilesToPackage Include="..\Graphics\**\*.*" />
+            <FilesToPackage Include="..\bin\**\*.*" />
+            <FilesToPackage Include="..\everest.yaml" />
+        </ItemGroup>
+        <PackageMod Files="@(FilesToPackage)" OutputPath="..\CelesteMod.zip" />
+    </Target>
     
     <PropertyGroup>
         <PathMap>$(MSBuildProjectDirectory)=CelesteMod/</PathMap>
     </PropertyGroup>
 
+    <!-- Inline task used to create a .zip for the mod -->
+    <UsingTask TaskName="PackageMod"
+               TaskFactory="RoslynCodeTaskFactory"
+               AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" >
+        <ParameterGroup>
+            <Files ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
+            <OutputPath ParameterType="System.String" Required="true" />
+        </ParameterGroup>
+        <Task>
+            <Using Namespace="System.IO" />
+            <Using Namespace="System.IO.Compression" />
+            <Code Type="Fragment" Language="cs">
+            <![CDATA[
+                var projectDir = Path.Combine("$(ProjectDir)", ".."); // Go one level up, since we're inside the 'Source' directory
+            
+                if (File.Exists(OutputPath))
+                    File.Delete(OutputPath);
+
+                using (ZipArchive zip = ZipFile.Open(OutputPath, ZipArchiveMode.Create))
+                {
+                    foreach (var file in Files)
+                    {
+                        string filePath = file.GetMetadata("FullPath");
+                        string entryName = GetRelativePath(projectDir, filePath);
+                        
+                        zip.CreateEntryFromFile(filePath, entryName);
+                    }
+                }
+    
+                string GetRelativePath(string fromPath, string toPath)
+                {
+                    if (string.IsNullOrEmpty(fromPath)) throw new ArgumentNullException("fromPath");
+                    if (string.IsNullOrEmpty(toPath))   throw new ArgumentNullException("toPath");
+                
+                    Uri fromUri = new Uri(fromPath);
+                    Uri toUri = new Uri(toPath);
+                
+                    if (fromUri.Scheme != toUri.Scheme) { return toPath; } // path can't be made relative.
+                
+                    Uri relativeUri = fromUri.MakeRelativeUri(toUri);
+                    string relativePath = Uri.UnescapeDataString(relativeUri.ToString());
+                
+                    if (toUri.Scheme.Equals("file", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        relativePath = relativePath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+                    }
+                
+                    return relativePath;
+                }
+            ]]>
+            </Code>
+        </Task>
+    </UsingTask>
+
 </Project>

From 188f1299afa8bebbbb8790634e6e2b89c9b9cb90 Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 15:11:24 +0100
Subject: [PATCH 2/9] Replace BepInEx publicizer with Celeste publicizer

---
 CelesteMod/Source/CelesteMod-core.csproj | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index b3e9fe8..4484289 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -16,21 +16,14 @@
     </ItemDefinitionGroup>
 
     <ItemGroup>
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
         <PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2" PrivateAssets="all" ExcludeAssets="runtime" />
         <PackageReference Include="MonoMod.Patcher" Version="25.0.0-prerelease.2" />
     </ItemGroup>
 
     <ItemGroup>
-        <Reference Include="$(CelestePrefix)\Celeste.dll">
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="$(CelestePrefix)\MMHOOK_Celeste.dll">
-            <Private>false</Private>
-        </Reference>
-        <Reference Include="$(CelestePrefix)\FNA.dll">
-            <Private>false</Private>
-        </Reference>
+        <PackageReference Include="CelesteMod.Publicizer" Version="1.0.0" CelesteAssembly="$(CelestePrefix)\Celeste.dll" />
+        <Reference Include="$(CelestePrefix)\MMHOOK_Celeste.dll" Private="false" />
+        <Reference Include="$(CelestePrefix)\FNA.dll" Private="false" />
     </ItemGroup>
 
     <Target Name="CopyFiles" AfterTargets="Build">

From 40893d3155039c0c5bd00f51bf5f36f87662192e Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 15:33:06 +0100
Subject: [PATCH 3/9] Include packaged mod inside .gitignore

---
 CelesteMod/.gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CelesteMod/.gitignore b/CelesteMod/.gitignore
index fefa62b..45c0d19 100644
--- a/CelesteMod/.gitignore
+++ b/CelesteMod/.gitignore
@@ -1,3 +1,6 @@
+# Packaged mods
+CelesteMod.zip
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##

From 85a866f8f4b2588741f4813635aabbd467e06547 Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 22:53:54 +0100
Subject: [PATCH 4/9] Fix CelesteMod.Publicizer package name getting replaced

---
 CelesteMod/Source/CelesteMod-core.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index 4484289..e98ee1c 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -21,7 +21,9 @@
     </ItemGroup>
 
     <ItemGroup>
+<!--/-:replacements:noEmit -->
         <PackageReference Include="CelesteMod.Publicizer" Version="1.0.0" CelesteAssembly="$(CelestePrefix)\Celeste.dll" />
+<!--/+:replacements:noEmit -->
         <Reference Include="$(CelestePrefix)\MMHOOK_Celeste.dll" Private="false" />
         <Reference Include="$(CelestePrefix)\FNA.dll" Private="false" />
     </ItemGroup>

From 279e14893bd4b99e88efd16b9d99c376c95f5e9d Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 22:55:16 +0100
Subject: [PATCH 5/9] Bump Everest versions

---
 CelesteMod/everest-core.yaml | 2 +-
 CelesteMod/everest.yaml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CelesteMod/everest-core.yaml b/CelesteMod/everest-core.yaml
index 3b872df..3b9038f 100644
--- a/CelesteMod/everest-core.yaml
+++ b/CelesteMod/everest-core.yaml
@@ -3,4 +3,4 @@
   DLL: bin/CelesteMod.dll
   Dependencies:
     - Name: EverestCore
-      Version: 1.4465.0
\ No newline at end of file
+      Version: 1.4607.0
\ No newline at end of file
diff --git a/CelesteMod/everest.yaml b/CelesteMod/everest.yaml
index 578e585..e9ca979 100644
--- a/CelesteMod/everest.yaml
+++ b/CelesteMod/everest.yaml
@@ -3,4 +3,4 @@
   DLL: bin/CelesteMod.dll
   Dependencies:
     - Name: Everest
-      Version: 1.3471.0
\ No newline at end of file
+      Version: 1.4449.0
\ No newline at end of file

From 4144427ff010d854dd787f512044676e159a4c20 Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 23:39:52 +0100
Subject: [PATCH 6/9] Add CelesteAnalyzer package

---
 CelesteMod/Source/CelesteMod-core.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index e98ee1c..e73ee5e 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -18,6 +18,9 @@
     <ItemGroup>
         <PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2" PrivateAssets="all" ExcludeAssets="runtime" />
         <PackageReference Include="MonoMod.Patcher" Version="25.0.0-prerelease.2" />
+<!--/-:replacements:noEmit -->        
+        <PackageReference Include="CelesteAnalyzer" Version="1.0.3.1" />
+<!--/+:replacements:noEmit -->
     </ItemGroup>
 
     <ItemGroup>

From 3eceb54564b377d69608aa98a106043ab698a2bf Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 23:41:32 +0100
Subject: [PATCH 7/9] Sync-up packaging between GitHub action and build task

---
 CelesteMod/.github/workflows/dotnet-core.yml | 3 +--
 CelesteMod/Source/CelesteMod-core.csproj     | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CelesteMod/.github/workflows/dotnet-core.yml b/CelesteMod/.github/workflows/dotnet-core.yml
index ce9d1f0..3dc1309 100644
--- a/CelesteMod/.github/workflows/dotnet-core.yml
+++ b/CelesteMod/.github/workflows/dotnet-core.yml
@@ -38,8 +38,7 @@ jobs:
         name: CelesteMod
         path: |
           everest.yaml
-          bin/CelesteMod.dll
-          bin/CelesteMod.pdb
+          bin
 #if Samples
           Ahorn/**/*
           Audio/**/*
diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index e73ee5e..700f600 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -38,12 +38,13 @@
 
     <Target Name="PackageMod" AfterTargets="CopyFiles" Condition="'$(Configuration)' == 'Release'">
         <ItemGroup>
-            <FilesToPackage Include="..\Ahorn\**\*.*" />
-            <FilesToPackage Include="..\Loenn\**\*.*" />
+            <FilesToPackage Include="..\everest.yaml" />
+            <FilesToPackage Include="..\bin\**\*.*" />
+            <FilesToPackage Include="..\Audio\**\*.*" />
             <FilesToPackage Include="..\Dialog\**\*.*" />
             <FilesToPackage Include="..\Graphics\**\*.*" />
-            <FilesToPackage Include="..\bin\**\*.*" />
-            <FilesToPackage Include="..\everest.yaml" />
+            <FilesToPackage Include="..\Ahorn\**\*.*" />
+            <FilesToPackage Include="..\Loenn\**\*.*" />
         </ItemGroup>
         <PackageMod Files="@(FilesToPackage)" OutputPath="..\CelesteMod.zip" />
     </Target>

From d808881acffbdefb6a58ff6a6f522bb25e844632 Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Fri, 1 Mar 2024 23:56:50 +0100
Subject: [PATCH 8/9] Always use latest version for CelesteMod.Publicizer

---
 CelesteMod/Source/CelesteMod-core.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index 700f600..d416aa9 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -25,7 +25,7 @@
 
     <ItemGroup>
 <!--/-:replacements:noEmit -->
-        <PackageReference Include="CelesteMod.Publicizer" Version="1.0.0" CelesteAssembly="$(CelestePrefix)\Celeste.dll" />
+        <PackageReference Include="CelesteMod.Publicizer" Version="*" CelesteAssembly="$(CelestePrefix)\Celeste.dll" />
 <!--/+:replacements:noEmit -->
         <Reference Include="$(CelestePrefix)\MMHOOK_Celeste.dll" Private="false" />
         <Reference Include="$(CelestePrefix)\FNA.dll" Private="false" />

From ac17f5fd7af5fe03a094a19bed3c126e2e48cf8b Mon Sep 17 00:00:00 2001
From: psyGamer <psygamer21@gmail.com>
Date: Sat, 2 Mar 2024 09:53:45 +0100
Subject: [PATCH 9/9] Fix some minor nitpicks

---
 CelesteMod/Source/CelesteMod-core.csproj | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CelesteMod/Source/CelesteMod-core.csproj b/CelesteMod/Source/CelesteMod-core.csproj
index d416aa9..6e2349e 100644
--- a/CelesteMod/Source/CelesteMod-core.csproj
+++ b/CelesteMod/Source/CelesteMod-core.csproj
@@ -18,9 +18,7 @@
     <ItemGroup>
         <PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2" PrivateAssets="all" ExcludeAssets="runtime" />
         <PackageReference Include="MonoMod.Patcher" Version="25.0.0-prerelease.2" />
-<!--/-:replacements:noEmit -->        
         <PackageReference Include="CelesteAnalyzer" Version="1.0.3.1" />
-<!--/+:replacements:noEmit -->
     </ItemGroup>
 
     <ItemGroup>
@@ -84,8 +82,8 @@
     
                 string GetRelativePath(string fromPath, string toPath)
                 {
-                    if (string.IsNullOrEmpty(fromPath)) throw new ArgumentNullException("fromPath");
-                    if (string.IsNullOrEmpty(toPath))   throw new ArgumentNullException("toPath");
+                    if (string.IsNullOrEmpty(fromPath)) throw new ArgumentNullException(nameof(fromPath));
+                    if (string.IsNullOrEmpty(toPath))   throw new ArgumentNullException(nameof(toPath));
                 
                     Uri fromUri = new Uri(fromPath);
                     Uri toUri = new Uri(toPath);