Merge branch 'v2.5' into monoorigin/mono

Conflicts:
	src/DotNetOpenId/Properties/AssemblyInfo.cs
	src/DotNetOpenId/RelyingParty/AuthenticationResponse.cs

1 files changed, 197 insertions, 13 deletions

diff --git a/src/DotNetOpenId/Strings.Designer.cs b/src/DotNetOpenId/Strings.Designer.cs
index eac43d2..0af791f 100644
--- a/src/DotNetOpenId/Strings.Designer.cs
+++ b/src/DotNetOpenId/Strings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:2.0.50727.1434

+//     Runtime Version:2.0.50727.3521

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -88,6 +88,69 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to A Simple Registration request must be deserialized before CreateResponse can be called..

+        /// </summary>

+        internal static string CallDeserializeBeforeCreateResponse {

+            get {

+                return ResourceManager.GetString("CallDeserializeBeforeCreateResponse", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to XRI CanonicalID verification failed..

+        /// </summary>

+        internal static string CIDVerificationFailed {

+            get {

+                return ResourceManager.GetString("CIDVerificationFailed", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to The ClaimedIdentifier property cannot be set when IsDelegatedIdentifier is true to avoid breaking OpenID URL delegation..

+        /// </summary>

+        internal static string ClaimedIdentifierCannotBeSetOnDelegatedAuthentication {

+            get {

+                return ResourceManager.GetString("ClaimedIdentifierCannotBeSetOnDelegatedAuthentication", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to The ClaimedIdentifier property must be set first..

+        /// </summary>

+        internal static string ClaimedIdentifierMustBeSetFirst {

+            get {

+                return ResourceManager.GetString("ClaimedIdentifierMustBeSetFirst", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to An extension with this property name (&apos;{0}&apos;) has already been registered..

+        /// </summary>

+        internal static string ClientScriptExtensionPropertyNameCollision {

+            get {

+                return ResourceManager.GetString("ClientScriptExtensionPropertyNameCollision", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to The extension &apos;{0}&apos; has already been registered..

+        /// </summary>

+        internal static string ClientScriptExtensionTypeCollision {

+            get {

+                return ResourceManager.GetString("ClientScriptExtensionTypeCollision", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to An authentication request has already been created using CreateRequest()..

+        /// </summary>

+        internal static string CreateRequestAlreadyCalled {

+            get {

+                return ResourceManager.GetString("CreateRequestAlreadyCalled", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to HttpContext.Current is null.  There must be an ASP.NET request in process for this operation to succeed..

         /// </summary>

         internal static string CurrentHttpContextRequired {

@@ -115,7 +178,7 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The nonce has expired..

+        ///   Looks up a localized string similar to The nonce has expired.  It was good until {0} (UTC), and it is now {1} (UTC).  If this looks wrong, check the server&apos;s clock, time zone and daylight savings settings..

         /// </summary>

         internal static string ExpiredNonce {

             get {

@@ -124,6 +187,15 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to URI is not SSL yet requireSslDiscovery is set to true..

+        /// </summary>

+        internal static string ExplicitHttpUriSuppliedWithSslRequirement {

+            get {

+                return ResourceManager.GetString("ExplicitHttpUriSuppliedWithSslRequirement", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to An extension sharing namespace &apos;{0}&apos; has already been added.  Only one extension per namespace is allowed in a given request..

         /// </summary>

         internal static string ExtensionAlreadyAddedWithSameTypeURI {

@@ -151,6 +223,15 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Fragment segments do not apply to XRI identifiers..

+        /// </summary>

+        internal static string FragmentNotAllowedOnXRIs {

+            get {

+                return ResourceManager.GetString("FragmentNotAllowedOnXRIs", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to No current ASP.NET HttpContext was detected.  Use an overload that does not require one..

         /// </summary>

         internal static string HttpContextRequiredForThisOverload {

@@ -169,25 +250,43 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to This operation is only allowed when IsIdentifierSelect is true..

+        ///   Looks up a localized string similar to ClaimedIdentifier and LocalIdentifier must be the same when IsIdentifierSelect is true..

         /// </summary>

-        internal static string IdentifierSelectModeOnly {

+        internal static string IdentifierSelectRequiresMatchingIdentifiers {

             get {

-                return ResourceManager.GetString("IdentifierSelectModeOnly", resourceCulture);

+                return ResourceManager.GetString("IdentifierSelectRequiresMatchingIdentifiers", resourceCulture);

             }

         }

         

         /// <summary>

-        ///   Looks up a localized string similar to ClaimedIdentifier and LocalIdentifier must be the same when IsIdentifierSelect is true..

+        ///   Looks up a localized string similar to The Provider requested association type &apos;{0}&apos; and session type &apos;{1}&apos;, which are not compatible with each other..

         /// </summary>

-        internal static string IdentifierSelectRequiresMatchingIdentifiers {

+        internal static string IncompatibleAssociationAndSessionTypes {

             get {

-                return ResourceManager.GetString("IdentifierSelectRequiresMatchingIdentifiers", resourceCulture);

+                return ResourceManager.GetString("IncompatibleAssociationAndSessionTypes", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Inconsistent setting of application state.  Authentication request was sent with application state available, but authentication response was received without it available.  This makes it impossible to validate the token&apos;s signature and will cause assertion verification failure..

+        /// </summary>

+        internal static string InconsistentAppState {

+            get {

+                return ResourceManager.GetString("InconsistentAppState", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Insecure web request for &apos;{0}&apos; aborted due to security requirements demanding HTTPS..

+        /// </summary>

+        internal static string InsecureWebRequestWithSslRequired {

+            get {

+                return ResourceManager.GetString("InsecureWebRequestWithSslRequired", resourceCulture);

             }

         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Cannot encode &apos;{0}&apos; because it contains an illegal character for Key-Value Form encoding..

+        ///   Looks up a localized string similar to Cannot encode &apos;{0}&apos; because it contains an illegal character for Key-Value Form encoding.  (line {1}: &apos;{2}&apos;).

         /// </summary>

         internal static string InvalidCharacterInKeyValueFormInput {

             get {

@@ -196,7 +295,7 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Cannot decode Key-Value Form because a line was found without a &apos;{0}&apos; character..

+        ///   Looks up a localized string similar to Cannot decode Key-Value Form because a line was found without a &apos;{0}&apos; character.  (line {1}: &apos;{2}&apos;).

         /// </summary>

         internal static string InvalidKeyValueFormCharacterMissing {

             get {

@@ -268,6 +367,15 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to Failure parsing XRDS document..

+        /// </summary>

+        internal static string InvalidXRDSDocument {

+            get {

+                return ResourceManager.GetString("InvalidXRDSDocument", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Not a recognized XRI format: &apos;{0}&apos;..

         /// </summary>

         internal static string InvalidXri {

@@ -277,7 +385,11 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The OpenId Provider issued an assertion for an Identifier whose discovery information did not match..

+        ///   Looks up a localized string similar to The OpenId Provider issued an assertion for an Identifier whose discovery information did not match.  

+        ///Assertion endpoint info: 

+        ///{0}

+        ///Discovered endpoint info:

+        ///{1}.

         /// </summary>

         internal static string IssuedAssertionFailsIdentifierDiscovery {

             get {

@@ -313,7 +425,16 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The XRDS document is missing the required CanonicalID element..

+        ///   Looks up a localized string similar to This Relying Party requires a Provider that supports at least OpenID version {0}, but Provider is detected to only support OpenID version {1}..

+        /// </summary>

+        internal static string MinimumOPVersionRequirementNotMet {

+            get {

+                return ResourceManager.GetString("MinimumOPVersionRequirementNotMet", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to The XRDS document for XRI {0} is missing the required CanonicalID element..

         /// </summary>

         internal static string MissingCanonicalIDElement {

             get {

@@ -358,6 +479,24 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to This operation is not supported by serialized authentication responses.  Try this operation from the LoggedIn event handler..

+        /// </summary>

+        internal static string NotSupportedByAuthenticationSnapshot {

+            get {

+                return ResourceManager.GetString("NotSupportedByAuthenticationSnapshot", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Positive assertion sent with OpenID version {0} but Identifier discovery suggested it would be {1}..

+        /// </summary>

+        internal static string OpenIdDiscoveredAndActualVersionMismatch {

+            get {

+                return ResourceManager.GetString("OpenIdDiscoveredAndActualVersionMismatch", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to No OpenId endpoint found..

         /// </summary>

         internal static string OpenIdEndpointNotFound {

@@ -376,6 +515,15 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to This operation is only allowed when IAuthenticationResponse.State == AuthenticationStatus.SetupRequired..

+        /// </summary>

+        internal static string OperationOnlyValidForSetupRequiredState {

+            get {

+                return ResourceManager.GetString("OperationOnlyValidForSetupRequiredState", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Prefix should not begin or end with a period..

         /// </summary>

         internal static string PrefixWithoutPeriodsExpected {

@@ -457,7 +605,7 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The {0} parameter does not match the actual URL the request was made with..

+        ///   Looks up a localized string similar to The {0} parameter ({1}) does not match the actual URL ({2}) the request was made with..

         /// </summary>

         internal static string ReturnToParamDoesNotMatchRequestUrl {

             get {

@@ -475,6 +623,15 @@ namespace DotNetOpenId {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to The maximum allowable number of redirects were exceeded while requesting &apos;{0}&apos;..

+        /// </summary>

+        internal static string TooManyRedirects {

+            get {

+                return ResourceManager.GetString("TooManyRedirects", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to The type must implement {0}..

         /// </summary>

         internal static string TypeMustImplementX {

@@ -500,5 +657,32 @@ namespace DotNetOpenId {
                 return ResourceManager.GetString("UnspecifiedDateTimeKindNotAllowed", resourceCulture);

             }

         }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Web request to &apos;{0}&apos; failed..

+        /// </summary>

+        internal static string WebRequestFailed {

+            get {

+                return ResourceManager.GetString("WebRequestFailed", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to XRI resolution failed..

+        /// </summary>

+        internal static string XriResolutionFailed {

+            get {

+                return ResourceManager.GetString("XriResolutionFailed", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to Could not find XRI resolution Status tag or code attribute was invalid..

+        /// </summary>

+        internal static string XriResolutionStatusMissing {

+            get {

+                return ResourceManager.GetString("XriResolutionStatusMissing", resourceCulture);

+            }

+        }

     }

 }