Skip to content
Merged
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 dir.targets
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</UsingTask>

<!--
Needed to avoid the InitialTargets from having an Output which ends up getting
Needed to avoid the InitialTargets from having an Output which ends up getting
added to the output references when you have a project to project reference.
-->
<Target Name="_RestoreBuildToolsWrapper" DependsOnTargets="_RestoreBuildTools" />
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/BuildEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ internal virtual void CreateFromStream(BinaryReader reader, int version)
[OnDeserializing]
private void SetBuildEventContextDefaultBeforeSerialization(StreamingContext sc)
{
// Don't want to create a new one here as default all the time as that would be a lot of
// Don't want to create a new one here as default all the time as that would be a lot of
// possibly useless allocations
_buildEventContext = null;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/BuildEventContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ public override int GetHashCode()
/// Compare a BuildEventContext with this BuildEventContext.
/// A build event context is compared in the following way.
///
/// 1. If the object references are the same the contexts are equivalent
/// 2. If the object type is the same and the Id values in the context are the same, the contexts are equivalent
/// 1. If the object references are the same the contexts are equivalent
/// 2. If the object type is the same and the Id values in the context are the same, the contexts are equivalent
/// </summary>
/// <param name="obj"></param>
/// <returns></returns>
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/BuildFinishedEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ protected BuildFinishedEventArgs()
}

/// <summary>
/// Constructor to initialize all parameters.
/// Constructor to initialize all parameters.
/// Sender field cannot be set here and is assumed to be "MSBuild"
/// </summary>
/// <param name="message">text message</param>
Expand Down
6 changes: 3 additions & 3 deletions src/Framework/BuildMessageEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protected BuildMessageEventArgs()
}

/// <summary>
/// This constructor allows all event data to be initialized
/// This constructor allows all event data to be initialized
/// </summary>
/// <param name="message">text message</param>
/// <param name="helpKeyword">help keyword </param>
Expand All @@ -75,7 +75,7 @@ MessageImportance importance
}

/// <summary>
/// This constructor allows a timestamp to be set
/// This constructor allows a timestamp to be set
/// </summary>
/// <param name="message">text message</param>
/// <param name="helpKeyword">help keyword </param>
Expand All @@ -96,7 +96,7 @@ DateTime eventTimestamp
}

/// <summary>
/// This constructor allows a timestamp to be set
/// This constructor allows a timestamp to be set
/// </summary>
/// <param name="message">text message</param>
/// <param name="helpKeyword">help keyword </param>
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/BuildStatusEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ string senderName
/// <param name="message">text message</param>
/// <param name="helpKeyword">help keyword </param>
/// <param name="senderName">name of event sender</param>
/// <param name="eventTimestamp">Timestamp when event was created</pparam>
/// <param name="eventTimestamp">Timestamp when event was created</param>
protected BuildStatusEventArgs
(
string message,
Expand All @@ -73,7 +73,7 @@ DateTime eventTimestamp
/// <param name="message">text message</param>
/// <param name="helpKeyword">help keyword </param>
/// <param name="senderName">name of event sender</param>
/// <param name="eventTimestamp">Timestamp when event was created</pparam>
/// <param name="eventTimestamp">Timestamp when event was created</param>
protected BuildStatusEventArgs
(
string message,
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/BuildWarningEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ internal override void WriteToStream(BinaryWriter writer)
internal override void CreateFromStream(BinaryReader reader, int version)
{
base.CreateFromStream(reader, version);
#region SubCatetory
#region SubCategory
if (reader.ReadByte() == 0)
{
_subcategory = null;
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/IBuildEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ bool ContinueOnError
}

/// <summary>
/// Retrieves the line number of the task node within the project file that called it.
/// Retrieves the line number of the task node within the project file that called it.
/// </summary>
int LineNumberOfTaskNode
{
get;
}

/// <summary>
/// Retrieves the line number of the task node within the project file that called it.
/// Retrieves the line number of the task node within the project file that called it.
/// </summary>
int ColumnNumberOfTaskNode
{
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/LazyFormattedBuildEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class LazyFormattedBuildEventArgs : BuildEventArgs
private Object _locker;

/// <summary>
/// This constructor allows all event data to be initialized.
/// This constructor allows all event data to be initialized.
/// </summary>
/// <param name="message">text message.</param>
/// <param name="helpKeyword">help keyword.</param>
Expand All @@ -51,7 +51,7 @@ string senderName
}

/// <summary>
/// This constructor that allows message arguments that are lazily formatted.
/// This constructor that allows message arguments that are lazily formatted.
/// </summary>
/// <param name="message">text message.</param>
/// <param name="helpKeyword">help keyword.</param>
Expand Down
4 changes: 2 additions & 2 deletions src/Framework/ProjectStartedEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public IEnumerable Properties
}

// IEnumerable is not a serializable type. That is okay because
// (a) this event will not be thrown by tasks, so it should not generally cross AppFomain boundaries
// (a) this event will not be thrown by tasks, so it should not generally cross AppDomain boundaries
// (b) this event still makes sense when this field is "null"
[NonSerialized]
private IEnumerable _items;
Expand Down Expand Up @@ -527,7 +527,7 @@ internal override void CreateFromStream(BinaryReader reader, int version)
private void SetDefaultsBeforeSerialization(StreamingContext sc)
{
_projectId = InvalidProjectId;
// Don't want to set the default before deserialization is completed to a new event context because
// Don't want to set the default before deserialization is completed to a new event context because
// that would most likely be a lot of wasted allocations
_parentProjectBuildEventContext = null;
}
Expand Down
16 changes: 8 additions & 8 deletions src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public void TestBuildFinishedEventArgs()
newGenericEvent = new BuildFinishedEventArgs(null, null, false);
newGenericEvent.CreateFromStream(_reader, _eventArgVersion);
VerifyGenericEventArg(genericEvent, newGenericEvent);
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");

// Test using null strings
_stream.Position = 0;
Expand All @@ -242,7 +242,7 @@ public void TestBuildFinishedEventArgs()
newGenericEvent = new BuildFinishedEventArgs("Something", "Something", false);
newGenericEvent.CreateFromStream(_reader, _eventArgVersion);
VerifyGenericEventArg(genericEvent, newGenericEvent);
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");
}

[TestMethod]
Expand Down Expand Up @@ -518,7 +518,7 @@ public void TestProjectFinishedEventArgs()
long streamReadEndPosition = _stream.Position;
Assert.IsTrue(streamWriteEndPosition == streamReadEndPosition, "Stream End Positions Should Match");
VerifyGenericEventArg(genericEvent, newGenericEvent);
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");
Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");

// Test with empty strings
Expand All @@ -537,7 +537,7 @@ public void TestProjectFinishedEventArgs()
streamReadEndPosition = _stream.Position;
Assert.IsTrue(streamWriteEndPosition == streamReadEndPosition, "Stream End Positions Should Match");
VerifyGenericEventArg(genericEvent, newGenericEvent);
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");
Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");

// Test with null strings
Expand All @@ -557,7 +557,7 @@ public void TestProjectFinishedEventArgs()
streamReadEndPosition = _stream.Position;
Assert.IsTrue(streamWriteEndPosition == streamReadEndPosition, "Stream End Positions Should Match");
VerifyGenericEventArg(genericEvent, newGenericEvent);
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");
Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");
}

