All product assemblies build without ccrewrite.exe now.

3 files changed, 29 insertions, 29 deletions

diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs
index 51aac39..ec001ec 100644
--- a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs
+++ b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/ClientBase.cs
@@ -27,7 +27,7 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="clientIdentifier">The client identifier.</param>
 		/// <param name="clientSecret">The client secret.</param>
 		protected ClientBase(AuthorizationServerDescription authorizationServer, string clientIdentifier = null, string clientSecret = null) {
-			Contract.Requires<ArgumentNullException>(authorizationServer != null);
+			Requires.NotNull(authorizationServer, "authorizationServer");
 			this.AuthorizationServer = authorizationServer;
 			this.Channel = new OAuth2ClientChannel();
 			this.ClientIdentifier = clientIdentifier;
@@ -63,8 +63,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="request">The request for protected resources from the service provider.</param>
 		/// <param name="accessToken">The access token previously obtained from the Authorization Server.</param>
 		public static void AuthorizeRequest(HttpWebRequest request, string accessToken) {
-			Contract.Requires<ArgumentNullException>(request != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(accessToken));
+			Requires.NotNull(request, "request");
+			Requires.NotNullOrEmpty(accessToken, "accessToken");
 
 			OAuthUtilities.AuthorizeWithBearerToken(request, accessToken);
 		}
@@ -76,9 +76,9 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="request">The request for protected resources from the service provider.</param>
 		/// <param name="authorization">The authorization for this request previously obtained via OAuth.</param>
 		public void AuthorizeRequest(HttpWebRequest request, IAuthorizationState authorization) {
-			Contract.Requires<ArgumentNullException>(request != null);
-			Contract.Requires<ArgumentNullException>(authorization != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(authorization.AccessToken));
+			Requires.NotNull(request, "request");
+			Requires.NotNull(authorization, "authorization");
+			Requires.True(!string.IsNullOrEmpty(authorization.AccessToken), "authorization");
 			Contract.Requires<ProtocolException>(!authorization.AccessTokenExpirationUtc.HasValue || authorization.AccessTokenExpirationUtc < DateTime.UtcNow || authorization.RefreshToken != null);
 
 			if (authorization.AccessTokenExpirationUtc.HasValue && authorization.AccessTokenExpirationUtc.Value < DateTime.UtcNow) {
@@ -103,8 +103,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// If the parameter value was updated, this method calls <see cref="IAuthorizationState.SaveChanges"/> on that instance.
 		/// </remarks>
 		public bool RefreshAuthorization(IAuthorizationState authorization, TimeSpan? skipIfUsefulLifeExceeds = null) {
-			Contract.Requires<ArgumentNullException>(authorization != null);
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(authorization.RefreshToken));
+			Requires.NotNull(authorization, "authorization");
+			Requires.True(!string.IsNullOrEmpty(authorization.RefreshToken), "authorization");
 
 			if (skipIfUsefulLifeExceeds.HasValue && authorization.AccessTokenExpirationUtc.HasValue) {
 				TimeSpan usefulLifeRemaining = authorization.AccessTokenExpirationUtc.Value - DateTime.UtcNow;
@@ -138,8 +138,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// replaced with the new one.
 		/// </remarks>
 		public IAuthorizationState GetScopedAccessToken(string refreshToken, HashSet<string> scope) {
-			Contract.Requires<ArgumentException>(!string.IsNullOrEmpty(refreshToken));
-			Contract.Requires<ArgumentNullException>(scope != null);
+			Requires.NotNullOrEmpty(refreshToken, "refreshToken");
+			Requires.NotNull(scope, "scope");
 			Contract.Ensures(Contract.Result<IAuthorizationState>() != null);
 
 			var request = new AccessTokenRefreshRequest(this.AuthorizationServer) {
@@ -161,8 +161,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="authorizationState">The authorization state maintained by the client.</param>
 		/// <param name="accessTokenSuccess">The access token containing response message.</param>
 		internal static void UpdateAuthorizationWithResponse(IAuthorizationState authorizationState, AccessTokenSuccessResponse accessTokenSuccess) {
-			Contract.Requires<ArgumentNullException>(authorizationState != null);
-			Contract.Requires<ArgumentNullException>(accessTokenSuccess != null);
+			Requires.NotNull(authorizationState, "authorizationState");
+			Requires.NotNull(accessTokenSuccess, "accessTokenSuccess");
 
 			authorizationState.AccessToken = accessTokenSuccess.AccessToken;
 			authorizationState.AccessTokenExpirationUtc = DateTime.UtcNow + accessTokenSuccess.Lifetime;
@@ -189,8 +189,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="authorizationState">The authorization state maintained by the client.</param>
 		/// <param name="accessTokenSuccess">The access token containing response message.</param>
 		internal static void UpdateAuthorizationWithResponse(IAuthorizationState authorizationState, EndUserAuthorizationSuccessAccessTokenResponse accessTokenSuccess) {
-			Contract.Requires<ArgumentNullException>(authorizationState != null);
-			Contract.Requires<ArgumentNullException>(accessTokenSuccess != null);
+			Requires.NotNull(authorizationState, "authorizationState");
+			Requires.NotNull(accessTokenSuccess, "accessTokenSuccess");
 
 			authorizationState.AccessToken = accessTokenSuccess.AccessToken;
 			authorizationState.AccessTokenExpirationUtc = DateTime.UtcNow + accessTokenSuccess.Lifetime;
@@ -215,8 +215,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="authorizationState">The authorization state to update.</param>
 		/// <param name="authorizationSuccess">The authorization success message obtained from the authorization server.</param>
 		internal void UpdateAuthorizationWithResponse(IAuthorizationState authorizationState, EndUserAuthorizationSuccessAuthCodeResponse authorizationSuccess) {
-			Contract.Requires<ArgumentNullException>(authorizationState != null);
-			Contract.Requires<ArgumentNullException>(authorizationSuccess != null);
+			Requires.NotNull(authorizationState, "authorizationState");
+			Requires.NotNull(authorizationSuccess, "authorizationSuccess");
 
 			var accessTokenRequest = new AccessTokenAuthorizationCodeRequest(this.AuthorizationServer) {
 				ClientIdentifier = this.ClientIdentifier,
@@ -242,9 +242,9 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="authorization">The authorization to measure.</param>
 		/// <returns>A fractional number no greater than 1.  Could be negative if the access token has already expired.</returns>
 		private static double ProportionalLifeRemaining(IAuthorizationState authorization) {
-			Contract.Requires<ArgumentNullException>(authorization != null);
-			Contract.Requires<ArgumentException>(authorization.AccessTokenIssueDateUtc.HasValue);
-			Contract.Requires<ArgumentException>(authorization.AccessTokenExpirationUtc.HasValue);
+			Requires.NotNull(authorization, "authorization");
+			Requires.True(authorization.AccessTokenIssueDateUtc.HasValue, "authorization");
+			Requires.True(authorization.AccessTokenExpirationUtc.HasValue, "authorization");
 
 			// Calculate what % of the total life this access token has left.
 			TimeSpan totalLifetime = authorization.AccessTokenExpirationUtc.Value - authorization.AccessTokenIssueDateUtc.Value;
diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/UserAgentClient.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/UserAgentClient.cs
index e23eca4..d452525 100644
--- a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/UserAgentClient.cs
+++ b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/UserAgentClient.cs
@@ -37,8 +37,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="clientSecret">The client secret.</param>
 		public UserAgentClient(Uri authorizationEndpoint, Uri tokenEndpoint, string clientIdentifier = null, string clientSecret = null)
 			: this(new AuthorizationServerDescription { AuthorizationEndpoint = authorizationEndpoint, TokenEndpoint = tokenEndpoint }, clientIdentifier, clientSecret) {
-			Contract.Requires<ArgumentNullException>(authorizationEndpoint != null);
-			Contract.Requires<ArgumentNullException>(tokenEndpoint != null);
+			Requires.NotNull(authorizationEndpoint, "authorizationEndpoint");
+			Requires.NotNull(tokenEndpoint, "tokenEndpoint");
 		}
 
 		/// <summary>
@@ -69,8 +69,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// A fully-qualified URL suitable to initiate the authorization flow.
 		/// </returns>
 		public Uri RequestUserAuthorization(IAuthorizationState authorization, string state = null) {
-			Contract.Requires<ArgumentNullException>(authorization != null);
-			Contract.Requires<InvalidOperationException>(!string.IsNullOrEmpty(this.ClientIdentifier));
+			Requires.NotNull(authorization, "authorization");
+			Requires.ValidState(!string.IsNullOrEmpty(this.ClientIdentifier));
 
 			if (authorization.Callback == null) {
 				authorization.Callback = new Uri("http://localhost/");
@@ -93,7 +93,7 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="authorizationState">The authorization.</param>
 		/// <returns>The granted authorization, or <c>null</c> if the incoming HTTP request did not contain an authorization server response or authorization was rejected.</returns>
 		public IAuthorizationState ProcessUserAuthorization(Uri actualRedirectUrl, IAuthorizationState authorizationState = null) {
-			Contract.Requires<ArgumentNullException>(actualRedirectUrl != null);
+			Requires.NotNull(actualRedirectUrl, "actualRedirectUrl");
 
 			if (authorizationState == null) {
 				authorizationState = new AuthorizationState();
diff --git a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs
index a6fae13..fc14bcf 100644
--- a/src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs
+++ b/src/DotNetOpenAuth.OAuth2.Client/OAuth2/WebServerClient.cs
@@ -66,9 +66,9 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="state">The state of the client that should be sent back with the authorization response.</param>
 		/// <returns>The authorization request.</returns>
 		public OutgoingWebResponse PrepareRequestUserAuthorization(IAuthorizationState authorization, string state = null) {
-			Contract.Requires<ArgumentNullException>(authorization != null);
-			Contract.Requires<InvalidOperationException>(authorization.Callback != null || (HttpContext.Current != null && HttpContext.Current.Request != null), MessagingStrings.HttpContextRequired);
-			Contract.Requires<InvalidOperationException>(!string.IsNullOrEmpty(this.ClientIdentifier));
+			Requires.NotNull(authorization, "authorization");
+			Requires.ValidState(authorization.Callback != null || (HttpContext.Current != null && HttpContext.Current.Request != null), MessagingStrings.HttpContextRequired);
+			Requires.ValidState(!string.IsNullOrEmpty(this.ClientIdentifier));
 			Contract.Ensures(Contract.Result<OutgoingWebResponse>() != null);
 
 			if (authorization.Callback == null) {
@@ -94,8 +94,8 @@ namespace DotNetOpenAuth.OAuth2 {
 		/// <param name="request">The incoming HTTP request that may carry an authorization response.</param>
 		/// <returns>The authorization state that contains the details of the authorization.</returns>
 		public IAuthorizationState ProcessUserAuthorization(HttpRequestInfo request = null) {
-			Contract.Requires<InvalidOperationException>(!string.IsNullOrEmpty(this.ClientIdentifier));
-			Contract.Requires<InvalidOperationException>(!string.IsNullOrEmpty(this.ClientSecret));
+			Requires.ValidState(!string.IsNullOrEmpty(this.ClientIdentifier));
+			Requires.ValidState(!string.IsNullOrEmpty(this.ClientSecret));
 
 			if (request == null) {
 				request = this.Channel.GetRequestFromContext();