Merge pull request #379 from lcalabrese/develop

StyleCop, fix tests, remove Microsoft.Net.Http and Microsoft.Bcl dependencies

1 files changed, 52 insertions, 55 deletions

diff --git a/samples/OpenIdProviderMvc/Web.config b/samples/OpenIdProviderMvc/Web.config
index 0289b1c..6dfafb0 100644
--- a/samples/OpenIdProviderMvc/Web.config
+++ b/samples/OpenIdProviderMvc/Web.config
@@ -1,12 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<configSections>
-		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false"/>
+		<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler" requirePermission="false" />
 		<sectionGroup name="dotNetOpenAuth" type="DotNetOpenAuth.Configuration.DotNetOpenAuthSection, DotNetOpenAuth.Core">
-			<section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true"/>
-			<section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true"/>
-			<section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true"/>
-			<section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true"/>
+			<section name="openid" type="DotNetOpenAuth.Configuration.OpenIdElement, DotNetOpenAuth.OpenId" requirePermission="false" allowLocation="true" />
+			<section name="oauth" type="DotNetOpenAuth.Configuration.OAuthElement, DotNetOpenAuth.OAuth" requirePermission="false" allowLocation="true" />
+			<section name="messaging" type="DotNetOpenAuth.Configuration.MessagingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
+			<section name="reporting" type="DotNetOpenAuth.Configuration.ReportingElement, DotNetOpenAuth.Core" requirePermission="false" allowLocation="true" />
 		</sectionGroup>
 	</configSections>
 
@@ -14,12 +14,12 @@
 	     which is necessary for OpenID urls with unicode characters in the domain/host name. 
 	     It is also required to put the Uri class into RFC 3986 escaping mode, which OpenID and OAuth require. -->
 	<uri>
-		<idn enabled="All"/>
-		<iriParsing enabled="true"/>
+		<idn enabled="All" />
+		<iriParsing enabled="true" />
 	</uri>
 
 	<system.net>
-		<defaultProxy enabled="true"/>
+		<defaultProxy enabled="true" />
 		<settings>
 			<!-- This setting causes .NET to check certificate revocation lists (CRL) 
 			     before trusting HTTPS certificates.  But this setting tends to not 
@@ -32,14 +32,14 @@
 	<dotNetOpenAuth>
 		<openid>
 			<provider>
-				<security requireSsl="false"/>
+				<security requireSsl="false" />
 				<behaviors>
 					<!-- Behaviors activate themselves automatically for individual matching requests. 
 					     The first one in this list to match an incoming request "owns" the request.  If no
 					     profile matches, the default behavior is assumed. -->
 					<!--<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.GsaIcamProfile, DotNetOpenAuth.OpenId.Provider" />-->
-					<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider"/>
-					<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.Provider"/>
+					<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.PpidGeneration, DotNetOpenAuth.OpenId.Provider" />
+					<add type="DotNetOpenAuth.OpenId.Provider.Behaviors.AXFetchAsSregTransform, DotNetOpenAuth.OpenId.Provider" />
 				</behaviors>
 				<!-- Uncomment the following to activate the sample custom store.  -->
 				<!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->
@@ -49,19 +49,19 @@
 			<untrustedWebRequest>
 				<whitelistHosts>
 					<!-- since this is a sample, and will often be used with localhost -->
-					<add name="localhost"/>
+					<add name="localhost" />
 				</whitelistHosts>
 			</untrustedWebRequest>
 		</messaging>
 		<!-- Allow DotNetOpenAuth to publish usage statistics to library authors to improve the library. -->
-		<reporting enabled="true"/>
+		<reporting enabled="true" />
 	</dotNetOpenAuth>
 	<appSettings>
-		<add key="ValidationSettings:UnobtrusiveValidationMode" value="None"/>
+		<add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
 	</appSettings>
 
 	<system.web>
-		<httpRuntime targetFramework="4.5"/>
+		<httpRuntime targetFramework="4.5" />
 		<!-- 
             Set compilation debug="true" to insert debugging 
             symbols into the compiled page. Because this 
@@ -70,10 +70,10 @@
     -->
 		<compilation debug="true" targetFramework="4.0">
 			<assemblies>
-				<add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
-				<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
+				<add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+				<add assembly="System.Web.Abstractions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+				<add assembly="System.Web.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
+				<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
 			</assemblies>
 		</compilation>
 		<!--
