From aa94c9955ec8473531a4870c01ed6fc200402fab Mon Sep 17 00:00:00 2001
From: Andreas Pardeike <andreas@pardeike.net>
Date: Sun, 3 Mar 2024 21:35:01 +0100
Subject: [PATCH] fixed netstandard problem

---
 Harmony.sln            | 32 +++++++++++++++++++-------------
 Harmony/Harmony.csproj | 14 +++++++-------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Harmony.sln b/Harmony.sln
index 2f8bdc72..ea0b5420 100644
--- a/Harmony.sln
+++ b/Harmony.sln
@@ -12,9 +12,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		azure-pipelines.yml = azure-pipelines.yml
 		CNAME = CNAME
 		CODE_OF_CONDUCT.md = CODE_OF_CONDUCT.md
-		ILRepack.targets = ILRepack.targets
 		Directory.Build.props = Directory.Build.props
 		global.json = global.json
+		ILRepack.targets = ILRepack.targets
 		LICENSE = LICENSE
 		README.md = README.md
 		_config.yml = _config.yml
@@ -101,8 +101,8 @@ Global
 		DebugFat|Any CPU = DebugFat|Any CPU
 		DebugThin|Any CPU = DebugThin|Any CPU
 		ReleaseFat|Any CPU = ReleaseFat|Any CPU
-		ReleaseThin|Any CPU = ReleaseThin|Any CPU
 		ReleaseRef|Any CPU = ReleaseRef|Any CPU
+		ReleaseThin|Any CPU = ReleaseThin|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{69AEE16A-B6E7-4642-8081-3928B32455DF}.DebugFat|Any CPU.ActiveCfg = DebugFat|Any CPU
@@ -111,16 +111,18 @@ Global
 		{69AEE16A-B6E7-4642-8081-3928B32455DF}.DebugThin|Any CPU.Build.0 = DebugThin|Any CPU
 		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseFat|Any CPU.ActiveCfg = ReleaseFat|Any CPU
 		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseFat|Any CPU.Build.0 = ReleaseFat|Any CPU
-		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseThin|Any CPU.ActiveCfg = ReleaseThin|Any CPU
-		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseThin|Any CPU.Build.0 = ReleaseThin|Any CPU
 		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseRef|Any CPU.ActiveCfg = ReleaseRef|Any CPU
 		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseRef|Any CPU.Build.0 = ReleaseRef|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseThin|Any CPU.ActiveCfg = ReleaseThin|Any CPU
