updates to prerelease.1

Directory.Build.props

@@ -2,7 +2,8 @@
 
 	<PropertyGroup>
 		<HarmonyVersion>2.3.0.0</HarmonyVersion>
-		<MonoModCoreVersion>23.3.22.1</MonoModCoreVersion>
+		<HarmonyPrerelease>-prerelease.1</HarmonyPrerelease>
+		<MonoModCoreVersion>1.0.0-prerelease.1</MonoModCoreVersion>
 	</PropertyGroup>
 
 </Project>

Harmony/Documentation/Documentation.csproj

@@ -27,6 +27,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="MonoModReorg.Core" Version="$(MonoModCoreVersion)" />
+
 		<!-- Reference assemblies are needed for non-Windows .NET Framework targeting builds. -->
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.3">
@@ -35,8 +37,4 @@
 		</PackageReference>
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="MonoMod.Common" Version="$(MonoModCommonVersion)" />
-	</ItemGroup>
-
 </Project>

Harmony/ForwardingAttributes/Mono.Cecil.Cil.cs

@@ -0,0 +1,45 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.Code))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ConstantDebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.CustomDebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.CustomDebugInformationKind))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.DebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.Document))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.DocumentHashAlgorithm))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.DocumentLanguage))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.DocumentLanguageVendor))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.DocumentType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ExceptionHandler))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ExceptionHandlerType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.FlowControl))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ILProcessor))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImageDebugDirectory))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImageDebugHeader))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImageDebugHeaderEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImageDebugType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImportDebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImportTarget))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ImportTargetKind))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.Instruction))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.InstructionOffset))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ISymbolReader))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ISymbolReaderProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ISymbolWriter))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ISymbolWriterProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.MethodBody))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.MethodDebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.OpCode))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.OpCodeType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.OperandType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.ScopeDebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.SequencePoint))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.StackBehaviour))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.SymbolsNotFoundException))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.SymbolsNotMatchingException))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.VariableAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.VariableDebugInformation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.VariableDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Cil.VariableReference))]
+#endif

Harmony/ForwardingAttributes/Mono.Cecil.Mdb.cs

@@ -0,0 +1,5 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Mdb.MdbReader))]
+#endif

Harmony/ForwardingAttributes/Mono.Cecil.Pdb.cs

@@ -0,0 +1,6 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Pdb.NativePdbReader))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Pdb.NativePdbWriter))]
+#endif

Harmony/ForwardingAttributes/Mono.Cecil.Rocks.cs

@@ -0,0 +1,8 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Rocks.IILVisitor))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Rocks.ILParser))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Rocks.ModuleDefinitionRocks))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Rocks.TypeDefinitionRocks))]
+#endif

Harmony/ForwardingAttributes/Mono.Cecil.cs

@@ -0,0 +1,85 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyHashAlgorithm))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyNameDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyNameReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.AssemblyResolutionException))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.CallSite))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.CustomAttribute))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.CustomAttributeArgument))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.CustomAttributeNamedArgument))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.EventAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.EventDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.EventReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ExportedType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.FieldAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.FieldDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.FieldReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.GenericParameter))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.GenericParameterAttributes))]
+#if NET472
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.GenericParameterConstraint))]
+#endif
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.GenericParameterType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IAssemblyResolver))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ICustomAttributeProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IGenericParameterProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMemberDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMetadataImporter))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMetadataImporterProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMetadataResolver))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMetadataScope))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMetadataTokenProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IMethodSignature))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.InterfaceImplementation))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IReflectionImporter))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.IReflectionImporterProvider))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ManifestResourceAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MarshalInfo))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MemberReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MetadataKind))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MetadataScopeType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MetadataToken))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MetadataType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodCallingConvention))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodImplAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodReturnType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.MethodSemanticsAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ModuleAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ModuleCharacteristics))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ModuleDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ModuleKind))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ModuleParameters))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ModuleReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.NativeType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ParameterAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ParameterDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ParameterReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.PInvokeAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.PInvokeInfo))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.PropertyAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.PropertyDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.PropertyReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ReaderParameters))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ReadingMode))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ResolutionException))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.Resource))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.ResourceType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.SecurityAction))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.SecurityAttribute))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.SecurityDeclaration))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TargetArchitecture))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TargetRuntime))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TokenType))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TypeAttributes))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TypeDefinition))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TypeReference))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.TypeSystem))]
+[assembly: TypeForwardedTo(typeof(Mono.Cecil.WriterParameters))]
+#endif

