Merge branch 'retargeting-contracts'

1 files changed, 6 insertions, 6 deletions

diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
index c730dea..7d616d2 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
@@ -12,7 +12,6 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 	using System.Collections.ObjectModel;
 	using System.ComponentModel;
 	using System.Diagnostics.CodeAnalysis;
-	using System.Diagnostics.Contracts;
 	using System.Drawing.Design;
 	using System.Globalization;
 	using System.Linq;
@@ -27,6 +26,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 	using DotNetOpenAuth.OpenId.Extensions;
 	using DotNetOpenAuth.OpenId.Extensions.UI;
 	using DotNetOpenAuth.OpenId.Messages;
+	using Validation;
 
 	/// <summary>
 	/// Methods of indicating to the rest of the web site that the user has logged in.
@@ -604,7 +604,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// used to determine the user's control of the <see cref="IAuthenticationRequest.ClaimedIdentifier"/>.
 		/// </returns>
 		protected IEnumerable<IAuthenticationRequest> CreateRequests() {
-			Requires.ValidState(this.Identifier != null, OpenIdStrings.NoIdentifierSet);
+			RequiresEx.ValidState(this.Identifier != null, OpenIdStrings.NoIdentifierSet);
 			return this.CreateRequests(this.Identifier);
 		}
 
@@ -715,7 +715,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="response">The response.</param>
 		protected virtual void OnLoggedIn(IAuthenticationResponse response) {
 			Requires.NotNull(response, "response");
-			Requires.True(response.Status == AuthenticationStatus.Authenticated, "response");
+			Requires.That(response.Status == AuthenticationStatus.Authenticated, "response", "response not authenticatedl");
 
 			var loggedIn = this.LoggedIn;
 			OpenIdEventArgs args = new OpenIdEventArgs(response);
@@ -765,7 +765,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="response">The response.</param>
 		protected virtual void OnCanceled(IAuthenticationResponse response) {
 			Requires.NotNull(response, "response");
-			Requires.True(response.Status == AuthenticationStatus.Canceled, "response");
+			Requires.That(response.Status == AuthenticationStatus.Canceled, "response", "response not canceled");
 
 			var canceled = this.Canceled;
 			if (canceled != null) {
@@ -779,7 +779,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="response">The response.</param>
 		protected virtual void OnFailed(IAuthenticationResponse response) {
 			Requires.NotNull(response, "response");
-			Requires.True(response.Status == AuthenticationStatus.Failed, "response");
+			Requires.That(response.Status == AuthenticationStatus.Failed, "response", "response not failed");
 
 			var failed = this.Failed;
 			if (failed != null) {
@@ -1016,7 +1016,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="request">The request.</param>
 		private void ScriptPopupWindow(IAuthenticationRequest request) {
 			Requires.NotNull(request, "request");
-			Requires.ValidState(this.RelyingParty != null);
+			RequiresEx.ValidState(this.RelyingParty != null);
 
 			StringBuilder startupScript = new StringBuilder();