Merge branch 'master' into contracts

Conflicts:
	src/DotNetOpenAuth.vsmdi
	src/DotNetOpenAuth/Configuration/TypeConfigurationCollection.cs
	src/DotNetOpenAuth/Configuration/TypeConfigurationElement.cs
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/HttpRequestInfo.cs
	src/DotNetOpenAuth/Messaging/Reflection/MessagePart.cs
	src/DotNetOpenAuth/Messaging/Reflection/ValueMapping.cs
	src/DotNetOpenAuth/OAuth/ChannelElements/OAuthChannel.cs
	src/DotNetOpenAuth/OAuth/ConsumerBase.cs
	src/DotNetOpenAuth/OAuth/Messages/MessageBase.cs
	src/DotNetOpenAuth/OAuth/Messages/UnauthorizedTokenResponse.cs
	src/DotNetOpenAuth/OAuth/ServiceProvider.cs
	src/DotNetOpenAuth/OpenId/Protocol.cs
	src/DotNetOpenAuth/OpenId/Provider/AutoResponsiveRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/HostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/IHostProcessedRequest.cs
	src/DotNetOpenAuth/OpenId/Provider/Request.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
	src/DotNetOpenAuth/OpenId/RelyingParty/ServiceEndpoint.cs

1 files changed, 51 insertions, 0 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
new file mode 100644
index 0000000..e40eb78
--- /dev/null
+++ b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Microsoft.Build.Utilities;
+using Microsoft.Build.Framework;
+using System.IO;
+
+namespace DotNetOpenAuth.BuildTasks {
+	public class GetBuildVersion : Task {
+
+		/// <summary>
+		/// Gets the version string to use in the compiled assemblies.
+		/// </summary>
+		[Output]
+		public string Version { get; private set; }
+
+		/// <summary>
+		/// The file that contains the version base (Major.Minor.Build) to use.
+		/// </summary>
+		[Required]
+		public string VersionFile { 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();
+			} catch (ArgumentOutOfRangeException ex) {
+				Log.LogErrorFromException(ex);
+				return false;
+			}
+
+			return true;
+		}
+
+		private Version ReadVersionFromFile() {
+			string[] lines = File.ReadAllLines(VersionFile);
+			string versionLine = lines[0];
+			return new Version(versionLine);
+		}
+
+		private int CalculateJDate(DateTime date) {
+			int yearLastDigit = date.Year % 10;
+			DateTime firstOfYear = new DateTime(date.Year, 1, 1);
+			int dayOfYear = (date - firstOfYear).Days + 1;
+			int jdate = yearLastDigit * 1000 + dayOfYear;
+			return jdate;
+		}
+	}
+}