diff --git a/dir.targets b/dir.targets index 1c60e26c4d2..e3230e522f1 100644 --- a/dir.targets +++ b/dir.targets @@ -37,7 +37,7 @@ diff --git a/src/Framework/BuildEventArgs.cs b/src/Framework/BuildEventArgs.cs index 1797d5abe01..76f40626016 100644 --- a/src/Framework/BuildEventArgs.cs +++ b/src/Framework/BuildEventArgs.cs @@ -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; } diff --git a/src/Framework/BuildEventContext.cs b/src/Framework/BuildEventContext.cs index 1396963a4bc..5f754978b5e 100644 --- a/src/Framework/BuildEventContext.cs +++ b/src/Framework/BuildEventContext.cs @@ -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 /// /// /// diff --git a/src/Framework/BuildFinishedEventArgs.cs b/src/Framework/BuildFinishedEventArgs.cs index feebd6bf0cb..eb9ed6ef13a 100644 --- a/src/Framework/BuildFinishedEventArgs.cs +++ b/src/Framework/BuildFinishedEventArgs.cs @@ -39,7 +39,7 @@ protected BuildFinishedEventArgs() } /// - /// Constructor to initialize all parameters. + /// Constructor to initialize all parameters. /// Sender field cannot be set here and is assumed to be "MSBuild" /// /// text message diff --git a/src/Framework/BuildMessageEventArgs.cs b/src/Framework/BuildMessageEventArgs.cs index 353f3948bf7..40bba99e36c 100644 --- a/src/Framework/BuildMessageEventArgs.cs +++ b/src/Framework/BuildMessageEventArgs.cs @@ -57,7 +57,7 @@ protected BuildMessageEventArgs() } /// - /// This constructor allows all event data to be initialized + /// This constructor allows all event data to be initialized /// /// text message /// help keyword @@ -75,7 +75,7 @@ MessageImportance importance } /// - /// This constructor allows a timestamp to be set + /// This constructor allows a timestamp to be set /// /// text message /// help keyword @@ -96,7 +96,7 @@ DateTime eventTimestamp } /// - /// This constructor allows a timestamp to be set + /// This constructor allows a timestamp to be set /// /// text message /// help keyword diff --git a/src/Framework/BuildStatusEventArgs.cs b/src/Framework/BuildStatusEventArgs.cs index 90184947227..f150533d9b9 100644 --- a/src/Framework/BuildStatusEventArgs.cs +++ b/src/Framework/BuildStatusEventArgs.cs @@ -54,7 +54,7 @@ string senderName /// text message /// help keyword /// name of event sender - /// Timestamp when event was created + /// Timestamp when event was created protected BuildStatusEventArgs ( string message, @@ -73,7 +73,7 @@ DateTime eventTimestamp /// text message /// help keyword /// name of event sender - /// Timestamp when event was created + /// Timestamp when event was created protected BuildStatusEventArgs ( string message, diff --git a/src/Framework/BuildWarningEventArgs.cs b/src/Framework/BuildWarningEventArgs.cs index fe835d029da..8cc2bc29473 100644 --- a/src/Framework/BuildWarningEventArgs.cs +++ b/src/Framework/BuildWarningEventArgs.cs @@ -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; diff --git a/src/Framework/IBuildEngine.cs b/src/Framework/IBuildEngine.cs index 1e762742acd..a4183d4ebfd 100644 --- a/src/Framework/IBuildEngine.cs +++ b/src/Framework/IBuildEngine.cs @@ -55,7 +55,7 @@ bool ContinueOnError } /// - /// 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. /// int LineNumberOfTaskNode { @@ -63,7 +63,7 @@ int LineNumberOfTaskNode } /// - /// 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. /// int ColumnNumberOfTaskNode { diff --git a/src/Framework/LazyFormattedBuildEventArgs.cs b/src/Framework/LazyFormattedBuildEventArgs.cs index 6d8b52f77c8..511b260e207 100644 --- a/src/Framework/LazyFormattedBuildEventArgs.cs +++ b/src/Framework/LazyFormattedBuildEventArgs.cs @@ -35,7 +35,7 @@ public class LazyFormattedBuildEventArgs : BuildEventArgs private Object _locker; /// - /// This constructor allows all event data to be initialized. + /// This constructor allows all event data to be initialized. /// /// text message. /// help keyword. @@ -51,7 +51,7 @@ string senderName } /// - /// This constructor that allows message arguments that are lazily formatted. + /// This constructor that allows message arguments that are lazily formatted. /// /// text message. /// help keyword. diff --git a/src/Framework/ProjectStartedEventArgs.cs b/src/Framework/ProjectStartedEventArgs.cs index 8954bd0ee65..199526e12c4 100644 --- a/src/Framework/ProjectStartedEventArgs.cs +++ b/src/Framework/ProjectStartedEventArgs.cs @@ -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; @@ -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; } diff --git a/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs b/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs index 57f4bfe1e07..56d764e3b65 100644 --- a/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs +++ b/src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs @@ -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; @@ -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] @@ -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 @@ -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 @@ -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"); } @@ -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"); @@ -834,7 +834,7 @@ public void TestTargetFinishedEventArgs() /// 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"); @@ -972,7 +972,7 @@ public void TestTaskFinishedEventArgs() /// 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"); diff --git a/src/Framework/UnitTests/EventArgs_Tests.cs b/src/Framework/UnitTests/EventArgs_Tests.cs index d73c24061b2..7d8418edbd3 100644 --- a/src/Framework/UnitTests/EventArgs_Tests.cs +++ b/src/Framework/UnitTests/EventArgs_Tests.cs @@ -61,7 +61,7 @@ public void EventArgsCtors() #endregion /// - /// 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. /// [TestMethod] [Ignore] diff --git a/src/Framework/XamlTypes/BaseProperty.cs b/src/Framework/XamlTypes/BaseProperty.cs index 7e06498d73c..714485ae2f2 100644 --- a/src/Framework/XamlTypes/BaseProperty.cs +++ b/src/Framework/XamlTypes/BaseProperty.cs @@ -262,7 +262,7 @@ public string Switch /// /// /// For the VC++ CL task, WholeProgramOptimization is a boolean parameter. It's switch is GL and its - /// switch prefix (inherited from the parent since it is not overriden by WholeProgramOptimization) + /// switch prefix (inherited from the parent since it is not overridden by WholeProgramOptimization) /// is /. Thus the complete switch in the command line for this property would be /GL /// public string SwitchPrefix diff --git a/src/Framework/XamlTypes/ContentType.cs b/src/Framework/XamlTypes/ContentType.cs index dbf178b591e..6e0f160ca3e 100644 --- a/src/Framework/XamlTypes/ContentType.cs +++ b/src/Framework/XamlTypes/ContentType.cs @@ -83,7 +83,7 @@ public string ItemGroupName } /// - /// serializes content type's metadata. Accessable via IContentType.GetMetadata() + /// serializes content type's metadata. Accessible via IContentType.GetMetadata() /// [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")] diff --git a/src/Framework/XamlTypes/DataSource.cs b/src/Framework/XamlTypes/DataSource.cs index 3892cfa1e3b..4d8350eaf1b 100644 --- a/src/Framework/XamlTypes/DataSource.cs +++ b/src/Framework/XamlTypes/DataSource.cs @@ -60,7 +60,7 @@ public DataSource() /// /// /// This field is mandatory and is culture invariant. Current accepted values are ProjectFile - /// and UserFile. ProjectFile causes the property value to be writted to and read from + /// and UserFile. ProjectFile 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). UserFile causes the property value to be written to and /// read from the .user file. diff --git a/src/Framework/XamlTypes/FileExtension.cs b/src/Framework/XamlTypes/FileExtension.cs index 1ceb119ba55..6539529fa86 100644 --- a/src/Framework/XamlTypes/FileExtension.cs +++ b/src/Framework/XamlTypes/FileExtension.cs @@ -32,7 +32,7 @@ public string Name } /// - /// coresponding content type + /// corresponding content type /// public string ContentType { diff --git a/src/Framework/XamlTypes/ProjectSchemaDefinitions.cs b/src/Framework/XamlTypes/ProjectSchemaDefinitions.cs index e5d12a873b4..9629e9cb768 100644 --- a/src/Framework/XamlTypes/ProjectSchemaDefinitions.cs +++ b/src/Framework/XamlTypes/ProjectSchemaDefinitions.cs @@ -13,7 +13,7 @@ namespace Microsoft.Build.Framework.XamlTypes { /// - /// Serializatrion class for node for the Data driven project schema XAML + /// Serialization class for node for the Data driven project schema XAML /// [ContentProperty("Nodes")] public sealed class ProjectSchemaDefinitions : IProjectSchemaNode diff --git a/src/Framework/XamlTypes/Rule.cs b/src/Framework/XamlTypes/Rule.cs index c1b850cb965..153080800f7 100644 --- a/src/Framework/XamlTypes/Rule.cs +++ b/src/Framework/XamlTypes/Rule.cs @@ -164,12 +164,12 @@ public string HelpString /// The prefix to use for all property switches in this for the case when this property represent a tool. /// /// - /// The value specified can be overriden by the value specified by a child 's . + /// The value specified can be overridden by the value specified by a child 's . /// This field is optional and culture invariant. /// /// /// For the VC++ CL task, WholeProgramOptimization is a boolean parameter. It's switch is GL and its - /// switch prefix (inherited from the parent since it is not overriden by WholeProgramOptimization) + /// switch prefix (inherited from the parent since it is not overridden by WholeProgramOptimization) /// is /. Thus the complete switch in the command line for this property would be /GL /// public string SwitchPrefix @@ -182,7 +182,7 @@ public string SwitchPrefix /// The token used to separate a property switch from its value. /// /// - /// The value specified here is overriden by the value specified by the child 's . + /// The value specified here is overridden by the value specified by the child 's . /// This field is optional and culture invariant. /// /// diff --git a/src/Framework/XamlTypes/RuleBag.cs b/src/Framework/XamlTypes/RuleBag.cs index a8ac2cb9398..71b3e9e890e 100644 --- a/src/Framework/XamlTypes/RuleBag.cs +++ b/src/Framework/XamlTypes/RuleBag.cs @@ -41,7 +41,7 @@ public RuleBag() /// /// The collection of instances this instance contains. - /// Must have atleast one . + /// Must have at least one . /// [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 Rules diff --git a/src/Shared/AssemblyFoldersEx.cs b/src/Shared/AssemblyFoldersEx.cs index 8e658764ee8..dbd426707b0 100644 --- a/src/Shared/AssemblyFoldersEx.cs +++ b/src/Shared/AssemblyFoldersEx.cs @@ -83,7 +83,7 @@ OpenBaseKey openBaseKey * 32 bit OS: * 32 bit process: * Targeting 64 bit, or X86, or MSIL: - * Look in the default registy which is the 32 bit hive + * Look in the default registry which is the 32 bit hive */ // Under WOW64 the HKEY_CURRENT_USER\SOFTWARE key is shared. This means the values are the same in the 64 bit and 32 bit views. This means we only need to get one view of this key. @@ -307,7 +307,7 @@ private bool IsVersionInsideRange(Version v, RegistryKey keyPlatform) /// 1) Check to see if the string is a version /// If the string is not a version we will check to see if the string starts with the framework we are targeting, /// if it does we will add it to a list which will be added at the end - /// of the versions list, if not it gets ignored. We do this to stay compatible to what we have been doing since whidby. + /// of the versions list, if not it gets ignored. We do this to stay compatible to what we have been doing since whidbey. /// /// If the string is a version /// We check to see if the version is a valid target framework version. Meaning. It has a Maj.Minor version and may have @@ -323,7 +323,7 @@ private bool IsVersionInsideRange(Version v, RegistryKey keyPlatform) /// /// Since the dictionary is sorted in reverse order to generate the list to return we do the following: /// Go through the list of dictionary entries - /// For each entry sort the list in reverse alphabetical order and add the entries in their internal list to the listToreturn. + /// For each entry sort the list in reverse alphabetical order and add the entries in their internal list to the listToreturn. /// /// This way we have a reverse sorted list of all of the version keys. /// diff --git a/src/Shared/AssemblyNameExtension.cs b/src/Shared/AssemblyNameExtension.cs index a3d39877ae1..59676314e95 100644 --- a/src/Shared/AssemblyNameExtension.cs +++ b/src/Shared/AssemblyNameExtension.cs @@ -39,7 +39,7 @@ internal enum PartialComparisonFlags : int PublicKeyToken = 8, // 0000 0000 0000 1000 /// - /// When doing a comparison A.PartialComapare(B, Default) compare all fields of A which are not null with B. + /// When doing a comparison A.PartialCompare(B, Default) compare all fields of A which are not null with B. /// Default = 15, // 0000 0000 0000 1111 } diff --git a/src/Shared/CanonicalError.cs b/src/Shared/CanonicalError.cs index 2215fb0a997..f540df69ddb 100644 --- a/src/Shared/CanonicalError.cs +++ b/src/Shared/CanonicalError.cs @@ -293,7 +293,7 @@ internal static Parts Parse(string message) // -------------- ------------ ------- ------ ---------------------------------------------- // Origin SubCategory Cat. Code Text // - // To accommodate absolute filenames in Origin, tolerate a colon in the second position + // To accommodate absolute filenames in Origin, tolerate a colon in the second position // as long as its preceded by a letter. // // Localization Note: diff --git a/src/Shared/FrameworkLocationHelper.cs b/src/Shared/FrameworkLocationHelper.cs index 708b7a39f45..f2d0cd97177 100644 --- a/src/Shared/FrameworkLocationHelper.cs +++ b/src/Shared/FrameworkLocationHelper.cs @@ -559,7 +559,7 @@ internal static string GetPathToDotNetFramework(Version version, DotNetFramework /// Check the registry key and value to see if the .net Framework is installed on the machine. /// /// Registry path to look for the value - /// Key to retrieve the value from + /// Key to retrieve the value from /// True if the registry key is 1 false if it is not there. This method also return true if the complus enviornment variables are set. private static bool CheckForFrameworkInstallation(string registryEntryToCheckInstall, string registryValueToCheckInstall) { @@ -1386,7 +1386,7 @@ public virtual string GetPathToDotNetFrameworkReferenceAssemblies() { if (this.pathToDotNetFrameworkReferenceAssemblies == null) { - // when a user requests the 40 reference assembly path we don't need to read the redist list because we will not be chaining so we may as well just + // when a user requests the 40 reference assembly path we don't need to read the redist list because we will not be chaining so we may as well just // generate the path and save us some time. string referencePath = GenerateReferenceAssemblyPath(FrameworkLocationHelper.programFilesReferenceAssemblyLocation, this.FrameworkName); if (Directory.Exists(referencePath)) diff --git a/src/Shared/HybridDictionary.cs b/src/Shared/HybridDictionary.cs index 352039bdc6c..3b3a9bc797f 100644 --- a/src/Shared/HybridDictionary.cs +++ b/src/Shared/HybridDictionary.cs @@ -104,7 +104,7 @@ public HybridDictionary(int capacity, IEqualityComparer comparer) } /// - /// Serialization consturctor. + /// Serialization constructor. /// public HybridDictionary(SerializationInfo info, StreamingContext context) { diff --git a/src/Shared/LanguageParser/CSharptokenCharReader.cs b/src/Shared/LanguageParser/CSharptokenCharReader.cs index 3cadf619999..76b3b90c666 100644 --- a/src/Shared/LanguageParser/CSharptokenCharReader.cs +++ b/src/Shared/LanguageParser/CSharptokenCharReader.cs @@ -37,7 +37,7 @@ internal CSharpTokenCharReader(Stream binaryStream, bool forceANSI) */ internal bool SinkLongIntegerSuffix() { - // Skip the long interger suffix if there is one. + // Skip the long integer suffix if there is one. if (CurrentCharacter == 'U' || CurrentCharacter == 'u') { Skip(); diff --git a/src/Shared/LanguageParser/CSharptokenEnumerator.cs b/src/Shared/LanguageParser/CSharptokenEnumerator.cs index eaedd296cf8..ec70a0ff137 100644 --- a/src/Shared/LanguageParser/CSharptokenEnumerator.cs +++ b/src/Shared/LanguageParser/CSharptokenEnumerator.cs @@ -168,7 +168,7 @@ override internal bool FindNextToken() // Identifier or keyword? else if ( - // From 2.4.2 Identifiers: A '@' can be used to prefix an identifier so that a keword can be used as an identifier. + // From 2.4.2 Identifiers: A '@' can be used to prefix an identifier so that a keyword can be used as an identifier. _reader.CurrentCharacter == '@' || _reader.MatchNextIdentifierStart() ) diff --git a/src/Shared/LoadedType.cs b/src/Shared/LoadedType.cs index 7c11ffc0738..140a020d9e2 100644 --- a/src/Shared/LoadedType.cs +++ b/src/Shared/LoadedType.cs @@ -120,7 +120,7 @@ internal Type Type /// /// If we loaded an assembly for this type. - /// We use this information to help created AppDomains to resolve types that it could not load successfuly + /// We use this information to help created AppDomains to resolve types that it could not load successfully /// internal Assembly LoadedAssembly { @@ -157,7 +157,7 @@ internal AssemblyLoadInfo Assembly /// /// Assembly, if any, that we loaded for this type. - /// We use this information to help created AppDomains to resolve types that it could not load successfuly + /// We use this information to help created AppDomains to resolve types that it could not load successfully /// private Assembly _loadedAssembly; } diff --git a/src/Shared/MSBuildNameIgnoreCaseComparer.cs b/src/Shared/MSBuildNameIgnoreCaseComparer.cs index d7ac19d60e6..6c4ef17ffe3 100644 --- a/src/Shared/MSBuildNameIgnoreCaseComparer.cs +++ b/src/Shared/MSBuildNameIgnoreCaseComparer.cs @@ -73,7 +73,7 @@ internal class MSBuildNameIgnoreCaseComparer : EqualityComparer, IEquali private bool _immutable; /// - /// We need a static contructor to retrieve the running ProcessorArchitecture that way we can + /// We need a static constructor to retrieve the running ProcessorArchitecture that way we can /// Avoid using optimized code that will not run correctly on IA64 due to alignment issues /// static MSBuildNameIgnoreCaseComparer() diff --git a/src/Shared/MetadataConversionUtilities.cs b/src/Shared/MetadataConversionUtilities.cs index 0f6ce114778..90a25cba9c6 100644 --- a/src/Shared/MetadataConversionUtilities.cs +++ b/src/Shared/MetadataConversionUtilities.cs @@ -52,7 +52,7 @@ out bool metadataFound /// Convert a task item metadata to bool. Throw an exception if the string is badly formed and can't /// be converted. /// - /// If the attibute is not found, then return false. + /// If the attribute is not found, then return false. /// /// The item that contains the metadata. /// The name of the metadata. diff --git a/src/Shared/NodeEndpointOutOfProcBase.cs b/src/Shared/NodeEndpointOutOfProcBase.cs index bdc38a453e4..157cde24f5f 100644 --- a/src/Shared/NodeEndpointOutOfProcBase.cs +++ b/src/Shared/NodeEndpointOutOfProcBase.cs @@ -389,7 +389,7 @@ private void PacketPumpProc() catch (IOException e) { // We will get here when: - // 1. The host (OOP main node) connects to us, it immediately checks for user privileges + // 1. The host (OOP main node) connects to us, it immediately checks for user privileges // and if they don't match it disconnects immediately leaving us still trying to read the blank handshake // 2. The host is too old sending us bits we automatically reject in the handshake CommunicationsUtilities.Trace("Client connection failed but we will wait for another connection. Exception: {0}", e.Message); diff --git a/src/Shared/TaskLoggingHelper.cs b/src/Shared/TaskLoggingHelper.cs index 575298f1a39..1b0fdd43da9 100644 --- a/src/Shared/TaskLoggingHelper.cs +++ b/src/Shared/TaskLoggingHelper.cs @@ -128,7 +128,7 @@ protected IBuildEngine BuildEngine get { // If the task instance does not equal null then use its build engine because - // the task instances build engine can be changed for example during tests. This changin of the engine on the same task object is not expected to happen + // the task instances build engine can be changed for example during tests. This changing of the engine on the same task object is not expected to happen // during normal operation. if (_taskInstance != null) { @@ -1373,7 +1373,7 @@ public override object InitializeLifetimeService() ILease lease = (ILease)base.InitializeLifetimeService(); // Set how long a lease should be initially. Once a lease expires - // the remote object will be disconnected and it will be marked as being available + // the remote object will be disconnected and it will be marked as being available // for garbage collection int initialLeaseTime = 1; @@ -1430,7 +1430,7 @@ public void MarkAsInactive() lock (_locker) { // Clear out the sponsor (who is responsible for keeping the TaskLoggingHelper remoting lease alive until the task is done) - // this will be null if the engineproxy was never sent across an appdomain boundary. + // this will be null if the engineproxy was never sent across an appdomain boundary. if (_sponsor != null) { ILease lease = (ILease)RemotingServices.GetLifetimeService(this); diff --git a/src/Shared/ToolsetElement.cs b/src/Shared/ToolsetElement.cs index 3d7ccebcd52..7a7d8f56f57 100644 --- a/src/Shared/ToolsetElement.cs +++ b/src/Shared/ToolsetElement.cs @@ -54,7 +54,7 @@ internal static ToolsetConfigurationSection ReadToolsetConfigurationSection(Conf configuration.SaveAs(tempFileName + ".config"); // Open the configuration again, the new type for the section handler will do its stuff - // Note that the OpenExeConfiguraion call uses the config filename *without* the .config + // Note that the OpenExeConfiguration call uses the config filename *without* the .config // extension configuration = ConfigurationManager.OpenExeConfiguration(tempFileName); diff --git a/src/Shared/TypeLoader.cs b/src/Shared/TypeLoader.cs index 0ce638f6c3f..005cf489abd 100644 --- a/src/Shared/TypeLoader.cs +++ b/src/Shared/TypeLoader.cs @@ -251,7 +251,7 @@ private class AssemblyInfoToLoadedTypes /// /// Assembly, if any, that we loaded for this type. /// We use this information to set the LoadedType.LoadedAssembly so that this object can be used - /// to help created AppDomains to resolve those that it could not load successfuly + /// to help created AppDomains to resolve those that it could not load successfully /// private Assembly _loadedAssembly; @@ -281,7 +281,7 @@ internal LoadedType GetLoadedTypeByTypeName(string typeName) { Type type = null; - // Maybe we've already cracked open this assembly before. Check to see if the typeName is in the list we don't look for partial matches here + // Maybe we've already cracked open this assembly before. Check to see if the typeName is in the list we don't look for partial matches here // this is an optimization. bool foundType = _typeNameToType.TryGetValue(typeName, out type); if (!foundType) diff --git a/src/Shared/UnitTests/MockEngine.cs b/src/Shared/UnitTests/MockEngine.cs index 4c2eb295715..8331b043979 100644 --- a/src/Shared/UnitTests/MockEngine.cs +++ b/src/Shared/UnitTests/MockEngine.cs @@ -431,7 +431,7 @@ internal void AssertLogDoesntContain(string contains) } /// - /// Delegate which will get the resource from the correct resoruce manager + /// Delegate which will get the resource from the correct resource manager /// public delegate string GetStringDelegate(string resourceName); diff --git a/src/Shared/UnitTests/NativeMethodsShared_Tests.cs b/src/Shared/UnitTests/NativeMethodsShared_Tests.cs index 70e480765f9..6ae5911a2b5 100644 --- a/src/Shared/UnitTests/NativeMethodsShared_Tests.cs +++ b/src/Shared/UnitTests/NativeMethodsShared_Tests.cs @@ -18,7 +18,7 @@ public sealed class NativeMethodsShared_Tests { #region Data - // Create a delegate to test the GetPRocessId method when using GetProcAddress + // Create a delegate to test the GetProcessId method when using GetProcAddress private delegate uint GetProcessIdDelegate(); #endregion @@ -107,7 +107,7 @@ public void TestGetProcAddress() GetProcessIdDelegate processIdDelegate = (GetProcessIdDelegate)Marshal.GetDelegateForFunctionPointer(processHandle, typeof(GetProcessIdDelegate)); uint processId = processIdDelegate(); - //Make sure the return value is the same as retreived from the .net methods to make sure everything works + //Make sure the return value is the same as retrieved from the .net methods to make sure everything works Assert.AreEqual((uint)Process.GetCurrentProcess().Id, processId, "Expected the .net processId to match the one from GetCurrentProcessId"); } finally diff --git a/src/Shared/UnitTests/TypeLoader_Tests.cs b/src/Shared/UnitTests/TypeLoader_Tests.cs index 9a8eaa66e14..ca877e4c7db 100644 --- a/src/Shared/UnitTests/TypeLoader_Tests.cs +++ b/src/Shared/UnitTests/TypeLoader_Tests.cs @@ -85,7 +85,7 @@ public void Regress640476FullyQualifiedName() /// /// Make sure if no typeName is passed in then pick the first type which matches the desired typefilter. - /// This has been in since whidby but there has been no test for it and it was broken in the last refactoring of TypeLoader. + /// This has been in since whidbey but there has been no test for it and it was broken in the last refactoring of TypeLoader. /// This test is to prevent that from happening again. /// [TestMethod] diff --git a/src/Shared/XamlUtilities.cs b/src/Shared/XamlUtilities.cs index 6e7a8206b6e..b45082802f0 100644 --- a/src/Shared/XamlUtilities.cs +++ b/src/Shared/XamlUtilities.cs @@ -46,7 +46,7 @@ internal static string GetPropertyId(string propertyName, string containingObjec /// /// Returns an identifier for a property based on its name and its containing object's type. Use this - /// overload when the containin object's name is not known (which can be the case when the property + /// overload when the containing object's name is not known (which can be the case when the property /// being tested is the Name property itself). /// /// The name of the property. 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/ExtensionSDK.cs b/src/Utilities/ExtensionSDK.cs index f8d0c929395..39dcd348dbd 100644 --- a/src/Utilities/ExtensionSDK.cs +++ b/src/Utilities/ExtensionSDK.cs @@ -153,7 +153,7 @@ public ICollection ApiContracts /// /// Reference to the manifest object - /// Maks sure manifest is instantiated only once + /// Makes sure manifest is instantiated only once /// private SDKManifest Manifest { diff --git a/src/Utilities/MuxLogger.cs b/src/Utilities/MuxLogger.cs index e92e86cc235..7878ee54cce 100644 --- a/src/Utilities/MuxLogger.cs +++ b/src/Utilities/MuxLogger.cs @@ -43,8 +43,8 @@ namespace Microsoft.Build.Utilities /// A new event source will be created so that the logger passed in can be registered to that event source /// If the build started event has already been logged the MUX logger will create a new BuildStartedEvent and send that to the event source. /// - /// UnregisterLoggers: - /// When a build submission is completed the UnregisterLoggers method will be called with the submission ID. + /// UnregisterLoggers: + /// When a build submission is completed the UnregisterLoggers method will be called with the submission ID. /// At this point we will look up the success state of the project finished event for the submission ID and log a build finished event to the logger. /// The event source will be cleaned up. This may be interesting because the unregister will come from a thread other than what is doing the logging. /// This may create a Synchronization issue, if unregister is called while events are being logged. @@ -95,7 +95,7 @@ public class MuxLogger : INodeLogger private Dictionary _submissionProjectsInProgress = new Dictionary(); /// - /// The maximum node count as specified in the call to Initialze() + /// The maximum node count as specified in the call to Initialize() /// private int _maxNodeCount = 1; diff --git a/src/Utilities/TaskItem.cs b/src/Utilities/TaskItem.cs index bcd83973901..e1db60c16bc 100644 --- a/src/Utilities/TaskItem.cs +++ b/src/Utilities/TaskItem.cs @@ -408,7 +408,7 @@ public override string ToString() } /// - /// Overridden to give this class infinite lease time. Otherwise we end up with a limited + /// Overridden to give this class infinite lease time. Otherwise we end up with a limited /// lease (5 minutes I think) and instances can expire if they take long time processing. /// [SecurityCritical] diff --git a/src/Utilities/ToolLocationHelper.cs b/src/Utilities/ToolLocationHelper.cs index 5c97022a658..14cff3697b4 100644 --- a/src/Utilities/ToolLocationHelper.cs +++ b/src/Utilities/ToolLocationHelper.cs @@ -146,7 +146,7 @@ public static class ToolLocationHelper private static object s_locker = new Object(); /// - /// Cache the results of calling the GetPathToRefernceAssemblies so that we do not recalculate it every time we call the method + /// Cache the results of calling the GetPathToReferenceAssemblies so that we do not recalculate it every time we call the method /// private static Dictionary> s_cachedReferenceAssemblyPaths; @@ -1569,7 +1569,7 @@ internal static string VersionToDotNetReferenceAssemblies(VersionToPath PathToDo /// /// Generate the list of reference assembly paths for well known .net framework versions /// - /// Target framework moniker class which contains the targetframeworkVersion + /// Target framework moniker class which contains the targetframeworkVersion /// A collection of strings which list the chained reference assembly paths with the highest version being first internal static IList HandleLegacyDotNetFrameworkReferenceAssemblyPaths(VersionToPath PathToDotNetFramework, VersionToPath PathToReferenceAssemblies, FrameworkNameVersioning frameworkName) { @@ -1586,7 +1586,7 @@ internal static IList HandleLegacyDotNetFrameworkReferenceAssemblyPaths( return HandleLegacy35(PathToDotNetFramework, PathToReferenceAssemblies); } - // Don't know the framework send back an empty list because it does not exist + // Don't know the framework send back an empty list because it does not exist return new List(); } @@ -1752,7 +1752,7 @@ private static IList HandleLegacy20(VersionToPath PathToDotNetFramework) /// Returns the paths to the reference assemblies location for the given framework version relative to a given targetFrameworkRoot. /// The method will not check to see if the path exists or not. /// - /// Root directory which will be used to calculate the reference assembly path. The references assembies will be + /// Root directory which will be used to calculate the reference assembly path. The references assemblies will be /// generated in the following way TargetFrameworkRootPath\TargetFrameworkIdentifier\TargetFrameworkVersion\SubType\TargetFrameworkSubType. /// /// A frameworkName class which represents a TargetFrameworkMoniker. This cannot be null. @@ -2238,7 +2238,7 @@ internal static void GatherSDKListFromDirectory(List diskroots, Dictiona } /// - /// Given a registy location enumerate the registry and find the installed SDKs. + /// Given a registry location enumerate the registry and find the installed SDKs. /// internal static void GatherSDKsFromRegistryImpl(Dictionary platformMonikers, string registryKeyRoot, RegistryView registryView, RegistryHive registryHive, GetRegistrySubKeyNames getRegistrySubKeyNames, GetRegistrySubKeyDefaultValue getRegistrySubKeyDefaultValue, OpenBaseKey openBaseKey, FileExists fileExists) { @@ -2457,11 +2457,11 @@ private static void GatherSDKListFromRegistry(string registryRoot, Dictionary - /// Get the disk locations to search for sdks under. This can be overridden by an environment variable + /// Get the disk locations to search for sdks under. This can be overridden by an environment variable /// private static void GetDefaultSDKDiskRoots(List diskRoots) { - // The order is important here because we want to look in the users location first before the non privileged location. + // The order is important here because we want to look in the users location first before the non privileged location. // We need this so that a user can also have an sdk installed in a non privileged location string userLocalAppData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); diff --git a/src/Utilities/ToolTask.cs b/src/Utilities/ToolTask.cs index 85e14fc9af8..82807b821a9 100644 --- a/src/Utilities/ToolTask.cs +++ b/src/Utilities/ToolTask.cs @@ -831,7 +831,7 @@ string commandLineCommands // turn on the Process.Exited event proc.EnableRaisingEvents = true; - // sign up for the exit notifcation + // sign up for the exit notification proc.Exited += new EventHandler(ReceiveExitNotification); // turn on async stderr notifications @@ -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/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs index 0da5009ec87..54c97a091a8 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedFilesHelper.cs @@ -84,7 +84,7 @@ private static bool FilesExistAndRecordRequestedWriteTime(ITaskItem[] files, Tas requestedFilename = String.Empty; // No output files for the source were tracked - // safely assume that this is becuase we didn't track them because they were'nt compiled + // safely assume that this is because we didn't track them because they weren't compiled if ((files == null) || (files.Length == 0)) { allExist = false; diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs index 9baf642177f..c5877cfae87 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedInputFiles.cs @@ -56,7 +56,7 @@ public class CanonicalTrackedInputFiles #region Properties - // This is provided to faciltate unit testing + // This is provided to facilitate unit testing internal ITaskItem[] SourcesNeedingCompilation { get { return _sourcesNeedingCompilation; } diff --git a/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs b/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs index 77db40d02d6..87adb779b4c 100644 --- a/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs +++ b/src/Utilities/TrackedDependencies/CanonicalTrackedOutputFiles.cs @@ -14,14 +14,14 @@ namespace Microsoft.Build.Utilities { /// /// This class is the filetracking log interpreter for .write. tracking logs in canonical form - /// Canoncial .write. logs need to be rooted, since the outputs need to be associated with an input. + /// Canonical .write. logs need to be rooted, since the outputs need to be associated with an input. /// public class CanonicalTrackedOutputFiles { #region Member Data // The output dependency table private Dictionary> _dependencyTable; - // The .write. trackg log files + // The .write. tracking log files private ITaskItem[] _tlogFiles; // The TaskLoggingHelper that we log progress to private TaskLoggingHelper _log; diff --git a/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs b/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs index bd4e958d1f6..dc92d07b796 100644 --- a/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs +++ b/src/Utilities/UnitTests/CommandLineBuilder_Tests.cs @@ -82,7 +82,7 @@ public void AppendLiteralSwitchWithSpacesInParameter() /* * Method: AppendTwoStringsEnsureNoSpace * - * When appending two comma-delimted strings, there should be no space before the comma. + * When appending two comma-delimited strings, there should be no space before the comma. */ [TestMethod] public void AppendTwoStringsEnsureNoSpace() diff --git a/src/Utilities/UnitTests/TaskItem_Tests.cs b/src/Utilities/UnitTests/TaskItem_Tests.cs index 4a5e456646f..3fa1fe7bf9e 100644 --- a/src/Utilities/UnitTests/TaskItem_Tests.cs +++ b/src/Utilities/UnitTests/TaskItem_Tests.cs @@ -61,7 +61,7 @@ public void CopyMetadataFromITaskItem() from.CopyMetadataTo(to); Assert.AreEqual("Bonobo.txt", to.ItemSpec); // ItemSpec is never overwritten - Assert.AreEqual("Bob", to.GetMetadata("Sponge")); // Metadata not in source are preserverd. + Assert.AreEqual("Bob", to.GetMetadata("Sponge")); // Metadata not in source are preserved. Assert.AreEqual("Harriet", to.GetMetadata("Dog")); // Metadata present on destination are not overwritten. Assert.AreEqual("Mike", to.GetMetadata("Cat")); Assert.AreEqual("Big", to.GetMetadata("Bird")); diff --git a/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs b/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs index c89fc5b8d55..1e55c60d39e 100644 --- a/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs +++ b/src/Utilities/UnitTests/ToolLocationHelper_Tests.cs @@ -822,7 +822,7 @@ public void GetPathToDotNetFrameworkSdk() Assert.AreEqual(ToolLocationHelper.GetPathToDotNetFrameworkSdk(TargetDotNetFrameworkVersion.Version46, VisualStudioVersion.Version140), pathToSdkV4InstallRootOnVS14); } -#pragma warning disable 618 //The test below tests a deprecated API. We disable the warning for obsolete methods for this paricular test +#pragma warning disable 618 //The test below tests a deprecated API. We disable the warning for obsolete methods for this particular test [TestMethod] public void GetPathToWindowsSdk() diff --git a/src/XMakeBuildEngine/ApexTests/ConfigurationCache/ConfigurationCacheTestExtension.cs b/src/XMakeBuildEngine/ApexTests/ConfigurationCache/ConfigurationCacheTestExtension.cs index dc4650f6bd1..43b78170d89 100644 --- a/src/XMakeBuildEngine/ApexTests/ConfigurationCache/ConfigurationCacheTestExtension.cs +++ b/src/XMakeBuildEngine/ApexTests/ConfigurationCache/ConfigurationCacheTestExtension.cs @@ -48,11 +48,11 @@ public void WriteConfigurationsToDisk() } /// - /// Retreives the configuration cache from the data provided. + /// Retrieves the configuration cache from the data provided. /// /// Data containing the build request entry. /// Tools version used to build the request. - /// BuildRequestConfigurationTestExtensuin which contains the configuration retreived from the cache. Can return NULL if the entry for the data is not in the cache. + /// BuildRequestConfigurationTestExtension which contains the configuration retrieved from the cache. Can return NULL if the entry for the data is not in the cache. public BuildRequestConfigurationTestExtension GetConfigurationFromCache(BuildRequestData requestData, string toolsVersion) { BuildRequestConfiguration unresolvedConfiguration = new BuildRequestConfiguration(requestData, toolsVersion); diff --git a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs index 9016e2c1ed5..85fa3ac7035 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/Logging/LoggingService.cs @@ -1291,8 +1291,8 @@ private void InitializeLogger(ILogger logger, IEventSource sourceForLogger) /// /// When an exception is raised in the logging thread, we do not want the application to terminate right away. - /// Whidby and orcas msbuild have the logger exceptions occuring on the engine thread so that the host can - /// catch and deal with these exceptions as they may occure somewhat frequently due to user generated loggers. + /// Whidbey and orcas msbuild have the logger exceptions occurring on the engine thread so that the host can + /// catch and deal with these exceptions as they may occur somewhat frequently due to user generated loggers. /// This method will raise the exception on a delegate to which the engine is registered to. This delegate will /// send the exception to the engine so that it can be raised on the engine thread. /// diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs index faad7091da6..dda3f10d9c9 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/IntrinsicTasks/MSBuild.cs @@ -461,7 +461,7 @@ public async Task ExecuteInternal() bool isRunningMultipleNodes = BuildEngine2.IsRunningMultipleNodes; // If we are in single proc mode and stopOnFirstFailure is true, we cannot build in parallel because // building in parallel sends all of the projects to the engine at once preventing us from not sending - // any more projects after the first failure. Therefore, to preserve compatibility with whidby if we are in this situation disable buildInParallel. + // any more projects after the first failure. Therefore, to preserve compatibility with whidbey if we are in this situation disable buildInParallel. if (!isRunningMultipleNodes && _stopOnFirstFailure && _buildInParallel) { _buildInParallel = false; @@ -471,7 +471,7 @@ public async Task ExecuteInternal() // When the condition below is met, provide an information message indicating stopOnFirstFailure // will have no effect. The reason there will be no effect is, when buildInParallel is true // All project files will be submitted to the engine all at once, this mean there is no stopping for failures between projects. - // When RunEachTargetSpearately is false, all targets will be submitted to the engine at once, this means there is no way to stop between target failures. + // When RunEachTargetSeparately is false, all targets will be submitted to the engine at once, this means there is no way to stop between target failures. // therefore the first failure seen will be the only failure seen. if (isRunningMultipleNodes && _buildInParallel && _stopOnFirstFailure && !_runEachTargetSeparately) { diff --git a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs index 8654369b42e..2a8a4a26329 100644 --- a/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs +++ b/src/XMakeBuildEngine/BackEnd/Components/RequestBuilder/TargetEntry.cs @@ -483,7 +483,7 @@ internal async Task ExecuteTarget(ITaskBuilder taskBuilder, BuildRequestEntry re // Now aggregate the result with the existing known results. There are four rules, assuming the target was not // skipped due to being up-to-date: // 1. If this bucket failed or was cancelled, the aggregate result is failure. - // 2. If this bucket succeded and we have not previously failed, the aggregate result is a success. + // 2. If this bucket Succeeded and we have not previously failed, the aggregate result is a success. // 3. Otherwise, the bucket was skipped, which has no effect on the aggregate result. // 4. If the bucket's action code says to stop, then we stop, regardless of the success or failure state. if (dependencyResult != DependencyAnalysisResult.SkipUpToDate) diff --git a/src/XMakeBuildEngine/Evaluation/Expander.cs b/src/XMakeBuildEngine/Evaluation/Expander.cs index c498366fcf4..abf3d16a3f4 100644 --- a/src/XMakeBuildEngine/Evaluation/Expander.cs +++ b/src/XMakeBuildEngine/Evaluation/Expander.cs @@ -1200,7 +1200,7 @@ internal static string ConvertToString(object valueToConvert) } else if (valueToConvert is IEnumerable) { - // If the return is enumerable, then we'll convert to semi-colon delimted elements + // If the return is enumerable, then we'll convert to semi-colon delimited elements // each of which must be converted, so we'll recurse for each element using (var builder = new ReuseableStringBuilder()) { diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs index 78eb44b0bee..7e763e00f59 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/AssemblyTaskFactory_Tests.cs @@ -218,7 +218,7 @@ public void CreatableByTaskFactoryMismatchedIdentity() } /// - /// Make sure the number of properties retreived from the task factory are the same number retreived from the type directly. + /// Make sure the number of properties retrieved from the task factory are the same number retrieved from the type directly. /// [TestMethod] public void VerifyGetTaskParameters() diff --git a/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs b/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs index e0c0be3eb70..5682b7e0ec6 100644 --- a/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs +++ b/src/XMakeBuildEngine/UnitTests/BackEnd/MSBuild_Tests.cs @@ -1173,7 +1173,7 @@ public void StopOnFirstFailureandBuildInParallelSingleNode() break; } // The build should fail as the first project has an error - Assert.IsFalse(success, "Iteration of i " + i + " Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Iteration of i " + i + " Build Succeeded. See 'Standard Out' tab for details."); } } finally @@ -1298,7 +1298,7 @@ public void StopOnFirstFailureandBuildInParallelMultipleNode() break; } // The build should fail as the first project has an error - Assert.IsFalse(success, "Iteration of i " + i + " Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Iteration of i " + i + " Build Succeeded. See 'Standard Out' tab for details."); } } finally @@ -1351,7 +1351,7 @@ public void SkipRemainingProjects() bool success = p.Build(); logger.AssertLogDoesntContain(AssemblyResources.GetString("MSBuild.SkippingRemainingProjects")); - Assert.IsFalse(success, "Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Build Succeeded. See 'Standard Out' tab for details."); parentProjectContents = @" @@ -1371,7 +1371,7 @@ public void SkipRemainingProjects() Project p2 = ObjectModelHelpers.CreateInMemoryProject(pc, parentProjectContents, logger2); bool success2 = p2.Build(); logger2.AssertLogDoesntContain(AssemblyResources.GetString("MSBuild.SkippingRemainingProjects")); - Assert.IsFalse(success2, "Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success2, "Build Succeeded. See 'Standard Out' tab for details."); } finally { @@ -1527,7 +1527,7 @@ public void TargetStopOnFirstFailureBuildInParallel() } // The build should fail as the first project has an error - Assert.IsFalse(success, "Iteration of i:" + i + "Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Iteration of i:" + i + "Build Succeeded. See 'Standard Out' tab for details."); } } finally diff --git a/src/XMakeBuildEngine/UnitTests/QaTests/MockTargetBuilder.cs b/src/XMakeBuildEngine/UnitTests/QaTests/MockTargetBuilder.cs index 2bb11b2b4a5..61f18aa6fdc 100644 --- a/src/XMakeBuildEngine/UnitTests/QaTests/MockTargetBuilder.cs +++ b/src/XMakeBuildEngine/UnitTests/QaTests/MockTargetBuilder.cs @@ -169,7 +169,7 @@ private BuildResult GenerateResults(string[] targetNames) } /// - /// Simulates callback. Access the configuration for the primary project. Retreive the test test data definition. + /// Simulates callback. Access the configuration for the primary project. Retrieve the test test data definition. /// Get the child definitions if available and simulate a callback for each of the child definitions. Note that the /// targets to build parameter is the same for all the projects - that is we instruct to build the same set of targets /// for all of the projects. Thus the child test definitions of the entry should have the same set of targets available diff --git a/src/XMakeCommandLine/MSBuildTaskHost/MSBuildTaskHost/TypeLoader.cs b/src/XMakeCommandLine/MSBuildTaskHost/MSBuildTaskHost/TypeLoader.cs index c797aefb5aa..ade3ac7c261 100644 --- a/src/XMakeCommandLine/MSBuildTaskHost/MSBuildTaskHost/TypeLoader.cs +++ b/src/XMakeCommandLine/MSBuildTaskHost/MSBuildTaskHost/TypeLoader.cs @@ -251,7 +251,7 @@ private class AssemblyInfoToLoadedTypes /// /// If we loaded an assembly for this type. /// We use this information to set the LoadedType.LoadedAssembly so that this object can be used - /// to help created AppDomains to resolve those that it could not load successfuly + /// to help created AppDomains to resolve those that it could not load successfully /// private Assembly loadedAssembly; diff --git a/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs b/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs index c2a18ced3b2..9235ea47fae 100644 --- a/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs +++ b/src/XMakeTasks/AssemblyDependency/GlobalAssemblyCache.cs @@ -23,7 +23,7 @@ static internal class GlobalAssemblyCache /// /// Default delegate to get the path based on a fusion name. /// - internal static readonly GetPathFromFusionName pathFromFusionName = new GetPathFromFusionName(RetreivePathFromFusionName); + internal static readonly GetPathFromFusionName pathFromFusionName = new GetPathFromFusionName(RetrievePathFromFusionName); /// /// Default delegate to get the gac enumerator. @@ -160,7 +160,7 @@ private static SortedDictionary [SuppressMessage("Microsoft.Usage", "CA1806:DoNotIgnoreMethodResults", MessageId = "Microsoft.Build.Tasks.IAssemblyCache.QueryAssemblyInfo(System.UInt32,System.String,Microsoft.Build.Tasks.ASSEMBLY_INFO@)", Justification = "We use the out parameters to determine if we got a good assembly back or not")] - internal static string RetreivePathFromFusionName(string strongName) + internal static string RetrievePathFromFusionName(string strongName) { // Extra checks for PInvoke-destined data. ErrorUtilities.VerifyThrowArgumentNull(strongName, "assemblyName"); diff --git a/src/XMakeTasks/MSBuild.cs b/src/XMakeTasks/MSBuild.cs index 167968d5f1e..2194fb5e9d8 100644 --- a/src/XMakeTasks/MSBuild.cs +++ b/src/XMakeTasks/MSBuild.cs @@ -414,7 +414,7 @@ public override bool Execute() bool isRunningMultipleNodes = BuildEngine2.IsRunningMultipleNodes; // If we are in single proc mode and stopOnFirstFailure is true, we cannot build in parallel because // building in parallel sends all of the projects to the engine at once preventing us from not sending - // any more projects after the first failure. Therefore, to preserve compatibility with whidby if we are in this situation disable buildInParallel. + // any more projects after the first failure. Therefore, to preserve compatibility with whidbey if we are in this situation disable buildInParallel. if (!isRunningMultipleNodes && _stopOnFirstFailure && _buildInParallel) { _buildInParallel = false; @@ -424,7 +424,7 @@ public override bool Execute() // When the condition below is met, provide an information message indicating stopOnFirstFailure // will have no effect. The reason there will be no effect is, when buildInParallel is true // All project files will be submitted to the engine all at once, this mean there is no stopping for failures between projects. - // When RunEachTargetSpearately is false, all targets will be submitted to the engine at once, this means there is no way to stop between target failures. + // When RunEachTargetSeparately is false, all targets will be submitted to the engine at once, this means there is no way to stop between target failures. // therefore the first failure seen will be the only failure seen. if (isRunningMultipleNodes && _buildInParallel && _stopOnFirstFailure && !_runEachTargetSeparately) { diff --git a/src/XMakeTasks/UnitTests/MSBuild_Tests.cs b/src/XMakeTasks/UnitTests/MSBuild_Tests.cs index b7d4c521458..a2643b71e82 100644 --- a/src/XMakeTasks/UnitTests/MSBuild_Tests.cs +++ b/src/XMakeTasks/UnitTests/MSBuild_Tests.cs @@ -930,7 +930,7 @@ public void StopOnFirstFailureandBuildInParallelSingleNode() // Verify build did not build second project which has the message SecondProject mockEngine.AssertLogDoesntContain("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 0 Epected BuildInParallel to be false"); + Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 0 Expected BuildInParallel to be false"); break; case 1: // Verify setting BuildInParallel to true and StopOnFirstFailure to @@ -941,7 +941,7 @@ public void StopOnFirstFailureandBuildInParallelSingleNode() // Verify build did build second project which has the message SecondProject mockEngine.AssertLogContains("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsTrue(msbuildTask.BuildInParallel, "Iteration of 1 Epected BuildInParallel to be true"); + Assert.IsTrue(msbuildTask.BuildInParallel, "Iteration of 1 Expected BuildInParallel to be true"); break; case 2: // Verify setting BuildInParallel to false and StopOnFirstFailure to @@ -952,7 +952,7 @@ public void StopOnFirstFailureandBuildInParallelSingleNode() // Verify build did not build second project which has the message SecondProject mockEngine.AssertLogDoesntContain("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 2 Epected BuildInParallel to be false"); + Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 2 Expected BuildInParallel to be false"); break; case 3: @@ -964,11 +964,11 @@ public void StopOnFirstFailureandBuildInParallelSingleNode() // Verify build did build second project which has the message SecondProject mockEngine.AssertLogContains("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 3 Epected BuildInParallel to be false"); + Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 3 Expected BuildInParallel to be false"); break; } // The build should fail as the first project has an error - Assert.IsFalse(success, "Iteration of i " + i + " Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Iteration of i " + i + " Build Succeeded. See 'Standard Out' tab for details."); } } finally @@ -1030,7 +1030,7 @@ public void StopOnFirstFailureandBuildInParallelMultipleNode() // Verify build did build second project which has the message SecondProject mockEngine.AssertLogContains("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsTrue(msbuildTask.BuildInParallel, "Iteration of 0 Epected BuildInParallel to be true"); + Assert.IsTrue(msbuildTask.BuildInParallel, "Iteration of 0 Expected BuildInParallel to be true"); break; case 1: // Verify setting BuildInParallel to true and StopOnFirstFailure to @@ -1041,7 +1041,7 @@ public void StopOnFirstFailureandBuildInParallelMultipleNode() // Verify build did build second project which has the message SecondProject mockEngine.AssertLogContains("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsTrue(msbuildTask.BuildInParallel, "Iteration of 1 Epected BuildInParallel to be true"); + Assert.IsTrue(msbuildTask.BuildInParallel, "Iteration of 1 Expected BuildInParallel to be true"); break; case 2: // Verify setting BuildInParallel to false and StopOnFirstFailure to @@ -1052,7 +1052,7 @@ public void StopOnFirstFailureandBuildInParallelMultipleNode() // Verify build did not build second project which has the message SecondProject mockEngine.AssertLogDoesntContain("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 2 Epected BuildInParallel to be false"); + Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 2 Expected BuildInParallel to be false"); break; case 3: @@ -1064,11 +1064,11 @@ public void StopOnFirstFailureandBuildInParallelMultipleNode() // Verify build did build second project which has the message SecondProject mockEngine.AssertLogContains("SecondProject"); // Verify the correct msbuild task messages are in the log - Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 3 Epected BuildInParallel to be false"); + Assert.IsFalse(msbuildTask.BuildInParallel, "Iteration of 3 Expected BuildInParallel to be false"); break; } // The build should fail as the first project has an error - Assert.IsFalse(success, "Iteration of i " + i + " Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Iteration of i " + i + " Build Succeeded. See 'Standard Out' tab for details."); } } finally @@ -1238,7 +1238,7 @@ public void TargetStopOnFirstFailureBuildInParallel() } // The build should fail as the first project has an error - Assert.IsFalse(success, "Iteration of i:" + i + "Build Succeded. See 'Standard Out' tab for details."); + Assert.IsFalse(success, "Iteration of i:" + i + "Build Succeeded. See 'Standard Out' tab for details."); } } finally 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)