Harmony/ForwardingAttributes/Mono.Collections.Generic.cs

@@ -0,0 +1,5 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.Collections.Generic.Collection<>))]
+#endif

Harmony/ForwardingAttributes/Mono.CompilerServices.SymbolWriter.cs

@@ -0,0 +1,18 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.AnonymousScopeEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.CapturedScope))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.CapturedVariable))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.CodeBlockEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.CompileUnitEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.LineNumberEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.LineNumberTable))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.LocalVariableEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.MethodEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.MonoSymbolFile))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.NamespaceEntry))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.OffsetTable))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.ScopeVariable))]
+[assembly: TypeForwardedTo(typeof(Mono.CompilerServices.SymbolWriter.SourceFileEntry))]
+#endif

Harmony/ForwardingAttributes/MonoMod.Utils.Cil.cs

@@ -0,0 +1,6 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.Cil.CecilILGenerator))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.Cil.ILGeneratorShim))]
+#endif

Harmony/ForwardingAttributes/MonoMod.Utils.cs

@@ -0,0 +1,11 @@
+#if NETFRAMEWORK || NETSTANDARD2_0
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.DMDEmitDynamicMethodGenerator))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.DMDGenerator<>))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.DynamicMethodDefinition))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.Extensions))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.ICallSiteGenerator))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.ReflectionHelper))]
+[assembly: TypeForwardedTo(typeof(MonoMod.Utils.Relinker))]
+#endif

Harmony/Harmony.csproj

@@ -28,8 +28,8 @@
 		<Version>$(HarmonyVersion)</Version>
 		<AssemblyVersion>$(HarmonyVersion)</AssemblyVersion>
 		<FileVersion>$(HarmonyVersion)</FileVersion>
-		<PackageVersion>$(HarmonyVersion)-alpha.5</PackageVersion>
-		<InformationalVersion>$(HarmonyVersion)-alpha.5</InformationalVersion>
+		<PackageVersion>$(HarmonyVersion)$(HarmonyPrerelease)</PackageVersion>
+		<InformationalVersion>$(HarmonyVersion)$(HarmonyPrerelease)</InformationalVersion>
 	</PropertyGroup>
 
 	<!-- In .NET 5.0 Binary Formatters are off by default.  Support is added for .NET 5.0+ for fallback JSON Serialization -->
@@ -64,36 +64,6 @@
 		</Otherwise>
 	</Choose>
 
-	<!-- ILRepack config needs to be specified before MonoMod.Common PackageReference due its dependency on properties defined here.
-	<Choose>
-		<When Condition="!$(IsCoreOrStandard) And '$(Configuration)'=='Release'">
-			<PropertyGroup>
-				<ILRepackInternalize>true</ILRepackInternalize>
-			</PropertyGroup>
-			<Choose>
-				<When Condition="$([System.Environment]::GetEnvironmentVariable('DYLD_FALLBACK_LIBRARY_PATH'))=='' And $([MSBuild]::IsOsPlatform('OSX'))">
-					<PropertyGroup>
-						<DoILRepack>false</DoILRepack>
-						<DoExecILRepack>true</DoExecILRepack>
-					</PropertyGroup>
-				</When>
-				<Otherwise>
-					<PropertyGroup>
-						<DoILRepack>true</DoILRepack>
-						<DoExecILRepack>false</DoExecILRepack>
-					</PropertyGroup>
-				</Otherwise>
-			</Choose>
-		</When>
-		<Otherwise>
-			<PropertyGroup>
-				<ILRepackInternalize>false</ILRepackInternalize>
-				<DoILRepack>false</DoILRepack>
-				<DoExecILRepack>false</DoExecILRepack>
-			</PropertyGroup>
-		</Otherwise>
-	</Choose> -->
-
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="" />
 		<None Include="..\LICENSE" Pack="true" PackagePath="" />
@@ -118,23 +88,12 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net35" Version="1.0.3">
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		  <PrivateAssets>all</PrivateAssets>
-		</PackageReference>
 		<PackageReference Include="MonoModReorg.Core" Version="$(MonoModCoreVersion)">
 			<!-- <PrivateAssets Condition="$(ILRepackInternalize)">all</PrivateAssets> -->
 		</PackageReference>
 
 		<!-- Reference assemblies are needed for non-Windows .NET Framework targeting builds. -->
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
-
-		<!--
-		See ILRepack config above.
-		Version 2.1.15+ currently doesn't work on Linux and macOS (results in "Current platform not supported. Unable to find .NET Framework root"),
-		WE MUST USE VERSION 2.1.14 HERE FOR NOW!
-		
-		<PackageReference Include="ILRepack.Lib.MSBuild" Version="2.1.14" PrivateAssets="all" /> -->
 	</ItemGroup>
 
 	<!-- netstandard2.0 reference assemblies -->
