Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 50 insertions, 0 deletions

diff --git a/src/DotNetOpenId.BuildTasks/ChangeProjectReferenceToAssemblyReference.cs b/src/DotNetOpenId.BuildTasks/ChangeProjectReferenceToAssemblyReference.cs
new file mode 100644
index 0000000..d5e4af0
--- /dev/null
+++ b/src/DotNetOpenId.BuildTasks/ChangeProjectReferenceToAssemblyReference.cs
@@ -0,0 +1,50 @@
+using System;

+using System.Linq;

+using System.IO;

+using System.Xml;

+

+using Microsoft.Build.Framework;

+using Microsoft.Build.Utilities;

+using Microsoft.Build.BuildEngine;

+

+namespace DotNetOpenId.BuildTasks {

+	/// <summary>

+	/// Replaces ProjectReference items in a set of projects with Reference items.

+	/// </summary>

+	public class ChangeProjectReferenceToAssemblyReference : Task {

+		/// <summary>

+		/// The projects to alter.

+		/// </summary>

+		[Required]

+		public ITaskItem[] Projects { get; set; }

+		/// <summary>

+		/// The project reference to remove.

+		/// </summary>

+		[Required]

+		public string ProjectReference { get; set; }

+		/// <summary>

+		/// The assembly reference to add.

+		/// </summary>

+		[Required]

+		public string Reference { get; set; }

+

+		const string msbuildNamespace = "http://schemas.microsoft.com/developer/msbuild/2003";

+		public override bool Execute() {

+			foreach (var project in Projects) {

+				Project doc = new Project();

+				doc.Load(project.ItemSpec);

+				

+				var projectReference = doc.EvaluatedItems.OfType<BuildItem>().Where(

+					item => item.Name == "ProjectReference" && item.Include == ProjectReference).Single();

+				doc.RemoveItem(projectReference);

+

+				var newReference = doc.AddNewItem("Reference", Path.GetFileNameWithoutExtension(Reference));

+				newReference.SetMetadata("HintPath", Reference);

+

+				doc.Save(project.ItemSpec);

+			}

+

+			return true;

+		}

+	}

+}