Merge branch 'v3.4' into oauth2

Conflicts:
	samples/OAuthConsumer/Web.config
	src/DotNetOpenAuth/Configuration/DotNetOpenAuth.xsd
	src/DotNetOpenAuth/DotNetOpenAuth.csproj

1 files changed, 15 insertions, 2 deletions

diff --git a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
index 1d60ca4..dfb3468 100644
--- a/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
+++ b/src/DotNetOpenAuth.BuildTasks/GetBuildVersion.cs
@@ -10,6 +10,11 @@ using Microsoft.Build.Utilities;
 
 namespace DotNetOpenAuth.BuildTasks {
 	public class GetBuildVersion : Task {
+		/// <summary>
+		/// Initializes a new instance of the <see cref="GetBuildVersion"/> class.
+		/// </summary>
+		public GetBuildVersion() {
+		}
 
 		/// <summary>
 		/// Gets the version string to use in the compiled assemblies.
@@ -18,6 +23,12 @@ namespace DotNetOpenAuth.BuildTasks {
 		public string Version { get; private set; }
 
 		/// <summary>
+		/// Gets the version string to use in the official release name (lacks revision number).
+		/// </summary>
+		[Output]
+		public string SimpleVersion { get; private set; }
+
+		/// <summary>
 		/// Gets the Git revision control commit id for HEAD (the current source code version).
 		/// </summary>
 		[Output]
@@ -37,9 +48,11 @@ namespace DotNetOpenAuth.BuildTasks {
 		public override bool Execute() {
 			try {
 				Version typedVersion = ReadVersionFromFile();
-				typedVersion = new Version(typedVersion.Major, typedVersion.Minor, typedVersion.Build, CalculateJDate(DateTime.Now));
-				Version = typedVersion.ToString();
+				SimpleVersion = typedVersion.ToString();
 
+				var fullVersion = new Version(typedVersion.Major, typedVersion.Minor, typedVersion.Build, CalculateJDate(DateTime.Now));
+				Version = fullVersion.ToString();
+	
 				this.GitCommitId = GetGitHeadCommitId();
 			} catch (ArgumentOutOfRangeException ex) {
 				Log.LogErrorFromException(ex);