Merge branch 'master' into mvcProjTemplate

4 files changed, 40 insertions, 4 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
index c875882..fca41e8 100644
--- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
+++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln
@@ -7,6 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		..\..\build.proj = ..\..\build.proj
 		..\..\lib\DotNetOpenAuth.BuildTasks.targets = ..\..\lib\DotNetOpenAuth.BuildTasks.targets
+		..\..\tools\DotNetOpenAuth.Common.Settings.targets = ..\..\tools\DotNetOpenAuth.Common.Settings.targets
+		..\..\tools\DotNetOpenAuth.Versioning.targets = ..\..\tools\DotNetOpenAuth.Versioning.targets
 	EndProjectSection
 EndProject
 Global
diff --git a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
index e40eb78..48b5d5c 100644
--- a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
+++ b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
@@ -16,16 +16,29 @@ namespace DotNetOpenAuth.BuildTasks {
 		public string Version { get; private set; }
 
 		/// <summary>
+		/// Gets the Git revision control commit id for HEAD (the current source code version).
+		/// </summary>
+		[Output]
+		public string GitCommitId { get; private set; }
+
+		/// <summary>
 		/// The file that contains the version base (Major.Minor.Build) to use.
 		/// </summary>
 		[Required]
 		public string VersionFile { get; set; }
 
+		/// <summary>
+		/// Gets or sets the parent directory of the .git directory.
+		/// </summary>
+		public string GitRepoRoot { get; set; }
+
 		public override bool Execute() {
 			try {
 				Version typedVersion = ReadVersionFromFile();
 				typedVersion = new Version(typedVersion.Major, typedVersion.Minor, typedVersion.Build, CalculateJDate(DateTime.Now));
 				Version = typedVersion.ToString();
+
+				this.GitCommitId = GetGitHeadCommitId();
 			} catch (ArgumentOutOfRangeException ex) {
 				Log.LogErrorFromException(ex);
 				return false;
@@ -34,6 +47,25 @@ namespace DotNetOpenAuth.BuildTasks {
 			return true;
 		}
 
+		private string GetGitHeadCommitId() {
+			if (string.IsNullOrEmpty(this.GitRepoRoot)) {
+				return string.Empty;
+			}
+
+			string headContent = string.Empty;
+			try {
+				headContent = File.ReadAllText(Path.Combine(this.GitRepoRoot, @".git/HEAD")).Trim();
+				if (headContent.StartsWith("ref:", StringComparison.Ordinal)) {
+					string refName = headContent.Substring(5).Trim();
+					headContent = File.ReadAllText(Path.Combine(this.GitRepoRoot, @".git/" + refName)).Trim();
+				}
+			} catch (FileNotFoundException) {
+			} catch (DirectoryNotFoundException) {
+			}
+
+			return headContent.Trim();
+		}
+
 		private Version ReadVersionFromFile() {
 			string[] lines = File.ReadAllLines(VersionFile);
 			string versionLine = lines[0];
@@ -41,7 +73,7 @@ namespace DotNetOpenAuth.BuildTasks {
 		}
 
 		private int CalculateJDate(DateTime date) {
-			int yearLastDigit = date.Year % 10;
+			int yearLastDigit = date.Year - 2000; // can actually be two digits in or after 2010
 			DateTime firstOfYear = new DateTime(date.Year, 1, 1);
 			int dayOfYear = (date - firstOfYear).Days + 1;
 			int jdate = yearLastDigit * 1000 + dayOfYear;
diff --git a/src/DotNetOpenAuth.BuildTasks/Purge.cs b/src/DotNetOpenAuth.BuildTasks/Purge.cs
index f23a6d9..e19e485 100644
--- a/src/DotNetOpenAuth.BuildTasks/Purge.cs
+++ b/src/DotNetOpenAuth.BuildTasks/Purge.cs
@@ -56,7 +56,7 @@ namespace DotNetOpenAuth.BuildTasks {
 		public override bool Execute() {
 			HashSet<string> intendedFiles = new HashSet<string>(this.IntendedFiles.Select(file => file.GetMetadata("FullPath")), StringComparer.OrdinalIgnoreCase);
 
-			foreach (string directory in this.Directories.Select(dir => NormalizePath(dir))) {
+			foreach (string directory in this.Directories.Select(dir => NormalizePath(dir)).Where(dir => Directory.Exists(dir))) {
 				foreach (string existingFile in Directory.GetFiles(directory, "*", SearchOption.AllDirectories)) {
 					if (!intendedFiles.Contains(existingFile)) {
 						this.Log.LogWarning("Purging file \"{0}\".", existingFile);
diff --git a/src/DotNetOpenAuth/OpenId/OpenIdXrdsHelper.cs b/src/DotNetOpenAuth/OpenId/OpenIdXrdsHelper.cs
index 75b4efd..00468ed 100644
--- a/src/DotNetOpenAuth/OpenId/OpenIdXrdsHelper.cs
+++ b/src/DotNetOpenAuth/OpenId/OpenIdXrdsHelper.cs
@@ -143,8 +143,10 @@ namespace DotNetOpenAuth.OpenId {
 		/// <param name="userSuppliedIdentifier">The i-name supplied by the user.</param>
 		/// <returns>A sequence of the providers that can assert ownership of the given identifier.</returns>
 		private static IEnumerable<IdentifierDiscoveryResult> GenerateClaimedIdentifierServiceEndpoints(this IEnumerable<XrdElement> xrds, XriIdentifier userSuppliedIdentifier) {
-			Contract.Requires<ArgumentNullException>(xrds != null);
-			Contract.Ensures(Contract.Result<IEnumerable<IdentifierDiscoveryResult>>() != null);
+			// Cannot use code contracts because this method uses yield return.
+			////Contract.Requires<ArgumentNullException>(xrds != null);
+			////Contract.Ensures(Contract.Result<IEnumerable<IdentifierDiscoveryResult>>() != null);
+			ErrorUtilities.VerifyArgumentNotNull(xrds, "xrds");
 
 			foreach (var service in xrds.FindClaimedIdentifierServices()) {
 				foreach (var uri in service.UriElements) {