179 files changed, 496 insertions, 278 deletions

diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.disco b/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.disco
deleted file mode 100644
index 1c29f1d..0000000
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.disco
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
-  <contractRef ref="http://localhost:65169/ServiceProvider/DataApi.svc?wsdl" docRef="http://localhost:65169/ServiceProvider/DataApi.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
-</discovery>
\ No newline at end of file
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo b/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
deleted file mode 100644
index 5716423..0000000
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
-  <behaviors />
-  <bindings>
-    <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;WSHttpBinding_IDataApi&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Message&quot;&gt;&lt;message algorithmSuite=&quot;Default&quot; clientCredentialType=&quot;Windows&quot; establishSecurityContext=&quot;true&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi" />
-  </bindings>
-  <endpoints>
-    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/ServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/ServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi" />
-  </endpoints>
-</configurationSnapshot>
\ No newline at end of file
diff --git a/samples/Consumer/App_Code/InMemoryTokenManager.cs b/samples/OAuthConsumer/App_Code/InMemoryTokenManager.cs
index f36a396..f36a396 100644
--- a/samples/Consumer/App_Code/InMemoryTokenManager.cs
+++ b/samples/OAuthConsumer/App_Code/InMemoryTokenManager.cs
diff --git a/samples/Consumer/App_Code/Logging.cs b/samples/OAuthConsumer/App_Code/Logging.cs
index e97ff37..e97ff37 100644
--- a/samples/Consumer/App_Code/Logging.cs
+++ b/samples/OAuthConsumer/App_Code/Logging.cs
diff --git a/samples/Consumer/App_Code/TracePageAppender.cs b/samples/OAuthConsumer/App_Code/TracePageAppender.cs
index 93ec9e3..93ec9e3 100644
--- a/samples/Consumer/App_Code/TracePageAppender.cs
+++ b/samples/OAuthConsumer/App_Code/TracePageAppender.cs
diff --git a/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.disco b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.disco
new file mode 100644
index 0000000..a3cecd3
--- /dev/null
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.disco
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<discovery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/disco/">
+  <contractRef ref="http://localhost:65169/OAuthServiceProvider/DataApi.svc?wsdl" docRef="http://localhost:65169/OAuthServiceProvider/DataApi.svc" xmlns="http://schemas.xmlsoap.org/disco/scl/" />
+</discovery>
\ No newline at end of file
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl
index 3f1206e..46a07e1 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.wsdl
@@ -222,9 +222,9 @@
   </wsp:Policy>
   <wsdl:types>
     <xsd:schema targetNamespace="http://tempuri.org/Imports">
-      <xsd:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd0" namespace="http://tempuri.org/" />
-      <xsd:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
-      <xsd:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+      <xsd:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd0" namespace="http://tempuri.org/" />
+      <xsd:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd1" namespace="http://schemas.microsoft.com/2003/10/Serialization/" />
+      <xsd:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
     </xsd:schema>
   </wsdl:types>
   <wsdl:message name="IDataApi_GetAge_InputMessage">
@@ -298,9 +298,9 @@
   </wsdl:binding>
   <wsdl:service name="DataApi">
     <wsdl:port name="WSHttpBinding_IDataApi" binding="tns:WSHttpBinding_IDataApi">
-      <soap12:address location="http://localhost:65169/ServiceProvider/DataApi.svc" />
+      <soap12:address location="http://localhost:65169/OAuthServiceProvider/DataApi.svc" />
       <wsa10:EndpointReference>
-        <wsa10:Address>http://localhost:65169/ServiceProvider/DataApi.svc</wsa10:Address>
+        <wsa10:Address>http://localhost:65169/OAuthServiceProvider/DataApi.svc</wsa10:Address>
         <Identity xmlns="http://schemas.xmlsoap.org/ws/2006/02/addressingidentity">
           <Dns>localhost</Dns>
         </Identity>
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.xsd b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.xsd
index d58e7f3..d58e7f3 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi.xsd
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi.xsd
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd
index 0853058..bcb9ef8 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi1.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:tns="http://tempuri.org/" elementFormDefault="qualified" targetNamespace="http://tempuri.org/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:import schemaLocation="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
+  <xs:import schemaLocation="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd2" namespace="http://schemas.microsoft.com/2003/10/Serialization/Arrays" />
   <xs:element name="GetAge">
     <xs:complexType>
       <xs:sequence />
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd
index 04a74a4..04a74a4 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/DataApi2.xsd
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/Reference.svcmap b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/Reference.svcmap
index 4302f14..c3f76fc 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/Reference.svcmap
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/Reference.svcmap
@@ -17,14 +17,14 @@
     <ServiceContractMappings />
   </ClientOptions>
   <MetadataSources>
-    <MetadataSource Address="http://localhost:65169/ServiceProvider/DataApi.svc" Protocol="http" SourceId="1" />
+    <MetadataSource Address="http://localhost:65169/OAuthServiceProvider/DataApi.svc" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="DataApi2.xsd" MetadataType="Schema" ID="232b71c0-94e9-43eb-9b23-fe9a229dce94" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd2" />
-    <MetadataFile FileName="DataApi.xsd" MetadataType="Schema" ID="fdc9f289-8c10-4fc6-abeb-052bc1116679" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd1" />
-    <MetadataFile FileName="DataApi.wsdl" MetadataType="Wsdl" ID="182a10fe-d606-4fc0-b64c-3e682dcae89d" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?wsdl" />
-    <MetadataFile FileName="DataApi1.xsd" MetadataType="Schema" ID="80d06927-f2e7-4d1d-8c7a-f3dc74f4d3d6" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?xsd=xsd0" />
-    <MetadataFile FileName="DataApi.disco" MetadataType="Disco" ID="25047770-8993-4bf3-acee-64b5f3598f2c" SourceId="1" SourceUrl="http://localhost:65169/ServiceProvider/DataApi.svc?disco" />
+    <MetadataFile FileName="DataApi.wsdl" MetadataType="Wsdl" ID="182a10fe-d606-4fc0-b64c-3e682dcae89d" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?wsdl" />
+    <MetadataFile FileName="DataApi2.xsd" MetadataType="Schema" ID="232b71c0-94e9-43eb-9b23-fe9a229dce94" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd2" />
+    <MetadataFile FileName="DataApi1.xsd" MetadataType="Schema" ID="80d06927-f2e7-4d1d-8c7a-f3dc74f4d3d6" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd0" />
+    <MetadataFile FileName="DataApi.disco" MetadataType="Disco" ID="25047770-8993-4bf3-acee-64b5f3598f2c" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?disco" />
+    <MetadataFile FileName="DataApi.xsd" MetadataType="Schema" ID="fdc9f289-8c10-4fc6-abeb-052bc1116679" SourceId="1" SourceUrl="http://localhost:65169/OAuthServiceProvider/DataApi.svc?xsd=xsd1" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
diff --git a/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
new file mode 100644
index 0000000..d014dc9
--- /dev/null
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration.svcinfo
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configurationSnapshot xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
+  <behaviors />
+  <bindings>
+    <binding digest="System.ServiceModel.Configuration.WSHttpBindingElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data hostNameComparisonMode=&quot;StrongWildcard&quot; messageEncoding=&quot;Text&quot; name=&quot;WSHttpBinding_IDataApi1&quot; textEncoding=&quot;utf-8&quot; transactionFlow=&quot;false&quot;&gt;&lt;readerQuotas maxArrayLength=&quot;16384&quot; maxBytesPerRead=&quot;4096&quot; maxDepth=&quot;32&quot; maxNameTableCharCount=&quot;16384&quot; maxStringContentLength=&quot;8192&quot; /&gt;&lt;reliableSession enabled=&quot;false&quot; inactivityTimeout=&quot;00:10:00&quot; ordered=&quot;true&quot; /&gt;&lt;security mode=&quot;Message&quot;&gt;&lt;message algorithmSuite=&quot;Default&quot; clientCredentialType=&quot;Windows&quot; establishSecurityContext=&quot;true&quot; negotiateServiceCredential=&quot;true&quot; /&gt;&lt;transport clientCredentialType=&quot;Windows&quot; proxyCredentialType=&quot;None&quot; realm=&quot;&quot; /&gt;&lt;/security&gt;&lt;/Data&gt;" bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi1" />
+  </bindings>
+  <endpoints>
+    <endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/OAuthServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi1&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi1&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;http://localhost:65169/OAuthServiceProvider/DataApi.svc&quot; binding=&quot;wsHttpBinding&quot; bindingConfiguration=&quot;WSHttpBinding_IDataApi1&quot; contract=&quot;SampleServiceProvider.IDataApi&quot; name=&quot;WSHttpBinding_IDataApi1&quot;&gt;&lt;identity&gt;&lt;dns value=&quot;localhost&quot; /&gt;&lt;/identity&gt;&lt;/Data&gt;" contractName="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi1" />
+  </endpoints>
+</configurationSnapshot>
\ No newline at end of file
diff --git a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo
index bf2c6c8..0dba466 100644
--- a/samples/Consumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo
+++ b/samples/OAuthConsumer/App_WebReferences/SampleServiceProvider/configuration91.svcinfo
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="Gtb7NAD474X6NPnHmitA0NiFc2w=">
+<SavedWcfConfigurationInformation xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="9.1" CheckSum="ieaabeY3T59437Mou0eeT4Hleso=">
   <bindingConfigurations>
-    <bindingConfiguration bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi">
+    <bindingConfiguration bindingType="wsHttpBinding" name="WSHttpBinding_IDataApi1">
       <properties>
         <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>WSHttpBinding_IDataApi</serializedValue>
+          <serializedValue>WSHttpBinding_IDataApi1</serializedValue>
         </property>
         <property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>00:01:00</serializedValue>
@@ -96,6 +96,18 @@
         <property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue />
         </property>
+        <property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>Never</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>TransportSelected</serializedValue>
+        </property>
+        <property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+          <serializedValue>(Collection)</serializedValue>
+        </property>
         <property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.NonDualMessageSecurityOverHttpElement, System.ServiceModel, Version=3.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>System.ServiceModel.Configuration.NonDualMessageSecurityOverHttpElement</serializedValue>
         </property>
@@ -115,10 +127,10 @@
     </bindingConfiguration>
   </bindingConfigurations>
   <endpoints>
-    <endpoint name="WSHttpBinding_IDataApi" contract="SampleServiceProvider.IDataApi" bindingType="wsHttpBinding" address="http://localhost:65169/ServiceProvider/DataApi.svc" bindingConfiguration="WSHttpBinding_IDataApi">
+    <endpoint name="WSHttpBinding_IDataApi1" contract="SampleServiceProvider.IDataApi" bindingType="wsHttpBinding" address="http://localhost:65169/OAuthServiceProvider/DataApi.svc" bindingConfiguration="WSHttpBinding_IDataApi1">
       <properties>
         <property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>http://localhost:65169/ServiceProvider/DataApi.svc</serializedValue>
+          <serializedValue>http://localhost:65169/OAuthServiceProvider/DataApi.svc</serializedValue>
         </property>
         <property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue />
@@ -127,7 +139,7 @@
           <serializedValue>wsHttpBinding</serializedValue>
         </property>
         <property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>WSHttpBinding_IDataApi</serializedValue>
+          <serializedValue>WSHttpBinding_IDataApi1</serializedValue>
         </property>
         <property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
           <serializedValue>SampleServiceProvider.IDataApi</serializedValue>
@@ -190,7 +202,7 @@
           <serializedValue>False</serializedValue>
         </property>
         <property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-          <serializedValue>WSHttpBinding_IDataApi</serializedValue>
+          <serializedValue>WSHttpBinding_IDataApi1</serializedValue>
         </property>
       </properties>
     </endpoint>
diff --git a/samples/OAuthConsumer/Bin/log4net.dll.refresh b/samples/OAuthConsumer/Bin/log4net.dll.refresh
new file mode 100644
index 0000000..ede40da
--- /dev/null
+++ b/samples/OAuthConsumer/Bin/log4net.dll.refresh
diff --git a/samples/Consumer/Default.aspx b/samples/OAuthConsumer/Default.aspx
index 20e0f94..20e0f94 100644
--- a/samples/Consumer/Default.aspx
+++ b/samples/OAuthConsumer/Default.aspx
diff --git a/samples/Consumer/Global.asax b/samples/OAuthConsumer/Global.asax
index fa4ca9b..fa4ca9b 100644
--- a/samples/Consumer/Global.asax
+++ b/samples/OAuthConsumer/Global.asax
diff --git a/samples/Consumer/GoogleAddressBook.aspx b/samples/OAuthConsumer/GoogleAddressBook.aspx
index 1c20954..1c20954 100644
--- a/samples/Consumer/GoogleAddressBook.aspx
+++ b/samples/OAuthConsumer/GoogleAddressBook.aspx
diff --git a/samples/Consumer/GoogleAddressBook.aspx.cs b/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
index 838b286..838b286 100644
--- a/samples/Consumer/GoogleAddressBook.aspx.cs
+++ b/samples/OAuthConsumer/GoogleAddressBook.aspx.cs
diff --git a/samples/Consumer/MasterPage.master b/samples/OAuthConsumer/MasterPage.master
index 0044208..0044208 100644
--- a/samples/Consumer/MasterPage.master
+++ b/samples/OAuthConsumer/MasterPage.master
diff --git a/samples/Consumer/SampleWcf.aspx b/samples/OAuthConsumer/SampleWcf.aspx
index b3eda25..b3eda25 100644
--- a/samples/Consumer/SampleWcf.aspx
+++ b/samples/OAuthConsumer/SampleWcf.aspx
diff --git a/samples/Consumer/SampleWcf.aspx.cs b/samples/OAuthConsumer/SampleWcf.aspx.cs
index db58cea..db58cea 100644
--- a/samples/Consumer/SampleWcf.aspx.cs
+++ b/samples/OAuthConsumer/SampleWcf.aspx.cs
diff --git a/samples/Consumer/Settings.StyleCop b/samples/OAuthConsumer/Settings.StyleCop
index 7f55ce6..7f55ce6 100644
--- a/samples/Consumer/Settings.StyleCop
+++ b/samples/OAuthConsumer/Settings.StyleCop
diff --git a/samples/Consumer/TracePage.aspx b/samples/OAuthConsumer/TracePage.aspx
index 4d6ecc5..4d6ecc5 100644
--- a/samples/Consumer/TracePage.aspx
+++ b/samples/OAuthConsumer/TracePage.aspx
diff --git a/samples/Consumer/TracePage.aspx.cs b/samples/OAuthConsumer/TracePage.aspx.cs
index 7075ce3..7075ce3 100644
--- a/samples/Consumer/TracePage.aspx.cs
+++ b/samples/OAuthConsumer/TracePage.aspx.cs
diff --git a/samples/Consumer/Web.config b/samples/OAuthConsumer/Web.config
index 0997e8c..60efcee 100644
--- a/samples/Consumer/Web.config
+++ b/samples/OAuthConsumer/Web.config
@@ -141,7 +141,27 @@
       enabled="false" />
      <security mode="Message">
       <transport clientCredentialType="Windows" proxyCredentialType="None"
