Merge branch 'v3.3'

Conflicts:
	samples/InfoCardRelyingParty/Site.Master
	samples/OpenIdProviderWebForms/Site.Master
	samples/OpenIdRelyingPartyClassicAsp/MembersOnly.asp
	samples/OpenIdRelyingPartyClassicAsp/default.asp
	samples/OpenIdRelyingPartyClassicAsp/login.asp
	samples/OpenIdRelyingPartyWebForms/Site.Master
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
	src/DotNetOpenAuth/OpenId/Extensions/ExtensionsInteropHelper.cs

2 files changed, 31 insertions, 10 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/CompareFiles.cs b/src/DotNetOpenAuth.BuildTasks/CompareFiles.cs
index 691df20..51fcee4 100644
--- a/src/DotNetOpenAuth.BuildTasks/CompareFiles.cs
+++ b/src/DotNetOpenAuth.BuildTasks/CompareFiles.cs
@@ -81,5 +81,32 @@ namespace DotNetOpenAuth.BuildTasks {
 
 			return true;
 		}
+
+		/// <summary>
+		/// Tests whether a file is up to date with respect to another,
+		/// based on existence, last write time and file size.
+		/// </summary>
+		/// <param name="sourcePath">The source path.</param>
+		/// <param name="destPath">The dest path.</param>
+		/// <returns><c>true</c> if the files are the same; <c>false</c> if the files are different</returns>
+		internal static bool FastFileEqualityCheck(string sourcePath, string destPath) {
+			FileInfo sourceInfo = new FileInfo(sourcePath);
+			FileInfo destInfo = new FileInfo(destPath);
+			
+			if (sourceInfo.Exists ^ destInfo.Exists) {
+				// Either the source file or the destination file is missing.
+				return false;
+			}
+
+			if (!sourceInfo.Exists) {
+				// Neither file exists.
+				return true;
+			}
+
+			// We'll say the files are the same if their modification date and length are the same.
+			return
+				sourceInfo.LastWriteTimeUtc == destInfo.LastWriteTimeUtc &&
+				sourceInfo.Length == destInfo.Length;
+		}
 	}
 }
diff --git a/src/DotNetOpenAuth.BuildTasks/CopyWithTokenSubstitution.cs b/src/DotNetOpenAuth.BuildTasks/CopyWithTokenSubstitution.cs
index 3b81978..e17d8f2 100644
--- a/src/DotNetOpenAuth.BuildTasks/CopyWithTokenSubstitution.cs
+++ b/src/DotNetOpenAuth.BuildTasks/CopyWithTokenSubstitution.cs
@@ -18,15 +18,6 @@ namespace DotNetOpenAuth.BuildTasks {
 	/// </summary>
 	public class CopyWithTokenSubstitution : Task {
 		/// <summary>
-		/// Gets or sets a value indicating whether the task should
-		/// skip the copying of files that are unchanged between the source and destination.
-		/// </summary>
-		/// <value>
-		/// 	<c>true</c> to skip copying files where the destination files are newer than the source files; otherwise, <c>false</c> to copy all files.
-		/// </value>
-		public bool SkipUnchangedFiles { get; set; }
-
-		/// <summary>
 		/// Gets or sets the files to copy.
 		/// </summary>
 		/// <value>The files to copy.</value>
@@ -65,8 +56,11 @@ namespace DotNetOpenAuth.BuildTasks {
 			for (int i = 0; i < this.SourceFiles.Length; i++) {
 				string sourcePath = this.SourceFiles[i].ItemSpec;
 				string destPath = this.DestinationFiles[i].ItemSpec;
+				bool skipUnchangedFiles = bool.Parse(this.SourceFiles[i].GetMetadata("SkipUnchangedFiles"));
 
-				if (this.SkipUnchangedFiles && File.GetLastWriteTimeUtc(sourcePath) < File.GetLastWriteTimeUtc(destPath)) {
+				// We deliberably consider newer destination files to be up-to-date rather than
+				// requiring equality because this task modifies the destination file while copying.
+				if (skipUnchangedFiles && File.GetLastWriteTimeUtc(sourcePath) < File.GetLastWriteTimeUtc(destPath)) {
 					Log.LogMessage(MessageImportance.Low, "Skipping \"{0}\" -> \"{1}\" because the destination is up to date.", sourcePath, destPath);
 					continue;
 				}