Coroutine/ActiveCoroutine.cs

@@ -84,7 +84,7 @@ namespace Coroutine {
         }
 
         internal bool OnEvent(Event evt) {
-            if (!this.WasCanceled && object.Equals(this.current.Event, evt))
+            if (!this.WasCanceled && Equals(this.current.Event, evt))
                 this.MoveNext();
             return this.IsFinished;
         }

Coroutine/Coroutine.csproj

@@ -2,7 +2,6 @@
     <PropertyGroup>
         <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <IsTrimmable>true</IsTrimmable>
     </PropertyGroup>
     
     <PropertyGroup>
@@ -14,7 +13,7 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageIcon>Logo.png</PackageIcon>
-        <VersionPrefix>2.1.5</VersionPrefix>
+        <VersionPrefix>2.1.4</VersionPrefix>
     </PropertyGroup>
     
     <ItemGroup>

Coroutine/CoroutineHandler.cs

@@ -11,48 +11,42 @@ namespace Coroutine {
         private static readonly CoroutineHandlerInstance Instance = new CoroutineHandlerInstance();
 
         /// <inheritdoc cref="CoroutineHandlerInstance.TickingCount"/>
-        public static int TickingCount => CoroutineHandler.Instance.TickingCount;
+        public static int TickingCount => Instance.TickingCount;
         /// <inheritdoc cref="CoroutineHandlerInstance.EventCount"/>
-        public static int EventCount => CoroutineHandler.Instance.EventCount;
+        public static int EventCount => Instance.EventCount;
 
         /// <inheritdoc cref="CoroutineHandlerInstance.Start(IEnumerable{Wait},string,int)"/>
         public static ActiveCoroutine Start(IEnumerable<Wait> coroutine, string name = "", int priority = 0) {
-            return CoroutineHandler.Instance.Start(coroutine, name, priority);
+            return Instance.Start(coroutine, name, priority);
         }
 
         /// <inheritdoc cref="CoroutineHandlerInstance.Start(IEnumerator{Wait},string,int)"/>
         public static ActiveCoroutine Start(IEnumerator<Wait> coroutine, string name = "", int priority = 0) {
-            return CoroutineHandler.Instance.Start(coroutine, name, priority);
+            return Instance.Start(coroutine, name, priority);
         }
 
-        /// <inheritdoc cref="CoroutineHandlerInstance.InvokeLater(Wait,Action,string,int)"/>
+        /// <inheritdoc cref="CoroutineHandlerInstance.InvokeLater"/>
         public static ActiveCoroutine InvokeLater(Wait wait, Action action, string name = "", int priority = 0) {
-            return CoroutineHandler.Instance.InvokeLater(wait, action, name, priority);
+            return Instance.InvokeLater(wait, action, name, priority);
-        }
-
-        /// <inheritdoc cref="CoroutineHandlerInstance.InvokeLater(Event,Action,string,int)"/>
-        public static ActiveCoroutine InvokeLater(Event evt, Action action, string name = "", int priority = 0) {
-            return CoroutineHandler.Instance.InvokeLater(evt, action, name, priority);
         }
 
         /// <inheritdoc cref="CoroutineHandlerInstance.Tick(double)"/>
         public static void Tick(double deltaSeconds) {
-            CoroutineHandler.Instance.Tick(deltaSeconds);
+            Instance.Tick(deltaSeconds);
         }
-
         /// <inheritdoc cref="CoroutineHandlerInstance.Tick(TimeSpan)"/>
         public static void Tick(TimeSpan delta) {
-            CoroutineHandler.Instance.Tick(delta);
+            Instance.Tick(delta);
         }
 
         /// <inheritdoc cref="CoroutineHandlerInstance.RaiseEvent"/>
         public static void RaiseEvent(Event evt) {
-            CoroutineHandler.Instance.RaiseEvent(evt);
+            Instance.RaiseEvent(evt);
         }
 
         /// <inheritdoc cref="CoroutineHandlerInstance.GetActiveCoroutines"/>
         public static IEnumerable<ActiveCoroutine> GetActiveCoroutines() {
-            return CoroutineHandler.Instance.GetActiveCoroutines();
+            return Instance.GetActiveCoroutines();
         }
 
     }

Coroutine/CoroutineHandlerInstance.cs

