Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Utilities/AppDomainIsolatedTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ protected string HelpKeywordPrefix
public abstract bool Execute();

/// <summary>
/// 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.
/// </summary>
[SecurityCritical]
Expand Down
6 changes: 3 additions & 3 deletions src/Utilities/ToolTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ protected int TaskProcessTerminationTimeout
}

/// <summary>
/// Used to signal when a tool has been cancelled.
/// Used to signal when a tool has been canceled.
/// </summary>
protected ManualResetEvent ToolCanceled
{
Expand Down Expand Up @@ -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");
Expand Down Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ internal class TaskExecutionHost : ITaskExecutionHost, IDisposable
private bool _continueOnError;

/// <summary>
/// Set to true if the execution has been cancelled.
/// Set to true if the execution has been canceled.
/// </summary>
private bool _cancelled;
private bool _canceled;

/// <summary>
/// Event which is signalled when a task is not executing. Used for cancellation.
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -664,8 +664,8 @@ private void CleanupCancellationToken()
/// </summary>
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;
Expand Down
10 changes: 5 additions & 5 deletions src/XMakeTasks/BootstrapperUtil/Product.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down Expand Up @@ -67,23 +67,23 @@ internal CopyAllFilesType CopyAllPackageFiles
}

/// <summary>
/// The ProductBuilder representation of this Product
/// The ProductBuilder representation of this Product.
/// </summary>
public ProductBuilder ProductBuilder
{
get { return new ProductBuilder(this); }
}

/// <summary>
/// A string specifying the unique identifier of this product
/// A string specifying the unique identifier of this product.
/// </summary>
public string ProductCode
{
get { return _productCode; }
}

/// <summary>
/// A human-readable name for this product
/// A human-readable name for this product.
/// </summary>
public string Name
{
Expand Down Expand Up @@ -119,7 +119,7 @@ public string Name
}

/// <summary>
/// All products which this product also installs
/// All products which this product also installs.
/// </summary>
public ProductCollection Includes
{
Expand Down
2 changes: 1 addition & 1 deletion src/dirs.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Import Project="..\dir.traversal.targets" />

<PropertyGroup>
<!-- Explicitly set the OutDir as it is used by the packaging targets -->
<!-- Explicitly set the OutDir as it is used by the packaging targets -->
<OutDir>$(BaseOutputPathWithConfig)</OutDir>
</PropertyGroup>

Expand Down