Merge branch 'v3.2' into v3.3

8 files changed, 21 insertions, 21 deletions

diff --git a/samples/OAuthConsumer/Twitter.aspx.cs b/samples/OAuthConsumer/Twitter.aspx.cs
index a4fb0cb..9b9eced 100644
--- a/samples/OAuthConsumer/Twitter.aspx.cs
+++ b/samples/OAuthConsumer/Twitter.aspx.cs
@@ -54,7 +54,7 @@ public partial class Twitter : System.Web.UI.Page {
 
 	protected void downloadUpdates_Click(object sender, EventArgs e) {
 		var twitter = new WebConsumer(TwitterConsumer.ServiceDescription, this.TokenManager);
-		XPathDocument updates = new XPathDocument(TwitterConsumer.GetUpdates(twitter, AccessToken).CreateReader());
+		XPathDocument updates = new XPathDocument(TwitterConsumer.GetUpdates(twitter, this.AccessToken).CreateReader());
 		XPathNavigator nav = updates.CreateNavigator();
 		var parsedUpdates = from status in nav.Select("/statuses/status").OfType<XPathNavigator>()
 							where !status.SelectSingleNode("user/protected").ValueAsBoolean
diff --git a/samples/OpenIdProviderWebForms/ProfileFields.ascx.cs b/samples/OpenIdProviderWebForms/ProfileFields.ascx.cs
index 893830f..6954aa6 100644
--- a/samples/OpenIdProviderWebForms/ProfileFields.ascx.cs
+++ b/samples/OpenIdProviderWebForms/ProfileFields.ascx.cs
@@ -76,15 +76,15 @@ namespace OpenIdProviderWebForms {
 				this.privacyLink.Visible = false;
 			}
 
-			this.dobRequiredLabel.Visible = (requestFields.BirthDate == DemandLevel.Require);
-			this.countryRequiredLabel.Visible = (requestFields.Country == DemandLevel.Require);
-			this.emailRequiredLabel.Visible = (requestFields.Email == DemandLevel.Require);
-			this.fullnameRequiredLabel.Visible = (requestFields.FullName == DemandLevel.Require);
-			this.genderRequiredLabel.Visible = (requestFields.Gender == DemandLevel.Require);
-			this.languageRequiredLabel.Visible = (requestFields.Language == DemandLevel.Require);
-			this.nicknameRequiredLabel.Visible = (requestFields.Nickname == DemandLevel.Require);
-			this.postcodeRequiredLabel.Visible = (requestFields.PostalCode == DemandLevel.Require);
-			this.timezoneRequiredLabel.Visible = (requestFields.TimeZone == DemandLevel.Require);
+			this.dobRequiredLabel.Visible = requestFields.BirthDate == DemandLevel.Require;
+			this.countryRequiredLabel.Visible = requestFields.Country == DemandLevel.Require;
+			this.emailRequiredLabel.Visible = requestFields.Email == DemandLevel.Require;
+			this.fullnameRequiredLabel.Visible = requestFields.FullName == DemandLevel.Require;
+			this.genderRequiredLabel.Visible = requestFields.Gender == DemandLevel.Require;
+			this.languageRequiredLabel.Visible = requestFields.Language == DemandLevel.Require;
+			this.nicknameRequiredLabel.Visible = requestFields.Nickname == DemandLevel.Require;
+			this.postcodeRequiredLabel.Visible = requestFields.PostalCode == DemandLevel.Require;
+			this.timezoneRequiredLabel.Visible = requestFields.TimeZone == DemandLevel.Require;
 
 			this.dateOfBirthRow.Visible = !(requestFields.BirthDate == DemandLevel.NoRequest);
 			this.countryRow.Visible = !(requestFields.Country == DemandLevel.NoRequest);
diff --git a/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
index 78d08f3..f7d44d5 100644
--- a/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
@@ -18,7 +18,7 @@
 		}
 
 		protected void OpenIdAjaxTextBox1_LoggedIn(object sender, OpenIdEventArgs e) {
-			Label label = ((Label)this.commentSubmitted.FindControl("emailLabel"));
+			Label label = (Label)this.commentSubmitted.FindControl("emailLabel");
 			label.Text = e.Response.FriendlyIdentifierForDisplay;
 
 			// We COULD get the sreg extension response here for the email, but since we let the user
diff --git a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs
index 24171e1..b9e7436 100644
--- a/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs
+++ b/src/DotNetOpenAuth.Test/Messaging/Reflection/MessageDictionaryTests.cs
@@ -300,7 +300,7 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 		[TestMethod]
 		public void CopyTo() {
 			ICollection<KeyValuePair<string, string>> target = this.MessageDescriptions.GetAccessor(this.message);
-			IDictionary<string, string> targetAsDictionary = ((IDictionary<string, string>)target);
+			IDictionary<string, string> targetAsDictionary = (IDictionary<string, string>)target;
 			KeyValuePair<string, string>[] array = new KeyValuePair<string, string>[target.Count + 1];
 			int arrayIndex = 1;
 			target.CopyTo(array, arrayIndex);
@@ -317,7 +317,7 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 		[TestMethod]
 		public void ContainsKeyValuePair() {
 			ICollection<KeyValuePair<string, string>> target = this.MessageDescriptions.GetAccessor(this.message);
-			IDictionary<string, string> targetAsDictionary = ((IDictionary<string, string>)target);
+			IDictionary<string, string> targetAsDictionary = (IDictionary<string, string>)target;
 			Assert.IsFalse(target.Contains(new KeyValuePair<string, string>("age", "1")));
 			Assert.IsTrue(target.Contains(new KeyValuePair<string, string>("age", "0")));
 
@@ -333,7 +333,7 @@ namespace DotNetOpenAuth.Test.Messaging.Reflection {
 		[TestMethod]
 		public void ClearValues() {
 			MessageDictionary target = this.MessageDescriptions.GetAccessor(this.message);
-			IDictionary<string, string> targetAsDictionary = ((IDictionary<string, string>)target);
+			IDictionary<string, string> targetAsDictionary = (IDictionary<string, string>)target;
 			this.message.Name = "Andrew";
 			this.message.Age = 15;
 			targetAsDictionary["extra"] = "value";
diff --git a/src/DotNetOpenAuth.Test/OpenId/Extensions/AttributeExchange/AttributeExchangeRoundtripTests.cs b/src/DotNetOpenAuth.Test/OpenId/Extensions/AttributeExchange/AttributeExchangeRoundtripTests.cs
index 1051092..fa05e94 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Extensions/AttributeExchange/AttributeExchangeRoundtripTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Extensions/AttributeExchange/AttributeExchangeRoundtripTests.cs
@@ -34,8 +34,8 @@ namespace DotNetOpenAuth.Test.OpenId.Extensions {
 			var request = new StoreRequest();
 			var newAttribute = new AttributeValues(
 				IncrementingAttribute,
-				"val" + (incrementingAttributeValue++).ToString(),
-				"val" + (incrementingAttributeValue++).ToString());
+				"val" + (this.incrementingAttributeValue++).ToString(),
+				"val" + (this.incrementingAttributeValue++).ToString());
 			request.Attributes.Add(newAttribute);
 
 			var successResponse = new StoreResponse();
diff --git a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
index 10497b2..0ddc76b 100644
--- a/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/RelyingParty/AuthenticationRequestTests.cs
@@ -112,11 +112,11 @@ namespace DotNetOpenAuth.Test.OpenId.RelyingParty {
 			var rp = CreateRelyingParty();
 
 			// First verify that delegating identifiers work
-			Assert.IsTrue(AuthenticationRequest.Create(id, rp, realm, returnTo, false).Any(), "The delegating identifier should have not generated any results.");
+			Assert.IsTrue(AuthenticationRequest.Create(id, rp, this.realm, this.returnTo, false).Any(), "The delegating identifier should have not generated any results.");
 
 			// Now disable them and try again.
 			rp.SecuritySettings.RejectDelegatingIdentifiers = true;
-			Assert.IsFalse(AuthenticationRequest.Create(id, rp, realm, returnTo, false).Any(), "The delegating identifier should have not generated any results.");
+			Assert.IsFalse(AuthenticationRequest.Create(id, rp, this.realm, this.returnTo, false).Any(), "The delegating identifier should have not generated any results.");
 		}
 
 		/// <summary>
diff --git a/src/DotNetOpenAuth/Messaging/EnumerableCache.cs b/src/DotNetOpenAuth/Messaging/EnumerableCache.cs
index 6639de1..71825bc 100644
--- a/src/DotNetOpenAuth/Messaging/EnumerableCache.cs
+++ b/src/DotNetOpenAuth/Messaging/EnumerableCache.cs
@@ -135,7 +135,7 @@ namespace DotNetOpenAuth.Messaging {
 				private int cachePosition = -1;
 
 				/// <summary>
-				/// Initializes a new instance of the <see cref="EnumerableCache&lt;T&gt;.EnumeratorCache"/> class.
+				/// Initializes a new instance of the <see cref="EnumeratorCache"/> class.
 				/// </summary>
 				/// <param name="parent">The parent cached enumerable whose GetEnumerator method is calling this constructor.</param>
 				internal EnumeratorCache(EnumerableCache<T> parent) {
diff --git a/src/DotNetOpenAuth/Messaging/Reflection/MessageDescription.cs b/src/DotNetOpenAuth/Messaging/Reflection/MessageDescription.cs
index 738c2a3..5493ba6 100644
--- a/src/DotNetOpenAuth/Messaging/Reflection/MessageDescription.cs
+++ b/src/DotNetOpenAuth/Messaging/Reflection/MessageDescription.cs
@@ -128,7 +128,7 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 		/// <param name="keys">The names of all parameters included in a message.</param>
 		/// <exception cref="ProtocolException">Thrown when required parts of a message are not in <paramref name="keys"/></exception>
 		private void EnsureRequiredMessagePartsArePresent(IEnumerable<string> keys) {
-			var missingKeys = (from part in Mapping.Values
+			var missingKeys = (from part in this.Mapping.Values
 							   where part.IsRequired && !keys.Contains(part.Name)
 							   select part.Name).ToArray();
 			if (missingKeys.Length > 0) {
@@ -147,7 +147,7 @@ namespace DotNetOpenAuth.Messaging.Reflection {
 		/// <param name="partValues">A dictionary of key/value pairs that make up the serialized message.</param>
 		private void EnsureRequiredProtocolMessagePartsAreNotEmpty(IDictionary<string, string> partValues) {
 			string value;
-			var emptyValuedKeys = (from part in Mapping.Values
+			var emptyValuedKeys = (from part in this.Mapping.Values
 								   where !part.AllowEmpty && partValues.TryGetValue(part.Name, out value) && value != null && value.Length == 0
 								   select part.Name).ToArray();
 			if (emptyValuedKeys.Length > 0) {