@@ -82,31 +82,26 @@
             ASP.NET to identify an incoming user. 
     -->
 		<authentication mode="Forms">
-			<forms loginUrl="~/Account/LogOn" timeout="2880" name="ProviderMvcSession"/>
+			<forms loginUrl="~/Account/LogOn" timeout="2880" name="ProviderMvcSession" />
 			<!-- named cookie prevents conflicts with other samples -->
 		</authentication>
 		<membership defaultProvider="AspNetReadOnlyXmlMembershipProvider">
 			<providers>
-				<clear/>
-				<add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderMvc.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider"
-					xmlFileName="~/App_Data/Users.xml"/>
+				<clear />
+				<add name="AspNetReadOnlyXmlMembershipProvider" type="OpenIdProviderMvc.Code.ReadOnlyXmlMembershipProvider" description="Read-only XML membership provider" xmlFileName="~/App_Data/Users.xml" />
 			</providers>
 		</membership>
 		<profile>
 			<providers>
-				<clear/>
-				<add name="AspNetSqlProfileProvider"
-					type="System.Web.Profile.SqlProfileProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-					connectionStringName="ApplicationServices" applicationName="/"/>
+				<clear />
+				<add name="AspNetSqlProfileProvider" type="System.Web.Profile.SqlProfileProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="ApplicationServices" applicationName="/" />
 			</providers>
 		</profile>
 		<roleManager enabled="false">
 			<providers>
-				<clear/>
-				<add connectionStringName="ApplicationServices" applicationName="/" name="AspNetSqlRoleProvider"
-					type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
-				<add applicationName="/" name="AspNetWindowsTokenRoleProvider"
-					type="System.Web.Security.WindowsTokenRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+				<clear />
+				<add connectionStringName="ApplicationServices" applicationName="/" name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+				<add applicationName="/" name="AspNetWindowsTokenRoleProvider" type="System.Web.Security.WindowsTokenRoleProvider, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 			</providers>
 		</roleManager>
 		<!--
@@ -123,48 +118,50 @@
     -->
 		<pages controlRenderingCompatibilityVersion="3.5" clientIDMode="AutoID">
 			<namespaces>
-				<add namespace="System.Web.Mvc"/>
-				<add namespace="System.Web.Mvc.Ajax"/>
-				<add namespace="System.Web.Mvc.Html"/>
-				<add namespace="System.Web.Routing"/>
-				<add namespace="System.Linq"/>
-				<add namespace="System.Collections.Generic"/>
+				<add namespace="System.Web.Mvc" />
+				<add namespace="System.Web.Mvc.Ajax" />
+				<add namespace="System.Web.Mvc.Html" />
+				<add namespace="System.Web.Routing" />
+				<add namespace="System.Linq" />
+				<add namespace="System.Collections.Generic" />
 			</namespaces>
 		</pages>
 		<httpHandlers>
-			<add verb="*" path="*.mvc" validate="false"
-				type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<add verb="*" path="*.mvc" validate="false" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
 		</httpHandlers>
 	</system.web>
-	<system.web.extensions/>
+	<system.web.extensions />
 	<!-- 
         The system.webServer section is required for running ASP.NET AJAX under Internet
         Information Services 7.0.  It is not necessary for previous version of IIS.
   -->
 	<system.webServer>
-		<validation validateIntegratedModeConfiguration="false"/>
-		<modules runAllManagedModulesForAllRequests="true"/>
+		<validation validateIntegratedModeConfiguration="false" />
+		<modules runAllManagedModulesForAllRequests="true" />
 		<handlers>
-			<remove name="MvcHttpHandler"/>
-			<remove name="UrlRoutingHandler"/>
-			<add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc"
-				type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"/>
+			<remove name="MvcHttpHandler" />
+			<remove name="UrlRoutingHandler" />
+			<add name="MvcHttpHandler" preCondition="integratedMode" verb="*" path="*.mvc" type="System.Web.Mvc.MvcHttpHandler, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
 		</handlers>
 	</system.webServer>
 	<runtime>
-		<legacyHMACWarning enabled="0"/>
+		<legacyHMACWarning enabled="0" />
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
-				<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+				<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
-				<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+				<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
-				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-				<bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0"/>
+				<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+				<bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+			</dependentAssembly>
+			<dependentAssembly>
+				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+				<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>