Merge branch 'v3.2' into mono2origin/mono2

Conflicts:
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs

1 files changed, 56 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/ReSignDelaySignedAssemblies.cs b/src/DotNetOpenAuth.BuildTasks/ReSignDelaySignedAssemblies.cs
new file mode 100644
index 0000000..a0ba386
--- /dev/null
+++ b/src/DotNetOpenAuth.BuildTasks/ReSignDelaySignedAssemblies.cs
@@ -0,0 +1,56 @@
+//-----------------------------------------------------------------------
+// <copyright file="ReSignDelaySignedAssemblies.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.BuildTasks {
+	using System;
+	using Microsoft.Build.Framework;
+	using Microsoft.Build.Utilities;
+
+	public class ReSignDelaySignedAssemblies : SnToolTask {
+		/// <summary>
+		/// Gets or sets the key file to use for signing.
+		/// </summary>
+		public ITaskItem KeyFile { get; set; }
+
+		/// <summary>
+		/// Gets or sets the key container.
+		/// </summary>
+		public ITaskItem KeyContainer { get; set; }
+
+		/// <summary>
+		/// Gets or sets the assemblies to re-sign.
+		/// </summary>
+		public ITaskItem[] Assemblies { get; set; }
+
+		/// <summary>
+		/// Generates the command line commands.
+		/// </summary>
+		protected override string GenerateCommandLineCommands() {
+			////if (this.Assemblies.Length != 1) {
+			////    throw new NotSupportedException("Exactly 1 assembly for signing is supported.");
+			////}
+			CommandLineBuilder args = new CommandLineBuilder();
+			args.AppendSwitch("-q");
+
+			if (this.KeyFile != null) {
+				args.AppendSwitch("-R");
+			} else if (this.KeyContainer != null) {
+				args.AppendSwitch("-Rc");
+			} else {
+				throw new InvalidOperationException("Either KeyFile or KeyContainer must be set.");
+			}
+
+			args.AppendFileNameIfNotNull(this.Assemblies[0]);
+			if (this.KeyFile != null) {
+				args.AppendFileNameIfNotNull(this.KeyFile);
+			} else {
+				args.AppendFileNameIfNotNull(this.KeyContainer);
+			}
+
+			return args.ToString();
+		}
+	}
+}