Expand Down Expand Up @@ -699,7 +699,7 @@ private static void VerifyProjectStartedEvent(ProjectStartedEventArgs genericEve
{
Assert.AreEqual(genericEvent.Items, newGenericEvent.Items, "Expected Properties to match");
Assert.AreEqual(genericEvent.Properties, newGenericEvent.Properties, "Expected Properties to match");
Assert.AreEqual(genericEvent.ParentProjectBuildEventContext, newGenericEvent.ParentProjectBuildEventContext, "Expected ParentEvent Contextes to match");
Assert.AreEqual(genericEvent.ParentProjectBuildEventContext, newGenericEvent.ParentProjectBuildEventContext, "Expected ParentEvent Contexts to match");
Assert.AreEqual(genericEvent.ProjectId, newGenericEvent.ProjectId, "Expected ProjectId to Match");
Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");
Assert.IsTrue(string.Compare(genericEvent.TargetNames, newGenericEvent.TargetNames, StringComparison.OrdinalIgnoreCase) == 0, "Expected TargetNames to Match");
Expand Down Expand Up @@ -834,7 +834,7 @@ public void TestTargetFinishedEventArgs()
/// </summary>
private static void VerifyTargetFinished(TargetFinishedEventArgs genericEvent, TargetFinishedEventArgs newGenericEvent)
{
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");
Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");
Assert.IsTrue(string.Compare(genericEvent.TargetFile, newGenericEvent.TargetFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected TargetFile to Match");
Assert.IsTrue(string.Compare(genericEvent.TargetName, newGenericEvent.TargetName, StringComparison.OrdinalIgnoreCase) == 0, "Expected TargetName to Match");
Expand Down Expand Up @@ -972,7 +972,7 @@ public void TestTaskFinishedEventArgs()
/// </summary>
private static void VerifyTaskFinished(TaskFinishedEventArgs genericEvent, TaskFinishedEventArgs newGenericEvent)
{
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeeded to Match");
Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");
Assert.IsTrue(string.Compare(genericEvent.TaskFile, newGenericEvent.TaskFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected TaskFile to Match");
Assert.IsTrue(string.Compare(genericEvent.TaskName, newGenericEvent.TaskName, StringComparison.OrdinalIgnoreCase) == 0, "Expected TaskName to Match");
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/UnitTests/EventArgs_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void EventArgsCtors()
#endregion

/// <summary>
/// Verify a whidby project started event can be deserialized, the whidby event is stored in a serialized base64 string.
/// Verify a whidbey project started event can be deserialized, the whidbey event is stored in a serialized base64 string.
/// </summary>
[TestMethod]
[Ignore]
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/XamlTypes/BaseProperty.cs
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public string Switch
/// </remarks>
/// <example>
/// For the VC++ CL task, <c>WholeProgramOptimization</c> is a boolean parameter. It's switch is <c>GL</c> and its
/// switch prefix (inherited from the parent <see cref="Rule.SwitchPrefix"/> since it is not overriden by <c>WholeProgramOptimization</c>)
/// switch prefix (inherited from the parent <see cref="Rule.SwitchPrefix"/> since it is not overridden by <c>WholeProgramOptimization</c>)
/// is <c>/</c>. Thus the complete switch in the command line for this property would be <c>/GL</c>
/// </example>
public string SwitchPrefix
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/XamlTypes/ContentType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public string ItemGroupName
}

/// <summary>
/// serializes content type's metadata. Accessable via IContentType.GetMetadata()
/// serializes content type's metadata. Accessible via IContentType.GetMetadata()
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods", Justification = "This has shipped in Framework, which is especially important to keep binary compatible, so we can't change it now")]
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Justification = "This has shipped in Framework, which is especially important to keep binary compatible, so we can't change it now")]
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/XamlTypes/DataSource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public DataSource()
/// </summary>
/// <remarks>
/// This field is mandatory and is culture invariant. Current accepted values are <c>ProjectFile</c>
/// and <c>UserFile</c>. <c>ProjectFile</c> causes the property value to be writted to and read from
/// and <c>UserFile</c>. <c>ProjectFile</c> causes the property value to be written to and read from
/// the project manifest file or the property sheet (depending on which node in the solution explorer/property manager
/// window is used to spawn the property pages UI). <c>UserFile</c> causes the property value to be written to and
/// read from the .user file.
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/XamlTypes/FileExtension.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public string Name
}

/// <summary>
/// coresponding content type
/// corresponding content type
/// </summary>
public string ContentType
{
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/XamlTypes/ProjectSchemaDefinitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace Microsoft.Build.Framework.XamlTypes
{
/// <summary>
/// Serializatrion class for node for the Data driven project schema XAML
/// Serialization class for node for the Data driven project schema XAML
/// </summary>
[ContentProperty("Nodes")]
public sealed class ProjectSchemaDefinitions : IProjectSchemaNode
Expand Down
6 changes: 3 additions & 3 deletions src/Framework/XamlTypes/Rule.cs
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,12 @@ public string HelpString
/// The prefix to use for all property switches in this <see cref="Rule"/> for the case when this property <see cref="Rule"/> represent a tool.
/// </summary>
/// <remarks>
/// The value specified can be overriden by the value specified by a child <see cref="BaseProperty"/>'s <see cref="BaseProperty.SwitchPrefix"/>.
/// The value specified can be overridden by the value specified by a child <see cref="BaseProperty"/>'s <see cref="BaseProperty.SwitchPrefix"/>.
/// This field is optional and culture invariant.
/// </remarks>
/// <example>
/// For the VC++ CL task, <c>WholeProgramOptimization</c> is a boolean parameter. It's switch is <c>GL</c> and its
/// switch prefix (inherited from the parent <see cref="Rule.SwitchPrefix"/> since it is not overriden by <c>WholeProgramOptimization</c>)
/// switch prefix (inherited from the parent <see cref="Rule.SwitchPrefix"/> since it is not overridden by <c>WholeProgramOptimization</c>)
/// is <c>/</c>. Thus the complete switch in the command line for this property would be <c>/GL</c>
/// </example>
public string SwitchPrefix
Expand All @@ -182,7 +182,7 @@ public string SwitchPrefix
/// The token used to separate a property switch from its value.
/// </summary>
/// <remarks>
/// The value specified here is overriden by the value specified by the child <see cref="BaseProperty"/>'s <see cref="BaseProperty.Separator"/>.
/// The value specified here is overridden by the value specified by the child <see cref="BaseProperty"/>'s <see cref="BaseProperty.Separator"/>.
/// This field is optional and culture invariant.
/// </remarks>
/// <example>
Expand Down
2 changes: 1 addition & 1 deletion src/Framework/XamlTypes/RuleBag.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public RuleBag()

/// <summary>
/// The collection of <see cref="Rule"/> instances this <see cref="RuleBag"/> instance contains.
/// Must have atleast one <see cref="Rule"/>.
/// Must have at least one <see cref="Rule"/>.
/// </summary>
[SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly", Justification = "This has shipped in Framework, which is especially important to keep binary compatible, so we can't change it now")]
public List<Rule> Rules
Expand Down
Loading