diff --git a/src/Utilities/AppDomainIsolatedTask.cs b/src/Utilities/AppDomainIsolatedTask.cs index 7a0a4b716a6..2caf85f36ce 100644 --- a/src/Utilities/AppDomainIsolatedTask.cs +++ b/src/Utilities/AppDomainIsolatedTask.cs @@ -161,7 +161,7 @@ protected string HelpKeywordPrefix public abstract bool Execute(); /// - /// Overridden to give tasks deriving from this class infinite lease time. Otherwise we end up with a limited + /// Overridden to give tasks deriving from this class infinite lease time. Otherwise we end up with a limited /// lease (5 minutes I think) and task instances can expire if they take long time processing. /// [SecurityCritical] diff --git a/src/Utilities/ToolTask.cs b/src/Utilities/ToolTask.cs index 85e14fc9af8..dcdc65faebe 100644 --- a/src/Utilities/ToolTask.cs +++ b/src/Utilities/ToolTask.cs @@ -159,7 +159,7 @@ protected int TaskProcessTerminationTimeout } /// - /// Used to signal when a tool has been cancelled. + /// Used to signal when a tool has been canceled. /// protected ManualResetEvent ToolCanceled { @@ -1083,7 +1083,7 @@ private void KillToolProcessOnTimeout(Process proc, bool isBeingCancelled) } // wait until the process finishes exiting/getting killed. - // We don't want to wait forever here because the task is already supposed to be dieing, we just want to give it long enough + // We don't want to wait forever here because the task is already supposed to be dieing, we just want to give it long enough // to try and flush what it can and stop. If it cannot do that in a reasonable time frame then we will just ignore it. int timeout = 5000; string timeoutFromEnvironment = Environment.GetEnvironmentVariable("MSBUILDTOOLTASKCANCELPROCESSWAITTIMEOUT"); @@ -1534,7 +1534,7 @@ public override bool Execute() } // Log the environment. We do this up here, - // rather than later where the environment is set, + // rather than later where the environment is set, // so that it appears before the command line is logged. bool alreadyLoggedEnvironmentHeader = false; diff --git a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs index 080949fbe26..d49d2bc2865 100644 --- a/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs +++ b/src/XMakeBuildEngine/BackEnd/TaskExecutionHost/TaskExecutionHost.cs @@ -124,9 +124,9 @@ internal class TaskExecutionHost : ITaskExecutionHost, IDisposable private bool _continueOnError; /// - /// Set to true if the execution has been cancelled. + /// Set to true if the execution has been canceled. /// - private bool _cancelled; + private bool _canceled; /// /// Event which is signalled when a task is not executing. Used for cancellation. @@ -603,7 +603,7 @@ bool ITaskExecutionHost.Execute() // and Execute may not even have been called yet. _taskExecutionIdle.Reset(); - if (_cancelled) + if (_canceled) { _taskExecutionIdle.Set(); return false; @@ -664,8 +664,8 @@ private void CleanupCancellationToken() /// private void Cancel() { - // This will prevent the current and any future tasks from running on this TaskExecutionHost, because we don't reset the cancelled flag. - _cancelled = true; + // This will prevent the current and any future tasks from running on this TaskExecutionHost, because we don't reset the canceled flag. + _canceled = true; ITask currentInstance = _taskInstance; ICancelableTask cancellableTask = null; diff --git a/src/XMakeTasks/BootstrapperUtil/Product.cs b/src/XMakeTasks/BootstrapperUtil/Product.cs index 5c1f28bf1ff..459c75e87a1 100644 --- a/src/XMakeTasks/BootstrapperUtil/Product.cs +++ b/src/XMakeTasks/BootstrapperUtil/Product.cs @@ -34,7 +34,7 @@ public class Product : IProduct public Product() { - Debug.Fail("Products are not to be created in this fashion. Please use IBootstrapperBuilder.Products instead."); + Debug.Fail("Products are not to be created in this fashion. Please use IBootstrapperBuilder. Products instead."); throw new InvalidOperationException(); } @@ -67,7 +67,7 @@ internal CopyAllFilesType CopyAllPackageFiles } /// - /// The ProductBuilder representation of this Product + /// The ProductBuilder representation of this Product. /// public ProductBuilder ProductBuilder { @@ -75,7 +75,7 @@ public ProductBuilder ProductBuilder } /// - /// A string specifying the unique identifier of this product + /// A string specifying the unique identifier of this product. /// public string ProductCode { @@ -83,7 +83,7 @@ public string ProductCode } /// - /// A human-readable name for this product + /// A human-readable name for this product. /// public string Name { @@ -119,7 +119,7 @@ public string Name } /// - /// All products which this product also installs + /// All products which this product also installs. /// public ProductCollection Includes { diff --git a/src/dirs.proj b/src/dirs.proj index 3bcb30ff1e4..7cf11da1b4c 100644 --- a/src/dirs.proj +++ b/src/dirs.proj @@ -18,7 +18,7 @@ - + $(BaseOutputPathWithConfig)