@@ -171,32 +130,6 @@
 		<Compile Remove="**\*.net7.cs" />
 	</ItemGroup>
 
-	<!--
-	On macOS .NET Framework builds, ILRepack uses Mono.Posix package for copying file permissions, but this problematic because:
-	1) Its P/Invoke usage relies on dynamic linking with the native libs (specifically, libMonoPosixHelper.dylib) of the Mono install(s),
-		(which are typically rooted at /Library/Frameworks/Mono.framework).
-	2) Mono.Posix.dll's dynamic linking doesn't specify absolute paths, so it relies on DYLD_* environment variables for searching for the dylib.
-	3) However, these DYLD_* environment variables are often unset in modern macOS due to SIP:
-		https://developer.apple.com/library/archive/documentation/Security/Conceptual/System_Integrity_Protection_Guide/RuntimeProtections/RuntimeProtections.html
-	This results in "Unable to load shared library 'MonoPosixHelper' ... at Mono.Unix.Native.Syscall.stat..." errors.
-
-	Workaround:
-	We default DYLD_FALLBACK_LIBRARY_PATH to what's supposed to be its default value, prepended by Mono's lib folder.
-	However, dyld already initializes and reads DYLD_* env vars before any target is run (even before InitialTargets targets),
-	so we must spawn a new process via the Exec task that sets DYLD_* env vars and runs msbuild on the ILRepack target.
-	Furthermore, DYLD_* env vars aren't inherited (even if specified via Exec's EnvironmentVariables attribute), probably due to SIP,
-	so we must set DYLD_* env vars within the Exec'd command itself.
-	
-	<Target Name="ExecILRepack" AfterTargets="PostBuildEvent" Condition="$(DoExecILRepack)">
-		<PropertyGroup>
-			<DYLD_FALLBACK_LIBRARY_PATH>/Library/Frameworks/Mono.framework/Versions/Current/lib:$(HOME)/lib:/usr/local/lib:/lib:/usr/lib</DYLD_FALLBACK_LIBRARY_PATH>
-			<MSBuildCmd Condition="'$(MSBuildRuntimeType)'!='Core'">"$(MSBuildToolsPath)\MSBuild.exe"</MSBuildCmd>
-			<MSBuildCmd Condition="'$(MSBuildRuntimeType)'=='Core'">"$(DOTNET_HOST_PATH)" msbuild</MSBuildCmd>
-			<MSBuildCmdArgs>"-p:TargetFramework=$(TargetFramework);Configuration=$(Configuration);DoILRepack=true" -t:ILRepack</MSBuildCmdArgs>
-		</PropertyGroup>
-		<Exec Command="export DYLD_FALLBACK_LIBRARY_PATH=$(DYLD_FALLBACK_LIBRARY_PATH); $(MSBuildCmd) $(MSBuildCmdArgs)" />
-	</Target> -->
-
 	<Target Name="RemoveOldNuGetPackages" BeforeTargets="PreBuildEvent">
 		<PropertyGroup>
 			<WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)</WorkingDirectory>

Harmony/Public/InlineSignature.cs

@@ -11,7 +11,7 @@ namespace HarmonyLib
 	/// Used by the calli instruction, can be used by transpilers
 	/// </summary>
 	///
-	public class InlineSignature : ICallSiteGenerator
+	internal class InlineSignature : ICallSiteGenerator
 	{
 		/// <summary>See <see cref="System.Reflection.CallingConventions.HasThis"/></summary>
 		///

HarmonyTests/HarmonyTests.csproj

@@ -62,14 +62,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="MonoModReorg.Core" Version="$(MonoModCoreVersion)" />
+
 		<!-- Reference assemblies are needed for non-Windows .NET Framework targeting builds. -->
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="MonoModReorg.Core" Version="$(MonoModCoreVersion)" />
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETCoreApp'">
 		<PackageReference Include="Lokad.ILPack" Version="0.1.4" PrivateAssets="all" />
 	</ItemGroup>