Fix changes made in previous commits to actually adhere to StyleCop rules, so the project even builds in Release mode

15 files changed, 130 insertions, 88 deletions

diff --git a/samples/OAuthAuthorizationServer/Global.asax.cs b/samples/OAuthAuthorizationServer/Global.asax.cs
index 8e3aefa..01cc78e 100644
--- a/samples/OAuthAuthorizationServer/Global.asax.cs
+++ b/samples/OAuthAuthorizationServer/Global.asax.cs
@@ -10,7 +10,7 @@
 

 	using DotNetOpenAuth.Logging;

 

-    /// <summary>

+	/// <summary>

 	/// The global MVC Application.

 	/// </summary>

 	/// <remarks>

@@ -85,7 +85,7 @@
 

 			KeyNonceStore = new DatabaseKeyNonceStore();

 

-///			LogProvider.SetCurrentLogProvider(new ....)

+////			LogProvider.SetCurrentLogProvider(new ....)

 			Logger.Info("Sample starting...");

 		}

 

diff --git a/samples/OAuthClient/Code/Logging.cs b/samples/OAuthClient/Code/Logging.cs
index 8fbf594..d7d725e 100644
--- a/samples/OAuthClient/Code/Logging.cs
+++ b/samples/OAuthClient/Code/Logging.cs
@@ -7,7 +7,7 @@
 
 	using DotNetOpenAuth.Logging;
 
