Merge branch 'v3.4'

Conflicts:
	nuget/nuget.proj
	samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/Reflection/MessageDescription.cs
	tools/DotNetOpenAuth.props

5 files changed, 11 insertions, 9 deletions

diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index efa8845..bf86b1c 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -62,4 +62,4 @@
 
 	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/>
 	<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
index 6971026..5798bdb 100644
--- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
+++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
@@ -252,4 +252,4 @@
   </Target>
   <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.targets" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))\EnlistmentInfo.targets" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.targets))' != '' " />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescription.cs b/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescription.cs
index 9a8098b..6e16478 100644
--- a/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescription.cs
+++ b/src/DotNetOpenAuth.Core/Messaging/Reflection/MessageDescription.cs
@@ -108,10 +108,11 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 				this.CheckMessagePartsConstantValues(parts, true);
 			} catch (ProtocolException) {
 				Logger.Messaging.ErrorFormat(
-					"Error while performing basic validation of {0} with these message parts:{1}{2}",
+					"Error while performing basic validation of {0} ({3}) with these message parts:{1}{2}",
 					this.MessageType.Name,
 					Environment.NewLine,
-					parts.ToStringDeferred());
+					parts.ToStringDeferred(),
+					this.messageVersion);
 				throw;
 			}
 		}
diff --git a/src/DotNetOpenAuth.OAuth.Consumer/OAuth/ConsumerBase.cs b/src/DotNetOpenAuth.OAuth.Consumer/OAuth/ConsumerBase.cs
index 89f5a5f..0366f0a 100644
--- a/src/DotNetOpenAuth.OAuth.Consumer/OAuth/ConsumerBase.cs
+++ b/src/DotNetOpenAuth.OAuth.Consumer/OAuth/ConsumerBase.cs
@@ -84,8 +84,9 @@ namespace DotNetOpenAuth.OAuth {
 		/// The token secret is stored in the <see cref="TokenManager"/>.
 		/// </remarks>
 		public string RequestNewClientAccount(IDictionary<string, string> requestParameters = null) {
-			// Obtain an unauthorized request token.  Assume the OAuth version given in the service description.
-			var token = new UnauthorizedTokenRequest(this.ServiceProvider.RequestTokenEndpoint, this.ServiceProvider.Version) {
+			// Obtain an unauthorized request token.  Force use of OAuth 1.0 (not 1.0a) so that 
+			// we are not expected to provide an oauth_verifier which doesn't apply in 2-legged OAuth.
+			var token = new UnauthorizedTokenRequest(this.ServiceProvider.RequestTokenEndpoint, Protocol.V10.Version) {
 				ConsumerKey = this.ConsumerKey,
 			};
 			var tokenAccessor = this.Channel.MessageDescriptions.GetAccessor(token);
@@ -93,7 +94,7 @@ namespace DotNetOpenAuth.OAuth {
 			var requestTokenResponse = this.Channel.Request<UnauthorizedTokenResponse>(token);
 			this.TokenManager.StoreNewRequestToken(token, requestTokenResponse);
 
-			var requestAccess = new AuthorizedTokenRequest(this.ServiceProvider.AccessTokenEndpoint, this.ServiceProvider.Version) {
+			var requestAccess = new AuthorizedTokenRequest(this.ServiceProvider.AccessTokenEndpoint, Protocol.V10.Version) {
 				RequestToken = requestTokenResponse.RequestToken,
 				ConsumerKey = this.ConsumerKey,
 			};
diff --git a/src/DotNetOpenAuth.OpenId.Provider.UI/OpenId/Provider/IdentityEndpoint.cs b/src/DotNetOpenAuth.OpenId.Provider.UI/OpenId/Provider/IdentityEndpoint.cs
index 3a18b70..2685af2 100644
--- a/src/DotNetOpenAuth.OpenId.Provider.UI/OpenId/Provider/IdentityEndpoint.cs
+++ b/src/DotNetOpenAuth.OpenId.Provider.UI/OpenId/Provider/IdentityEndpoint.cs
@@ -196,7 +196,7 @@ namespace DotNetOpenAuth.OpenId.Provider {
 			if (!string.IsNullOrEmpty(this.ProviderEndpointUrl)) {
 				writer.WriteBeginTag("link");
 				writer.WriteAttribute("rel", this.Protocol.HtmlDiscoveryProviderKey);
-				writer.WriteAttribute("href", new Uri(requestUrlBeforeRewrites, this.Page.ResolveUrl(this.ProviderEndpointUrl)).AbsoluteUri);
+				writer.WriteAttribute("href", new Uri(requestUrlBeforeRewrites, this.Page.Response.ApplyAppPathModifier(this.ProviderEndpointUrl)).AbsoluteUri);
 				writer.Write(">");
 				writer.WriteEndTag("link");
 				writer.WriteLine();
@@ -204,7 +204,7 @@ namespace DotNetOpenAuth.OpenId.Provider {
 			if (!string.IsNullOrEmpty(this.ProviderLocalIdentifier)) {
 				writer.WriteBeginTag("link");
 				writer.WriteAttribute("rel", Protocol.HtmlDiscoveryLocalIdKey);
-				writer.WriteAttribute("href", new Uri(requestUrlBeforeRewrites, this.Page.ResolveUrl(this.ProviderLocalIdentifier)).AbsoluteUri);
+				writer.WriteAttribute("href", new Uri(requestUrlBeforeRewrites, this.Page.Response.ApplyAppPathModifier(this.ProviderLocalIdentifier)).AbsoluteUri);
 				writer.Write(">");
 				writer.WriteEndTag("link");
 				writer.WriteLine();