Merge branch 'v2.2' into v2.3

5 files changed, 7 insertions, 5 deletions

diff --git a/src/DotNetOpenId.sln b/src/DotNetOpenId.sln
index 8cd73a7..e3371ce 100644
--- a/src/DotNetOpenId.sln
+++ b/src/DotNetOpenId.sln
@@ -37,6 +37,7 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DotNetOpenId.TestWeb", "Dot
 		Release.AspNetCompiler.Debug = "False"

 		VWDPort = "22205"

 		DefaultWebSiteLanguage = "Visual C#"

+		StartServerOnDebug = "false"

 	EndProjectSection

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyCustomStore", "..\samples\RelyingPartyCustomStore\RelyingPartyCustomStore.csproj", "{DB54DC19-BA56-4C22-A8A0-C49289EA4F53}"

diff --git a/src/DotNetOpenId/Nonce.cs b/src/DotNetOpenId/Nonce.cs
index b86b4e8..3876fde 100644
--- a/src/DotNetOpenId/Nonce.cs
+++ b/src/DotNetOpenId/Nonce.cs
@@ -95,7 +95,8 @@ namespace DotNetOpenId {
 

 		internal void Consume(INonceStore store) {

 			if (IsExpired)

-				throw new OpenIdException(Strings.ExpiredNonce);

+				throw new OpenIdException(string.Format(CultureInfo.CurrentCulture,

+					Strings.ExpiredNonce, ExpirationDate, DateTime.UtcNow));

 

 			// We could store unused nonces and remove them as they are used, or

 			// we could store used nonces and check that they do not previously exist.

diff --git a/src/DotNetOpenId/Protocol.cs b/src/DotNetOpenId/Protocol.cs
index a784150..a9b7cf2 100644
--- a/src/DotNetOpenId/Protocol.cs
+++ b/src/DotNetOpenId/Protocol.cs
@@ -301,7 +301,7 @@ namespace DotNetOpenId {
 		/// <remarks>

 		/// This is used to calculate the length of time that nonces are stored.

 		/// This is internal until we can decide whether to leave this static, or make

-		/// it an instance member, or put it inside the IConsumerAppliationStore interface.

+		/// it an instance member, or put it inside the IConsumerApplicationStore interface.

 		/// </remarks>

 		internal static TimeSpan MaximumUserAgentAuthenticationTime = TimeSpan.FromMinutes(5);

 		/// <summary>

diff --git a/src/DotNetOpenId/Strings.Designer.cs b/src/DotNetOpenId/Strings.Designer.cs
index abc3690..8382b9b 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.3053

 //

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

 //     the code is regenerated.

@@ -133,7 +133,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 {

diff --git a/src/DotNetOpenId/Strings.resx b/src/DotNetOpenId/Strings.resx
index a97f36d..53b3d4a 100644
--- a/src/DotNetOpenId/Strings.resx
+++ b/src/DotNetOpenId/Strings.resx
@@ -142,7 +142,7 @@
     <value>OpenID parameter '{0}' was expected to be base64 encoded but is not.</value>

   </data>

   <data name="ExpiredNonce" xml:space="preserve">

-    <value>The nonce has expired.</value>

+    <value>The nonce has expired.  It was good until {0} (UTC), and it is now {1} (UTC).  If this looks wrong, check the server's clock, time zone and daylight savings settings.</value>

   </data>

   <data name="ExtensionAlreadyAddedWithSameTypeURI" xml:space="preserve">

     <value>An extension sharing namespace '{0}' has already been added.  Only one extension per namespace is allowed in a given request.</value>