-       realm="" />
+       realm="">
+       <extendedProtectionPolicy policyEnforcement="Never" />
+      </transport>
+      <message clientCredentialType="Windows" negotiateServiceCredential="true"
+       algorithmSuite="Default" establishSecurityContext="true" />
+     </security>
+    </binding>
+    <binding name="WSHttpBinding_IDataApi1" closeTimeout="00:01:00"
+     openTimeout="00:01:00" receiveTimeout="00:10:00" sendTimeout="00:01:00"
+     bypassProxyOnLocal="false" transactionFlow="false" hostNameComparisonMode="StrongWildcard"
+     maxBufferPoolSize="524288" maxReceivedMessageSize="65536" messageEncoding="Text"
+     textEncoding="utf-8" useDefaultWebProxy="true" allowCookies="false">
+     <readerQuotas maxDepth="32" maxStringContentLength="8192" maxArrayLength="16384"
+      maxBytesPerRead="4096" maxNameTableCharCount="16384" />
+     <reliableSession ordered="true" inactivityTimeout="00:10:00"
+      enabled="false" />
+     <security mode="Message">
+      <transport clientCredentialType="Windows" proxyCredentialType="None"
+       realm="">
+       <extendedProtectionPolicy policyEnforcement="Never" />
+      </transport>
       <message clientCredentialType="Windows" negotiateServiceCredential="true"
        algorithmSuite="Default" establishSecurityContext="true" />
      </security>
@@ -149,13 +169,20 @@
    </wsHttpBinding>
   </bindings>
   <client>
-   <endpoint address="http://localhost:65169/ServiceProvider/DataApi.svc"
+   <endpoint address="http://localhost:65169/OAuthServiceProvider/DataApi.svc"
     binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi"
     contract="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi">
     <identity>
      <dns value="localhost" />
     </identity>
    </endpoint>
+   <endpoint address="http://localhost:65169/OAuthServiceProvider/DataApi.svc"
+    binding="wsHttpBinding" bindingConfiguration="WSHttpBinding_IDataApi1"
+    contract="SampleServiceProvider.IDataApi" name="WSHttpBinding_IDataApi1">
+    <identity>
+     <dns value="localhost" />
+    </identity>
+   </endpoint>
   </client>
  </system.serviceModel>
 </configuration>
