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 IntialTargets 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
3 changes: 1 addition & 2 deletions 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)
{
// Dont 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 All @@ -351,4 +351,3 @@ private void SetBuildEventContextDefaultAfterSerialization(StreamingContext sc)
#endregion
}
}

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 obect references are the same the contexts are equivilant
/// 2. If the object type is the same and the Id values in the context are the same, the contexts are equivilant
/// 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 paramterers.
/// 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
8 changes: 3 additions & 5 deletions src/Framework/BuildMessageEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ namespace Microsoft.Build.Framework
/// <summary>
/// This enumeration provides three levels of importance for messages.
/// </summary>
///
///
[Serializable]
public enum MessageImportance
{
Expand Down Expand Up @@ -59,7 +57,7 @@ protected BuildMessageEventArgs()
}

/// <summary>
/// This constuctor 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 @@ -77,7 +75,7 @@ MessageImportance importance
}

/// <summary>
/// This constuctor 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 @@ -98,7 +96,7 @@ DateTime eventTimestamp
}

/// <summary>
/// This constuctor 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/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 withing 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 withing 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 constuctor 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 constuctor 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
2 changes: 1 addition & 1 deletion src/Framework/ProjectStartedEventArgs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ internal override void CreateFromStream(BinaryReader reader, int version)
private void SetDefaultsBeforeSerialization(StreamingContext sc)
{
_projectId = InvalidProjectId;
// Dont 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
2 changes: 1 addition & 1 deletion src/Shared/CanonicalError.cs
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ internal static Parts Parse(string message)
// -------------- ------------ ------- ------ ----------------------------------------------
// Origin SubCategory Cat. Code Text
//
// To accomodate 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:
Expand Down
4 changes: 2 additions & 2 deletions src/Shared/FrameworkLocationHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
/// </summary>
/// <param name="registryEntryToCheckInstall">Registry path to look for the value</param>
/// <param name="registryValueToCheckInstall">Key to retreive the value from</param>
/// <param name="registryValueToCheckInstall">Key to retrieve the value from</param>
/// <returns>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.</returns>
private static bool CheckForFrameworkInstallation(string registryEntryToCheckInstall, string registryValueToCheckInstall)
{
Expand Down Expand Up @@ -1386,7 +1386,7 @@ public virtual string GetPathToDotNetFrameworkReferenceAssemblies()
{
if (this.pathToDotNetFrameworkReferenceAssemblies == null)
{
// when a user requests the 40 reference assembly path we dont 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))
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/NodeEndpointOutOfProcBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 priviledges
// 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);
Expand Down
4 changes: 2 additions & 2 deletions src/Shared/TaskLoggingHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 availiable
// the remote object will be disconnected and it will be marked as being available
// for garbage collection
int initialLeaseTime = 1;

Expand Down Expand Up @@ -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 boundry.
// this will be null if the engineproxy was never sent across an appdomain boundary.
if (_sponsor != null)
{
ILease lease = (ILease)RemotingServices.GetLifetimeService(this);
Expand Down
2 changes: 1 addition & 1 deletion src/Shared/TypeLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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 dont 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)
Expand Down
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>
/// Overriden 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
4 changes: 2 additions & 2 deletions src/Utilities/MuxLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
/// UnRegisterLogger:
/// When a build submission is completed the UnregisterLogger 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/TaskItem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ public override string ToString()
}

/// <summary>
/// Overriden 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.
/// </summary>
[SecurityCritical]
Expand Down
10 changes: 5 additions & 5 deletions src/Utilities/ToolLocationHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public static class ToolLocationHelper
private static object s_locker = new Object();

/// <summary>
/// Cache the results of calling the GetPathToRefernceAssemblies so that we do not recaculate it everytime we call the method
/// Cache the results of calling the GetPathToRefernceAssemblies so that we do not recalculate it every time we call the method
/// </summary>
private static Dictionary<string, IList<string>> s_cachedReferenceAssemblyPaths;

Expand Down Expand Up @@ -1569,7 +1569,7 @@ internal static string VersionToDotNetReferenceAssemblies(VersionToPath PathToDo
/// <summary>
/// Generate the list of reference assembly paths for well known .net framework versions
/// </summary>
/// <param name="frameworkName">Target framework moniker class wich contains the targetframeworkVersion</param>
/// <param name="frameworkName">Target framework moniker class which contains the targetframeworkVersion</param>
/// <returns>A collection of strings which list the chained reference assembly paths with the highest version being first</returns>
internal static IList<string> HandleLegacyDotNetFrameworkReferenceAssemblyPaths(VersionToPath PathToDotNetFramework, VersionToPath PathToReferenceAssemblies, FrameworkNameVersioning frameworkName)
{
Expand All @@ -1586,7 +1586,7 @@ internal static IList<string> HandleLegacyDotNetFrameworkReferenceAssemblyPaths(
return HandleLegacy35(PathToDotNetFramework, PathToReferenceAssemblies);
}

// Dont 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<string>();
}

Expand Down Expand Up @@ -2457,11 +2457,11 @@ private static void GatherSDKListFromRegistry(string registryRoot, Dictionary<Ta
}

/// <summary>
/// Get the disk locations to search for sdks under. This can be overidden by an environment variable
/// Get the disk locations to search for sdks under. This can be overridden by an environment variable
/// </summary>
private static void GetDefaultSDKDiskRoots(List<string> diskRoots)
{
// The order is important here becuase 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);
Expand Down
4 changes: 2 additions & 2 deletions src/Utilities/ToolTask.cs
Original file line number Diff line number Diff line change
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 enought
// 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 enviroment 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
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>
<!-- Explicity 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