Merge branch 'v2.3' into v2.4v2.4.3.8264

9 files changed, 12 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 5374b5e..257aeeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ TestResult.xml
 Drop
 drop
 DotNetOpenId-*
+StyleCop.Cache
diff --git a/build.proj b/build.proj
index 115bb74..eca301f 100644
--- a/build.proj
+++ b/build.proj
@@ -119,6 +119,7 @@
 															$(ProjectRoot)\**\log4net.xml;

 															$(ProjectRoot)\**\*.user;

 															$(ProjectRoot)\**\*.sln.cache;

+															$(ProjectRoot)\**\StyleCop.Cache;

 															$(ProjectRoot)\**\*.suo;

 															$(ProjectRoot)\**\*.user;

 															$(ProjectRoot)\**\*.gitignore;

diff --git a/samples/ProviderPortal/Web.config b/samples/ProviderPortal/Web.config
index d6153ac..c27f8bc 100644
--- a/samples/ProviderPortal/Web.config
+++ b/samples/ProviderPortal/Web.config
@@ -88,12 +88,12 @@
 			<maximumFileSize value="100KB" />

 			<staticLogFileName value="true" />

 			<layout type="log4net.Layout.PatternLayout">

-				<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />

+				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />

 			</layout>

 		</appender>

 		<appender name="TracePageAppender" type="ProviderPortal.Code.TracePageAppender, ProviderPortal">

 			<layout type="log4net.Layout.PatternLayout">

-				<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />

+				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />

 			</layout>

 		</appender>

 		<!-- Setup the root category, add the appenders and set the default level -->

diff --git a/samples/RelyingPartyPortal/Web.config b/samples/RelyingPartyPortal/Web.config
index 5ba91b7..3c68b88 100644
--- a/samples/RelyingPartyPortal/Web.config
+++ b/samples/RelyingPartyPortal/Web.config
@@ -45,12 +45,12 @@
 			<maximumFileSize value="100KB" />

 			<staticLogFileName value="true" />

 			<layout type="log4net.Layout.PatternLayout">

-				<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />

+				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />

 			</layout>

 		</appender>

 		<appender name="TracePageAppender" type="ConsumerPortal.Code.TracePageAppender, ConsumerPortal">

 			<layout type="log4net.Layout.PatternLayout">

-				<conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />

+				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />

 			</layout>

 		</appender>

 		<!-- Setup the root category, add the appenders and set the default level -->

diff --git a/src/DotNetOpenId.sln b/src/DotNetOpenId.sln
index 123c725..bfd2752 100644
--- a/src/DotNetOpenId.sln
+++ b/src/DotNetOpenId.sln
@@ -38,6 +38,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}") = "RelyingPartyMvc", "..\samples\RelyingPartyMvc\RelyingPartyMvc.csproj", "{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}"

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 3f0f219..aacec53 100644
--- a/src/DotNetOpenId/Protocol.cs
+++ b/src/DotNetOpenId/Protocol.cs
@@ -350,7 +350,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 ba34f10..8afb392 100644
--- a/src/DotNetOpenId/Strings.Designer.cs
+++ b/src/DotNetOpenId/Strings.Designer.cs
@@ -142,7 +142,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 c9f490c..35b49d3 100644
--- a/src/DotNetOpenId/Strings.resx
+++ b/src/DotNetOpenId/Strings.resx
@@ -145,7 +145,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="ExplicitHttpUriSuppliedWithSslRequirement" xml:space="preserve">

     <value>URI is not SSL yet requireSslDiscovery is set to true.</value>