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, 31 deletions

diff --git a/samples/OAuthServiceProvider/App_Code/DataApi.cs b/samples/OAuthServiceProvider/App_Code/DataApi.cs
deleted file mode 100644
index d5adb10..0000000
--- a/samples/OAuthServiceProvider/App_Code/DataApi.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using System.Linq;
-using System.ServiceModel;
-
-/// <summary>
-/// The WCF service API.
-/// </summary>
-/// <remarks>
-/// Note how there is no code here that is bound to OAuth or any other
-/// credential/authorization scheme.  That's all part of the channel/binding elsewhere.
-/// And the reference to OperationContext.Current.ServiceSecurityContext.PrimaryIdentity 
-/// is the user being impersonated by the WCF client.
-/// In the OAuth case, it is the user who authorized the OAuth access token that was used
-/// to gain access to the service.
-/// </remarks>
-public class DataApi : IDataApi {
-	private User User {
-		get { return OperationContext.Current.ServiceSecurityContext.PrimaryIdentity.GetUser(); }
-	}
-
-	public int? GetAge() {
-		return User.Age;
-	}
-
-	public string GetName() {
-		return User.FullName;
-	}
-
-	public string[] GetFavoriteSites() {
-		return User.FavoriteSites.Select(site => site.SiteUrl).ToArray();
-	}
-}