diff --git a/samples/ConsumerWpf/App.config b/samples/OAuthConsumerWpf/App.config
index 9780370..9780370 100644
--- a/samples/ConsumerWpf/App.config
+++ b/samples/OAuthConsumerWpf/App.config
diff --git a/samples/ConsumerWpf/App.xaml b/samples/OAuthConsumerWpf/App.xaml
index ffddc6d..630ed5f 100644
--- a/samples/ConsumerWpf/App.xaml
+++ b/samples/OAuthConsumerWpf/App.xaml
@@ -1,4 +1,4 @@
-<Application x:Class="ConsumerWpf.App"
+<Application x:Class="OAuthConsumerWpf.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="MainWindow.xaml">
diff --git a/samples/ConsumerWpf/App.xaml.cs b/samples/OAuthConsumerWpf/App.xaml.cs
index 337cd37..1cfc286 100644
--- a/samples/ConsumerWpf/App.xaml.cs
+++ b/samples/OAuthConsumerWpf/App.xaml.cs
@@ -1,4 +1,4 @@
-namespace ConsumerWpf {
+namespace OAuthConsumerWpf {
 	using System;
 	using System.Collections.Generic;
 	using System.Configuration;
diff --git a/samples/ConsumerWpf/InMemoryTokenManager.cs b/samples/OAuthConsumerWpf/InMemoryTokenManager.cs
index 2b89f39..b4692f1 100644
--- a/samples/ConsumerWpf/InMemoryTokenManager.cs
+++ b/samples/OAuthConsumerWpf/InMemoryTokenManager.cs
@@ -4,7 +4,7 @@
 // </copyright>
 //-----------------------------------------------------------------------
 
-namespace DotNetOpenAuth.Samples.ConsumerWpf {
+namespace DotNetOpenAuth.Samples.OAuthConsumerWpf {
 	using System;
 	using System.Collections.Generic;
 	using System.Diagnostics;
diff --git a/samples/ConsumerWpf/MainWindow.xaml b/samples/OAuthConsumerWpf/MainWindow.xaml
index a3794c8..f422353 100644
--- a/samples/ConsumerWpf/MainWindow.xaml
+++ b/samples/OAuthConsumerWpf/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="DotNetOpenAuth.Samples.ConsumerWpf.MainWindow"
+<Window x:Class="DotNetOpenAuth.Samples.OAuthConsumerWpf.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="DotNetOpenAuth Consumer (sample)" Height="400" Width="442">
diff --git a/samples/ConsumerWpf/MainWindow.xaml.cs b/samples/OAuthConsumerWpf/MainWindow.xaml.cs
index ea3ea39..b57589a 100644
--- a/samples/ConsumerWpf/MainWindow.xaml.cs
+++ b/samples/OAuthConsumerWpf/MainWindow.xaml.cs
@@ -1,4 +1,4 @@
-namespace DotNetOpenAuth.Samples.ConsumerWpf {
+namespace DotNetOpenAuth.Samples.OAuthConsumerWpf {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/ConsumerWpf/ConsumerWpf.csproj b/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
index 0440442..cd693e5 100644
--- a/samples/ConsumerWpf/ConsumerWpf.csproj
+++ b/samples/OAuthConsumerWpf/OAuthConsumerWpf.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{6EC36418-DBC5-4AD1-A402-413604AA7A08}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DotNetOpenAuth.Samples.ConsumerWpf</RootNamespace>
-    <AssemblyName>ConsumerWpf</AssemblyName>
+    <RootNamespace>DotNetOpenAuth.Samples.OAuthConsumerWpf</RootNamespace>
+    <AssemblyName>OAuthConsumerWpf</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/samples/ConsumerWpf/Properties/AssemblyInfo.cs b/samples/OAuthConsumerWpf/Properties/AssemblyInfo.cs
index 85e6239..029ad14 100644
--- a/samples/ConsumerWpf/Properties/AssemblyInfo.cs
+++ b/samples/OAuthConsumerWpf/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@ using System.Windows;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ConsumerWpf")]
+[assembly: AssemblyTitle("OAuthConsumerWpf")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ConsumerWpf")]
+[assembly: AssemblyProduct("OAuthConsumerWpf")]
 [assembly: AssemblyCopyright("Copyright ©  2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/samples/ConsumerWpf/Properties/Resources.Designer.cs b/samples/OAuthConsumerWpf/Properties/Resources.Designer.cs
index f1ea07d..7ab595b 100644
--- a/samples/ConsumerWpf/Properties/Resources.Designer.cs
+++ b/samples/OAuthConsumerWpf/Properties/Resources.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DotNetOpenAuth.Samples.ConsumerWpf.Properties {
+namespace DotNetOpenAuth.Samples.OAuthConsumerWpf.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace DotNetOpenAuth.Samples.ConsumerWpf.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetOpenAuth.Samples.ConsumerWpf.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DotNetOpenAuth.Samples.OAuthConsumerWpf.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/samples/ConsumerWpf/Properties/Resources.resx b/samples/OAuthConsumerWpf/Properties/Resources.resx
index af7dbeb..af7dbeb 100644
--- a/samples/ConsumerWpf/Properties/Resources.resx
+++ b/samples/OAuthConsumerWpf/Properties/Resources.resx
diff --git a/samples/ConsumerWpf/Properties/Settings.Designer.cs b/samples/OAuthConsumerWpf/Properties/Settings.Designer.cs
index daf59f9..57010d6 100644
--- a/samples/ConsumerWpf/Properties/Settings.Designer.cs
+++ b/samples/OAuthConsumerWpf/Properties/Settings.Designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DotNetOpenAuth.Samples.ConsumerWpf.Properties {
+namespace DotNetOpenAuth.Samples.OAuthConsumerWpf.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/samples/ConsumerWpf/Properties/Settings.settings b/samples/OAuthConsumerWpf/Properties/Settings.settings
index 033d7a5..033d7a5 100644
--- a/samples/ConsumerWpf/Properties/Settings.settings
+++ b/samples/OAuthConsumerWpf/Properties/Settings.settings
diff --git a/samples/ServiceProvider/App_Code/Constants.cs b/samples/OAuthServiceProvider/App_Code/Constants.cs
index 7780e96..7780e96 100644
--- a/samples/ServiceProvider/App_Code/Constants.cs
+++ b/samples/OAuthServiceProvider/App_Code/Constants.cs
diff --git a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs b/samples/OAuthServiceProvider/App_Code/CustomOAuthTypeProvider.cs
index a4397c1..a4397c1 100644
--- a/samples/ServiceProvider/App_Code/CustomOAuthTypeProvider.cs
+++ b/samples/OAuthServiceProvider/App_Code/CustomOAuthTypeProvider.cs
diff --git a/samples/ServiceProvider/App_Code/DataApi.cs b/samples/OAuthServiceProvider/App_Code/DataApi.cs
index a765159..a765159 100644
--- a/samples/ServiceProvider/App_Code/DataApi.cs
+++ b/samples/OAuthServiceProvider/App_Code/DataApi.cs
diff --git a/samples/ServiceProvider/App_Code/DataClasses.dbml b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
index 0b54d0d..0b54d0d 100644
--- a/samples/ServiceProvider/App_Code/DataClasses.dbml
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml
diff --git a/samples/ServiceProvider/App_Code/DataClasses.dbml.layout b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
index 1fc61cf..1fc61cf 100644
--- a/samples/ServiceProvider/App_Code/DataClasses.dbml.layout
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.dbml.layout
diff --git a/samples/ServiceProvider/App_Code/DataClasses.designer.cs b/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
index 2fc532e..2fc532e 100644
--- a/samples/ServiceProvider/App_Code/DataClasses.designer.cs
+++ b/samples/OAuthServiceProvider/App_Code/DataClasses.designer.cs
diff --git a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
index b5d8fdd..b5d8fdd 100644
--- a/samples/ServiceProvider/App_Code/DatabaseTokenManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/DatabaseTokenManager.cs
diff --git a/samples/ServiceProvider/App_Code/Global.cs b/samples/OAuthServiceProvider/App_Code/Global.cs
index b343dcd..b343dcd 100644
--- a/samples/ServiceProvider/App_Code/Global.cs
+++ b/samples/OAuthServiceProvider/App_Code/Global.cs
diff --git a/samples/ServiceProvider/App_Code/IDataApi.cs b/samples/OAuthServiceProvider/App_Code/IDataApi.cs
index 350df35..350df35 100644
--- a/samples/ServiceProvider/App_Code/IDataApi.cs
+++ b/samples/OAuthServiceProvider/App_Code/IDataApi.cs
diff --git a/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs b/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
index fce1ad4..fce1ad4 100644
--- a/samples/ServiceProvider/App_Code/OAuthAuthorizationManager.cs
+++ b/samples/OAuthServiceProvider/App_Code/OAuthAuthorizationManager.cs
diff --git a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs b/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs
index b33a734..b33a734 100644
--- a/samples/ServiceProvider/App_Code/RequestScopedTokenMessage.cs
+++ b/samples/OAuthServiceProvider/App_Code/RequestScopedTokenMessage.cs
diff --git a/samples/ServiceProvider/App_Code/TokenAuthorizationState.cs b/samples/OAuthServiceProvider/App_Code/TokenAuthorizationState.cs
index 8d3c8ac..8d3c8ac 100644
--- a/samples/ServiceProvider/App_Code/TokenAuthorizationState.cs
+++ b/samples/OAuthServiceProvider/App_Code/TokenAuthorizationState.cs
diff --git a/samples/ServiceProvider/App_Code/TracePageAppender.cs b/samples/OAuthServiceProvider/App_Code/TracePageAppender.cs
index 7490f3d..7490f3d 100644
--- a/samples/ServiceProvider/App_Code/TracePageAppender.cs
+++ b/samples/OAuthServiceProvider/App_Code/TracePageAppender.cs
diff --git a/samples/OAuthServiceProvider/Bin/log4net.dll.refresh b/samples/OAuthServiceProvider/Bin/log4net.dll.refresh
new file mode 100644
index 0000000..ede40da
--- /dev/null
+++ b/samples/OAuthServiceProvider/Bin/log4net.dll.refresh
diff --git a/samples/ServiceProvider/DataApi.svc b/samples/OAuthServiceProvider/DataApi.svc
index 4e9e477..4e9e477 100644
--- a/samples/ServiceProvider/DataApi.svc
+++ b/samples/OAuthServiceProvider/DataApi.svc
diff --git a/samples/ServiceProvider/Default.aspx b/samples/OAuthServiceProvider/Default.aspx
index 67efe3a..67efe3a 100644
--- a/samples/ServiceProvider/Default.aspx
+++ b/samples/OAuthServiceProvider/Default.aspx
diff --git a/samples/ServiceProvider/Global.asax b/samples/OAuthServiceProvider/Global.asax
index e9ae062..e9ae062 100644
--- a/samples/ServiceProvider/Global.asax
+++ b/samples/OAuthServiceProvider/Global.asax
diff --git a/samples/ServiceProvider/Login.aspx b/samples/OAuthServiceProvider/Login.aspx
index d63b2c8..d63b2c8 100644
--- a/samples/ServiceProvider/Login.aspx
+++ b/samples/OAuthServiceProvider/Login.aspx
diff --git a/samples/ServiceProvider/MasterPage.master b/samples/OAuthServiceProvider/MasterPage.master
index 136dfc9..136dfc9 100644
--- a/samples/ServiceProvider/MasterPage.master
+++ b/samples/OAuthServiceProvider/MasterPage.master
diff --git a/samples/ServiceProvider/Members/Authorize.aspx b/samples/OAuthServiceProvider/Members/Authorize.aspx
index 0fd272c..0fd272c 100644
--- a/samples/ServiceProvider/Members/Authorize.aspx
+++ b/samples/OAuthServiceProvider/Members/Authorize.aspx
diff --git a/samples/ServiceProvider/Members/Authorize.aspx.cs b/samples/OAuthServiceProvider/Members/Authorize.aspx.cs
index 76eec26..76eec26 100644
--- a/samples/ServiceProvider/Members/Authorize.aspx.cs
+++ b/samples/OAuthServiceProvider/Members/Authorize.aspx.cs
diff --git a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx
index d6ea668..d6ea668 100644
--- a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx
+++ b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx
diff --git a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx.cs b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx.cs
index e7af629..e7af629 100644
--- a/samples/ServiceProvider/Members/AuthorizedConsumers.aspx.cs
+++ b/samples/OAuthServiceProvider/Members/AuthorizedConsumers.aspx.cs
diff --git a/samples/ServiceProvider/Members/Logoff.aspx b/samples/OAuthServiceProvider/Members/Logoff.aspx
index afa9dd9..afa9dd9 100644
--- a/samples/ServiceProvider/Members/Logoff.aspx
+++ b/samples/OAuthServiceProvider/Members/Logoff.aspx
diff --git a/samples/ServiceProvider/Members/Web.config b/samples/OAuthServiceProvider/Members/Web.config
index 50fab27..50fab27 100644
--- a/samples/ServiceProvider/Members/Web.config
+++ b/samples/OAuthServiceProvider/Members/Web.config
diff --git a/samples/ServiceProvider/OAuth.ashx b/samples/OAuthServiceProvider/OAuth.ashx
index 46a516f..46a516f 100644
--- a/samples/ServiceProvider/OAuth.ashx
+++ b/samples/OAuthServiceProvider/OAuth.ashx
diff --git a/samples/RelyingPartyWebForms/Settings.StyleCop b/samples/OAuthServiceProvider/Settings.StyleCop
index 7f55ce6..7f55ce6 100644
--- a/samples/RelyingPartyWebForms/Settings.StyleCop
+++ b/samples/OAuthServiceProvider/Settings.StyleCop
diff --git a/samples/ServiceProvider/TracePage.aspx b/samples/OAuthServiceProvider/TracePage.aspx
index 4d6ecc5..4d6ecc5 100644
--- a/samples/ServiceProvider/TracePage.aspx
+++ b/samples/OAuthServiceProvider/TracePage.aspx
diff --git a/samples/ServiceProvider/TracePage.aspx.cs b/samples/OAuthServiceProvider/TracePage.aspx.cs
index 52848f2..52848f2 100644
--- a/samples/ServiceProvider/TracePage.aspx.cs
+++ b/samples/OAuthServiceProvider/TracePage.aspx.cs
diff --git a/samples/ServiceProvider/Web.config b/samples/OAuthServiceProvider/Web.config
index f4bd208..f4bd208 100644
--- a/samples/ServiceProvider/Web.config
+++ b/samples/OAuthServiceProvider/Web.config
diff --git a/samples/RelyingPartyClassicAsp/MembersOnly.asp b/samples/OpenIdRelyingPartyClassicAsp/MembersOnly.asp
index 741a3e7..741a3e7 100644
--- a/samples/RelyingPartyClassicAsp/MembersOnly.asp
+++ b/samples/OpenIdRelyingPartyClassicAsp/MembersOnly.asp
diff --git a/samples/RelyingPartyClassicAsp/default.asp b/samples/OpenIdRelyingPartyClassicAsp/default.asp
index 99bf93b..bdddbcc 100644
--- a/samples/RelyingPartyClassicAsp/default.asp
+++ b/samples/OpenIdRelyingPartyClassicAsp/default.asp
@@ -10,7 +10,7 @@
 			<img runat="server" src="images/DotNetOpenId_tiny.gif" title="Jump to the project web site."
 				alt="DotNetOpenAuth" border='0' /></a>
 	</div>
-	<h2>Classic ASP Relying Party</h2>
+	<h2>Classic ASP OpenID Relying Party</h2>
 	<p>Visit the <a href="MembersOnly.asp">Members Only</a> area. (This will trigger
 		a login demo). </p>
 	<h3>Required steps for this sample to work on your own machine:</h3>
diff --git a/samples/RelyingPartyClassicAsp/images/dotnetopenid_tiny.gif b/samples/OpenIdRelyingPartyClassicAsp/images/dotnetopenid_tiny.gif
index c4ed4f5..c4ed4f5 100644
--- a/samples/RelyingPartyClassicAsp/images/dotnetopenid_tiny.gif
+++ b/samples/OpenIdRelyingPartyClassicAsp/images/dotnetopenid_tiny.gif
diff --git a/samples/RelyingPartyClassicAsp/images/openid_login.gif b/samples/OpenIdRelyingPartyClassicAsp/images/openid_login.gif
index cde836c..cde836c 100644
--- a/samples/RelyingPartyClassicAsp/images/openid_login.gif
+++ b/samples/OpenIdRelyingPartyClassicAsp/images/openid_login.gif
diff --git a/samples/RelyingPartyClassicAsp/login.asp b/samples/OpenIdRelyingPartyClassicAsp/login.asp
index 878ab39..878ab39 100644
--- a/samples/RelyingPartyClassicAsp/login.asp
+++ b/samples/OpenIdRelyingPartyClassicAsp/login.asp
diff --git a/samples/RelyingPartyClassicAsp/logout.asp b/samples/OpenIdRelyingPartyClassicAsp/logout.asp
index a3f0633..a3f0633 100644
--- a/samples/RelyingPartyClassicAsp/logout.asp
+++ b/samples/OpenIdRelyingPartyClassicAsp/logout.asp
diff --git a/samples/RelyingPartyClassicAsp/styles.css b/samples/OpenIdRelyingPartyClassicAsp/styles.css
index d777e33..d777e33 100644
--- a/samples/RelyingPartyClassicAsp/styles.css
+++ b/samples/OpenIdRelyingPartyClassicAsp/styles.css
diff --git a/samples/RelyingPartyMvc/.gitignore b/samples/OpenIdRelyingPartyMvc/.gitignore
index 0b08797..0b08797 100644
--- a/samples/RelyingPartyMvc/.gitignore
+++ b/samples/OpenIdRelyingPartyMvc/.gitignore
diff --git a/samples/RelyingPartyMvc/Content/Site.css b/samples/OpenIdRelyingPartyMvc/Content/Site.css
index 6fda856..6fda856 100644
--- a/samples/RelyingPartyMvc/Content/Site.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/Site.css
diff --git a/samples/RelyingPartyMvc/Content/css/openidlogin.css b/samples/OpenIdRelyingPartyMvc/Content/css/openidlogin.css
index 20338c4..20338c4 100644
--- a/samples/RelyingPartyMvc/Content/css/openidlogin.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/css/openidlogin.css
diff --git a/samples/RelyingPartyMvc/Content/images/aol.gif b/samples/OpenIdRelyingPartyMvc/Content/images/aol.gif
index decc4f1..decc4f1 100644
--- a/samples/RelyingPartyMvc/Content/images/aol.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/aol.gif
diff --git a/samples/RelyingPartyMvc/Content/images/facebook.gif b/samples/OpenIdRelyingPartyMvc/Content/images/facebook.gif
index b997b35..b997b35 100644
--- a/samples/RelyingPartyMvc/Content/images/facebook.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/facebook.gif
diff --git a/samples/RelyingPartyMvc/Content/images/google.gif b/samples/OpenIdRelyingPartyMvc/Content/images/google.gif
index 1b6cd07..1b6cd07 100644
--- a/samples/RelyingPartyMvc/Content/images/google.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/google.gif
diff --git a/samples/RelyingPartyMvc/Content/images/openid.gif b/samples/OpenIdRelyingPartyMvc/Content/images/openid.gif
index c718b0e..c718b0e 100644
--- a/samples/RelyingPartyMvc/Content/images/openid.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/openid.gif
diff --git a/samples/RelyingPartyMvc/Content/images/openid_small.gif b/samples/OpenIdRelyingPartyMvc/Content/images/openid_small.gif
index cde836c..cde836c 100644
--- a/samples/RelyingPartyMvc/Content/images/openid_small.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/openid_small.gif
diff --git a/samples/RelyingPartyMvc/Content/images/yahoo.gif b/samples/OpenIdRelyingPartyMvc/Content/images/yahoo.gif
index 42adbfa..42adbfa 100644
--- a/samples/RelyingPartyMvc/Content/images/yahoo.gif
+++ b/samples/OpenIdRelyingPartyMvc/Content/images/yahoo.gif
diff --git a/samples/RelyingPartyMvc/Content/scripts/jquery-1.3.1.js b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-1.3.1.js
index 3a4badd..3a4badd 100644
--- a/samples/RelyingPartyMvc/Content/scripts/jquery-1.3.1.js
+++ b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-1.3.1.js
diff --git a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js
index 71bea46..71bea46 100644
--- a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js
+++ b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.js
diff --git a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js
index 2d97bb8..2d97bb8 100644
--- a/samples/RelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js
+++ b/samples/OpenIdRelyingPartyMvc/Content/scripts/jquery-ui-personalized-1.6rc6.min.js
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png
index 6b6de7d..6b6de7d 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_55_999999_40x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png
index 5b5dab2..5b5dab2 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_flat_75_aaaaaa_40x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png
index 3dac650..3dac650 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_45_0078ae_1x400.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png
index b383704..b383704 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_55_f8da4e_1x400.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png
index d384e42..d384e42 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_glass_75_79c9ec_1x400.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
index b9851ba..b9851ba 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
index 76dac56..76dac56 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png
index eeacf69..eeacf69 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_gloss-wave_75_2191c0_500x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
index 38c3833..38c3833 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png
index 58f96f8..58f96f8 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_0078ae_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png
index 8e6103d..8e6103d 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_056b93_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png
index 2c8aac4..2c8aac4 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_d8e7f3_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png
index d985a26..d985a26 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_e0fdff_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png
index 7862520..7862520 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f5e175_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png
index c5297f8..c5297f8 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_f7a50d_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png
index 68dcff5..68dcff5 100644
--- a/samples/RelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/images/ui-icons_fcd113_256x240.png
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.accordion.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.accordion.css
index c84ad4e..c84ad4e 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.accordion.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.accordion.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.all.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.all.css
index 543e4c3..543e4c3 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.all.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.all.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.base.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.base.css
index dadf378..dadf378 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.base.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.base.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.core.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.core.css
index d832ad7..d832ad7 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.core.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.core.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.datepicker.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.datepicker.css
index 92986c9..92986c9 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.datepicker.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.datepicker.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.dialog.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.dialog.css
index f10f409..f10f409 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.dialog.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.dialog.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.progressbar.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.progressbar.css
index bc0939e..bc0939e 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.progressbar.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.progressbar.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.resizable.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.resizable.css
index 44efeb2..44efeb2 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.resizable.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.resizable.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.slider.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.slider.css
index 0792a48..0792a48 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.slider.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.slider.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.tabs.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.tabs.css
index 70ed3ef..70ed3ef 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.tabs.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.tabs.css
diff --git a/samples/RelyingPartyMvc/Content/theme/ui.theme.css b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.theme.css
index 84f7fed..84f7fed 100644
--- a/samples/RelyingPartyMvc/Content/theme/ui.theme.css
+++ b/samples/OpenIdRelyingPartyMvc/Content/theme/ui.theme.css
diff --git a/samples/OpenIdRelyingPartyMvc/Controllers/AccountController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/AccountController.cs
new file mode 100644
index 0000000..5422a61
--- /dev/null
+++ b/samples/OpenIdRelyingPartyMvc/Controllers/AccountController.cs
@@ -0,0 +1,113 @@
+namespace RelyingPartyMvc.Controllers {
+	using System;
+	using System.Collections.Generic;
+	using System.Diagnostics.CodeAnalysis;
+	using System.Globalization;
+	using System.Linq;
+	using System.Security.Cryptography;
+	using System.Security.Principal;
+	using System.Web;
+	using System.Web.Mvc;
+	using System.Web.Security;
+	using System.Web.UI;
+
+	public class AccountController : Controller {
+		// This constructor is used by the MVC framework to instantiate the controller using
+		// the default forms authentication and membership providers.
+
+		public AccountController()
+			: this(null, null) {
+		}
+
+		// This constructor is not used by the MVC framework but is instead provided for ease
+		// of unit testing this type. See the comments at the end of this file for more
+		// information.
+		public AccountController(IFormsAuthentication formsAuth, IMembershipService service) {
+			this.FormsAuth = formsAuth ?? new FormsAuthenticationService();
+			this.MembershipService = service ?? new AccountMembershipService();
+		}
+
+		public IFormsAuthentication FormsAuth { get; private set; }
+
+		public IMembershipService MembershipService { get; private set; }
+
+		public ActionResult LogOn() {
+			return View();
+		}
+
+		[AcceptVerbs(HttpVerbs.Post)]
+		[SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings",
+			Justification = "Needs to take same parameter type as Controller.Redirect()")]
+		public ActionResult LogOn(string userName, bool rememberMe, string returnUrl) {
+			this.FormsAuth.SignIn(userName, rememberMe);
+			if (!String.IsNullOrEmpty(returnUrl)) {
+				return Redirect(returnUrl);
+			} else {
+				return RedirectToAction("Index", "Home");
+			}
+		}
+
+		public ActionResult LogOff() {
+			this.FormsAuth.SignOut();
+
+			return RedirectToAction("Index", "Home");
+		}
+
+		protected override void OnActionExecuting(ActionExecutingContext filterContext) {
+			if (filterContext.HttpContext.User.Identity is WindowsIdentity) {
+				throw new InvalidOperationException("Windows authentication is not supported.");
+			}
+		}
+	}
+
+	// The FormsAuthentication type is sealed and contains static members, so it is difficult to
+	// unit test code that calls its members. The interface and helper class below demonstrate
+	// how to create an abstract wrapper around such a type in order to make the AccountController
+	// code unit testable.
+
+	public interface IFormsAuthentication {
+		void SignIn(string userName, bool createPersistentCookie);
+
+		void SignOut();
+	}
+
+	public class FormsAuthenticationService : IFormsAuthentication {
+		public void SignIn(string userName, bool createPersistentCookie) {
+			FormsAuthentication.SetAuthCookie(userName, createPersistentCookie);
+		}
+		public void SignOut() {
+			FormsAuthentication.SignOut();
+		}
+	}
+
+	public interface IMembershipService {
+		MembershipCreateStatus CreateUser(string claimedIdentifier, string email);
+	}
+
+	public class AccountMembershipService : IMembershipService {
+		private MembershipProvider provider;
+		private RandomNumberGenerator passwordGenerator;
+
+		public AccountMembershipService()
+			: this(null) {
+		}
+
+		public AccountMembershipService(MembershipProvider provider) {
+			this.provider = provider ?? Membership.Provider;
+			this.passwordGenerator = RNGCryptoServiceProvider.Create();
+		}
+
+		public MembershipCreateStatus CreateUser(string userName, string email) {
+			MembershipCreateStatus status;
+			string password = this.GenerateInsaneSecurePassword();
+			this.provider.CreateUser(userName, password, email, null, null, true, null, out status);
+			return status;
+		}
+
+		private string GenerateInsaneSecurePassword() {
+			byte[] secureBits = new byte[20];
+			this.passwordGenerator.GetBytes(secureBits);
+			return Convert.ToBase64String(secureBits);
+		}
+	}
+}
diff --git a/samples/RelyingPartyMvc/Controllers/HomeController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/HomeController.cs
index ac33185..d26cdd9 100644
--- a/samples/RelyingPartyMvc/Controllers/HomeController.cs
+++ b/samples/OpenIdRelyingPartyMvc/Controllers/HomeController.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc.Controllers {
+namespace OpenIdRelyingPartyMvc.Controllers {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/RelyingPartyMvc/Controllers/UserController.cs b/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs
index ba94efe..dd526d3 100644
--- a/samples/RelyingPartyMvc/Controllers/UserController.cs
+++ b/samples/OpenIdRelyingPartyMvc/Controllers/UserController.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc.Controllers {
+namespace OpenIdRelyingPartyMvc.Controllers {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/RelyingPartyMvc/Default.aspx b/samples/OpenIdRelyingPartyMvc/Default.aspx
index b570fd8..b570fd8 100644
--- a/samples/RelyingPartyMvc/Default.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Default.aspx
diff --git a/samples/OpenIdRelyingPartyMvc/Global.asax b/samples/OpenIdRelyingPartyMvc/Global.asax
new file mode 100644
index 0000000..756d5eb
--- /dev/null
+++ b/samples/OpenIdRelyingPartyMvc/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="OpenIdRelyingPartyMvc.MvcApplication" Language="C#" %>
diff --git a/samples/RelyingPartyMvc/Global.asax.cs b/samples/OpenIdRelyingPartyMvc/Global.asax.cs
index 4015d71..a43b734 100644
--- a/samples/RelyingPartyMvc/Global.asax.cs
+++ b/samples/OpenIdRelyingPartyMvc/Global.asax.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc {
+namespace OpenIdRelyingPartyMvc {
 	using System;
 	using System.Collections.Generic;
 	using System.Linq;
diff --git a/samples/RelyingPartyMvc/RelyingPartyMvc.csproj b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
index 13bd612..a6fab7c 100644
--- a/samples/RelyingPartyMvc/RelyingPartyMvc.csproj
+++ b/samples/OpenIdRelyingPartyMvc/OpenIdRelyingPartyMvc.csproj
@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{603c0e0b-db56-11dc-be95-000d561079b0};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RelyingPartyMvc</RootNamespace>
-    <AssemblyName>RelyingPartyMvc</AssemblyName>
+    <RootNamespace>OpenIdRelyingPartyMvc</RootNamespace>
+    <AssemblyName>OpenIdRelyingPartyMvc</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/RelyingPartyMvc/Properties/AssemblyInfo.cs b/samples/OpenIdRelyingPartyMvc/Properties/AssemblyInfo.cs
index 483a4a1..8a23a59 100644
--- a/samples/RelyingPartyMvc/Properties/AssemblyInfo.cs
+++ b/samples/OpenIdRelyingPartyMvc/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("RelyingPartyMvc")]
+[assembly: AssemblyTitle("OpenIdRelyingPartyMvc")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("RelyingPartyMvc")]
+[assembly: AssemblyProduct("OpenIdRelyingPartyMvc")]
 [assembly: AssemblyCopyright("Copyright © Andrew Arnott 2008")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/samples/RelyingPartyMvc/Views/Home/Index.aspx b/samples/OpenIdRelyingPartyMvc/Views/Home/Index.aspx
index 82eb924..82eb924 100644
--- a/samples/RelyingPartyMvc/Views/Home/Index.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/Home/Index.aspx
diff --git a/samples/RelyingPartyMvc/Views/Home/xrds.aspx b/samples/OpenIdRelyingPartyMvc/Views/Home/xrds.aspx
index 583c77c..583c77c 100644
--- a/samples/RelyingPartyMvc/Views/Home/xrds.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/Home/xrds.aspx
diff --git a/samples/RelyingPartyMvc/Views/Shared/Site.Master b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master
index 698ea34..d9b759c 100644
--- a/samples/RelyingPartyMvc/Views/Shared/Site.Master
+++ b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master
@@ -1,4 +1,4 @@
-<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="RelyingPartyMvc.Views.Shared.Site" %>
+<%@ Master Language="C#" AutoEventWireup="true" CodeBehind="Site.master.cs" Inherits="OpenIdRelyingPartyMvc.Views.Shared.Site" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/samples/RelyingPartyMvc/Views/Shared/Site.Master.cs b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.cs
index c844657..9fca9d7 100644
--- a/samples/RelyingPartyMvc/Views/Shared/Site.Master.cs
+++ b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyMvc.Views.Shared {
+namespace OpenIdRelyingPartyMvc.Views.Shared {
 	public partial class Site : System.Web.Mvc.ViewMasterPage {
 	}
 }
diff --git a/samples/RelyingPartyMvc/Views/Shared/Site.Master.designer.cs b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.designer.cs
index 2793ee4..a207a32 100644
--- a/samples/RelyingPartyMvc/Views/Shared/Site.Master.designer.cs
+++ b/samples/OpenIdRelyingPartyMvc/Views/Shared/Site.Master.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyMvc.Views.Shared {
+namespace OpenIdRelyingPartyMvc.Views.Shared {
     
     
     public partial class Site {
diff --git a/samples/RelyingPartyMvc/Views/User/Index.aspx b/samples/OpenIdRelyingPartyMvc/Views/User/Index.aspx
index ef55c06..ef55c06 100644
--- a/samples/RelyingPartyMvc/Views/User/Index.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/User/Index.aspx
diff --git a/samples/RelyingPartyMvc/Views/User/Login.aspx b/samples/OpenIdRelyingPartyMvc/Views/User/Login.aspx
index 24f9f56..24f9f56 100644
--- a/samples/RelyingPartyMvc/Views/User/Login.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/User/Login.aspx
diff --git a/samples/RelyingPartyMvc/Views/User/LoginPopup.aspx b/samples/OpenIdRelyingPartyMvc/Views/User/LoginPopup.aspx
index 67006fa..67006fa 100644
--- a/samples/RelyingPartyMvc/Views/User/LoginPopup.aspx
+++ b/samples/OpenIdRelyingPartyMvc/Views/User/LoginPopup.aspx
diff --git a/samples/RelyingPartyMvc/Views/Web.config b/samples/OpenIdRelyingPartyMvc/Views/Web.config
index e67c0eb..e67c0eb 100644
--- a/samples/RelyingPartyMvc/Views/Web.config
+++ b/samples/OpenIdRelyingPartyMvc/Views/Web.config
diff --git a/samples/RelyingPartyMvc/Web.config b/samples/OpenIdRelyingPartyMvc/Web.config
index 03c7fc4..b051162 100644
--- a/samples/RelyingPartyMvc/Web.config
+++ b/samples/OpenIdRelyingPartyMvc/Web.config
@@ -84,7 +84,7 @@
             ASP.NET to identify an incoming user. 
     -->
 		<authentication mode="Forms">
-			<forms defaultUrl="/Home" loginUrl="/User/Login" name="RelyingPartyMvcSession"/>
+			<forms defaultUrl="/Home" loginUrl="/User/Login" name="OpenIdRelyingPartyMvcSession"/>
 			<!-- named cookie prevents conflicts with other samples -->
 		</authentication>
 		<!--
diff --git a/samples/RelyingPartyWebForms/.gitignore b/samples/OpenIdRelyingPartyWebForms/.gitignore
index b086a60..b086a60 100644
--- a/samples/RelyingPartyWebForms/.gitignore
+++ b/samples/OpenIdRelyingPartyWebForms/.gitignore
diff --git a/samples/RelyingPartyWebForms/Code/CustomStore.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStore.cs
index c4a7854..2363aec 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStore.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStore.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms.Code {
+namespace OpenIdRelyingPartyWebForms.Code {
 	using System;
 	using System.Data;
 	using System.Globalization;
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs
index a0ffef0..beacfc4 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.Designer.cs
@@ -10,7 +10,7 @@
 
 #pragma warning disable 1591
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     /// <summary>
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.cs
index 8dc69d4..abc77e9 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms.Code {
+namespace OpenIdRelyingPartyWebForms.Code {
 	public partial class CustomStoreDataSet {
 	}
 }
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsc b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsc
index 05b0199..05b0199 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsc
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsc
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsd b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsd
index b80310e..b80310e 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xsd
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xsd
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xss b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xss
index 483a137..483a137 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet.xss
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet.xss
diff --git a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs
index 9382ca7..580b1fa 100644
--- a/samples/RelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/CustomStoreDataSet1.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -10,7 +10,7 @@
 
 #pragma warning disable 1591
 
-namespace RelyingPartyWebForms.Code {
+namespace OpenIdRelyingPartyWebForms.Code {
     
     
     /// <summary>
diff --git a/samples/RelyingPartyWebForms/Code/State.cs b/samples/OpenIdRelyingPartyWebForms/Code/State.cs
index 857e02a..4861a34 100644
--- a/samples/RelyingPartyWebForms/Code/State.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/State.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System.Collections.Generic;
 	using System.Web;
 	using DotNetOpenAuth.OpenId.Extensions.ProviderAuthenticationPolicy;
diff --git a/samples/RelyingPartyWebForms/Code/TracePageAppender.cs b/samples/OpenIdRelyingPartyWebForms/Code/TracePageAppender.cs
index e6e453a..9848bb3 100644
--- a/samples/RelyingPartyWebForms/Code/TracePageAppender.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Code/TracePageAppender.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Generic;
 	using System.IO;
diff --git a/samples/RelyingPartyWebForms/Default.aspx b/samples/OpenIdRelyingPartyWebForms/Default.aspx
index 602d5ed..602d5ed 100644
--- a/samples/RelyingPartyWebForms/Default.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/Default.aspx
diff --git a/samples/OpenIdRelyingPartyWebForms/Global.asax b/samples/OpenIdRelyingPartyWebForms/Global.asax
new file mode 100644
index 0000000..8be3cd1
--- /dev/null
+++ b/samples/OpenIdRelyingPartyWebForms/Global.asax
@@ -0,0 +1 @@
+<%@ Application Codebehind="Global.asax.cs" Inherits="OpenIdRelyingPartyWebForms.Global" Language="C#" %>
diff --git a/samples/RelyingPartyWebForms/Global.asax.cs b/samples/OpenIdRelyingPartyWebForms/Global.asax.cs
index cdf941b..c7d1e8b 100644
--- a/samples/RelyingPartyWebForms/Global.asax.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Global.asax.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Specialized;
 	using System.IO;
diff --git a/samples/RelyingPartyWebForms/MembersOnly/Default.aspx b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
index cdfbc09..46458e8 100644
--- a/samples/RelyingPartyWebForms/MembersOnly/Default.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Default.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="~/Site.Master" %>
-<%@ Import Namespace="RelyingPartyWebForms" %>
+<%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
 
 <asp:Content ID="Content1" runat="server" ContentPlaceHolderID="Main">
 	<h2>
diff --git a/samples/RelyingPartyWebForms/MembersOnly/Web.config b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Web.config
index 3cfad05..3cfad05 100644
--- a/samples/RelyingPartyWebForms/MembersOnly/Web.config
+++ b/samples/OpenIdRelyingPartyWebForms/MembersOnly/Web.config
diff --git a/samples/RelyingPartyWebForms/RelyingPartyWebForms.csproj b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
index f67bb54..cf40440 100644
--- a/samples/RelyingPartyWebForms/RelyingPartyWebForms.csproj
+++ b/samples/OpenIdRelyingPartyWebForms/OpenIdRelyingPartyWebForms.csproj
@@ -8,8 +8,8 @@
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RelyingPartyWebForms</RootNamespace>
-    <AssemblyName>RelyingPartyWebForms</AssemblyName>
+    <RootNamespace>OpenIdRelyingPartyWebForms</RootNamespace>
+    <AssemblyName>OpenIdRelyingPartyWebForms</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/samples/RelyingPartyWebForms/PrivacyPolicy.aspx b/samples/OpenIdRelyingPartyWebForms/PrivacyPolicy.aspx
index e99112e..e99112e 100644
--- a/samples/RelyingPartyWebForms/PrivacyPolicy.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/PrivacyPolicy.aspx
diff --git a/samples/RelyingPartyWebForms/Properties/AssemblyInfo.cs b/samples/OpenIdRelyingPartyWebForms/Properties/AssemblyInfo.cs
index 6411677..ea71bfc 100644
--- a/samples/RelyingPartyWebForms/Properties/AssemblyInfo.cs
+++ b/samples/OpenIdRelyingPartyWebForms/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("RelyingPartyWebForms sample")]
+[assembly: AssemblyTitle("OpenIdRelyingPartyWebForms sample")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/samples/ServiceProvider/Settings.StyleCop b/samples/OpenIdRelyingPartyWebForms/Settings.StyleCop
index 7f55ce6..7f55ce6 100644
--- a/samples/ServiceProvider/Settings.StyleCop
+++ b/samples/OpenIdRelyingPartyWebForms/Settings.StyleCop
diff --git a/samples/RelyingPartyWebForms/Site.Master b/samples/OpenIdRelyingPartyWebForms/Site.Master
index 4171e4b..9630f78 100644
--- a/samples/RelyingPartyWebForms/Site.Master
+++ b/samples/OpenIdRelyingPartyWebForms/Site.Master
@@ -1,5 +1,5 @@
 <%@ Master Language="C#" AutoEventWireup="true" %>
-<%@ Import Namespace="RelyingPartyWebForms" %>
+<%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <script runat="server">
diff --git a/samples/RelyingPartyWebForms/TracePage.aspx b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx
index 2df425f..b115298 100644
--- a/samples/RelyingPartyWebForms/TracePage.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TracePage.aspx.cs" Inherits="RelyingPartyWebForms.TracePage" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TracePage.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.TracePage" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
diff --git a/samples/RelyingPartyWebForms/TracePage.aspx.cs b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.cs
index f859a41..171bb67 100644
--- a/samples/RelyingPartyWebForms/TracePage.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Generic;
 	using System.Web;
diff --git a/samples/RelyingPartyWebForms/TracePage.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.designer.cs
index 7755a2c..8d8720d 100644
--- a/samples/RelyingPartyWebForms/TracePage.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/TracePage.aspx.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class TracePage {
diff --git a/samples/RelyingPartyWebForms/Web.config b/samples/OpenIdRelyingPartyWebForms/Web.config
index 934510c..10cc266 100644
--- a/samples/RelyingPartyWebForms/Web.config
+++ b/samples/OpenIdRelyingPartyWebForms/Web.config
@@ -12,7 +12,7 @@
 			<relyingParty>
 				<security requireSsl="false" />
 				<!-- Uncomment the following to activate the sample custom store.  -->
-				<!--<store type="RelyingPartyWebForms.CustomStore, RelyingPartyWebForms" />-->
+				<!--<store type="OpenIdRelyingPartyWebForms.CustomStore, OpenIdRelyingPartyWebForms" />-->
 			</relyingParty>
 		</openid>
 		<messaging>
@@ -46,7 +46,7 @@
 		<compilation debug="true"/>
 		<customErrors mode="RemoteOnly"/>
 		<authentication mode="Forms">
-			<forms name="RelyingPartySession"/> <!-- named cookie prevents conflicts with other samples -->
+			<forms name="OpenIdRelyingPartySession"/> <!-- named cookie prevents conflicts with other samples -->
 		</authentication>
 		<trace enabled="false" writeToDiagnosticsTrace="true" />
 		<!-- Trust level discussion:
@@ -70,7 +70,7 @@
 				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
 			</layout>
 		</appender>
-		<appender name="TracePageAppender" type="RelyingPartyWebForms.TracePageAppender, RelyingPartyWebForms">
+		<appender name="TracePageAppender" type="OpenIdRelyingPartyWebForms.TracePageAppender, OpenIdRelyingPartyWebForms">
 			<layout type="log4net.Layout.PatternLayout">
 				<conversionPattern value="%date (GMT%date{%z}) [%thread] %-5level %logger - %message%newline" />
 			</layout>
diff --git a/samples/RelyingPartyWebForms/ajaxlogin.aspx b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx
index a44bf52..de82304 100644
--- a/samples/RelyingPartyWebForms/ajaxlogin.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ajaxlogin.aspx.cs" Inherits="RelyingPartyWebForms.ajaxlogin"
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ajaxlogin.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.ajaxlogin"
 	ValidateRequest="false" MasterPageFile="~/Site.Master" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="openid" %>
diff --git a/samples/RelyingPartyWebForms/ajaxlogin.aspx.cs b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
index 4024e59..ffaf6f0 100644
--- a/samples/RelyingPartyWebForms/ajaxlogin.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Web.UI.WebControls;
 	using DotNetOpenAuth.OpenId.Extensions.SimpleRegistration;
diff --git a/samples/RelyingPartyWebForms/ajaxlogin.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.designer.cs
index 96cf3cf..7e8f83c 100644
--- a/samples/RelyingPartyWebForms/ajaxlogin.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/ajaxlogin.aspx.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class ajaxlogin {
diff --git a/samples/RelyingPartyWebForms/images/attention.png b/samples/OpenIdRelyingPartyWebForms/images/attention.png
index 8003700..8003700 100644
--- a/samples/RelyingPartyWebForms/images/attention.png
+++ b/samples/OpenIdRelyingPartyWebForms/images/attention.png
diff --git a/samples/RelyingPartyWebForms/images/dotnetopenid_tiny.gif b/samples/OpenIdRelyingPartyWebForms/images/dotnetopenid_tiny.gif
index c4ed4f5..c4ed4f5 100644
--- a/samples/RelyingPartyWebForms/images/dotnetopenid_tiny.gif
+++ b/samples/OpenIdRelyingPartyWebForms/images/dotnetopenid_tiny.gif
diff --git a/samples/RelyingPartyWebForms/images/openid_login.gif b/samples/OpenIdRelyingPartyWebForms/images/openid_login.gif
index cde836c..cde836c 100644
--- a/samples/RelyingPartyWebForms/images/openid_login.gif
+++ b/samples/OpenIdRelyingPartyWebForms/images/openid_login.gif
diff --git a/samples/RelyingPartyWebForms/images/yahoo.png b/samples/OpenIdRelyingPartyWebForms/images/yahoo.png
index 3129217..3129217 100644
--- a/samples/RelyingPartyWebForms/images/yahoo.png
+++ b/samples/OpenIdRelyingPartyWebForms/images/yahoo.png
diff --git a/samples/RelyingPartyWebForms/login.aspx b/samples/OpenIdRelyingPartyWebForms/login.aspx
index 9aeef06..6e66fd3 100644
--- a/samples/RelyingPartyWebForms/login.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="login.aspx.cs" Inherits="RelyingPartyWebForms.login"
+<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="login.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.login"
 	ValidateRequest="false" MasterPageFile="~/Site.Master" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty" TagPrefix="rp" %>
diff --git a/samples/RelyingPartyWebForms/login.aspx.cs b/samples/OpenIdRelyingPartyWebForms/login.aspx.cs
index 4c5af89..37a714c 100644
--- a/samples/RelyingPartyWebForms/login.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Collections.Generic;
 	using System.Web.UI;
diff --git a/samples/RelyingPartyWebForms/login.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs
index 28e93ab..436ef7b 100644
--- a/samples/RelyingPartyWebForms/login.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/login.aspx.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class login {
diff --git a/samples/RelyingPartyWebForms/loginProgrammatic.aspx b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
index dfbfe69..a00eccd 100644
--- a/samples/RelyingPartyWebForms/loginProgrammatic.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="loginProgrammatic.aspx.cs"
-	Inherits="RelyingPartyWebForms.loginProgrammatic" MasterPageFile="~/Site.Master" %>
+	Inherits="OpenIdRelyingPartyWebForms.loginProgrammatic" MasterPageFile="~/Site.Master" %>
 <asp:Content ID="Content1" runat="server" ContentPlaceHolderID="Main">
 	<h2>Login Page </h2>
 	<asp:Label ID="Label1" runat="server" Text="OpenID Login" />
diff --git a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.cs b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.cs
index 52e3a49..fe73b7e 100644
--- a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
 	using System;
 	using System.Net;
 	using System.Web.Security;
diff --git a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
index 835188e..0363be7 100644
--- a/samples/RelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/loginProgrammatic.aspx.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms {
+namespace OpenIdRelyingPartyWebForms {
     
     
     public partial class loginProgrammatic {
diff --git a/samples/RelyingPartyWebForms/logout.aspx b/samples/OpenIdRelyingPartyWebForms/logout.aspx
index 84bcdc4..71c0433 100644
--- a/samples/RelyingPartyWebForms/logout.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/logout.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" %>
-<%@ Import Namespace="RelyingPartyWebForms" %>
+<%@ Import Namespace="OpenIdRelyingPartyWebForms" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <script runat="server">
diff --git a/samples/RelyingPartyWebForms/m/Login.aspx b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx
index 2915106..dda8c85 100644
--- a/samples/RelyingPartyWebForms/m/Login.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx
@@ -1,4 +1,4 @@
-<%@ Page Language="C#" CodeBehind="Login.aspx.cs" Inherits="RelyingPartyWebForms.m.Login" %>
+<%@ Page Language="C#" CodeBehind="Login.aspx.cs" Inherits="OpenIdRelyingPartyWebForms.m.Login" %>
 
 <%@ Register Assembly="DotNetOpenAuth" Namespace="DotNetOpenAuth.OpenId.RelyingParty"
 	TagPrefix="RP" %>
diff --git a/samples/RelyingPartyWebForms/m/Login.aspx.cs b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs
index 088fb5b..86cd5c1 100644
--- a/samples/RelyingPartyWebForms/m/Login.aspx.cs
+++ b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.cs
@@ -1,4 +1,4 @@
-namespace RelyingPartyWebForms.m {
+namespace OpenIdRelyingPartyWebForms.m {
 	using System;
 	using System.Web.UI.MobileControls;
 
diff --git a/samples/RelyingPartyWebForms/m/Login.aspx.designer.cs b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.designer.cs
index e3d5448..e55b802 100644
--- a/samples/RelyingPartyWebForms/m/Login.aspx.designer.cs
+++ b/samples/OpenIdRelyingPartyWebForms/m/Login.aspx.designer.cs
@@ -1,14 +1,14 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3521
+//     Runtime Version:2.0.50727.4912
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace RelyingPartyWebForms.m {
+namespace OpenIdRelyingPartyWebForms.m {
     
     
     public partial class Login {
diff --git a/samples/RelyingPartyWebForms/styles.css b/samples/OpenIdRelyingPartyWebForms/styles.css
index 2e4d3db..2e4d3db 100644
--- a/samples/RelyingPartyWebForms/styles.css
+++ b/samples/OpenIdRelyingPartyWebForms/styles.css
diff --git a/samples/RelyingPartyWebForms/xrds.aspx b/samples/OpenIdRelyingPartyWebForms/xrds.aspx
index e169bc7..e169bc7 100644
--- a/samples/RelyingPartyWebForms/xrds.aspx
+++ b/samples/OpenIdRelyingPartyWebForms/xrds.aspx
diff --git a/samples/RelyingPartyMvc/Global.asax b/samples/RelyingPartyMvc/Global.asax
deleted file mode 100644
index bc13a45..0000000
--- a/samples/RelyingPartyMvc/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="RelyingPartyMvc.MvcApplication" Language="C#" %>
diff --git a/samples/RelyingPartyWebForms/Global.asax b/samples/RelyingPartyWebForms/Global.asax
deleted file mode 100644
index 3882feb..0000000
--- a/samples/RelyingPartyWebForms/Global.asax
+++ /dev/null
@@ -1 +0,0 @@
-<%@ Application Codebehind="Global.asax.cs" Inherits="RelyingPartyWebForms.Global" Language="C#" %>
diff --git a/samples/Samples.sln b/samples/Samples.sln
index 261f829..b586268 100644
--- a/samples/Samples.sln
+++ b/samples/Samples.sln
@@ -1,69 +1,71 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumerWpf", "ConsumerWpf\ConsumerWpf.csproj", "{6EC36418-DBC5-4AD1-A402-413604AA7A08}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetOpenAuth.ApplicationBlock", "DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj", "{AA78D112-D889-414B-A7D4-467B34C7B663}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderWebForms", "OpenIdProviderWebForms\OpenIdProviderWebForms.csproj", "{2A59DE0A-B76A-4B42-9A33-04D34548353D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyMvc", "RelyingPartyMvc\RelyingPartyMvc.csproj", "{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderMvc", "OpenIdProviderMvc\OpenIdProviderMvc.csproj", "{AEA29D4D-396F-47F6-BC81-B58D4B855245}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenID", "OpenID", "{A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyWebForms", "RelyingPartyWebForms\RelyingPartyWebForms.csproj", "{1E8AEA89-BF69-47A1-B290-E8B0FE588700}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{812D828E-C91A-45AB-BAE9-3FC6D9560F9F}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Consumer", "Consumer", "{85C2FCFD-5DF7-4E62-8944-946881ED3609}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfoCard", "InfoCard", "{9145144C-1192-41C9-9A6D-D8F6BFE350F2}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "InfoCardRelyingParty", "InfoCardRelyingParty", "{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
-		Debug.AspNetCompiler.VirtualPath = "/Consumer"
-		Debug.AspNetCompiler.PhysicalPath = "Consumer\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Consumer\"
+		Debug.AspNetCompiler.VirtualPath = "/InfoCardRelyingParty"
+		Debug.AspNetCompiler.PhysicalPath = "InfoCardRelyingParty\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\InfoCardRelyingParty\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Consumer"
-		Release.AspNetCompiler.PhysicalPath = "Consumer\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Consumer\"
+		Release.AspNetCompiler.VirtualPath = "/InfoCardRelyingParty"
+		Release.AspNetCompiler.PhysicalPath = "InfoCardRelyingParty\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\InfoCardRelyingParty\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "6319"
+		VWDPort = "4490"
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "RelyingPartyClassicAsp", "RelyingPartyClassicAsp", "{6AC0A348-BB42-40E6-84EB-1A83EBD6B0D5}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OAuthConsumer", "OAuthConsumer", "{5100F73C-3082-4B81-95DD-F443F90B8EA7}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
-		Debug.AspNetCompiler.VirtualPath = "/RelyingPartyClassicAsp"
-		Debug.AspNetCompiler.PhysicalPath = "RelyingPartyClassicAsp\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\RelyingPartyClassicAsp\"
+		Debug.AspNetCompiler.VirtualPath = "/OAuthConsumer"
+		Debug.AspNetCompiler.PhysicalPath = "OAuthConsumer\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthConsumer\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/RelyingPartyClassicAsp"
-		Release.AspNetCompiler.PhysicalPath = "RelyingPartyClassicAsp\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\RelyingPartyClassicAsp\"
+		Release.AspNetCompiler.VirtualPath = "/OAuthConsumer"
+		Release.AspNetCompiler.PhysicalPath = "OAuthConsumer\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthConsumer\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "49675"
+		VWDPort = "10335"
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "ServiceProvider", "ServiceProvider", "{EF101762-3158-4CF2-92F7-61F0117A3A56}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OAuthServiceProvider", "OAuthServiceProvider", "{DD52C0C8-F986-495A-AAA1-090CFE2F801F}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
-		Debug.AspNetCompiler.VirtualPath = "/ServiceProvider"
-		Debug.AspNetCompiler.PhysicalPath = "ServiceProvider\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\ServiceProvider\"
+		Debug.AspNetCompiler.VirtualPath = "/OAuthServiceProvider"
+		Debug.AspNetCompiler.PhysicalPath = "OAuthServiceProvider\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthServiceProvider\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/ServiceProvider"
-		Release.AspNetCompiler.PhysicalPath = "ServiceProvider\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\ServiceProvider\"
+		Release.AspNetCompiler.VirtualPath = "/OAuthServiceProvider"
+		Release.AspNetCompiler.PhysicalPath = "OAuthServiceProvider\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthServiceProvider\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
@@ -72,52 +74,112 @@ Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "ServiceProvider", "ServiceP
 		VWDDynamicPort = "false"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderMvc", "OpenIdProviderMvc\OpenIdProviderMvc.csproj", "{AEA29D4D-396F-47F6-BC81-B58D4B855245}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthConsumerWpf", "OAuthConsumerWpf\OAuthConsumerWpf.csproj", "{6EC36418-DBC5-4AD1-A402-413604AA7A08}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdRelyingPartyMvc", "OpenIdRelyingPartyMvc\OpenIdRelyingPartyMvc.csproj", "{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdRelyingPartyWebForms", "OpenIdRelyingPartyWebForms\OpenIdRelyingPartyWebForms.csproj", "{1E8AEA89-BF69-47A1-B290-E8B0FE588700}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OpenIdRelyingPartyClassicAsp", "OpenIdRelyingPartyClassicAsp", "{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFramework = "2.0"
+		Debug.AspNetCompiler.VirtualPath = "/OpenIdRelyingPartyClassicAsp"
+		Debug.AspNetCompiler.PhysicalPath = "OpenIdRelyingPartyClassicAsp\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\OpenIdRelyingPartyClassicAsp\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/OpenIdRelyingPartyClassicAsp"
+		Release.AspNetCompiler.PhysicalPath = "OpenIdRelyingPartyClassicAsp\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\OpenIdRelyingPartyClassicAsp\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "10318"
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		CodeAnalysis|Any CPU = CodeAnalysis|Any CPU
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA78D112-D889-414B-A7D4-467B34C7B663}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{AA78D112-D889-414B-A7D4-467B34C7B663}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
 		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
 		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Release|Any CPU.Build.0 = Release|Any CPU
-		{85C2FCFD-5DF7-4E62-8944-946881ED3609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{85C2FCFD-5DF7-4E62-8944-946881ED3609}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{85C2FCFD-5DF7-4E62-8944-946881ED3609}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{85C2FCFD-5DF7-4E62-8944-946881ED3609}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{6AC0A348-BB42-40E6-84EB-1A83EBD6B0D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AC0A348-BB42-40E6-84EB-1A83EBD6B0D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6AC0A348-BB42-40E6-84EB-1A83EBD6B0D5}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{6AC0A348-BB42-40E6-84EB-1A83EBD6B0D5}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{EF101762-3158-4CF2-92F7-61F0117A3A56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF101762-3158-4CF2-92F7-61F0117A3A56}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF101762-3158-4CF2-92F7-61F0117A3A56}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF101762-3158-4CF2-92F7-61F0117A3A56}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0}.Release|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245} = {A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}
+		{2A59DE0A-B76A-4B42-9A33-04D34548353D} = {A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB} = {A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700} = {A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}
+		{9F9A83C3-55FC-42F1-A6B6-15A52BD01FC0} = {A4059F7E-8E6F-4FA2-A1D5-1B9B46C93F82}
+		{5100F73C-3082-4B81-95DD-F443F90B8EA7} = {812D828E-C91A-45AB-BAE9-3FC6D9560F9F}
+		{DD52C0C8-F986-495A-AAA1-090CFE2F801F} = {812D828E-C91A-45AB-BAE9-3FC6D9560F9F}
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08} = {812D828E-C91A-45AB-BAE9-3FC6D9560F9F}
+		{BE7016A8-D1B9-471A-AA53-A3D0CB800D35} = {9145144C-1192-41C9-9A6D-D8F6BFE350F2}
+	EndGlobalSection
 EndGlobal
diff --git a/src/DotNetOpenAuth.sln b/src/DotNetOpenAuth.sln
index 0b8b301..a811989 100644
--- a/src/DotNetOpenAuth.sln
+++ b/src/DotNetOpenAuth.sln
@@ -22,132 +22,132 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Specs", "Specs", "{CD57219F
 		..\doc\specs\openid-simple-registration-extension-1_0.html = ..\doc\specs\openid-simple-registration-extension-1_0.html
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Consumer", "..\samples\Consumer", "{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B4C6F647-C046-4B54-BE12-7701C4119EE7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetOpenAuth.ApplicationBlock", "..\samples\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj", "{AA78D112-D889-414B-A7D4-467B34C7B663}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DotNetOpenAuth.TestWeb", "DotNetOpenAuth.TestWeb", "{47A84EF7-68C3-4D47-926A-9CCEA6518531}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
-		ProjectReferences = "{3191B653-F76D-4C1A-9A5A-347BC3AAAAB7}|DotNetOpenAuth.dll;{AA78D112-D889-414B-A7D4-467B34C7B663}|DotNetOpenAuth.ApplicationBlock.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/Consumer"
-		Debug.AspNetCompiler.PhysicalPath = "..\samples\Consumer\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\Consumer\"
-		Debug.AspNetCompiler.Updateable = "true"
+		ProjectReferences = "{3191B653-F76D-4C1A-9A5A-347BC3AAAAB7}|DotNetOpenAuth.dll;{4376ECC9-C346-4A99-B13C-FA93C0FBD2C9}|DotNetOpenAuth.Test.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/DotNetOpenAuth.TestWeb"
+		Debug.AspNetCompiler.PhysicalPath = "DotNetOpenAuth.TestWeb\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\DotNetOpenAuth.TestWeb\"
+		Debug.AspNetCompiler.Updateable = "false"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/Consumer"
-		Release.AspNetCompiler.PhysicalPath = "..\samples\Consumer\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\Consumer\"
-		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.VirtualPath = "/DotNetOpenAuth.TestWeb"
+		Release.AspNetCompiler.PhysicalPath = "DotNetOpenAuth.TestWeb\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\DotNetOpenAuth.TestWeb\"
+		Release.AspNetCompiler.Updateable = "false"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4486"
+		VWDPort = "5073"
 		DefaultWebSiteLanguage = "Visual C#"
-	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557} = {EC910270-AAB6-4AC6-9B57-99118CFBE557}
+		StartServerOnDebug = "false"
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B4C6F647-C046-4B54-BE12-7701C4119EE7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderWebForms", "..\samples\OpenIdProviderWebForms\OpenIdProviderWebForms.csproj", "{2A59DE0A-B76A-4B42-9A33-04D34548353D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsumerWpf", "..\samples\ConsumerWpf\ConsumerWpf.csproj", "{6EC36418-DBC5-4AD1-A402-413604AA7A08}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderMvc", "..\samples\OpenIdProviderMvc\OpenIdProviderMvc.csproj", "{AEA29D4D-396F-47F6-BC81-B58D4B855245}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "ServiceProvider", "..\samples\ServiceProvider", "{EC910270-AAB6-4AC6-9B57-99118CFBE557}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "InfoCardRelyingParty", "..\samples\InfoCardRelyingParty", "{6EB90284-BD15-461C-BBF2-131CF55F7C8B}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
 		ProjectReferences = "{3191B653-F76D-4C1A-9A5A-347BC3AAAAB7}|DotNetOpenAuth.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/ServiceProvider"
-		Debug.AspNetCompiler.PhysicalPath = "..\samples\ServiceProvider\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\ServiceProvider\"
+		Debug.AspNetCompiler.VirtualPath = "/InfoCardRelyingParty"
+		Debug.AspNetCompiler.PhysicalPath = "..\samples\InfoCardRelyingParty\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\InfoCardRelyingParty\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/ServiceProvider"
-		Release.AspNetCompiler.PhysicalPath = "..\samples\ServiceProvider\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\ServiceProvider\"
+		Release.AspNetCompiler.VirtualPath = "/InfoCardRelyingParty"
+		Release.AspNetCompiler.PhysicalPath = "..\samples\InfoCardRelyingParty\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\InfoCardRelyingParty\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "65169"
-		VWDDynamicPort = "false"
-		DefaultWebSiteLanguage = "Visual C#"
+		VWDPort = "4490"
+		DefaultWebSiteLanguage = "Visual Basic"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetOpenAuth.ApplicationBlock", "..\samples\DotNetOpenAuth.ApplicationBlock\DotNetOpenAuth.ApplicationBlock.csproj", "{AA78D112-D889-414B-A7D4-467B34C7B663}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdRelyingPartyMvc", "..\samples\OpenIdRelyingPartyMvc\OpenIdRelyingPartyMvc.csproj", "{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}"
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "DotNetOpenAuth.TestWeb", "DotNetOpenAuth.TestWeb", "{47A84EF7-68C3-4D47-926A-9CCEA6518531}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdRelyingPartyWebForms", "..\samples\OpenIdRelyingPartyWebForms\OpenIdRelyingPartyWebForms.csproj", "{1E8AEA89-BF69-47A1-B290-E8B0FE588700}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OpenIdRelyingPartyClassicAsp", "..\samples\OpenIdRelyingPartyClassicAsp", "{BBACD972-014D-478F-9B07-56B9E1D4CC73}"
 	ProjectSection(WebsiteProperties) = preProject
-		TargetFramework = "3.5"
-		ProjectReferences = "{3191B653-F76D-4C1A-9A5A-347BC3AAAAB7}|DotNetOpenAuth.dll;{4376ECC9-C346-4A99-B13C-FA93C0FBD2C9}|DotNetOpenAuth.Test.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/DotNetOpenAuth.TestWeb"
-		Debug.AspNetCompiler.PhysicalPath = "DotNetOpenAuth.TestWeb\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\DotNetOpenAuth.TestWeb\"
-		Debug.AspNetCompiler.Updateable = "false"
+		TargetFramework = "2.0"
+		Debug.AspNetCompiler.VirtualPath = "/OpenIdRelyingPartyClassicAsp"
+		Debug.AspNetCompiler.PhysicalPath = "..\samples\OpenIdRelyingPartyClassicAsp\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\OpenIdRelyingPartyClassicAsp\"
+		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/DotNetOpenAuth.TestWeb"
-		Release.AspNetCompiler.PhysicalPath = "DotNetOpenAuth.TestWeb\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\DotNetOpenAuth.TestWeb\"
-		Release.AspNetCompiler.Updateable = "false"
+		Release.AspNetCompiler.VirtualPath = "/OpenIdRelyingPartyClassicAsp"
+		Release.AspNetCompiler.PhysicalPath = "..\samples\OpenIdRelyingPartyClassicAsp\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\OpenIdRelyingPartyClassicAsp\"
+		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "5073"
-		DefaultWebSiteLanguage = "Visual C#"
-		StartServerOnDebug = "false"
+		VWDPort = "10318"
 	EndProjectSection
 EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "RelyingPartyClassicAsp", "..\samples\RelyingPartyClassicAsp", "{97684CCA-BB86-4B77-8124-D73A5514B270}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAuthConsumerWpf", "..\samples\OAuthConsumerWpf\OAuthConsumerWpf.csproj", "{6EC36418-DBC5-4AD1-A402-413604AA7A08}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenID", "OpenID", "{034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OAuth", "OAuth", "{1E2CBAA5-60A3-4AED-912E-541F5753CDC6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "InfoCard", "InfoCard", "{8A5CEDB9-7F8A-4BE2-A1B9-97130F453277}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OAuthConsumer", "..\samples\OAuthConsumer", "{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
-		Debug.AspNetCompiler.VirtualPath = "/RelyingPartyClassicAsp"
-		Debug.AspNetCompiler.PhysicalPath = "..\samples\RelyingPartyClassicAsp\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\RelyingPartyClassicAsp\"
+		ProjectReferences = "{3191B653-F76D-4C1A-9A5A-347BC3AAAAB7}|DotNetOpenAuth.dll;{AA78D112-D889-414B-A7D4-467B34C7B663}|DotNetOpenAuth.ApplicationBlock.dll;"
+		Debug.AspNetCompiler.VirtualPath = "/OAuthConsumer"
+		Debug.AspNetCompiler.PhysicalPath = "..\samples\OAuthConsumer\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthConsumer\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/RelyingPartyClassicAsp"
-		Release.AspNetCompiler.PhysicalPath = "..\samples\RelyingPartyClassicAsp\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\RelyingPartyClassicAsp\"
+		Release.AspNetCompiler.VirtualPath = "/OAuthConsumer"
+		Release.AspNetCompiler.PhysicalPath = "..\samples\OAuthConsumer\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthConsumer\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "5364"
-		DefaultWebSiteLanguage = "Visual C#"
+		VWDPort = "10335"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyWebForms", "..\samples\RelyingPartyWebForms\RelyingPartyWebForms.csproj", "{1E8AEA89-BF69-47A1-B290-E8B0FE588700}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderWebForms", "..\samples\OpenIdProviderWebForms\OpenIdProviderWebForms.csproj", "{2A59DE0A-B76A-4B42-9A33-04D34548353D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RelyingPartyMvc", "..\samples\RelyingPartyMvc\RelyingPartyMvc.csproj", "{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenIdProviderMvc", "..\samples\OpenIdProviderMvc\OpenIdProviderMvc.csproj", "{AEA29D4D-396F-47F6-BC81-B58D4B855245}"
-EndProject
-Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "InfoCardRelyingParty", "..\samples\InfoCardRelyingParty", "{6EB90284-BD15-461C-BBF2-131CF55F7C8B}"
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "OAuthServiceProvider", "..\samples\OAuthServiceProvider", "{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}"
 	ProjectSection(WebsiteProperties) = preProject
 		TargetFramework = "3.5"
 		ProjectReferences = "{3191B653-F76D-4C1A-9A5A-347BC3AAAAB7}|DotNetOpenAuth.dll;"
-		Debug.AspNetCompiler.VirtualPath = "/InfoCardRelyingParty"
-		Debug.AspNetCompiler.PhysicalPath = "..\samples\InfoCardRelyingParty\"
-		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\InfoCardRelyingParty\"
+		Debug.AspNetCompiler.VirtualPath = "/OAuthServiceProvider"
+		Debug.AspNetCompiler.PhysicalPath = "..\samples\OAuthServiceProvider\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthServiceProvider\"
 		Debug.AspNetCompiler.Updateable = "true"
 		Debug.AspNetCompiler.ForceOverwrite = "true"
 		Debug.AspNetCompiler.FixedNames = "false"
 		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.VirtualPath = "/InfoCardRelyingParty"
-		Release.AspNetCompiler.PhysicalPath = "..\samples\InfoCardRelyingParty\"
-		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\InfoCardRelyingParty\"
+		Release.AspNetCompiler.VirtualPath = "/OAuthServiceProvider"
+		Release.AspNetCompiler.PhysicalPath = "..\samples\OAuthServiceProvider\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\OAuthServiceProvider\"
 		Release.AspNetCompiler.Updateable = "true"
 		Release.AspNetCompiler.ForceOverwrite = "true"
 		Release.AspNetCompiler.FixedNames = "false"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "4490"
-		DefaultWebSiteLanguage = "Visual Basic"
+		VWDPort = "65169"
+		VWDDynamicPort = "false"
 	EndProjectSection
 EndProject
 Global
@@ -172,24 +172,6 @@ Global
 		{4376ECC9-C346-4A99-B13C-FA93C0FBD2C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4376ECC9-C346-4A99-B13C-FA93C0FBD2C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4376ECC9-C346-4A99-B13C-FA93C0FBD2C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557}.Release|Any CPU.Build.0 = Debug|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
 		{AA78D112-D889-414B-A7D4-467B34C7B663}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -202,29 +184,12 @@ Global
 		{47A84EF7-68C3-4D47-926A-9CCEA6518531}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47A84EF7-68C3-4D47-926A-9CCEA6518531}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{47A84EF7-68C3-4D47-926A-9CCEA6518531}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{97684CCA-BB86-4B77-8124-D73A5514B270}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
-		{97684CCA-BB86-4B77-8124-D73A5514B270}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
-		{97684CCA-BB86-4B77-8124-D73A5514B270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{97684CCA-BB86-4B77-8124-D73A5514B270}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{97684CCA-BB86-4B77-8124-D73A5514B270}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{97684CCA-BB86-4B77-8124-D73A5514B270}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A59DE0A-B76A-4B42-9A33-04D34548353D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
-		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
 		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
 		{AEA29D4D-396F-47F6-BC81-B58D4B855245}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -237,21 +202,60 @@ Global
 		{6EB90284-BD15-461C-BBF2-131CF55F7C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6EB90284-BD15-461C-BBF2-131CF55F7C8B}.Release|Any CPU.ActiveCfg = Debug|Any CPU
 		{6EB90284-BD15-461C-BBF2-131CF55F7C8B}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.CodeAnalysis|Any CPU.ActiveCfg = Release|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.CodeAnalysis|Any CPU.Build.0 = Release|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.CodeAnalysis|Any CPU.ActiveCfg = CodeAnalysis|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.CodeAnalysis|Any CPU.Build.0 = CodeAnalysis|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3}.Release|Any CPU.Build.0 = Debug|Any CPU
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}.CodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}.CodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191}.Release|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{CD57219F-24F4-4136-8741-6063D0D7A031} = {20B5E173-C3C4-49F8-BD25-E69044075B4D}
-		{F9076F04-17AF-4205-93A2-1D3BEBFCDAEB} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{6EC36418-DBC5-4AD1-A402-413604AA7A08} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{EC910270-AAB6-4AC6-9B57-99118CFBE557} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
 		{AA78D112-D889-414B-A7D4-467B34C7B663} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{97684CCA-BB86-4B77-8124-D73A5514B270} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{1E8AEA89-BF69-47A1-B290-E8B0FE588700} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{2A59DE0A-B76A-4B42-9A33-04D34548353D} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{AEA29D4D-396F-47F6-BC81-B58D4B855245} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
-		{6EB90284-BD15-461C-BBF2-131CF55F7C8B} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
+		{034D5B5B-7D00-4A9D-8AFE-4A476E0575B1} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
+		{8A5CEDB9-7F8A-4BE2-A1B9-97130F453277} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
+		{1E2CBAA5-60A3-4AED-912E-541F5753CDC6} = {B4C6F647-C046-4B54-BE12-7701C4119EE7}
+		{AEA29D4D-396F-47F6-BC81-B58D4B855245} = {034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}
+		{07B193F1-68AD-4E9C-98AF-BEFB5E9403CB} = {034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}
+		{1E8AEA89-BF69-47A1-B290-E8B0FE588700} = {034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}
+		{BBACD972-014D-478F-9B07-56B9E1D4CC73} = {034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}
+		{2A59DE0A-B76A-4B42-9A33-04D34548353D} = {034D5B5B-7D00-4A9D-8AFE-4A476E0575B1}
+		{6EB90284-BD15-461C-BBF2-131CF55F7C8B} = {8A5CEDB9-7F8A-4BE2-A1B9-97130F453277}
+		{6EC36418-DBC5-4AD1-A402-413604AA7A08} = {1E2CBAA5-60A3-4AED-912E-541F5753CDC6}
+		{9ADBE36D-9960-48F6-82E9-B4AC559E9AC3} = {1E2CBAA5-60A3-4AED-912E-541F5753CDC6}
+		{7ADCCD5C-AC2B-4340-9410-FE3A31A48191} = {1E2CBAA5-60A3-4AED-912E-541F5753CDC6}
 	EndGlobalSection
 EndGlobal
diff --git a/src/DotNetOpenAuth.vsmdi b/src/DotNetOpenAuth.vsmdi
index dba5a01..a992475 100644
--- a/src/DotNetOpenAuth.vsmdi
+++ b/src/DotNetOpenAuth.vsmdi
@@ -27,7 +27,7 @@
       <TestLink id="bdba0004-be80-f5c1-1aae-487db09bdf04" name="GetReturnToArgumentDoesNotReturnExtraArgs" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="8fd673c8-977a-7b66-72cb-38c7054796c7" name="DiscoverRequireSslWithSecureRedirects" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="8a5c9404-1e77-68cf-229a-ef7ed413e6e7" name="OptionalNonNullableStruct" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="8375c7bb-b539-3396-885a-a3ca220078ec" name="InsufficientlyProtectedMessageSent" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="8346368c-9c8a-de76-18dd-5faeeac3917d" name="OPRejectsMismatchingAssociationAndSessionTypes" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="315b5857-7697-8222-f94c-f6f10d539491" name="BaseSignatureStringTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="0290975f-02ce-d8a7-d723-5dae623cab46" name="CtorNullTokenManager" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="21cf1f9a-063f-395a-f8aa-92c190c69146" name="SignaturesMatchKnownGood" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -40,6 +40,7 @@
       <TestLink id="9d4a230d-9e74-dc1b-ecdc-bf875b56e1b3" name="CtorNullVersion" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="04be6602-31a2-f4ae-8fdb-b9ad2ac370be" name="PrepareMessageForReceiving" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="90557d85-db17-e9ab-e17b-32d6cc9fd437" name="TrimFragment" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="0f36556d-ece7-eb70-8597-a9d085165c2c" name="Sign" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e1958fc5-a979-88b2-b593-3bc89ad6ad4e" name="GetEnumeratorUntyped" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="248f0afc-979f-a86f-e7de-fdeb4f9dd3ea" name="CtorBadUri" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="a94ee2ec-02df-b535-1d2e-0c5db9c76b49" name="ReceiveUnrecognizedMessage" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -64,9 +65,11 @@
       <TestLink id="ed7efca3-c3c1-bc4a-cef7-eaf984749355" name="ValidMessageReceivedTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="fe55cc74-98eb-c6c7-622f-77ad3e304c10" name="EqualityTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f362baf3-da5b-1b8c-39ae-7c9b2051270a" name="AuthenticationTimeUtcSetUtc" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="77934ac4-bd65-7ad8-9c53-9c9447f9e175" name="GetReturnToArgumentAndNames" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="643d722c-2c2b-fbd8-a499-5a852ef14dc7" name="PrepareMessageForSending" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5a0d31d9-9c70-2a28-3e8c-46e8e047ac2d" name="ReceiveNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="8bbc6a02-b5a4-ea8e-2a77-8d1b6671ceb5" name="ImplicitConverstionFromUriTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="a1a0178c-cd4a-1651-8535-3c9ee3d40821" name="ToDictionaryWithNullKey" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5ab06bb5-d047-8c3a-6b91-5951e0a55cc5" name="ToStringTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="d6951a97-9d0b-31c1-7a29-01fbb986c5a9" name="SpoofedClaimedIdDetectionSolicited" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="c057a3e5-b527-62a9-c19b-abb82e6be621" name="SendIndirectMessage301GetEmptyRecipient" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -82,7 +85,6 @@
       <TestLink id="7f9c4a9e-de7a-555c-543d-db89b757588e" name="AppendQueryArgs" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="c23e762d-4162-cb9e-47b3-455a568b5072" name="SendIndirectMessageFormPostEmptyRecipient" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e9cceef5-383d-92f0-a8bb-f3e207582836" name="RealmReturnToMismatchV2" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="2f6a81c5-cd04-0ca0-22ee-d4213f9cf147" name="EqualityTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="0f80456a-5465-dd68-bfb0-ba27b676187c" name="EqualsTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="53cbbf4a-89d3-122b-0d88-662f3022ce26" name="OpenIdMaxAuthenticationTime" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="03e293d0-dbe8-ad09-1ddd-de7be2cf9276" name="CopyTo" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -98,7 +100,7 @@
       <TestLink id="1f3ea08b-9880-635f-368f-9fcd3e25f3cd" name="ReadFromRequestNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f1e1aa37-c712-6096-22fa-394008f0820a" name="CtorNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e9bc3f63-aeb1-d84d-8abc-fc6ed77955e6" name="SignedResponsesIncludeExtraDataInSignature" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="8346368c-9c8a-de76-18dd-5faeeac3917d" name="OPRejectsMismatchingAssociationAndSessionTypes" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="78f622a3-750c-12c5-afc6-470c1bf71d85" name="ProtocolDetectionWithoutClues" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="b211de14-4dd8-bd3e-dcf0-58f0c6aa0031" name="AllowUnsignedIncomingExtensionsDefault" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="121983e3-1336-70cb-8d2a-498629e92bec" name="GetReturnToArgumentNullKey" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="13acd546-c82e-324c-220d-34f42a6d705e" name="DeserializeSimple" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -136,7 +138,7 @@
       <TestLink id="e2b1ae2a-8f30-b6b3-bca6-ef28fc5a0175" name="ClaimedIdAndLocalIdSpecifiedIsValid" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="577b8522-8516-4f62-22db-76227bf82f4c" name="UserSetupUrlNotRequiredInV1SetupOrV2" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="9026e58c-8582-0852-3c3c-9eadfd544cbc" name="VerifyNonZeroLengthOnEmpty" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="65f16786-7296-ee46-8a8f-82f18b211234" name="AddByKeyValuePair" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="a59c5dc0-de4d-8136-8545-2e2e9616de46" name="SerializationWithXri" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="cc0031b8-1fdb-cd87-97c1-c6f893c296e0" name="TooManyBindingElementsProvidingSameProtection" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e2ab77b2-a6dc-f165-1485-140b9b3d916f" name="EqualityTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="41ff051f-03d5-5f06-c6e4-615360cac08a" name="ReadFromRequestDisallowedHttpMethod" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -157,12 +159,11 @@
       <TestLink id="1ea8bd07-75a5-bfc0-5f8c-1a78d04240c2" name="TryGetValue" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="715dcbdd-28f5-3c33-7d88-e0a1b648d89a" name="CreateRequestDumbMode" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="352d9fd6-cf38-4b72-478f-e3e17ace55f5" name="NoValueLoose" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="9986fea9-8d64-9ada-60cb-ab95adb50fb7" name="ToStringDeferredEmptyMultiLine" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="62c6ee5b-ac29-461c-2373-bf620e948825" name="InvalidRealmNoScheme" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="63944cb8-4c61-c42c-906f-986fa793370b" name="SignatureTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="2a7b77c3-27d5-7788-e664-5d20118d223b" name="OPRejectsHttpNoEncryptionAssociateRequests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="98e7a0f9-ab6c-7ff1-3a2c-00d8244e1bec" name="CommonMethods" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="385c302d-b546-c164-2a59-2e35f75d7d60" name="RemoveStructDeclaredProperty" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="93c157e8-1293-3aff-f616-66502872b37d" name="DiscoveryRequiresSslIgnoresInsecureEndpointsInXrds" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e137b84a-d2a7-9af6-d15d-a92417668ccf" name="Transport" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5218fba2-d1af-e1f4-7641-9ae1d4975430" name="DirectResponsesSentUsingKeyValueForm" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f787ae5d-b8fc-0862-a527-9157d11bbed7" name="UntrustedWebRequest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -185,6 +186,7 @@
       <TestLink id="a79e43c9-ad5a-5543-51ff-22271ec87ab0" name="PrepareMessageForSendingNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e3a3b3b6-e05f-0a99-e20c-af91a9065819" name="AssociateRequestDeterminedBySecuritySettings" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="7b89844d-f60a-fb66-c48d-e483864c66b5" name="RespondTooManyValues" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="e8337858-a320-8aad-51aa-402e65a90b75" name="ReplayDetectionTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="0f56721c-ef8f-84be-28b7-d909614c2f85" name="EqualsTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="b71e8878-b20e-5d96-bce4-7f10831ceaf8" name="AddPolicies" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="0443f5f8-aa08-80d5-dcc6-261802debe5a" name="XrdsDirectDiscovery_10" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -196,6 +198,7 @@
       <TestLink id="777af676-ee70-0e16-799b-85b9ec33cd63" name="IsValid" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f583b298-139a-e733-dde6-f9dc4b73d4bf" name="SendDirectMessageResponseHonorsHttpStatusCodes" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5f02e24c-2972-c598-ca71-ea362b2fe7d8" name="SecuritySettingsSetNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="65f16786-7296-ee46-8a8f-82f18b211234" name="AddByKeyValuePair" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f49bcd49-76fb-bfea-b119-4e0f70159f80" name="OpenIdProvider" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5aa4dfa9-9691-bfe0-7d81-587cfa519a55" name="DirectResponsesReceivedAsKeyValueForm" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="832dbf28-5bf2-bd95-9029-bf798349d917" name="GetCallbackArguments" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -211,7 +214,7 @@
       <TestLink id="73c6c979-205d-2216-d98d-2dd136b352c6" name="UtcCreationDateConvertsToUniversal" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="4bd86299-18d7-abbe-e5d2-1afad17279e9" name="Parse" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="fa2e5bbd-4c41-f2b1-e875-38c6ef011fa1" name="RandomCharactersTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="77934ac4-bd65-7ad8-9c53-9c9447f9e175" name="GetReturnToArgumentAndNames" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="47706bc6-7bee-0385-62b4-4f9cec6cc702" name="CtorWithTextMessage" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="a778f331-f14e-9d6e-f942-a023423540f6" name="Ctor" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="495dd486-08dd-d365-7a84-67d96fef8460" name="SendIndirectedUndirectedMessage" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="fda58c48-e03a-73a3-4294-9a49e776ffb6" name="CtorWithTextMessageAndInnerException" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -262,9 +265,9 @@
       <TestLink id="8b11aa63-4c0f-41ff-f70c-882aacf939fe" name="CtorCountNegative" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="28fe030c-d36e-13cf-475c-7813210bf886" name="AddAttributeRequestAgain" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="538a7a31-b908-a435-4861-2bff584f6340" name="ApplyHeadersToResponseNullResponse" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="93c157e8-1293-3aff-f616-66502872b37d" name="DiscoveryRequiresSslIgnoresInsecureEndpointsInXrds" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="64142858-d52e-be06-d11f-6be326c6176b" name="RespondTwoValues" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="910f8448-5454-8ae5-cba3-690c7f375576" name="ParameterNames" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="8375c7bb-b539-3396-885a-a3ca220078ec" name="InsufficientlyProtectedMessageSent" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="507cd1b6-1010-0bca-cf7f-f96e3f4f6c6c" name="QueryBeforeSettingUrl" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="734dd45c-6320-26a9-e412-62ecacfd285a" name="CtorNullAttribute" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="3df1f62b-4fb4-d399-cf7f-40b72001d9d6" name="CtorUnsolicited" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -289,6 +292,7 @@
       <TestLink id="fdf439d0-3b74-4d32-d395-d5a2559ed88b" name="Ctor" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5f3758b3-1410-c742-e623-b964c01b0633" name="AuthenticationTimeUtcConvertsToUtc" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="547cfee6-bbb4-6138-a114-fc0eb6cc94f6" name="PrivateAssociationTampered" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="385c302d-b546-c164-2a59-2e35f75d7d60" name="RemoveStructDeclaredProperty" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="b2b54c72-1d26-8c28-ebf5-7a5a4beeec43" name="VerifyNonZeroLengthOnNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="14acb719-f090-018f-b870-9a5acb1d7179" name="AddAuthLevelTypes" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="90d3c411-8895-a07f-7a21-258b9d43c5b2" name="InvalidMessageNoNonceReceivedTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -297,7 +301,6 @@
       <TestLink id="534bee09-36e1-c3e0-f6af-bc191b10aa48" name="CtorNullSigner" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="ae384709-e9a4-0142-20ba-6adb6b40b3e2" name="CtorStringHttpsSchemeSecure" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="3b70dd09-384d-5b99-222b-dc8ce8e791f2" name="SecuritySettingsSetNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="b70b4bd5-6dae-b4ad-349c-c3ad70603773" name="ReadFromRequestQueryString" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="19d2219e-c04d-fa3a-5e26-92448f35f21d" name="RespondNull" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="f17128c1-5953-5391-ed75-c33774eacbfc" name="LastLineNotTerminated" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="2f1a3fc4-77ec-2ae3-668c-9e18f9ab0ebe" name="SendIndirectMessage301Get" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -348,7 +351,6 @@
       <TestLink id="809afd59-8f10-ce37-6630-06b59351a05a" name="CommonProperties" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="ca9f3da7-e19f-b58b-54fe-54fa56ab9556" name="AddByKeyAndValue" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="95e1fc36-2500-2721-1919-35e9e8349a1c" name="AddPolicyMultipleTimes" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="a59c5dc0-de4d-8136-8545-2e2e9616de46" name="SerializationWithXri" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="aedfde98-4357-5b63-7dca-cced838ee416" name="Provider" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="ae8b7cba-696e-2362-d5e1-79a9c202a994" name="EmptyLineLoose" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="e7aacb49-62ef-637d-ada2-0a12d836414d" name="ExtensionFactory" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -357,7 +359,6 @@
       <TestLink id="fc7af2d7-6262-d761-335b-ef3ec029484d" name="DeserializeVerifyElementOrdering" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5dd2e6c9-ff0f-48de-3a1a-cbab61370843" name="SetCountNegative" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="dbf7855c-0cc6-309f-b5f5-022e0b95fe3b" name="QueryStringLookupWithoutQuery" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="736a09b4-f56e-0176-6c1c-81db0fbe3412" name="CtorUriHttpsSchemeSecure" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="cc9200bf-1399-d40a-9754-6415f0b7bcf8" name="CreateRequest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="0aa1bc22-0b26-3977-5983-5dc4a454cea5" name="OptionalNullableStruct" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="7ea157db-cf32-529f-f1d3-b3351f17725a" name="CtorSimpleServiceProvider" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -369,7 +370,6 @@
       <TestLink id="2e23dc5a-93ea-11a5-d00d-02d294794e5f" name="AssociateDiffieHellmanOverHttps" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="40e1121e-8ff3-df73-203b-04baab671a0c" name="ImplicitConversionToStringTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="724cc3e8-c13c-5cc6-ce14-25c51ad6297d" name="Mode" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="78f622a3-750c-12c5-afc6-470c1bf71d85" name="ProtocolDetectionWithoutClues" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="3027bfe5-3612-7089-16cc-d6a2a556a41f" name="Transport" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="90f06a50-7b81-05ec-3dc0-7b3e8ade8cfa" name="NormalizeCase" storage="..\bin\debug\dotnetopenauth.test.dll" enabled="false" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="a6ea74e5-8681-4eb4-a51b-5051e5f7603c" name="NonFieldOrPropertyMember" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -378,7 +378,7 @@
       <TestLink id="7fb8d29c-c8ea-7f88-ed42-ae7368d6a429" name="CtorNullStore" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="264cd371-e830-c09b-5511-18f54d4c69d5" name="RespondSimpleValue" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="035cd43a-23d5-af91-12ee-0a0ce78b3548" name="XrdsDiscoveryFromHttpHeader" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="f69f1c0c-e258-95fb-4fcb-ad14bfc40e3c" name="Discover" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="9986fea9-8d64-9ada-60cb-ab95adb50fb7" name="ToStringDeferredEmptyMultiLine" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="d067c55c-3715-ed87-14a2-c07349813c94" name="IsDirectedIdentity" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="ef20222d-b2e2-d593-17fa-512041020643" name="InvalidRealmNullString" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="50986611-9de6-a112-2fe8-691210989f45" name="IsTypeUriPresent" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -394,7 +394,7 @@
       <TestLink id="f334cc44-b2d0-2d67-358a-532def3bee80" name="ContainsKeyValuePair" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="4ba7ca33-72f1-3fc6-d37c-65134eda904d" name="AddDeclaredValueThatAlreadyExists" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5e0c892d-7ad8-6d56-1f1d-2fb6236670d6" name="CtorDefault" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="e03f0038-5bb7-92f2-87a7-00a7d2c31a77" name="MessageExpirationWithoutTamperResistance" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="736a09b4-f56e-0176-6c1c-81db0fbe3412" name="CtorUriHttpsSchemeSecure" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="069995aa-4136-610b-3f41-df80a138c244" name="AppendQueryArgsNullUriBuilder" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="71564ca7-7845-92b3-7433-2f2beeb6b9f7" name="VerifyNonZeroLengthOnNonEmpty" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="b191e585-49d9-df8e-c156-307f798db169" name="AddAttributeRequest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -413,8 +413,8 @@
       <TestLink id="06b350b0-79d1-9393-7620-cd919061898c" name="ParseEndUserSuppliedUriIdentifier" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="a9f7897c-b299-807b-0612-384732cd10c9" name="Ctor" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="456c3468-9081-4879-7e7e-8299bd8c7f68" name="IsReadOnly" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="0f36556d-ece7-eb70-8597-a9d085165c2c" name="Sign" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="47706bc6-7bee-0385-62b4-4f9cec6cc702" name="CtorWithTextMessage" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="e03f0038-5bb7-92f2-87a7-00a7d2c31a77" name="MessageExpirationWithoutTamperResistance" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="f69f1c0c-e258-95fb-4fcb-ad14bfc40e3c" name="Discover" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="5435ab79-de25-e2fc-0b2d-b05d5686d27d" name="IsUrlWithinRealmTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="06ec5bce-5a78-89c3-0cda-fa8bddfea27d" name="SetCountZero" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="93041654-1050-3878-6b90-656a7e2e3cfd" name="CtorDefault" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
@@ -436,9 +436,9 @@
       <TestLink id="54a65e0b-1857-72b9-797b-fe3d9a082131" name="Ctor" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="ef8a2274-4e58-0dde-4c5c-7f286865fc3a" name="SendReplayProtectedMessageSetsNonce" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="3c438474-63f3-b56c-dcba-1ed923fcdbdd" name="CreateResponse" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="e8337858-a320-8aad-51aa-402e65a90b75" name="ReplayDetectionTest" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="b70b4bd5-6dae-b4ad-349c-c3ad70603773" name="ReadFromRequestQueryString" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="4735a071-3c06-509b-05f5-912ab0e39f13" name="InvalidRealmBadProtocol" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
-      <TestLink id="a1a0178c-cd4a-1651-8535-3c9ee3d40821" name="ToDictionaryWithNullKey" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+      <TestLink id="2f6a81c5-cd04-0ca0-22ee-d4213f9cf147" name="EqualityTests" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="64d8c630-76c6-e420-937b-19c889dd7f59" name="CtorNonMessageType" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="83aba528-c8ea-f464-177e-2ea8ae2cfd0b" name="Birthdates" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
       <TestLink id="864578a5-61a2-bc5d-1d19-17093885bea3" name="InvalidRealmTwoWildcards1" storage="..\bin\debug\dotnetopenauth.test.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />