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, 0 insertions, 30 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/Constants.cs b/samples/OAuthServiceProvider/App_Code/Constants.cs
deleted file mode 100644
index 7780e96..0000000
--- a/samples/OAuthServiceProvider/App_Code/Constants.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-using System;
-using DotNetOpenAuth.Messaging;
-using DotNetOpenAuth.OAuth;
-using DotNetOpenAuth.OAuth.ChannelElements;
-
-/// <summary>
-/// Service Provider definitions.
-/// </summary>
-public static class Constants {
-	public static Uri WebRootUrl { get; set; }
-
-	public static ServiceProviderDescription SelfDescription {
-		get {
-			ServiceProviderDescription description = new ServiceProviderDescription {
-				AccessTokenEndpoint = new MessageReceivingEndpoint(new Uri(WebRootUrl, "/OAuth.ashx"), HttpDeliveryMethods.PostRequest),
-				RequestTokenEndpoint = new MessageReceivingEndpoint(new Uri(WebRootUrl, "/OAuth.ashx"), HttpDeliveryMethods.PostRequest),
-				UserAuthorizationEndpoint = new MessageReceivingEndpoint(new Uri(WebRootUrl, "/OAuth.ashx"), HttpDeliveryMethods.PostRequest),
-				TamperProtectionElements = new ITamperProtectionChannelBindingElement[] {
-					new HmacSha1SigningBindingElement(),
-				},
-			};
-
-			return description;
-		}
-	}
-
-	public static ServiceProvider CreateServiceProvider() {
-		return new ServiceProvider(SelfDescription, Global.TokenManager);
-	}
-}