Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.Test/Mocks/MockIdentifier.cs
	src/DotNetOpenAuth.Test/OpenId/Provider/OpenIdProviderTests.cs
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/MessageReceivingEndpoint.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthServiceProviderMessageFactory.cs
	src/DotNetOpenAuth/OAuth/Protocol.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Association.cs
	src/DotNetOpenAuth/OpenId/Behaviors/PpidGeneration.cs
	src/DotNetOpenAuth/OpenId/NoDiscoveryIdentifier.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IDirectedIdentityIdentifierProvider.cs
	src/DotNetOpenAuth/OpenId/Provider/PrivatePersonalIdentifierProviderBase.cs
	src/DotNetOpenAuth/OpenId/Realm.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/AuthenticationRequest.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdTextBox.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/PositiveAuthenticationResponseSnapshot.cs
	src/DotNetOpenAuth/OpenId/UriIdentifier.cs
	src/DotNetOpenAuth/OpenId/XriIdentifier.cs
	src/DotNetOpenAuth/Util.cs

1 files changed, 56 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/Trim.cs b/src/DotNetOpenAuth.BuildTasks/Trim.cs
new file mode 100644
index 0000000..1cc943e
--- /dev/null
+++ b/src/DotNetOpenAuth.BuildTasks/Trim.cs
@@ -0,0 +1,56 @@
+//-----------------------------------------------------------------------
+// <copyright file="Trim.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.BuildTasks {
+	using Microsoft.Build.Framework;
+	using Microsoft.Build.Utilities;
+
+	/// <summary>
+	/// Trims item identities.
+	/// </summary>
+	public class Trim : Task {
+		/// <summary>
+		/// Gets or sets the characters that should be trimmed off if found at the start of items' ItemSpecs.
+		/// </summary>
+		public string StartCharacters { get; set; }
+
+		/// <summary>
+		/// Gets or sets the characters that should be trimmed off if found at the end of items' ItemSpecs.
+		/// </summary>
+		public string EndCharacters { get; set; }
+
+		/// <summary>
+		/// Gets or sets the items with ItemSpec's to be trimmed.
+		/// </summary>
+		[Required]
+		public ITaskItem[] Inputs { get; set; }
+
+		/// <summary>
+		/// Gets or sets the items with trimmed ItemSpec strings.
+		/// </summary>
+		[Output]
+		public ITaskItem[] Outputs { get; set; }
+
+		/// <summary>
+		/// Executes this instance.
+		/// </summary>
+		/// <returns>A value indicating whether the task completed successfully.</returns>
+		public override bool Execute() {
+			this.Outputs = new ITaskItem[this.Inputs.Length];
+			for (int i = 0; i < this.Inputs.Length; i++) {
+				this.Outputs[i] = new TaskItem(this.Inputs[i]);
+				if (!string.IsNullOrEmpty(this.StartCharacters)) {
+					this.Outputs[i].ItemSpec = this.Outputs[i].ItemSpec.TrimStart(this.StartCharacters.ToCharArray());
+				}
+				if (!string.IsNullOrEmpty(this.EndCharacters)) {
+					this.Outputs[i].ItemSpec = this.Outputs[i].ItemSpec.TrimEnd(this.EndCharacters.ToCharArray());
+				}
+			}
+
+			return true;
+		}
+	}
+}