Merge branch 'master' into master-Dev10

Conflicts:
	samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
	src/DotNetOpenAuth.Test/DotNetOpenAuth.Test.csproj
	src/DotNetOpenAuth/DotNetOpenAuth.csproj

1 files changed, 11 insertions, 7 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs b/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs
index 92b0235..a6088c9 100644
--- a/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs
+++ b/src/DotNetOpenAuth.BuildTasks/FixupShippingToolSamples.cs
@@ -7,12 +7,12 @@
 namespace DotNetOpenAuth.BuildTasks {
 	using System;
 	using System.Collections.Generic;
+	using System.IO;
 	using System.Linq;
 	using System.Text;
-	using Microsoft.Build.Utilities;
-	using Microsoft.Build.Framework;
-	using System.IO;
 	using Microsoft.Build.BuildEngine;
+	using Microsoft.Build.Framework;
+	using Microsoft.Build.Utilities;
 
 	/// <summary>
 	/// Removes imports that only apply when a shipping tool sample builds as part of
@@ -22,6 +22,8 @@ namespace DotNetOpenAuth.BuildTasks {
 		[Required]
 		public ITaskItem[] Projects { get; set; }
 
+		public string[] RemoveImportsStartingWith { get; set; }
+
 		/// <summary>
 		/// Executes this instance.
 		/// </summary>
@@ -34,10 +36,12 @@ namespace DotNetOpenAuth.BuildTasks {
 				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));
+				if (this.RemoveImportsStartingWith != null && this.RemoveImportsStartingWith.Length > 0) {
+					project.Imports.Cast<Import>()
+						.Where(import => this.RemoveImportsStartingWith.Any(start => import.ProjectPath.StartsWith(start, StringComparison.OrdinalIgnoreCase)))
+						.ToList()
+						.ForEach(import => project.Imports.RemoveImport(import));
+				}
 
 				project.Save(projectTaskItem.ItemSpec);
 			}