Merge branch 'v3.4' into oauthWRAP

Conflicts:
	samples/OAuthConsumer/Web.config
	src/DotNetOpenAuth/DotNetOpenAuth.csproj
	src/DotNetOpenAuth/Messaging/MessagingStrings.Designer.cs
	src/DotNetOpenAuth/Messaging/MessagingStrings.resx
	src/version.txt

1 files changed, 43 insertions, 0 deletions

diff --git a/samples/OAuthServiceProvider/Code/OAuthConsumer.cs b/samples/OAuthServiceProvider/Code/OAuthConsumer.cs
new file mode 100644
index 0000000..d7dfc06
--- /dev/null
+++ b/samples/OAuthServiceProvider/Code/OAuthConsumer.cs
@@ -0,0 +1,43 @@
+//-----------------------------------------------------------------------
+// <copyright file="OAuthConsumer.cs" company="Andrew Arnott">
+//     Copyright (c) Andrew Arnott. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace OAuthServiceProvider.Code {
+	using System;
+	using System.Collections.Generic;
+	using System.Linq;
+	using System.Web;
+	using DotNetOpenAuth.OAuth.ChannelElements;
+
+	public partial class OAuthConsumer : IConsumerDescription {
+		#region IConsumerDescription Members
+
+		string IConsumerDescription.Key {
+			get { return this.ConsumerKey; }
+		}
+
+		string IConsumerDescription.Secret {
+			get { return this.ConsumerSecret; }
+		}
+
+		System.Security.Cryptography.X509Certificates.X509Certificate2 IConsumerDescription.Certificate {
+			get { return null; }
+		}
+
+		Uri IConsumerDescription.Callback {
+			get { return string.IsNullOrEmpty(this.Callback) ? null : new Uri(this.Callback); }
+		}
+
+		DotNetOpenAuth.OAuth.VerificationCodeFormat IConsumerDescription.VerificationCodeFormat {
+			get { return this.VerificationCodeFormat; }
+		}
+
+		int IConsumerDescription.VerificationCodeLength {
+			get { return this.VerificationCodeLength; }
+		}
+
+		#endregion
+	}
+}
\ No newline at end of file