+		{69AEE16A-B6E7-4642-8081-3928B32455DF}.ReleaseThin|Any CPU.Build.0 = ReleaseThin|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.DebugFat|Any CPU.ActiveCfg = Debug|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.DebugFat|Any CPU.Build.0 = Debug|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.DebugThin|Any CPU.ActiveCfg = Debug|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.DebugThin|Any CPU.Build.0 = Debug|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseFat|Any CPU.ActiveCfg = Release|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseFat|Any CPU.Build.0 = Release|Any CPU
+		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseRef|Any CPU.ActiveCfg = Release|Any CPU
+		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseRef|Any CPU.Build.0 = Release|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseThin|Any CPU.ActiveCfg = Release|Any CPU
 		{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseThin|Any CPU.Build.0 = Release|Any CPU
 		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.DebugFat|Any CPU.ActiveCfg = Default|Any CPU
@@ -129,6 +131,8 @@ Global
 		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.DebugThin|Any CPU.Build.0 = Default|Any CPU
 		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseFat|Any CPU.ActiveCfg = Default|Any CPU
 		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseFat|Any CPU.Build.0 = Default|Any CPU
+		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseRef|Any CPU.ActiveCfg = Default|Any CPU
+		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseRef|Any CPU.Build.0 = Default|Any CPU
 		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseThin|Any CPU.ActiveCfg = Default|Any CPU
 		{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseThin|Any CPU.Build.0 = Default|Any CPU
 		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.DebugFat|Any CPU.ActiveCfg = Debug|Any CPU
@@ -137,27 +141,29 @@ Global
 		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.DebugThin|Any CPU.Build.0 = Debug|Any CPU
 		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseFat|Any CPU.ActiveCfg = Release|Any CPU
 		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseFat|Any CPU.Build.0 = Release|Any CPU
+		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseRef|Any CPU.ActiveCfg = Release|Any CPU
+		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseRef|Any CPU.Build.0 = Release|Any CPU
 		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseThin|Any CPU.ActiveCfg = Release|Any CPU
 		{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseThin|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {61622750-C658-496F-B2E2-75D94AF6CF8B}
-	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{597B1581-64EA-4F8F-A703-17B642B05C94} = {887FC7DA-9A29-4130-92E7-66E21E76CAC4}
-		{71B8832A-3E69-4908-98FE-EE9680F5EF25} = {597B1581-64EA-4F8F-A703-17B642B05C94}
 		{9A886F28-B059-46CC-BE43-EA234CE1DD78} = {887FC7DA-9A29-4130-92E7-66E21E76CAC4}
-		{FF253D20-5CFB-42A6-BC33-A0E213C3CF7E} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
+		{B0927B75-AE86-460B-9C42-6DED427304C6} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
 		{685B28DF-D62E-4A68-842D-C3E6D4CFB24B} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
 		{BBEC08CE-1F26-46B3-9EC2-F1BC7B692A56} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
-		{AE672D7F-D913-4CED-A6B3-A21001E5C8DF} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
-		{B0927B75-AE86-460B-9C42-6DED427304C6} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
-		{145A597F-00D3-42D0-930D-85EF1257FA6D} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
 		{E625C76C-C4AA-43A9-AFB5-BD1D605A4F48} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
 		{15C84537-CCEF-43F5-B556-34369D7B320D} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
+		{AE672D7F-D913-4CED-A6B3-A21001E5C8DF} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
+		{FF253D20-5CFB-42A6-BC33-A0E213C3CF7E} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
+		{145A597F-00D3-42D0-930D-85EF1257FA6D} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
+		{597B1581-64EA-4F8F-A703-17B642B05C94} = {887FC7DA-9A29-4130-92E7-66E21E76CAC4}
+		{71B8832A-3E69-4908-98FE-EE9680F5EF25} = {597B1581-64EA-4F8F-A703-17B642B05C94}
 		{821995BE-A095-4C39-95F5-8E54A5E6944D} = {9A886F28-B059-46CC-BE43-EA234CE1DD78}
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {61622750-C658-496F-B2E2-75D94AF6CF8B}
+	EndGlobalSection
 EndGlobal
diff --git a/Harmony/Harmony.csproj b/Harmony/Harmony.csproj
index e9d809df..c9a7ed24 100644
--- a/Harmony/Harmony.csproj
+++ b/Harmony/Harmony.csproj
@@ -8,7 +8,7 @@
 		<Copyright>Copyright © 2016</Copyright>
 		<Description>A general non-destructive patch library for .NET and Mono modules</Description>
 		<PackageId>Lib.Harmony</PackageId>
-		<PackageId Condition="'$(Configuration)'=='DebugThin' Or '$(Configuration)'=='ReleaseThin'">Lib.Harmony.Thin</PackageId>
+		<PackageId Condition="$(Configuration.EndsWith('Thin'))">Lib.Harmony.Thin</PackageId>
 		<Authors>Andreas Pardeike</Authors>
 		<AssemblyName>0Harmony</AssemblyName>
 		<SignAssembly>true</SignAssembly>
@@ -54,7 +54,7 @@
 		<None Include="..\_._" Pack="true" Visible="false" PackagePath="lib/netstandard2.0" Condition="$(Configuration)!='ReleaseRef'" />
 	</ItemGroup>
 
-	<PropertyGroup Condition="'$(Configuration)'=='DebugThin' Or '$(Configuration)'=='DebugFat'">
+	<PropertyGroup Condition="$(Configuration.StartsWith('Debug'))">
 		<Optimize>false</Optimize>
 		<DebugType>full</DebugType>
 		<DebugSymbols>true</DebugSymbols>
@@ -74,11 +74,11 @@
 		<CopyDebugSymbolFilesFromPackages>true</CopyDebugSymbolFilesFromPackages>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(Configuration)'=='DebugThin' Or '$(Configuration)'=='ReleaseThin'">
+	<ItemGroup Condition="$(Configuration.EndsWith('Thin'))">
 		<PackageReference Include="MonoMod.Core" Version="$(MonoModCoreVersion)" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(Configuration)'=='DebugFat' Or '$(Configuration)'=='ReleaseFat' Or '$(Configuration)'=='ReleaseRef'">
+	<ItemGroup Condition="$(Configuration.EndsWith('Fat')) Or '$(Configuration)'=='ReleaseRef'">
 		<PackageReference Include="MonoMod.Core" Version="$(MonoModCoreVersion)" PrivateAssets="all" />
 	</ItemGroup>
 
@@ -90,14 +90,14 @@
 	</ItemGroup>
 
 	<!-- netstandard2.0 reference assemblies -->
-	<PropertyGroup Condition="$(Configuration)!='ReleaseRef' AND $(TargetFramework)=='netstandard2.0'">
+	<PropertyGroup Condition="$(Configuration)!='ReleaseRef' And $(TargetFramework)=='netstandard2.0'">
 		<!-- Remove from /lib in NuGet -->
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 	</PropertyGroup>
-	<ItemGroup Condition="$(Configuration)!='ReleaseRef' AND $(TargetFramework)=='netstandard2.0'">
+	<ItemGroup Condition="$(Configuration)!='ReleaseRef' And $(TargetFramework)=='netstandard2.0'">
 		<PackageReference Include="System.Reflection.Emit" Version="4.7.0" PrivateAssets="all" IncludeAssets="compile" />
 	</ItemGroup>
-	<ItemGroup Condition="$(Configuration)!='ReleaseRef' AND $(TargetFramework)=='netstandard2.0'">
+	<ItemGroup Condition="$(Configuration)!='ReleaseRef' And $(TargetFramework)=='netstandard2.0'">
 		<PackageReference Include="Lib.Harmony.Ref" Version="$(HarmonyVersion)" IncludeAssets="contentFiles" />
 	</ItemGroup>
 	<!-- netstandard2.0 reference assemblies -->