Merge branch 'v3.2' into mono2origin/mono2

Conflicts:
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs

1 files changed, 45 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/SignatureVerification.cs b/src/DotNetOpenAuth.BuildTasks/SignatureVerification.cs
new file mode 100644
index 0000000..2e69926
--- /dev/null
+++ b/src/DotNetOpenAuth.BuildTasks/SignatureVerification.cs
@@ -0,0 +1,45 @@
+//-----------------------------------------------------------------------
+// <copyright file="SignatureVerification.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.BuildTasks {
+	using Microsoft.Build.Utilities;
+
+	public class SignatureVerification : SnToolTask {
+		/// <summary>
+		/// Gets or sets a value indicating whether to register the given assembly and public key token
+		/// for skip verification or clear any pre-existing skip verification entry.
+		/// </summary>
+		public bool SkipVerification { get; set; }
+
+		/// <summary>
+		/// Gets or sets the name of the assembly.
+		/// </summary>
+		/// <value>The name of the assembly.</value>
+		public string AssemblyName { get; set; }
+
+		/// <summary>
+		/// Gets or sets the public key token.
+		/// </summary>
+		/// <value>The public key token.</value>
+		public string PublicKeyToken { get; set; }
+
+		/// <summary>
+		/// Generates the command line commands.
+		/// </summary>
+		protected override string GenerateCommandLineCommands() {
+			CommandLineBuilder builder = new CommandLineBuilder();
+			builder.AppendSwitch("-q");
+			if (this.SkipVerification) {
+				builder.AppendSwitch("-Vr");
+			} else {
+				builder.AppendSwitch("-Vu");
+			}
+
+			builder.AppendFileNameIfNotNull(this.AssemblyName + "," + this.PublicKeyToken);
+			return builder.ToString();
+		}
+	}
+}