@@ -75,20 +75,7 @@ namespace Coroutine {
         /// <param name="priority">The <see cref="ActiveCoroutine.Priority"/> that the underlying coroutine should have. The higher the priority, the earlier it is advanced compared to other coroutines that advance around the same time. Defaults to 0.</param>
         /// <returns>An active coroutine object representing this coroutine</returns>
         public ActiveCoroutine InvokeLater(Wait wait, Action action, string name = "", int priority = 0) {
-            return this.Start(CoroutineHandlerInstance.InvokeLaterImpl(wait, action), name, priority);
+            return this.Start(InvokeLaterImpl(wait, action), name, priority);
-        }
-
-        /// <summary>
-        /// Causes the given action to be invoked after the given <see cref="Event"/>.
-        /// This is equivalent to a coroutine that waits for the given wait and then executes the given <see cref="Action"/>.
-        /// </summary>
-        /// <param name="evt">The event to wait for</param>
-        /// <param name="action">The action to execute after waiting</param>
-        /// <param name="name">The <see cref="ActiveCoroutine.Name"/> that the underlying coroutine should have. Defaults to an empty string.</param>
-        /// <param name="priority">The <see cref="ActiveCoroutine.Priority"/> that the underlying coroutine should have. The higher the priority, the earlier it is advanced compared to other coroutines that advance around the same time. Defaults to 0.</param>
-        /// <returns>An active coroutine object representing this coroutine</returns>
-        public ActiveCoroutine InvokeLater(Event evt, Action action, string name = "", int priority = 0) {
-            return this.InvokeLater(new Wait(evt), action, name, priority);
         }
 
         /// <summary>

Example/Example.cs

@@ -9,19 +9,19 @@ namespace Example {
         private static readonly Event TestEvent = new Event();
 
         public static void Main() {
-            var seconds = CoroutineHandler.Start(Example.WaitSeconds(), "Awesome Waiting Coroutine");
+            var seconds = CoroutineHandler.Start(WaitSeconds(), "Awesome Waiting Coroutine");
-            CoroutineHandler.Start(Example.PrintEvery10Seconds(seconds));
+            CoroutineHandler.Start(PrintEvery10Seconds(seconds));
 
-            CoroutineHandler.Start(Example.EmptyCoroutine());
+            CoroutineHandler.Start(EmptyCoroutine());
 
             CoroutineHandler.InvokeLater(new Wait(5), () => {
                 Console.WriteLine("Raising test event");
-                CoroutineHandler.RaiseEvent(Example.TestEvent);
+                CoroutineHandler.RaiseEvent(TestEvent);
             });
-            CoroutineHandler.InvokeLater(new Wait(Example.TestEvent), () => Console.WriteLine("Example event received"));
+            CoroutineHandler.InvokeLater(new Wait(TestEvent), () => Console.WriteLine("Example event received"));
 
-            CoroutineHandler.InvokeLater(new Wait(Example.TestEvent), () => Console.WriteLine("I am invoked after 'Example event received'"), priority: -5);
+            CoroutineHandler.InvokeLater(new Wait(TestEvent), () => Console.WriteLine("I am invoked after 'Example event received'"), priority: -5);
-            CoroutineHandler.InvokeLater(new Wait(Example.TestEvent), () => Console.WriteLine("I am invoked before 'Example event received'"), priority: 2);
+            CoroutineHandler.InvokeLater(new Wait(TestEvent), () => Console.WriteLine("I am invoked before 'Example event received'"), priority: 2);
 
             var lastTime = DateTime.Now;
             while (true) {
@@ -38,7 +38,7 @@ namespace Example {
             Console.WriteLine("After 1 second " + DateTime.Now);
             yield return new Wait(9);
             Console.WriteLine("After 10 seconds " + DateTime.Now);
-            CoroutineHandler.Start(Example.NestedCoroutine());
+            CoroutineHandler.Start(NestedCoroutine());
             yield return new Wait(5);
             Console.WriteLine("After 5 more seconds " + DateTime.Now);
             yield return new Wait(10);

Tests/EventBasedCoroutineTests.cs

@@ -128,7 +128,7 @@ namespace Tests {
                 var p = CoroutineHandler.Start(Parent());
                 CoroutineHandler.RaiseEvent(onParentCreated);
                 // Nested corotuine starting in OnFinished.
-                p.OnFinished += _ => {
+                p.OnFinished += ac => {
                     CoroutineHandler.Start(Child());
                     CoroutineHandler.RaiseEvent(onChildCreated);
                 };

Tests/TimeBasedCoroutineTests.cs

@@ -164,7 +164,7 @@ namespace Tests {
                 // Nested corotuine starting.
                 var p = CoroutineHandler.Start(Parent());
                 // Nested corotuine starting in OnFinished.
-                p.OnFinished += _ => CoroutineHandler.Start(Child());
+                p.OnFinished += ac => CoroutineHandler.Start(Child());
             }
 
             var always = CoroutineHandler.Start(AlwaysRunning());
@@ -408,7 +408,7 @@ namespace Tests {
                 var p = CoroutineHandler.Start(Parent());
                 CoroutineHandler.RaiseEvent(onParentCreated);
                 // Nested corotuine starting in OnFinished.
-                p.OnFinished += _ => {
+                p.OnFinished += ac => {
                     CoroutineHandler.Start(Child());
                     CoroutineHandler.RaiseEvent(onChildCreated);
                 };