Fixed up XAML and ASPX references to the unified DotNetOpenAuth assembly.

6 files changed, 68 insertions, 0 deletions

diff --git a/lib/DotNetOpenAuth.BuildTasks.dll b/lib/DotNetOpenAuth.BuildTasks.dll
index 6889add..57e4b3c 100644
--- a/lib/DotNetOpenAuth.BuildTasks.dll
+++ b/lib/DotNetOpenAuth.BuildTasks.dll
diff --git a/lib/DotNetOpenAuth.BuildTasks.pdb b/lib/DotNetOpenAuth.BuildTasks.pdb
index 4026aa5..9e9349f 100644
--- a/lib/DotNetOpenAuth.BuildTasks.pdb
+++ b/lib/DotNetOpenAuth.BuildTasks.pdb
diff --git a/lib/DotNetOpenAuth.BuildTasks.targets b/lib/DotNetOpenAuth.BuildTasks.targets
index 27ca0ed..9ef88f6 100644
--- a/lib/DotNetOpenAuth.BuildTasks.targets
+++ b/lib/DotNetOpenAuth.BuildTasks.targets
@@ -30,4 +30,5 @@
 	<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="PrepareOhlohRelease" />
 	<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="AddFilesTo7Zip" />
 	<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="NuGetPack" />
+	<UsingTask AssemblyFile="DotNetOpenAuth.BuildTasks.dll" TaskName="RegexFileReplace" />
 </Project>
diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj
index 310ee9d..f7d7256 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.csproj
@@ -103,6 +103,7 @@
     <Compile Include="ChangeProjectReferenceToAssemblyReference.cs" />
     <Compile Include="CompareFiles.cs" />
     <Compile Include="ChangeAssemblyReference.cs" />
+    <Compile Include="RegexFileReplace.cs" />
     <Compile Include="CopyWithTokenSubstitution.cs" />
     <Compile Include="CreateWebApplication.cs" />
     <Compile Include="DeleteWebApplication.cs" />
diff --git a/src/DotNetOpenAuth.BuildTasks/RegexFileReplace.cs b/src/DotNetOpenAuth.BuildTasks/RegexFileReplace.cs
new file mode 100644
index 0000000..294a859
--- /dev/null
+++ b/src/DotNetOpenAuth.BuildTasks/RegexFileReplace.cs
@@ -0,0 +1,55 @@
+//-----------------------------------------------------------------------
+// <copyright file="RegexFileReplace.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.BuildTasks {
+	using System;
+	using System.Collections.Generic;
+	using System.IO;
+	using System.Linq;
+	using System.Reflection;
+	using System.Text;
+	using Microsoft.Build.BuildEngine;
+	using Microsoft.Build.Framework;
+	using Microsoft.Build.Utilities;
+	using System.Text.RegularExpressions;
+
+	public class RegexFileReplace : Task {
+		/// <summary>
+		/// Gets or sets the set of files to search.
+		/// </summary>
+		[Required]
+		public ITaskItem[] Files { get; set; }
+
+		/// <summary>
+		/// Gets or sets the files to save the changed files to.  This may be the same as the input files to make the change in place.
+		/// </summary>
+		public ITaskItem[] OutputFiles { get; set; }
+
+		public string Pattern { get; set; }
+
+		public string Replacement { get; set; }
+
+		/// <summary>
+		/// Executes this instance.
+		/// </summary>
+		public override bool Execute() {
+			if (this.OutputFiles == null || this.OutputFiles.Length == 0) {
+				this.OutputFiles = this.Files;
+			}
+
+			foreach (var file in this.Files) {
+				string[] lines = File.ReadAllLines(file.ItemSpec);
+				for (int i = 0; i < lines.Length; i++) {
+					lines[i] = Regex.Replace(lines[i], this.Pattern, this.Replacement);
+				}
+
+				File.WriteAllLines(file.ItemSpec, lines);
+			}
+
+			return !this.Log.HasLoggedErrors;
+		}
+	}
+}
diff --git a/tools/drop.proj b/tools/drop.proj
index 2c072e3..b438e33 100644
--- a/tools/drop.proj
+++ b/tools/drop.proj
@@ -79,6 +79,7 @@
 															$(ProjectRoot)Samples\**\*.refresh_;
 															$(ProjectRoot)Samples\*.proj;
 															" />
+			<DropSamplesSourceFiles Include="$(ProjectRoot)Samples\**\Bin\*.refresh"  />
 			<!-- Some .refresh files are only applicable to drop builds, so we rename them from *.refresh_ -->
 			<DropSamplesRefreshSourceFiles Include="$(ProjectRoot)Samples\**\*.refresh_" />
 			<DropSpecsSourceFiles Include="$(ProjectRoot)Doc\specs\*.htm*" />
@@ -135,6 +136,16 @@
 		                          AddReferences="Microsoft.Contracts"/>
 		<ChangeProjectReferenceToAssemblyReference Projects="@(SampleProjectTargets)"
 		  ProjectReferences="@(ProjectReferencesToRemove)" References="@(AssemblyReferencesToReplaceWith)" />
+		<RegexFileReplace
+			Files="@(DropSamplesFiles)"
+			Pattern='&lt;%@ Register Assembly="DotNetOpenAuth[^"]+"'
+			Replacement='&lt;%@ Register Assembly="DotNetOpenAuth"'
+			Condition=" '%(Extension)' == '.aspx' " />
+		<RegexFileReplace
+			Files="@(DropSamplesFiles)"
+			Pattern='xmlns\:(.+)assembly=DotNetOpenAuth([^;"]+)'
+			Replacement='xmlns:$1assembly=DotNetOpenAuth'
+			Condition=" '%(Extension)' == '.xaml' " />
 		<DowngradeProjects
 			Projects="@(SampleProjectTargets);@(SampleSolutionTargets)"
 			DowngradeMvc2ToMvc1="$(DowngradeMvc2ToMvc1)"