From 14eebbab410a2ee90b07548987e1748a7991cb2e Mon Sep 17 00:00:00 2001
From: Vitalii Mikhailov <personal@aragas.org>
Date: Sat, 2 Mar 2024 17:56:21 +0200
Subject: [PATCH] Added pdb generation (#588)

* Added pdb generation
* for Thin they are embedded
* for Fat they are portable
* Excluded ILRepack target from Thin
* Exclude the secondary System.Reflection.* packages from NuGet
---
 Harmony/Harmony.csproj | 29 ++++++++++++++++++++++-------
 ILRepack.targets       |  5 +++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Harmony/Harmony.csproj b/Harmony/Harmony.csproj
index 430ecefc..9fb4d0e2 100644
--- a/Harmony/Harmony.csproj
+++ b/Harmony/Harmony.csproj
@@ -35,8 +35,8 @@
 		<Configurations>DebugThin;DebugFat;ReleaseThin;ReleaseFat</Configurations>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
-		<IncludeSymbols>true</IncludeSymbols>
-		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
+		<CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages>
+		<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(TargetFramework)'=='net5.0' Or '$(TargetFramework)'=='net6.0' Or '$(TargetFramework)'=='net7.0' Or '$(TargetFramework)'=='net8.0'">
@@ -59,10 +59,18 @@
 		<DefineConstants>DEBUG</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)'=='ReleaseThin' Or '$(Configuration)'=='ReleaseFat'">
+	<PropertyGroup Condition="'$(Configuration)'=='ReleaseThin'">
+		<Optimize>true</Optimize>
+		<DebugType>embedded</DebugType>
+		<DebugSymbols>true</DebugSymbols>
+		<ILRepackTargetsFile>$(SolutionDir)ILRepack.targets</ILRepackTargetsFile>
+		<ClearOutputDirectory>True</ClearOutputDirectory>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)'=='ReleaseFat'">
 		<Optimize>true</Optimize>
 		<DebugType>portable</DebugType>
-		<DebugSymbols>false</DebugSymbols>
+		<DebugSymbols>true</DebugSymbols>
 		<ILRepackTargetsFile>$(SolutionDir)ILRepack.targets</ILRepackTargetsFile>
 		<ClearOutputDirectory>True</ClearOutputDirectory>
 	</PropertyGroup>
@@ -93,9 +101,9 @@
 	</PropertyGroup>
 	<ItemGroup Condition="$(TargetFramework)=='netstandard2.0'">
 		<!-- Adding System.Reflection.Emit.* because there are public types exposed from its's package -->
-		<PackageReference Include="System.Reflection.Emit" Version="4.7.0"  IncludeAssets="compile" />
-		<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0"  IncludeAssets="compile" />
-		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0"  IncludeAssets="compile" />
+		<PackageReference Include="System.Reflection.Emit" Version="4.7.0" IncludeAssets="compile" />
+		<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" PrivateAssets="all" IncludeAssets="compile" />
+		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="all" IncludeAssets="compile" />
 	</ItemGroup>
 	<Target Name="AddRefAssemblyToPackage" Condition="$(TargetFramework)=='netstandard2.0'">
 		<ItemGroup>
@@ -138,6 +146,13 @@
 		<Delete Files="@(OldNugetPackages)" />
 	</Target>
 
+	<Target Name="RemoveFaultyPdb" BeforeTargets="Build">
+		<ItemGroup>
+			<FilesToDelete Include="$(ProjectDir)\$(OutDir)\MonoMod.ILHelpers.pdb"/>
+		</ItemGroup>
+		<Delete Files="@(FilesToDelete)" />
+	</Target>
+
 	<Target Name="CleanZip" AfterTargets="Clean">
 		<ItemGroup>
 			<OldZipFiles Include="$(MSBuildThisFileDirectory)bin\Harmony-Thin.*.zip" Condition="'$(Configuration)'=='ReleaseThin'"/>
diff --git a/ILRepack.targets b/ILRepack.targets
index 2c17e5a4..ca906eb9 100644
--- a/ILRepack.targets
+++ b/ILRepack.targets
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'DebugFat' Or '$(Configuration)' == 'ReleaseFat'">
+		<PropertyGroup>
+			<DebugInfo Condition="'$(TargetFramework)' == 'netstandard2.0'">false</DebugInfo>
+			<DebugInfo Condition="'$(TargetFramework)' != 'netstandard2.0'">true</DebugInfo>
+		</PropertyGroup>
 		<ItemGroup>
 			<InputAssemblies Include="$(OutputPath)\*.dll" />
 		</ItemGroup>
 		<ILRepack
 			InputAssemblies="@(InputAssemblies)"
 			OutputFile="$(OutputPath)\$(AssemblyName).dll"
+			DebugInfo="$(DebugInfo)"
 			CopyAttributes="false"
 			XmlDocumentation="true"
 			Internalize="true"