Merge branch 'v3.3'

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/version.txt

1 files changed, 48 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs b/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs
new file mode 100644
index 0000000..92b0235
--- /dev/null
+++ b/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs
@@ -0,0 +1,48 @@
+//-----------------------------------------------------------------------
+// <copyright file="FixupShippingToolSamples.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.BuildTasks {
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+	using System.Text;
+	using Microsoft.Build.Utilities;
+	using Microsoft.Build.Framework;
+	using System.IO;
+	using Microsoft.Build.BuildEngine;
+
+	/// <summary>
+	/// Removes imports that only apply when a shipping tool sample builds as part of
+	/// the entire project, but not when it's part of a source code sample.
+	/// </summary>
+	public class FixupShippingToolSamples : Task {
+		[Required]
+		public ITaskItem[] Projects { get; set; }
+
+		/// <summary>
+		/// Executes this instance.
+		/// </summary>
+		/// <returns></returns>
+		public override bool Execute() {
+			foreach (ITaskItem projectTaskItem in this.Projects) {
+				this.Log.LogMessage("Fixing up the {0} sample for shipping as source code.", Path.GetFileNameWithoutExtension(projectTaskItem.ItemSpec));
+
+				var project = new Project();
+				Uri projectUri = new Uri(projectTaskItem.GetMetadata("FullPath"));
+				project.Load(projectTaskItem.ItemSpec, ProjectLoadSettings.IgnoreMissingImports);
+
+				project.Imports.Cast<Import>()
+					.Where(import => import.ProjectPath.StartsWith(@"..\..\tools\", StringComparison.OrdinalIgnoreCase))
+					.ToList()
+					.ForEach(import => project.Imports.RemoveImport(import));
+
+				project.Save(projectTaskItem.ItemSpec);
+			}
+
+			return !this.Log.HasLoggedErrors;
+		}
+	}
+}