All product assemblies build without ccrewrite.exe now.

11 files changed, 67 insertions, 67 deletions

diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/Mvc/OpenIdHelper.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/Mvc/OpenIdHelper.cs
index b98e0d6..3325084 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/Mvc/OpenIdHelper.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/Mvc/OpenIdHelper.cs
@@ -33,7 +33,7 @@ namespace DotNetOpenAuth.Mvc {
 		/// <param name="html">The <see cref="HtmlHelper"/> on the view.</param>
 		/// <returns>HTML that should be sent directly to the browser.</returns>
 		public static string OpenIdSelectorStyles(this HtmlHelper html) {
-			Contract.Requires<ArgumentNullException>(html != null);
+			Requires.NotNull(html, "html");
 			Contract.Ensures(Contract.Result<string>() != null);
 
 			using (var result = new StringWriter(CultureInfo.CurrentCulture)) {
@@ -63,7 +63,7 @@ namespace DotNetOpenAuth.Mvc {
 		/// </returns>
 		[SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Justification = "False positive")]
 		public static string OpenIdSelectorScripts(this HtmlHelper html, OpenIdSelector selectorOptions, OpenIdAjaxOptions additionalOptions) {
-			Contract.Requires<ArgumentNullException>(html != null);
+			Requires.NotNull(html, "html");
 			Contract.Ensures(Contract.Result<string>() != null);
 
 			bool selectorOptionsOwned = false;
@@ -207,9 +207,9 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// HTML that should be sent directly to the browser.
 		/// </returns>
 		public static string OpenIdSelectorOPButton(this HtmlHelper html, Identifier providerIdentifier, string imageUrl) {
-			Contract.Requires<ArgumentNullException>(html != null);
-			Contract.Requires<ArgumentNullException>(providerIdentifier != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(imageUrl));
+			Requires.NotNull(html, "html");
+			Requires.NotNull(providerIdentifier, "providerIdentifier");
+			Requires.NotNullOrEmpty(imageUrl, "imageUrl");
 			Contract.Ensures(Contract.Result<string>() != null);
 
 			return OpenIdSelectorButton(html, providerIdentifier, "OPButton", imageUrl);
@@ -225,8 +225,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// HTML that should be sent directly to the browser.
 		/// </returns>
 		public static string OpenIdSelectorOpenIdButton(this HtmlHelper html, string imageUrl) {
-			Contract.Requires<ArgumentNullException>(html != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(imageUrl));
+			Requires.NotNull(html, "html");
+			Requires.NotNullOrEmpty(imageUrl, "imageUrl");
 			Contract.Ensures(Contract.Result<string>() != null);
 
 			return OpenIdSelectorButton(html, "OpenIDButton", "OpenIDButton", imageUrl);
@@ -242,8 +242,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// </returns>
 		[SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "Not a problem for this type.")]
 		public static string OpenIdSelector(this HtmlHelper html, params SelectorButton[] buttons) {
-			Contract.Requires<ArgumentNullException>(html != null);
-			Contract.Requires<ArgumentNullException>(buttons != null);
+			Requires.NotNull(html, "html");
+			Requires.NotNull(buttons, "buttons");
 			Contract.Ensures(Contract.Result<string>() != null);
 
 			using (var writer = new StringWriter(CultureInfo.CurrentCulture)) {
@@ -307,9 +307,9 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// </returns>
 		[SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times", Justification = "Not a problem for this type.")]
 		private static string OpenIdSelectorButton(this HtmlHelper html, string id, string cssClass, string imageUrl) {
-			Contract.Requires<ArgumentNullException>(html != null);
-			Contract.Requires<ArgumentNullException>(id != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(imageUrl));
+			Requires.NotNull(html, "html");
+			Requires.NotNull(id, "id");
+			Requires.NotNullOrEmpty(imageUrl, "imageUrl");
 			Contract.Ensures(Contract.Result<string>() != null);
 
 			using (var writer = new StringWriter(CultureInfo.CurrentCulture)) {
@@ -357,8 +357,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// <param name="writer">The writer to emit the tags to.</param>
 		/// <param name="scriptUrls">The locations of the scripts to import.</param>
 		private static void WriteScriptTagsUrls(this TextWriter writer, IEnumerable<string> scriptUrls) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentNullException>(scriptUrls != null);
+			Requires.NotNull(writer, "writer");
+			Requires.NotNull(scriptUrls, "scriptUrls");
 
 			foreach (string script in scriptUrls) {
 				writer.WriteLine("<script type='text/javascript' src='{0}'></script>", script);
@@ -371,8 +371,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// <param name="writer">The writer to emit the tags to.</param>
 		/// <param name="resourceName">Name of the resource.</param>
 		private static void WriteScriptTags(this TextWriter writer, string resourceName) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(resourceName));
+			Requires.NotNull(writer, "writer");
+			Requires.NotNullOrEmpty(resourceName, "resourceName");
 
 			WriteScriptTags(writer, new[] { resourceName });
 		}
@@ -383,8 +383,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// <param name="writer">The writer to emit the tags to.</param>
 		/// <param name="resourceNames">The resource names.</param>
 		private static void WriteScriptTags(this TextWriter writer, IEnumerable<string> resourceNames) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentNullException>(resourceNames != null);
+			Requires.NotNull(writer, "writer");
+			Requires.NotNull(resourceNames, "resourceNames");
 
 			writer.WriteScriptTagsUrls(resourceNames.Select(r => Util.GetWebResourceUrl(typeof(OpenIdRelyingPartyControlBase), r)));
 		}
@@ -395,8 +395,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// <param name="writer">The writer to emit the tags to.</param>
 		/// <param name="script">The script to inline on the page.</param>
 		private static void WriteScriptBlock(this TextWriter writer, string script) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(script));
+			Requires.NotNull(writer, "writer");
+			Requires.NotNullOrEmpty(script, "script");
 
 			writer.WriteLine("<script type='text/javascript' language='javascript'><!--");
 			writer.WriteLine("//<![CDATA[");
@@ -410,8 +410,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// <param name="writer">The writer to emit the tags to.</param>
 		/// <param name="resourceName">Name of the resource containing the CSS content.</param>
 		private static void WriteStylesheetLink(this TextWriter writer, string resourceName) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(resourceName));
+			Requires.NotNull(writer, "writer");
+			Requires.NotNullOrEmpty(resourceName, "resourceName");
 
 			WriteStylesheetLinkUrl(writer, Util.GetWebResourceUrl(typeof(OpenIdRelyingPartyAjaxControlBase), resourceName));
 		}
@@ -422,8 +422,8 @@ window.openid_trace = {1}; // causes lots of messages";
 		/// <param name="writer">The writer to emit the tags to.</param>
 		/// <param name="stylesheet">The stylesheet to link in.</param>
 		private static void WriteStylesheetLinkUrl(this TextWriter writer, string stylesheet) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(stylesheet));
+			Requires.NotNull(writer, "writer");
+			Requires.NotNullOrEmpty(stylesheet, "stylesheet");
 
 			writer.WriteLine("<link rel='stylesheet' type='text/css' href='{0}' />", stylesheet);
 		}
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxRelyingParty.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxRelyingParty.cs
index 42bfbde..8e915cd 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxRelyingParty.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxRelyingParty.cs
@@ -143,7 +143,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </code>
 		/// </remarks>
 		public OutgoingWebResponse AsAjaxDiscoveryResult(IEnumerable<IAuthenticationRequest> requests) {
-			Contract.Requires<ArgumentNullException>(requests != null);
+			Requires.NotNull(requests, "requests");
 
 			var serializer = new JavaScriptSerializer();
 			return new OutgoingWebResponse {
@@ -160,7 +160,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// The JSON result to return to the user agent.
 		/// </returns>
 		public string AsAjaxPreloadedDiscoveryResult(IEnumerable<IAuthenticationRequest> requests) {
-			Contract.Requires<ArgumentNullException>(requests != null);
+			Requires.NotNull(requests, "requests");
 
 			var serializer = new JavaScriptSerializer();
 			string json = serializer.Serialize(this.AsJsonPreloadedDiscoveryResult(requests));
@@ -175,7 +175,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="requests">The discovery results from just <i>one</i> identifier to serialize as a JSON response.</param>
 		/// <returns>A JSON object, not yet serialized.</returns>
 		internal object AsJsonDiscoveryResult(IEnumerable<IAuthenticationRequest> requests) {
-			Contract.Requires<ArgumentNullException>(requests != null);
+			Requires.NotNull(requests, "requests");
 
 			requests = requests.CacheGeneratedResults();
 
@@ -205,7 +205,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// A JSON object, not yet serialized to a string.
 		/// </returns>
 		private object AsJsonPreloadedDiscoveryResult(IEnumerable<IAuthenticationRequest> requests) {
-			Contract.Requires<ArgumentNullException>(requests != null);
+			Requires.NotNull(requests, "requests");
 
 			// We prepare a JSON object with this interface:
 			// Array discoveryWrappers;
@@ -233,7 +233,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <c>false</c> to create a checkid_setup request.</param>
 		/// <returns>The absolute URL that carries the entire OpenID message.</returns>
 		private Uri GetRedirectUrl(IAuthenticationRequest request, bool immediate) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			request.Mode = immediate ? AuthenticationRequestMode.Immediate : AuthenticationRequestMode.Setup;
 			return request.RedirectingResponse.GetDirectUriRequest(this.Channel);
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxTextBox.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
index 8be097f..7fbc3ee 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdAjaxTextBox.cs
@@ -430,7 +430,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 			}
 
 			set {
-				Contract.Requires<ArgumentException>(!String.IsNullOrEmpty(value));
+				Requires.NotNullOrEmpty(value, "value");
 				this.ViewState[NameViewStateKey] = value ?? string.Empty;
 			}
 		}
@@ -478,7 +478,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 			}
 
 			set {
-				Contract.Requires<ArgumentException>(!String.IsNullOrEmpty(value));
+				Requires.NotNullOrEmpty(value, "value");
 				this.ViewState[LogOnTextViewStateKey] = value ?? string.Empty;
 			}
 		}
@@ -514,7 +514,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 			}
 
 			set {
-				Contract.Requires<ArgumentException>(!String.IsNullOrEmpty(value));
+				Requires.NotNullOrEmpty(value, "value");
 				this.ViewState[RetryTextViewStateKey] = value ?? string.Empty;
 			}
 		}
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdEventArgs.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdEventArgs.cs
index 5668cf4..cf38b61 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdEventArgs.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdEventArgs.cs
@@ -22,7 +22,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="request">The outgoing authentication request.</param>
 		internal OpenIdEventArgs(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			this.Request = request;
 			this.ClaimedIdentifier = request.ClaimedIdentifier;
@@ -36,7 +36,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The incoming authentication response.</param>
 		internal OpenIdEventArgs(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
+			Requires.NotNull(response, "response");
 
 			this.Response = response;
 			this.ClaimedIdentifier = response.ClaimedIdentifier;
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdMobileTextBox.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdMobileTextBox.cs
index fc80b32..d4b6769 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdMobileTextBox.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdMobileTextBox.cs
@@ -583,8 +583,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </remarks>
 		[SuppressMessage("Microsoft.Usage", "CA2234:PassSystemUriObjectsInsteadOfStrings", Justification = "Uri(Uri, string) accepts second arguments that Uri(Uri, new Uri(string)) does not that we must support.")]
 		public IAuthenticationRequest CreateRequest() {
-			Contract.Requires<InvalidOperationException>(this.Request == null, OpenIdStrings.CreateRequestAlreadyCalled);
-			Contract.Requires<InvalidOperationException>(!string.IsNullOrEmpty(this.Text), OpenIdStrings.OpenIdTextBoxEmpty);
+			Requires.ValidState(this.Request == null, OpenIdStrings.CreateRequestAlreadyCalled);
+			Requires.ValidState(!string.IsNullOrEmpty(this.Text), OpenIdStrings.OpenIdTextBoxEmpty);
 
 			try {
 				// Resolve the trust root, and swap out the scheme and port if necessary to match the
@@ -669,7 +669,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnLoggedIn(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
+			Requires.NotNull(response, "response");
 			ErrorUtilities.VerifyInternal(response.Status == AuthenticationStatus.Authenticated, "Firing OnLoggedIn event without an authenticated response.");
 
 			var loggedIn = this.LoggedIn;
@@ -688,7 +688,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnFailed(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
+			Requires.NotNull(response, "response");
 			ErrorUtilities.VerifyInternal(response.Status == AuthenticationStatus.Failed, "Firing Failed event for the wrong response type.");
 
 			var failed = this.Failed;
@@ -702,7 +702,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnCanceled(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
+			Requires.NotNull(response, "response");
 			ErrorUtilities.VerifyInternal(response.Status == AuthenticationStatus.Canceled, "Firing Canceled event for the wrong response type.");
 
 			var canceled = this.Canceled;
@@ -716,7 +716,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnSetupRequired(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
+			Requires.NotNull(response, "response");
 			ErrorUtilities.VerifyInternal(response.Status == AuthenticationStatus.SetupRequired, "Firing SetupRequired event for the wrong response type.");
 
 			// Why are we firing Failed when we're OnSetupRequired?  Backward compatibility.
@@ -734,7 +734,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="request">The authentication request to add the extensions to.</param>
 		private void AddProfileArgs(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			request.AddExtension(new ClaimsRequest() {
 				Nickname = this.RequestNickname,
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
index eaaba8c..9c0004b 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs
@@ -241,7 +241,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </remarks>
 		[SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Justification = "By design")]
 		public void RegisterClientScriptExtension<T>(string propertyName) where T : IClientScriptExtensionResponse {
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(propertyName));
+			Requires.NotNullOrEmpty(propertyName, "propertyName");
 			this.RelyingParty.RegisterClientScriptExtension<T>(propertyName);
 		}
 
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
index eb0eacd..ff345d4 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyControlBase.cs
@@ -359,7 +359,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 			}
 
 			set {
-				Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(value));
+				Requires.NotNullOrEmpty(value, "value");
 
 				if (Page != null && !DesignMode) {
 					// Validate new value by trying to construct a Realm object based on it.
@@ -522,7 +522,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="request">The request.</param>
 		public void LogOn(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			if (this.IsPopupAppropriate(request)) {
 				this.ScriptPopupWindow(request);
@@ -562,7 +562,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// used to determine the user's control of the <see cref="IAuthenticationRequest.ClaimedIdentifier"/>.
 		/// </returns>
 		protected internal virtual IEnumerable<IAuthenticationRequest> CreateRequests(Identifier identifier) {
-			Contract.Requires<ArgumentNullException>(identifier != null);
+			Requires.NotNull(identifier, "identifier");
 
 			// If this control is actually a member of another OpenID RP control,
 			// delegate creation of requests to the parent control.
@@ -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() {
-			Contract.Requires<InvalidOperationException>(this.Identifier != null, OpenIdStrings.NoIdentifierSet);
+			Requires.ValidState(this.Identifier != null, OpenIdStrings.NoIdentifierSet);
 			return this.CreateRequests(this.Identifier);
 		}
 
@@ -714,8 +714,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnLoggedIn(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
-			Contract.Requires<ArgumentException>(response.Status == AuthenticationStatus.Authenticated);
+			Requires.NotNull(response, "response");
+			Requires.True(response.Status == AuthenticationStatus.Authenticated, "response");
 
 			var loggedIn = this.LoggedIn;
 			OpenIdEventArgs args = new OpenIdEventArgs(response);
@@ -747,7 +747,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// Returns whether the login should proceed.  False if some event handler canceled the request.
 		/// </returns>
 		protected virtual bool OnLoggingIn(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			EventHandler<OpenIdEventArgs> loggingIn = this.LoggingIn;
 
@@ -764,8 +764,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnCanceled(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
-			Contract.Requires<ArgumentException>(response.Status == AuthenticationStatus.Canceled);
+			Requires.NotNull(response, "response");
+			Requires.True(response.Status == AuthenticationStatus.Canceled, "response");
 
 			var canceled = this.Canceled;
 			if (canceled != null) {
@@ -778,8 +778,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="response">The response.</param>
 		protected virtual void OnFailed(IAuthenticationResponse response) {
-			Contract.Requires<ArgumentNullException>(response != null);
-			Contract.Requires<ArgumentException>(response.Status == AuthenticationStatus.Failed);
+			Requires.NotNull(response, "response");
+			Requires.True(response.Status == AuthenticationStatus.Failed, "response");
 
 			var failed = this.Failed;
 			if (failed != null) {
@@ -811,7 +811,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="relyingParty">The relying party.</param>
 		[SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "relyingParty", Justification = "This makes it possible for overrides to see the value before it is set on a field.")]
 		protected virtual void ConfigureRelyingParty(OpenIdRelyingParty relyingParty) {
-			Contract.Requires<ArgumentNullException>(relyingParty != null);
+			Requires.NotNull(relyingParty, "relyingParty");
 
 			// Only set RequireSsl to true, as we don't want to override 
 			// a .config setting of true with false.
@@ -828,7 +828,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// 	<c>true</c> if a popup should be used; <c>false</c> otherwise.
 		/// </returns>
 		protected virtual bool IsPopupAppropriate(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			switch (this.Popup) {
 				case PopupBehavior.Never:
@@ -850,8 +850,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="request">The outgoing authentication request.</param>
 		/// <param name="windowStatus">The text to try to display in the status bar on mouse hover.</param>
 		protected void RenderOpenIdMessageTransmissionAsAnchorAttributes(HtmlTextWriter writer, IAuthenticationRequest request, string windowStatus) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(writer, "writer");
+			Requires.NotNull(request, "request");
 
 			// We render a standard HREF attribute for non-javascript browsers.
 			writer.AddAttribute(HtmlTextWriterAttribute.Href, request.RedirectingResponse.GetDirectUriRequest(this.RelyingParty.Channel).AbsoluteUri);
@@ -1004,7 +1004,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="request">The authentication request to send.</param>
 		/// <returns>The javascript that should execute.</returns>
 		private string CreateGetOrPostAHrefValue(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			Uri directUri = request.RedirectingResponse.GetDirectUriRequest(this.RelyingParty.Channel);
 			return "window.dnoa_internal.GetOrPost(" + MessagingUtilities.GetSafeJavascriptValue(directUri.AbsoluteUri) + ");";
@@ -1015,8 +1015,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="request">The request.</param>
 		private void ScriptPopupWindow(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
-			Contract.Requires<InvalidOperationException>(this.RelyingParty != null);
+			Requires.NotNull(request, "request");
+			Requires.ValidState(this.RelyingParty != null);
 
 			StringBuilder startupScript = new StringBuilder();
 
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdTextBox.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdTextBox.cs
index 335b435..1dea39a 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdTextBox.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdTextBox.cs
@@ -683,7 +683,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="request">The authentication request to add the extensions to.</param>
 		private void AddProfileArgs(IAuthenticationRequest request) {
-			Contract.Requires<ArgumentNullException>(request != null);
+			Requires.NotNull(request, "request");
 
 			var sreg = new ClaimsRequest() {
 				Nickname = this.RequestNickname,
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorButtonContract.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorButtonContract.cs
index c70218a..709ad2d 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorButtonContract.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorButtonContract.cs
@@ -30,7 +30,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// </summary>
 		/// <param name="writer">The writer.</param>
 		protected internal override void RenderLeadingAttributes(HtmlTextWriter writer) {
-			Contract.Requires<ArgumentNullException>(writer != null);
+			Requires.NotNull(writer, "writer");
 		}
 
 		/// <summary>
@@ -39,8 +39,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="writer">The writer.</param>
 		/// <param name="selector">The containing selector control.</param>
 		protected internal override void RenderButtonContent(HtmlTextWriter writer, OpenIdSelector selector) {
-			Contract.Requires<ArgumentNullException>(writer != null);
-			Contract.Requires<ArgumentNullException>(selector != null);
+			Requires.NotNull(writer, "writer");
+			Requires.NotNull(selector, "selector");
 		}
 	}
 }
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorOpenIdButton.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorOpenIdButton.cs
index ac4dcbf..26b10e8 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorOpenIdButton.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorOpenIdButton.cs
@@ -30,7 +30,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="imageUrl">The image to display on the button.</param>
 		public SelectorOpenIdButton(string imageUrl)
 			: this() {
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(imageUrl));
+			Requires.NotNullOrEmpty(imageUrl, "imageUrl");
 
 			this.Image = imageUrl;
 		}
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorProviderButton.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorProviderButton.cs
index 2195e73..efd6c50 100644
--- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorProviderButton.cs
+++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/SelectorProviderButton.cs
@@ -32,8 +32,8 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
 		/// <param name="imageUrl">The image to display on the button.</param>
 		public SelectorProviderButton(Identifier providerIdentifier, string imageUrl)
 			: this() {
-			Contract.Requires<ArgumentNullException>(providerIdentifier != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(imageUrl));
+			Requires.NotNull(providerIdentifier, "providerIdentifier");
+			Requires.NotNullOrEmpty(imageUrl, "imageUrl");
 
 			this.OPIdentifier = providerIdentifier;
 			this.Image = imageUrl;