removes 'Unmerged change' comments

pardeike · Mar 4, 2024 · 669729f · 669729f
1 parent 76b4879
commit 669729f
Showing 1 changed file with 0 additions and 156 deletions.
diff --git a/HarmonyTests/TestTools.cs b/HarmonyTests/TestTools.cs
@@ -134,116 +134,8 @@ ConstraintResult CaptureResult(ConstraintResult result)
 
 			public ConstraintResult ApplyTo<TActual>(TActual actual) => CaptureResult(resolvedParent.ApplyTo(actual));
 
-
-/* Unmerged change from project 'HarmonyTests (net8.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(del));
-After:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-*/
-
-/* Unmerged change from project 'HarmonyTests (netcoreapp3.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(del));
-After:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-*/
-
-/* Unmerged change from project 'HarmonyTests (net7.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(del));
-After:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-*/
-
-/* Unmerged change from project 'HarmonyTests (net5.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(del));
-After:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-*/
-
-/* Unmerged change from project 'HarmonyTests (net6.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(del));
-After:
 			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-*/
-
-/* Unmerged change from project 'HarmonyTests (netcoreapp3.1)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(del));
-After:
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-*/
-			public ConstraintResult ApplyTo<TActual>(ActualValueDelegate<TActual> del) => CaptureResult(resolvedParent.ApplyTo(del));
-
-
-/* Unmerged change from project 'HarmonyTests (net8.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(ref actual));
-After:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
-*/
-
-/* Unmerged change from project 'HarmonyTests (netcoreapp3.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(ref actual));
-After:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
-*/
-
-/* Unmerged change from project 'HarmonyTests (net7.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(ref actual));
-After:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
-*/
-
-/* Unmerged change from project 'HarmonyTests (net5.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(ref actual));
-After:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
-*/
-
-/* Unmerged change from project 'HarmonyTests (net6.0)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(ref actual));
-After:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
-*/
 
-/* Unmerged change from project 'HarmonyTests (netcoreapp3.1)'
-Before:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual)
-			{
-				return CaptureResult(resolvedParent.ApplyTo(ref actual));
-After:
-			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
-*/
 			public ConstraintResult ApplyTo<TActual>(ref TActual actual) => CaptureResult(resolvedParent.ApplyTo(ref actual));
 
 			public IConstraint Resolve()
@@ -271,61 +163,13 @@ public static Type ThrowsConstraintExceptionType(IConstraint resolvedConstraint)
 
 		// Run an action in a test isolation context.
 
-/* Unmerged change from project 'HarmonyTests (net8.0)'
-Before:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action)
-		{
-After:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
-*/
-
-/* Unmerged change from project 'HarmonyTests (netcoreapp3.0)'
-Before:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action)
-		{
-After:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
-*/
-
-/* Unmerged change from project 'HarmonyTests (net7.0)'
-Before:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action)
-		{
-After:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
-*/
-
-/* Unmerged change from project 'HarmonyTests (net5.0)'
-Before:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action)
-		{
-After:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
-*/
-
-/* Unmerged change from project 'HarmonyTests (net6.0)'
-Before:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action)
-		{
-After:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
-*/
-
-/* Unmerged change from project 'HarmonyTests (netcoreapp3.1)'
-Before:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action)
-		{
-After:
-		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
-*/
 		public static void RunInIsolationContext(Action<ITestIsolationContext> action) =>
 #if NETCOREAPP
 			TestAssemblyLoadContext.RunInIsolationContext(action);
 #else
 			TestDomainProxy.RunInIsolationContext(action);
 #endif
 
-
 #if NETCOREAPP
 		// .NET Core does not support multiple AppDomains, but it does support unloading assemblies via AssemblyLoadContext.
 		// Based off sample code in https://docs.microsoft.com/en-us/dotnet/standard/assembly/unloadability