From ffc723292fc863b72e0f7f67e43a4637486589ca Mon Sep 17 00:00:00 2001 From: jnm2 Date: Mon, 7 Nov 2016 08:46:28 -0500 Subject: [PATCH] Fixed 'occured' and 'occuring' --- src/Cake.Core.Tests/Unit/CakeEngineTests.cs | 4 ++-- src/Cake.Core/CakeEngine.cs | 6 +++--- src/Cake.Core/Scripting/ScriptAliasFinder.cs | 2 +- src/Cake/CakeOptions.cs | 4 ++-- src/Cake/Scripting/Mono/MonoScriptSession.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Cake.Core.Tests/Unit/CakeEngineTests.cs b/src/Cake.Core.Tests/Unit/CakeEngineTests.cs index 3f8dd8311f..080e2fbc04 100644 --- a/src/Cake.Core.Tests/Unit/CakeEngineTests.cs +++ b/src/Cake.Core.Tests/Unit/CakeEngineTests.cs @@ -487,7 +487,7 @@ public void Should_Throw_Exception_Thrown_From_Setup_Action_If_Both_Setup_And_Te } [Fact] - public void Should_Throw_Exception_Occuring_In_Teardown_If_No_Previous_Exception_Was_Thrown() + public void Should_Throw_Exception_Occurring_In_Teardown_If_No_Previous_Exception_Was_Thrown() { // Given var fixture = new CakeEngineFixture(); @@ -851,7 +851,7 @@ public void Should_Throw_Exception_Thrown_From_Task_Setup_Action_If_Both_Task_Se } [Fact] - public void Should_Throw_Exception_Occuring_In_Task_Teardown_If_No_Previous_Exception_Was_Thrown() + public void Should_Throw_Exception_Occurring_In_Task_Teardown_If_No_Previous_Exception_Was_Thrown() { // Given var fixture = new CakeEngineFixture(); diff --git a/src/Cake.Core/CakeEngine.cs b/src/Cake.Core/CakeEngine.cs index f39fe627e3..519a4cdcbc 100644 --- a/src/Cake.Core/CakeEngine.cs +++ b/src/Cake.Core/CakeEngine.cs @@ -221,7 +221,7 @@ private void ExecuteTask(ICakeContext context, IExecutionStrategy strategy, Stop } catch (Exception exception) { - _log.Error("An error occured when executing task '{0}'.", task.Name); + _log.Error("An error occurred when executing task '{0}'.", task.Name); exceptionWasThrown = true; @@ -293,7 +293,7 @@ private void PerformTaskTeardown(ICakeContext context, IExecutionStrategy strate } catch (Exception ex) { - _log.Error("An error occured in the custom task teardown action ({0}).", task.Name); + _log.Error("An error occurred in the custom task teardown action ({0}).", task.Name); if (!exceptionWasThrown) { // If no other exception was thrown, we throw this one. @@ -361,7 +361,7 @@ private void PerformTeardown(IExecutionStrategy strategy, ICakeContext context, } catch (Exception ex) { - _log.Error("An error occured in the custom teardown action."); + _log.Error("An error occurred in the custom teardown action."); if (!exceptionWasThrown) { // If no other exception was thrown, we throw this one. diff --git a/src/Cake.Core/Scripting/ScriptAliasFinder.cs b/src/Cake.Core/Scripting/ScriptAliasFinder.cs index 0510771590..2d9faaccd1 100644 --- a/src/Cake.Core/Scripting/ScriptAliasFinder.cs +++ b/src/Cake.Core/Scripting/ScriptAliasFinder.cs @@ -128,7 +128,7 @@ private ScriptAlias CreateAlias(Tuple alias) catch (Exception ex) { // Log this error. - const string format = "An error occured while generating code for alias {0}."; + const string format = "An error occurred while generating code for alias {0}."; _log.Error(format, method.GetSignature(false)); _log.Error("Error: {0}", ex.Message); } diff --git a/src/Cake/CakeOptions.cs b/src/Cake/CakeOptions.cs index d2e19a751e..47b790f654 100644 --- a/src/Cake/CakeOptions.cs +++ b/src/Cake/CakeOptions.cs @@ -91,10 +91,10 @@ public sealed class CakeOptions public bool Experimental { get; set; } /// - /// Gets or sets a value indicating whether an error occured during parsing. + /// Gets or sets a value indicating whether an error occurred during parsing. /// /// - /// true if an error occured during parsing; otherwise, false. + /// true if an error occurred during parsing; otherwise, false. /// public bool HasError { get; set; } diff --git a/src/Cake/Scripting/Mono/MonoScriptSession.cs b/src/Cake/Scripting/Mono/MonoScriptSession.cs index a8f5c9d809..f507361865 100644 --- a/src/Cake/Scripting/Mono/MonoScriptSession.cs +++ b/src/Cake/Scripting/Mono/MonoScriptSession.cs @@ -115,7 +115,7 @@ public void Execute(Script script) catch (InternalErrorException) { // The error will be logged via the report printer. - throw new CakeException("An error occured while executing build script."); + throw new CakeException("An error occurred while executing build script."); } } }