-    /// <summary>
+	/// <summary>
 	/// Logging tools for this sample.
 	/// </summary>
 	public static class Logging {
diff --git a/samples/OAuthClient/Global.asax.cs b/samples/OAuthClient/Global.asax.cs
index 0553cbc..4021896 100644
--- a/samples/OAuthClient/Global.asax.cs
+++ b/samples/OAuthClient/Global.asax.cs
@@ -6,9 +6,8 @@
 
 	using DotNetOpenAuth.Logging;
 
-    public partial class Global : HttpApplication {
+	public partial class Global : HttpApplication {
 		protected void Application_Start(object sender, EventArgs e) {
-
 			Logging.Logger.Info("Sample starting...");
 		}
 
diff --git a/samples/OAuthConsumer/Code/Logging.cs b/samples/OAuthConsumer/Code/Logging.cs
index dcd2813..8260ac6 100644
--- a/samples/OAuthConsumer/Code/Logging.cs
+++ b/samples/OAuthConsumer/Code/Logging.cs
@@ -7,7 +7,7 @@
 
 	using DotNetOpenAuth.Logging;
 
-    /// <summary>
+	/// <summary>
 	/// Logging tools for this sample.
 	/// </summary>
 	public static class Logging {
diff --git a/samples/OAuthConsumer/Global.asax.cs b/samples/OAuthConsumer/Global.asax.cs
index fbe339f..a28cd12 100644
--- a/samples/OAuthConsumer/Global.asax.cs
+++ b/samples/OAuthConsumer/Global.asax.cs
@@ -6,10 +6,10 @@
 
 	using DotNetOpenAuth.Logging;
 
-    public partial class Global : HttpApplication {
+	public partial class Global : HttpApplication {
 		protected void Application_Start(object sender, EventArgs e) {
-            ///			LogProvider.SetCurrentLogProvider(new ....)
-            Logging.Logger.Info("Sample starting...");
+			////			LogProvider.SetCurrentLogProvider(new ....)
+			Logging.Logger.Info("Sample starting...");
 		}
 
 		protected void Application_End(object sender, EventArgs e) {
diff --git a/samples/OpenIdOfflineProvider/App.xaml.cs b/samples/OpenIdOfflineProvider/App.xaml.cs
index 9878681..43fb9a9 100644
--- a/samples/OpenIdOfflineProvider/App.xaml.cs
+++ b/samples/OpenIdOfflineProvider/App.xaml.cs
@@ -5,15 +5,14 @@
 //-----------------------------------------------------------------------
 
 namespace DotNetOpenAuth.OpenIdOfflineProvider {
-    using System.Windows;
+	using System.Windows;
 
-    using DotNetOpenAuth.Logging;
+	using DotNetOpenAuth.Logging;
 
-    /// <summary>
+	/// <summary>
 	/// Interaction logic for App.xaml
 	/// </summary>
 	public partial class App : Application {
-
 		/// <summary>
 		/// Initializes a new instance of the <see cref="App"/> class.
 		/// </summary>
diff --git a/samples/OpenIdOfflineProvider/Controllers/HomeController.cs b/samples/OpenIdOfflineProvider/Controllers/HomeController.cs
index 96473b3..7c202dc 100644
--- a/samples/OpenIdOfflineProvider/Controllers/HomeController.cs
+++ b/samples/OpenIdOfflineProvider/Controllers/HomeController.cs
@@ -18,9 +18,10 @@ namespace DotNetOpenAuth.OpenIdOfflineProvider.Controllers {
 	using Validation;
 
 	public class HomeController : ApiController {
-        private static readonly ILog Logger = LogProvider.GetCurrentClassLogger();
-        public HttpResponseMessage Get() {
-            Logger.Info("Discovery on OP Identifier detected.");
+		private static readonly ILog Logger = LogProvider.GetCurrentClassLogger();
+
+		public HttpResponseMessage Get() {
+			Logger.Info("Discovery on OP Identifier detected.");
 			var opEndpoint = this.Url.Link("default", new { controller = "provider" });
 			var opEndpointUri = new Uri(opEndpoint);
 			return new HttpResponseMessage() {
diff --git a/samples/OpenIdOfflineProvider/Controllers/ProviderController.cs b/samples/OpenIdOfflineProvider/Controllers/ProviderController.cs
index 6502842..2a86ade 100644
--- a/samples/OpenIdOfflineProvider/Controllers/ProviderController.cs
+++ b/samples/OpenIdOfflineProvider/Controllers/ProviderController.cs
@@ -1,6 +1,6 @@
 //-----------------------------------------------------------------------
 // <copyright file="ProviderController.cs" company="Andrew Arnott">
-//     Copyright (c) Andrew Arnott. All rights reserved.
+//    Copyright (c) Andrew Arnott. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
@@ -23,7 +23,8 @@ namespace DotNetOpenAuth.OpenIdOfflineProvider.Controllers {
 	public class ProviderController : ApiController {
 		private static readonly ICryptoKeyAndNonceStore store = new MemoryCryptoKeyAndNonceStore();
 
-	    private static readonly ILog Logger = LogProvider.GetCurrentClassLogger();
+		private static readonly ILog Logger = LogProvider.GetCurrentClassLogger();
+
 		private MainWindow MainWindow {
 			get { return MainWindow.Instance; }
 		}
@@ -40,7 +41,7 @@ namespace DotNetOpenAuth.OpenIdOfflineProvider.Controllers {
 			var provider = new OpenIdProvider(store);
 			IRequest request = await provider.GetRequestAsync(this.Request);
 			if (request == null) {
-                Logger.Error("A request came in that did not carry an OpenID message.");
+				Logger.Error("A request came in that did not carry an OpenID message.");
 				return new HttpResponseMessage(HttpStatusCode.BadRequest) {
 					Content = new StringContent("<html><body>This is an OpenID Provider endpoint.</body></html>", Encoding.UTF8, "text/html"),
 				};
diff --git a/samples/OpenIdOfflineProvider/MainWindow.xaml.cs b/samples/OpenIdOfflineProvider/MainWindow.xaml.cs
index 0fe63c5..cb9ed24 100644
--- a/samples/OpenIdOfflineProvider/MainWindow.xaml.cs
+++ b/samples/OpenIdOfflineProvider/MainWindow.xaml.cs
@@ -1,42 +1,29 @@
 //-----------------------------------------------------------------------
 // <copyright file="MainWindow.xaml.cs" company="Outercurve Foundation">
-//     Copyright (c) Outercurve Foundation. All rights reserved.
+//   Copyright (c) Outercurve Foundation. All rights reserved.
 // </copyright>
 //-----------------------------------------------------------------------
 
 namespace DotNetOpenAuth.OpenIdOfflineProvider {
-    using System;
-    using System.ComponentModel;
-    using System.Globalization;
-    using System.Linq;
-    using System.Net;
-    using System.Net.Http.Headers;
-    using System.Runtime.InteropServices;
-    using System.ServiceModel;
-    using System.Threading.Tasks;
-    using System.Web;
-    using System.Web.Http;
-    using System.Windows;
-    using System.Windows.Input;
-
-    using DotNetOpenAuth.Logging;
-
-    using Microsoft.Owin.Hosting;
-
-    using Owin;
-
-    using Validation;
-	public class Startup {
-		// This code configures Web API. The Startup class is specified as a type
-		// parameter in the WebApp.Start method.
-		public void Configuration(IAppBuilder appBuilder) {
-			// Configure Web API for self-host. 
-			HttpConfiguration config = new HttpConfiguration();
-			config.Routes.MapHttpRoute("default", "{controller}/{id}", new { controller = "Home", id = RouteParameter.Optional });
-			appBuilder.UseWebApi(config);
-		}
-	} 
-    /// <summary>
+	using System;
+	using System.ComponentModel;
+	using System.Globalization;
+	using System.Linq;
+	using System.Net;
+	using System.Net.Http.Headers;
+	using System.Runtime.InteropServices;
+	using System.ServiceModel;
+	using System.Threading.Tasks;
+	using System.Web;
+	using System.Windows;
+	using System.Windows.Input;
+
+	using DotNetOpenAuth.Logging;
+
+	using Microsoft.Owin.Hosting;
+	using Validation;
+
+	/// <summary>
 	/// Interaction logic for MainWindow.xaml
 	/// </summary>
 	public partial class MainWindow : Window, IDisposable {
@@ -50,15 +37,15 @@ namespace DotNetOpenAuth.OpenIdOfflineProvider {
 		/// </summary>
 		private ILog _logger;
 
-	    private IDisposable hostServer;
+		private IDisposable hostServer;
 
-	    /// <summary>
+		/// <summary>
 		/// Initializes a new instance of the <see cref="MainWindow"/> class.
 		/// </summary>
 		public MainWindow() {
 			this.InitializeComponent();
 			LogProvider.SetCurrentLogProvider(new TextWriterLogProvider(new TextBoxTextWriter(this.logBox)));
-			_logger = LogProvider.GetLogger(typeof(MainWindow));
+			this._logger = LogProvider.GetLogger(typeof(MainWindow));
 			Instance = this;
 			this.StartProviderAsync();
 		}
diff --git a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
index e502922..f3aa4a6 100644
--- a/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
+++ b/samples/OpenIdOfflineProvider/OpenIdOfflineProvider.csproj
@@ -147,7 +147,8 @@
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\ProviderController.cs" />
     <Compile Include="Controllers\UserController.cs" />
-    <Compile Include="TextLogProvider.cs" />
+    <Compile Include="Startup.cs" />
+    <Compile Include="TextWriterLogProvider.cs" />
     <Page Include="CheckIdWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/samples/OpenIdOfflineProvider/Startup.cs b/samples/OpenIdOfflineProvider/Startup.cs
new file mode 100644
index 0000000..2477442
--- /dev/null
+++ b/samples/OpenIdOfflineProvider/Startup.cs
@@ -0,0 +1,21 @@
+//-----------------------------------------------------------------------
+// <copyright file="Startup.cs" company="Outercurve Foundation">
+//     Copyright (c) Outercurve Foundation. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.OpenIdOfflineProvider {
+	using System.Web.Http;
+	using Owin;
+
+	public class Startup {
+		// This code configures Web API. The Startup class is specified as a type
+		// parameter in the WebApp.Start method.
+		public void Configuration(IAppBuilder appBuilder) {
+			// Configure Web API for self-host. 
+			HttpConfiguration config = new HttpConfiguration();
+			config.Routes.MapHttpRoute("default", "{controller}/{id}", new { controller = "Home", id = RouteParameter.Optional });
+			appBuilder.UseWebApi(config);
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/OpenIdOfflineProvider/TextLogProvider.cs b/samples/OpenIdOfflineProvider/TextWriterLogProvider.cs
index c927a43..f24cf88 100644
--- a/samples/OpenIdOfflineProvider/TextLogProvider.cs
+++ b/samples/OpenIdOfflineProvider/TextWriterLogProvider.cs
@@ -1,4 +1,10 @@
-namespace DotNetOpenAuth.OpenIdOfflineProvider {
+//-----------------------------------------------------------------------
+// <copyright file="TextWriterLogProvider.cs" company="Outercurve Foundation">
+//     Copyright (c) Outercurve Foundation. All rights reserved.
+// </copyright>
+//-----------------------------------------------------------------------
+
+namespace DotNetOpenAuth.OpenIdOfflineProvider {
 	using System;
 	using System.IO;
 	using System.Text.RegularExpressions;
@@ -28,7 +34,7 @@
 		private static bool _providerIsAvailableOverride = true;
 
 		internal TextWriterLogProvider(TextBoxTextWriter writer) {
-			_writer = writer;
+			this._writer = writer;
 		}
 
 		/// <summary>
@@ -43,7 +49,7 @@
 		}
 
 		public ILog GetLogger(string name) {
-			return new TextWriterLogger(_writer);
+			return new TextWriterLogger(this._writer);
 		}
 
 		public class TextWriterLogger : ILog {
@@ -53,88 +59,101 @@
 			private IDateTimeProvider _dateTimeProvider;
 
 			internal TextWriterLogger(TextBoxTextWriter writer) {
-				_writer = writer;
-				_skipLevel = 1;
+				this._writer = writer;
+				this._skipLevel = 1;
 				this.DateTimeProvider = new UtcDateTimeProvider();
 				this.TextWriterFormatter = new DefaultTextWriterFormatter();
 			}
 
+			public interface IDateTimeProvider {
+				DateTime GetCurrentDateTime();
+			}
+
+			public interface ITextWriterFormatter {
+				void WriteText(TextWriter writer, LogLevel level, DateTime dateTime, string text);
+			}
+
 			public TextWriter Writer {
 				get {
-					return _writer;
+					return this._writer;
 				}
 
 				set {
-					_writer = value;
+					this._writer = value;
 				}
 			}
 
 			public ITextWriterFormatter TextWriterFormatter {
 				get {
-					return _textWriterFormatter;
+					return this._textWriterFormatter;
 				}
+
 				set {
-					if (value == null)
+					if (value == null) {
 						throw new ArgumentNullException();
-					_textWriterFormatter = value;
+					}
+					this._textWriterFormatter = value;
 				}
 			}
 
 			public IDateTimeProvider DateTimeProvider {
 				get {
-					return _dateTimeProvider;
+					return this._dateTimeProvider;
 				}
+
 				set {
-					if (value == null)
+					if (value == null) {
 						throw new ArgumentNullException();
-					_dateTimeProvider = value;
+					}
+					this._dateTimeProvider = value;
 				}
 			}
+
 			public bool Log(LogLevel logLevel, Func<string> messageFunc, Exception exception) {
 				if (messageFunc == null) {
-					//nothing to log..
+					// nothing to log..
 					return true;
 				}
 				string[] lines = Regex.Split(messageFunc(), "\r\n|\r|\n");
 				foreach (var line in lines) {
-					this.TextWriterFormatter.WriteText(_writer, logLevel, this.DateTimeProvider.GetCurrentDateTime(), line);
+					this.TextWriterFormatter.WriteText(this._writer, logLevel, this.DateTimeProvider.GetCurrentDateTime(), line);
 				}
-				_writer.Flush();
+				this._writer.Flush();
 				return true;
 			}
-			public interface IDateTimeProvider {
-				DateTime GetCurrentDateTime();
-			}
-			public interface ITextWriterFormatter {
-				void WriteText(TextWriter writer, LogLevel level, DateTime dateTime, string text);
-			}
+
 			public class DefaultTextWriterFormatter : ITextWriterFormatter {
 				public void WriteText(TextWriter writer, LogLevel level, DateTime dateTime, string text) {
-					string sLevel;
+					string logLevelAbbreviation;
 					switch (level) {
 						case LogLevel.Info:
 						default:
-							sLevel = "I";
+							logLevelAbbreviation = "I";
 							break;
 
 						case LogLevel.Debug:
-							sLevel = "D";
+							logLevelAbbreviation = "D";
 							break;
 
 						case LogLevel.Warn:
-							sLevel = "W";
+							logLevelAbbreviation = "W";
 							break;
 
 						case LogLevel.Error:
-							sLevel = "E";
+							logLevelAbbreviation = "E";
 							break;
 					}
 
-					writer.WriteLine("{0}:{1} {2} [{4}]: {3}",
-						sLevel, dateTime.ToShortDateString(), dateTime.ToLongTimeString(),
-						text, Thread.CurrentThread.GetHashCode());
+					writer.WriteLine(
+						"{0}:{1} {2} [{4}]: {3}",
+						logLevelAbbreviation,
+						dateTime.ToShortDateString(),
+						dateTime.ToLongTimeString(),
+						text,
+						Thread.CurrentThread.GetHashCode());
 				}
 			}
+
 			public class UtcDateTimeProvider : IDateTimeProvider {
 				public DateTime GetCurrentDateTime() {
 					return DateTime.UtcNow;
diff --git a/src/DotNetOpenAuth.Core/Reporting.cs b/src/DotNetOpenAuth.Core/Reporting.cs
index 4d21c38..fd52865 100644
--- a/src/DotNetOpenAuth.Core/Reporting.cs
+++ b/src/DotNetOpenAuth.Core/Reporting.cs
@@ -477,7 +477,7 @@ namespace DotNetOpenAuth {
 			} catch (ProtocolException ex) {
 				Logger.Library.ErrorException("Unable to submit statistical report due to an HTTP error.", ex);
 			} catch (FileNotFoundException ex) {
-                Logger.Library.ErrorException("Unable to submit statistical report because the report file is missing.", ex);
+				Logger.Library.ErrorException("Unable to submit statistical report because the report file is missing.", ex);
 			}
 
 			return false;
diff --git a/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs b/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs
index 23e9864..eb252a5 100644
--- a/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs
+++ b/src/DotNetOpenAuth.Test/OpenId/Messages/IndirectSignedResponseTests.cs
@@ -95,7 +95,17 @@ namespace DotNetOpenAuth.Test.OpenId.Messages {
 			responseReplay.UtcCreationDate = local;
 			DateTime utcCreationDate = responseReplay.UtcCreationDate;
 			Assert.AreEqual(DateTimeKind.Utc, utcCreationDate.Kind, "Local time should have been converted to universal time.");
-			//Assert.AreNotEqual(local.Hour, utcCreationDate.Hour, "The hour was expected to change (unless local time _is_ UTC time for this PC!)");
+
+			// Check if this PC is not UTC (i.e. the UTC hour and local hour are different), if so we can perform this test
+			DateTime currentUtc = DateTime.UtcNow;
+			DateTime currentLocal = DateTime.Now;
+
+			if (currentUtc.Hour != currentLocal.Hour) {
+				Assert.AreNotEqual(
+					local.Hour,
+					utcCreationDate.Hour,
+					"The hour was expected to change (unless local time _is_ UTC time for this PC!)");
+			}
 
 			// Now try setting UTC time just to make sure it DOESN'T mangle the hour
 			if (this.creationDate.Kind != DateTimeKind.Utc) {
diff --git a/src/DotNetOpenAuth.sln.DotSettings b/src/DotNetOpenAuth.sln.DotSettings
index 7cfdb63..e302278 100644
--- a/src/DotNetOpenAuth.sln.DotSettings
+++ b/src/DotNetOpenAuth.sln.DotSettings
@@ -2,6 +2,8 @@
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/AutoCompleteBasicCompletion/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Intellisense/LookupWindow/ShowSummary/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeEditing/Localization/CSharpLocalizationOptions/DontAnalyseVerbatimStrings/@EntryValue">False</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CommonFormatter/ALIGNMENT_TAB_FILL_STYLE/@EntryValue">USE_TABS_ONLY</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/ThisQualifier/INSTANCE_MEMBERS_QUALIFY_MEMBERS/@EntryValue">All</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_ARRAY_AND_OBJECT_INITIALIZER/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ANONYMOUS_METHOD_DECLARATION_BRACES/@EntryValue">END_OF_LINE</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/CASE_BLOCK_BRACES/@EntryValue">NEXT_LINE</s:String>
@@ -41,5 +43,7 @@
 	<s:String x:Key="/Default/CodeStyle/Generate/=Implementations/Options/=XmlDocumentation/@EntryIndexedValue">True</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/VBNaming/EventHandlerPatternLong/@EntryValue">$object$_On$event$</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file